brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'staging_environment' of gitlab.com:brandx/bxt-app into staging_environment

Browse source
This commit is contained in:
Carter 2025-07-23 09:59:56 -06:00
commit 7335b18ef3
4 changed files with 45 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package-lock.json generated
View file

@ -42,7 +42,7 @@
"mui-tel-input": "^7.0.0", "mui-tel-input": "^7.0.0",
"notistack": "^3.0.1", "notistack": "^3.0.1",
"openweathermap-ts": "^1.2.10", "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", "query-string": "^9.2.1",
"react": "^18.3.1", "react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1", "react-beautiful-dnd": "^13.1.1",
@ -10911,7 +10911,7 @@
}, },
"node_modules/protobuf-ts": { "node_modules/protobuf-ts": {
"version": "1.0.0", "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": { "dependencies": {
"protobufjs": "^6.8.8" "protobufjs": "^6.8.8"
} }

2
package.json
View file

@ -54,7 +54,7 @@
"mui-tel-input": "^7.0.0", "mui-tel-input": "^7.0.0",
"notistack": "^3.0.1", "notistack": "^3.0.1",
"openweathermap-ts": "^1.2.10", "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", "query-string": "^9.2.1",
"react": "^18.3.1", "react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1", "react-beautiful-dnd": "^13.1.1",

31
src/grain/GrainDescriber.ts
View file

@ -475,6 +475,37 @@ export const GrainExtensions: Map<pond.Grain, GrainExtension> = new Map([
weightConversionKg: 27.2158214642112, weightConversionKg: 27.2158214642112,
bushelsPerTonne: 36.744 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_DRY_BEANS_BLACK,
{
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
}
] ]
]); ]);

22
src/models/Device.ts
View file

@ -36,17 +36,17 @@ const featureVersions: Map<string, FeatureVersionByPlatform> = new Map([
],[ ],[
"detectI2C", "detectI2C",
{ {
photon: "NA", photon: "N/A",
electron: "NA", electron: "N/A",
v2Wifi: "2.1.6", v2Wifi: "N/A",
v2Cell: "2.1.6", v2Cell: "N/A",
v2WifiS3: "2.1.6", v2WifiS3: "N/A",
v2CellS3: "2.1.6", v2CellS3: "N/A",
v2CellBlack: "2.1.6", v2CellBlack: "N/A",
v2CellGreen: "2.1.6", v2CellGreen: "N/A",
v2WifiBlue: "2.1.6", v2WifiBlue: "N/A",
v2CellBlue: "2.1.6", v2CellBlue: "N/A",
v2EthBlue: "2.1.6" v2EthBlue: "N/A"
} }
] ]
]); ]);