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-05-22 15:11:31 -06:00
commit 422ee9a070
7 changed files with 32 additions and 7 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",
"notistack": "^3.0.1",
"openweathermap-ts": "^1.2.10",
"protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master",
"protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
"react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1",
"react-color": "^2.19.3",
@ -10864,7 +10864,7 @@
},
"node_modules/protobuf-ts": {
"version": "1.0.0",
"resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#f8704561c094b208029340cdf2ce0c510ef1eb12",
"resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#3f9a71a350651fb151d18514f990794f62a8e0cc",
"dependencies": {
"protobufjs": "^6.8.8"
}

2
package.json
View file

@ -52,7 +52,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#master",
"protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging",
"react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1",
"react-color": "^2.19.3",

6
src/firmware/UploadFirmware.tsx
View file

@ -79,7 +79,8 @@ class UploadFirmware extends React.Component<Props, State> {
pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR_BLACK,
pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR_GREEN,
pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR_BLUE,
pond.DevicePlatform.DEVICE_PLATFORM_V2_WIFI_BLUE
pond.DevicePlatform.DEVICE_PLATFORM_V2_WIFI_BLUE,
pond.DevicePlatform.DEVICE_PLATFORM_V2_ETHERNET_BLUE
].includes(platform);
var isChannelValid = [
pond.UpgradeChannel.UPGRADE_CHANNEL_ALPHA,
@ -229,6 +230,9 @@ class UploadFirmware extends React.Component<Props, State> {
</MenuItem>
<MenuItem value={pond.DevicePlatform.DEVICE_PLATFORM_V2_WIFI_BLUE}>
V2 Wifi Blue
</MenuItem>
<MenuItem value={pond.DevicePlatform.DEVICE_PLATFORM_V2_ETHERNET_BLUE}>
V2 Ethernet Blue
</MenuItem>
</TextField>
<TextField

6
src/models/Device.ts
View file

@ -14,6 +14,7 @@ interface FeatureVersionByPlatform {
v2CellGreen: string;
v2WifiBlue: string;
v2CellBlue: string;
v2EthBlue: string;
}
const featureVersions: Map<string, FeatureVersionByPlatform> = new Map([
@ -29,7 +30,8 @@ const featureVersions: Map<string, FeatureVersionByPlatform> = new Map([
v2CellBlack: "2.0.44",
v2CellGreen: "2.0.44",
v2WifiBlue: "2.0.44",
v2CellBlue: "2.0.44"
v2CellBlue: "2.0.44",
v2EthBlue: "2.0.44"
}
]
]);
@ -118,6 +120,8 @@ export class Device {
return this.status.firmwareVersion >= versions.v2WifiBlue;
case pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR_BLUE:
return this.status.firmwareVersion >= versions.v2CellBlue;
case pond.DevicePlatform.DEVICE_PLATFORM_V2_ETHERNET_BLUE:
return this.status.firmwareVersion >= versions.v2EthBlue;
default:
return false;
}

3
src/pages/DeviceSupport.tsx
View file

@ -301,6 +301,9 @@ export default function DeviceSupport() {
<MenuItem value={pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR_BLUE}>
V2 Cellular Blue
</MenuItem>
<MenuItem value={pond.DevicePlatform.DEVICE_PLATFORM_V2_ETHERNET_BLUE}>
V2 Ethernet Blue
</MenuItem>
</Select>
</FormControl>
<Button color="primary" onClick={() => updateDevicePlatform(platform)}>

2
src/pbHelpers/Connectivity.tsx
View file

@ -73,6 +73,8 @@ function getTooltip(platform: pond.DevicePlatform): string {
case pond.DevicePlatform.DEVICE_PLATFORM_PHOTON ||
pond.DevicePlatform.DEVICE_PLATFORM_V2_WIFI_S3:
return "Communicates via Wi-Fi";
case pond.DevicePlatform.DEVICE_PLATFORM_V2_ETHERNET_BLUE:
return "Communicates view Ethernet"
default:
return "";
}

16
src/pbHelpers/DevicePlatform.tsx
View file

@ -4,7 +4,9 @@ import {
SignalCellular4Bar,
SignalWifi4Bar,
SignalCellularOff,
SignalWifiOff
SignalWifiOff,
Cable,
DoNotDisturb
} from "@mui/icons-material";
import { pond } from "protobuf-ts/pond";
@ -98,6 +100,15 @@ const V2_Wifi_Blue: DevicePlatformDescriber = {
platformName: "v2wifiblue"
};
const V2_Ethernet_Blue: DevicePlatformDescriber = {
platform: pond.DevicePlatform.DEVICE_PLATFORM_V2_ETHERNET_BLUE,
label: "V2 Ethernet Blue",
description: "Communicates via ethernet",
icon: <Cable style={{ color: "#fff" }} />,
offlineIcon: <DoNotDisturb style={{ color: "#fff" }} />,
platformName: "v2ethernetblue"
};
const map = new Map<pond.DevicePlatform, DevicePlatformDescriber>([
[pond.DevicePlatform.DEVICE_PLATFORM_INVALID, Default],
[pond.DevicePlatform.DEVICE_PLATFORM_PHOTON, Photon],
@ -107,7 +118,8 @@ const map = new Map<pond.DevicePlatform, DevicePlatformDescriber>([
[pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR_BLACK, V2_Cell_Black],
[pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR_GREEN, V2_Cell_Green],
[pond.DevicePlatform.DEVICE_PLATFORM_V2_CELLULAR_BLUE, V2_Cell_Blue],
[pond.DevicePlatform.DEVICE_PLATFORM_V2_WIFI_BLUE, V2_Wifi_Blue]
[pond.DevicePlatform.DEVICE_PLATFORM_V2_WIFI_BLUE, V2_Wifi_Blue],
[pond.DevicePlatform.DEVICE_PLATFORM_V2_ETHERNET_BLUE, V2_Ethernet_Blue]
]);
export function getDevicePlatformDescriber(platform: pond.DevicePlatform): DevicePlatformDescriber {