Merge pull request #1229 from MichaelDvP/dev2

api/response, Gateway S3, small fixes
emsesp · Jul 21, 2023 · ba409b8 · ba409b8
2 parents ad6be2d + 207d92b
commit ba409b8
Show file tree

Hide file tree

Showing 29 changed files with 483 additions and 344 deletions.
diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
@@ -36,6 +36,9 @@ There are breaking changes between 3.5.x and earlier versions of 3.6.0. Please r
 - Support Buderus AM200 [#1161](https://github.com/emsesp/EMS-ESP32/issues/1161)
 - Custom telegram handler [#1155](https://github.com/emsesp/EMS-ESP32/issues/1155)
 - Added support for TLS in MQTT (ESP32-S3 only) [#1178](https://github.com/emsesp/EMS-ESP32/issues/1178)
+- Boardprofile BBQKees Gateway S3
+- Custom entity type RAW [#1212](https://github.com/emsesp/EMS-ESP32/discussions/1212)
+- API command response [#1212](https://github.com/emsesp/EMS-ESP32/discussions/1212)
 
 ## Fixed
 
@@ -46,6 +49,7 @@ There are breaking changes between 3.5.x and earlier versions of 3.6.0. Please r
 - thermostat modetype is not changing when mode changes (e.g. to night) bugSomething isn't working [#1098](https://github.com/emsesp/EMS-ESP32/issues/1098)
 - NTP: cant apply changed timezone [#1182](https://github.com/emsesp/EMS-ESP32/issues/1182)
 - Missing Status of VS1 for Buderus SM200 enhancement [#1034](https://github.com/emsesp/EMS-ESP32/issues/1034)
+- Allowed gpios for S3
 
 ## Changed
 
@@ -62,3 +66,4 @@ There are breaking changes between 3.5.x and earlier versions of 3.6.0. Please r
 - Use [espMqttClient](https://github.com/bertmelis/espMqttClient) with integrated queue [#1178](https://github.com/emsesp/EMS-ESP32/issues/1178)
 - Move Sensors from Web dashboard to it's own tab enhancement [#1170](https://github.com/emsesp/EMS-ESP32/issues/1170)
 - Optimize WebUI dashboard data [#1169](https://github.com/emsesp/EMS-ESP32/issues/1169)
+- Response to `system/send`` raw reads gives combined data for telegrams with more parts
diff --git a/esp32_asym_partition_4M.csv b/esp32_asym_partition_4M.csv
@@ -1,6 +1,6 @@
 # Name,   Type, SubType, Offset,   Size,    Flags
 nvs,      data, nvs,     0x9000,   0x5000,
 otadata,  data, ota,     ,         0x2000,
-app1,     app,  ota_1,   ,         0x140000,
 app0,     app,  ota_0,   ,         0x2A0000,
+app1,     app,  ota_1,   ,         0x140000,
 spiffs,   data, spiffs,  ,         64K,
diff --git a/interface/.typesafe-i18n.json b/interface/.typesafe-i18n.json
@@ -1,5 +1,5 @@
 {
-  "adapter": "react",
-  "baseLocale": "pl",
-  "$schema": "https://unpkg.com/typesafe-i18n@5.24.4/schema/typesafe-i18n.json"
-}
+   "adapter": "react",
+   "baseLocale": "pl",
+   "$schema": "https://unpkg.com/typesafe-i18n@5.25.1/schema/typesafe-i18n.json"
+}
diff --git a/interface/package.json b/interface/package.json
@@ -22,16 +22,16 @@
     "@alova/adapter-xhr": "^1.0.1",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.14.0",
-    "@mui/material": "^5.14.0",
+    "@mui/icons-material": "^5.14.1",
+    "@mui/material": "^5.14.1",
     "@preact/compat": "^17.1.2",
     "@table-library/react-table-library": "4.1.4",
     "@types/lodash-es": "^4.17.8",
     "@types/node": "^20.4.2",
     "@types/react": "^18.2.15",
     "@types/react-dom": "^18.2.7",
     "@types/react-router-dom": "^5.3.3",
-    "alova": "^2.9.2",
+    "alova": "^2.9.3",
     "async-validator": "^4.2.5",
     "history": "^5.3.0",
     "jwt-decode": "^3.1.2",
@@ -42,17 +42,17 @@
     "react-dom": "latest",
     "react-dropzone": "^14.2.3",
     "react-icons": "^4.10.1",
-    "react-router-dom": "^6.14.1",
+    "react-router-dom": "^6.14.2",
     "react-toastify": "^9.1.3",
     "sockette": "^2.0.6",
-    "typesafe-i18n": "^5.24.4",
+    "typesafe-i18n": "^5.25.1",
     "typescript": "^5.1.6"
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.5.0",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
-    "cspell": "^6.31.1",
+    "@typescript-eslint/eslint-plugin": "^6.1.0",
+    "@typescript-eslint/parser": "^6.1.0",
+    "cspell": "^6.31.2",
     "eslint": "^8.45.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.1.0",
@@ -62,14 +62,14 @@
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-prettier": "alpha",
-    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react": "^7.33.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "nodemon": "^3.0.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.0.0",
     "rollup-plugin-visualizer": "^5.9.2",
-    "terser": "^5.19.0",
-    "vite": "^4.4.4",
+    "terser": "^5.19.1",
+    "vite": "^4.4.6",
     "vite-plugin-svgr": "^3.2.0",
     "vite-tsconfig-paths": "^4.2.0"
   },

diff --git a/interface/src/framework/mqtt/MqttStatusForm.tsx b/interface/src/framework/mqtt/MqttStatusForm.tsx
@@ -68,10 +68,8 @@ const MqttStatusForm: FC = () => {
         return 'Malformed credentials';
       case MqttDisconnectReason.MQTT_NOT_AUTHORIZED:
         return 'Not authorized';
-      case MqttDisconnectReason.ESP8266_NOT_ENOUGH_SPACE:
-        return 'Device out of memory';
       case MqttDisconnectReason.TLS_BAD_FINGERPRINT:
-        return 'Server fingerprint invalid';
+        return 'TSL fingerprint invalid';
       default:
         return 'Unknown';
     }

diff --git a/interface/src/project/SettingsEntitiesDialog.tsx b/interface/src/project/SettingsEntitiesDialog.tsx
@@ -17,7 +17,7 @@ import {
 } from '@mui/material';
 import { useEffect, useState } from 'react';
 
-import { DeviceValueUOM_s } from './types';
+import { DeviceValueUOM_s, DeviceValueType } from './types';
 import type { EntityItem } from './types';
 import type Schema from 'async-validator';
 import type { ValidateFieldsError } from 'async-validator';
@@ -166,17 +166,18 @@ const SettingsEntitiesDialog = ({
               fullWidth
               select
             >
-              <MenuItem value={0}>BOOL</MenuItem>
-              <MenuItem value={1}>INT</MenuItem>
-              <MenuItem value={2}>UINT</MenuItem>
-              <MenuItem value={3}>SHORT</MenuItem>
-              <MenuItem value={4}>USHORT</MenuItem>
-              <MenuItem value={5}>ULONG</MenuItem>
-              <MenuItem value={6}>TIME</MenuItem>
+              <MenuItem value={DeviceValueType.BOOL}>BOOL</MenuItem>
+              <MenuItem value={DeviceValueType.INT}>INT</MenuItem>
+              <MenuItem value={DeviceValueType.UINT}>UINT</MenuItem>
+              <MenuItem value={DeviceValueType.SHORT}>SHORT</MenuItem>
+              <MenuItem value={DeviceValueType.USHORT}>USHORT</MenuItem>
+              <MenuItem value={DeviceValueType.ULONG}>ULONG</MenuItem>
+              <MenuItem value={DeviceValueType.TIME}>TIME</MenuItem>
+              <MenuItem value={DeviceValueType.STRING}>RAW</MenuItem>
             </TextField>
           </Grid>
 
-          {editItem.value_type !== 0 && (
+          {editItem.value_type !== DeviceValueType.BOOL && editItem.value_type !== DeviceValueType.STRING && (
             <>
               <Grid item xs={4}>
                 <TextField
@@ -210,6 +211,21 @@ const SettingsEntitiesDialog = ({
               </Grid>
             </>
           )}
+          {editItem.value_type === DeviceValueType.STRING && (
+            <Grid item xs={4}>
+              <TextField
+                name="factor"
+                label="Bytes"
+                value={editItem.factor}
+                variant="outlined"
+                onChange={updateFormValue}
+                fullWidth
+                margin="normal"
+                type="number"
+                inputProps={{ min: '1', max: '27', step: '1' }}
+              />
+            </Grid>
+          )}
         </Grid>
       </DialogContent>
 

diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts
@@ -243,7 +243,8 @@ export const BOARD_PROFILES: BoardProfiles = {
   OLIMEXPOE: 'Olimex ESP32-POE',
   C3MINI: 'Wemos C3 Mini',
   S2MINI: 'Wemos S2 Mini',
-  S3MINI: 'Liligo S3'
+  S3MINI: 'Liligo S3',
+  S32S3: 'BBQKees Gateway S3'
 };
 
 export interface BoardProfile {
@@ -364,3 +365,17 @@ export const enum DeviceType {
   CUSTOM,
   UNKNOWN
 }
+
+// matches emsdevicevalue.h
+export const enum DeviceValueType {
+  BOOL,
+  INT,
+  UINT,
+  SHORT,
+  USHORT,
+  ULONG,
+  TIME, // same as ULONG (32 bits)
+  ENUM,
+  STRING,
+  CMD
+}
diff --git a/interface/src/project/validators.ts b/interface/src/project/validators.ts
@@ -8,7 +8,7 @@ export const GPIO_VALIDATOR = {
     if (
       value &&
       (value === 1 ||
-        (value >= 10 && value <= 12) ||
+        (value >= 6 && value <= 12) ||
         (value >= 14 && value <= 15) ||
         value === 20 ||
         value === 24 ||
@@ -43,6 +43,23 @@ export const GPIO_VALIDATORS2 = {
   }
 };
 
+export const GPIO_VALIDATORS3 = {
+  validator(rule: InternalRuleItem, value: number, callback: (error?: string) => void) {
+    if (
+      value &&
+      ((value >= 19 && value <= 20) ||
+        (value >= 22 && value <= 37) ||
+        (value >= 39 && value <= 42) ||
+        value > 48 ||
+        value < 0)
+    ) {
+      callback('Must be an valid GPIO port');
+    } else {
+      callback();
+    }
+  }
+};
+
 export const createSettingsValidator = (settings: Settings) =>
   new Schema({
     ...(settings.board_profile === 'CUSTOM' &&
@@ -69,6 +86,14 @@ export const createSettingsValidator = (settings: Settings) =>
         tx_gpio: [{ required: true, message: 'Tx GPIO is required' }, GPIO_VALIDATORS2],
         rx_gpio: [{ required: true, message: 'Rx GPIO is required' }, GPIO_VALIDATORS2]
       }),
+    ...(settings.board_profile === 'CUSTOM' &&
+      settings.platform === 'ESP32-S3' && {
+        led_gpio: [{ required: true, message: 'LED GPIO is required' }, GPIO_VALIDATORS3],
+        dallas_gpio: [{ required: true, message: 'GPIO is required' }, GPIO_VALIDATORS3],
+        pbutton_gpio: [{ required: true, message: 'Button GPIO is required' }, GPIO_VALIDATORS3],
+        tx_gpio: [{ required: true, message: 'Tx GPIO is required' }, GPIO_VALIDATORS3],
+        rx_gpio: [{ required: true, message: 'Rx GPIO is required' }, GPIO_VALIDATORS3]
+      }),
     ...(settings.syslog_enabled && {
       syslog_host: [{ required: true, message: 'Host is required' }, IP_OR_HOSTNAME_VALIDATOR],
       syslog_port: [

diff --git a/interface/src/types/mqtt.ts b/interface/src/types/mqtt.ts
@@ -1,12 +1,12 @@
 export enum MqttDisconnectReason {
-  TCP_DISCONNECTED = 0,
+  USER_OK = 0,
   MQTT_UNACCEPTABLE_PROTOCOL_VERSION = 1,
   MQTT_IDENTIFIER_REJECTED = 2,
   MQTT_SERVER_UNAVAILABLE = 3,
   MQTT_MALFORMED_CREDENTIALS = 4,
   MQTT_NOT_AUTHORIZED = 5,
-  ESP8266_NOT_ENOUGH_SPACE = 6,
-  TLS_BAD_FINGERPRINT = 7
+  TLS_BAD_FINGERPRINT = 6,
+  TCP_DISCONNECTED = 7
 }
 
 export interface MqttStatus {