From ed8ba4b3e4217c085a3b14aaa748c0ea0e0dd590 Mon Sep 17 00:00:00 2001 From: csawatzky Date: Mon, 21 Jul 2025 13:21:19 -0600 Subject: [PATCH 1/3] added dry beans --- package-lock.json | 4 ++-- package.json | 2 +- src/grain/GrainDescriber.ts | 31 +++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index af61e6b..222fcf3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "mui-tel-input": "^7.0.0", "notistack": "^3.0.1", "openweathermap-ts": "^1.2.10", - "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging", + "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#beans", "query-string": "^9.2.1", "react": "^18.3.1", "react-beautiful-dnd": "^13.1.1", @@ -10911,7 +10911,7 @@ }, "node_modules/protobuf-ts": { "version": "1.0.0", - "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#4523ffef42032eb4a923bd50d4cfcccbb1397dbd", + "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#f09196cbc38911bab69fb35c16b1c8f691a4413f", "dependencies": { "protobufjs": "^6.8.8" } diff --git a/package.json b/package.json index fc7a1ac..5a27ce1 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "mui-tel-input": "^7.0.0", "notistack": "^3.0.1", "openweathermap-ts": "^1.2.10", - "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging", + "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#beans", "query-string": "^9.2.1", "react": "^18.3.1", "react-beautiful-dnd": "^13.1.1", diff --git a/src/grain/GrainDescriber.ts b/src/grain/GrainDescriber.ts index 00f9bb0..d112e90 100644 --- a/src/grain/GrainDescriber.ts +++ b/src/grain/GrainDescriber.ts @@ -475,6 +475,37 @@ export const GrainExtensions: Map = new Map([ weightConversionKg: 27.2158214642112, bushelsPerTonne: 36.744 } + ], + [ + pond.Grain.GRAIN_DRY_BEANS_RED, + { + name: "Dry Beans Red", + group: "Dry Beans", + equation: Equation.halsey, + a: 4.2669, + b: -0.013382, + c: 1.6933, + setTempC: defaultSetTemp, + targetMC: 15.0, + colour: "red", + weightConversionKg: 27.2155, + bushelsPerTonne: 36.744 + } + ],[ + pond.Grain.GRAIN_CUSTOM, + { + name: "Dry Beans Black", + group: "Dry Beans", + equation: Equation.halsey, + a: 5.2003, + b: -0.022685, + c: 1.9656, + setTempC: defaultSetTemp, + targetMC: 15.0, + colour: "grey", + weightConversionKg: 27.2155, + bushelsPerTonne: 36.744 + } ] ]); From 0266776e77ac25df51ce2a15ed3fae9e32748d8f Mon Sep 17 00:00:00 2001 From: csawatzky Date: Mon, 21 Jul 2025 13:21:30 -0600 Subject: [PATCH 2/3] missed change --- src/grain/GrainDescriber.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/grain/GrainDescriber.ts b/src/grain/GrainDescriber.ts index d112e90..ce394b3 100644 --- a/src/grain/GrainDescriber.ts +++ b/src/grain/GrainDescriber.ts @@ -492,7 +492,7 @@ export const GrainExtensions: Map = new Map([ bushelsPerTonne: 36.744 } ],[ - pond.Grain.GRAIN_CUSTOM, + pond.Grain.GRAIN_DRY_BEANS_BLACK, { name: "Dry Beans Black", group: "Dry Beans", From 2d5f21c9b5cf53584b936fe78fdcfae4fe25f4fe Mon Sep 17 00:00:00 2001 From: csawatzky Date: Tue, 22 Jul 2025 10:42:55 -0600 Subject: [PATCH 3/3] set the detect I2C feature to not be available yet as we have changed how it works on dev so will want to wait for those changes before it goes live --- src/models/Device.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/models/Device.ts b/src/models/Device.ts index 6311981..e45f7aa 100644 --- a/src/models/Device.ts +++ b/src/models/Device.ts @@ -36,17 +36,17 @@ const featureVersions: Map = new Map([ ],[ "detectI2C", { - photon: "NA", - electron: "NA", - v2Wifi: "2.1.6", - v2Cell: "2.1.6", - v2WifiS3: "2.1.6", - v2CellS3: "2.1.6", - v2CellBlack: "2.1.6", - v2CellGreen: "2.1.6", - v2WifiBlue: "2.1.6", - v2CellBlue: "2.1.6", - v2EthBlue: "2.1.6" + photon: "N/A", + electron: "N/A", + v2Wifi: "N/A", + v2Cell: "N/A", + v2WifiS3: "N/A", + v2CellS3: "N/A", + v2CellBlack: "N/A", + v2CellGreen: "N/A", + v2WifiBlue: "N/A", + v2CellBlue: "N/A", + v2EthBlue: "N/A" } ] ]);