Merge pull request emsesp#1647 from MichaelDvP/dev2

update testbuild to latest dev change
proddy · Mar 2, 2024 · bb35508 · bb35508
2 parents 8c4fc49 + f77fb12
commit bb35508
Show file tree

Hide file tree

Showing 13 changed files with 289 additions and 159 deletions.
diff --git a/.github/workflows/pre_release.yml b/.github/workflows/pre_release.yml
@@ -48,6 +48,10 @@ jobs:
         run: |
           platformio run -e ci_s3
 
+      - name: Build E32V2 firmware
+        run: |
+          platformio run -e ci_16M
+
       - name: Create a GH Release
         id: 'automatic_releases'
         uses: 'marvinpinto/action-automatic-releases@latest'

diff --git a/interface/package.json b/interface/package.json
@@ -23,16 +23,16 @@
   },
   "dependencies": {
     "@alova/adapter-xhr": "^1.0.3",
-    "@babel/core": "^7.23.9",
-    "@emotion/react": "^11.11.3",
+    "@babel/core": "^7.24.0",
+    "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.0",
     "@mui/icons-material": "^5.15.11",
     "@mui/material": "^5.15.11",
     "@table-library/react-table-library": "4.1.7",
     "@types/imagemin": "^8.0.5",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.11.20",
-    "@types/react": "^18.2.58",
+    "@types/node": "^20.11.23",
+    "@types/react": "^18.2.61",
     "@types/react-dom": "^18.2.19",
     "@types/react-router-dom": "^5.3.3",
     "alova": "^2.17.0",
@@ -45,7 +45,7 @@
     "react-dom": "latest",
     "react-dropzone": "^14.2.3",
     "react-icons": "^5.0.1",
-    "react-router-dom": "^6.22.1",
+    "react-router-dom": "^6.22.2",
     "react-toastify": "^10.0.4",
     "sockette": "^2.0.6",
     "typesafe-i18n": "^5.26.2",
@@ -54,8 +54,8 @@
   "devDependencies": {
     "@preact/compat": "^17.1.2",
     "@preact/preset-vite": "^2.8.1",
-    "@typescript-eslint/eslint-plugin": "^7.0.2",
-    "@typescript-eslint/parser": "^7.0.2",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
+    "@typescript-eslint/parser": "^7.1.0",
     "concurrently": "^8.2.2",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",

diff --git a/interface/src/framework/network/NetworkSettingsForm.tsx b/interface/src/framework/network/NetworkSettingsForm.tsx
@@ -216,6 +216,8 @@ const WiFiSettingsForm: FC = () => {
           <MenuItem value={44}>11 dBm</MenuItem>
           <MenuItem value={34}>8.5 dBm</MenuItem>
           <MenuItem value={28}>7 dBm</MenuItem>
+          <MenuItem value={20}>5 dBm</MenuItem>
+          <MenuItem value={8}>2 dBm</MenuItem>
         </TextField>
         <BlockFormControlLabel
           control={<Checkbox name="nosleep" checked={data.nosleep} onChange={updateFormValue} />}
@@ -257,10 +259,12 @@ const WiFiSettingsForm: FC = () => {
             margin="normal"
           />
         )}
-        <BlockFormControlLabel
-          control={<Checkbox name="enableIPv6" checked={data.enableIPv6} onChange={updateFormValue} />}
-          label={LL.NETWORK_ENABLE_IPV6()}
-        />
+        {data.enableIPv6 !== undefined && (
+          <BlockFormControlLabel
+            control={<Checkbox name="enableIPv6" checked={data.enableIPv6} onChange={updateFormValue} />}
+            label={LL.NETWORK_ENABLE_IPV6()}
+          />
+        )}
         <BlockFormControlLabel
           control={<Checkbox name="static_ip_config" checked={data.static_ip_config} onChange={updateFormValue} />}
           label={LL.NETWORK_FIXED_IP()}

diff --git a/interface/src/types/network.ts b/interface/src/types/network.ts
@@ -42,7 +42,7 @@ export interface NetworkSettings {
   password: string;
   hostname: string;
   static_ip_config: boolean;
-  enableIPv6: boolean;
+  enableIPv6?: boolean;
   bandwidth20: boolean;
   nosleep: boolean;
   tx_power: number;