diff --git a/lib/Hoymiles/src/parser/DevInfoParser.cpp b/lib/Hoymiles/src/parser/DevInfoParser.cpp index 2e89df2c..01245c35 100644 --- a/lib/Hoymiles/src/parser/DevInfoParser.cpp +++ b/lib/Hoymiles/src/parser/DevInfoParser.cpp @@ -30,11 +30,14 @@ const devInfo_t devInfo[] = { { { 0x10, 0x20, 0x21, ALL }, 350, "HMS-350" }, // 00 { { 0x10, 0x10, 0x71, ALL }, 500, "HMS-500" }, // 02 + { { 0x10, 0x21, 0x11, ALL }, 600, "HMS-600" }, // 01 { { 0x10, 0x21, 0x41, ALL }, 800, "HMS-800" }, // 00 { { 0x10, 0x21, 0x71, ALL }, 1000, "HMS-1000" }, // 05 + { { 0x10, 0x22, 0x41, ALL }, 1600, "HMS-1600" }, // 4 { { 0x10, 0x12, 0x51, ALL }, 1800, "HMS-1800" }, // 01 { { 0x10, 0x22, 0x51, ALL }, 1800, "HMS-1800" }, // 16 { { 0x10, 0x12, 0x71, ALL }, 2000, "HMS-2000" }, // 01 + { { 0x10, 0x22, 0x71, ALL }, 2000, "HMS-2000" }, // 10 { { 0x10, 0x33, 0x11, ALL }, 1800, "HMT-1800" }, // 01 { { 0x10, 0x33, 0x31, ALL }, 2250, "HMT-2250" } // 01 diff --git a/platformio.ini b/platformio.ini index 38b941ec..68ac02df 100644 --- a/platformio.ini +++ b/platformio.ini @@ -19,6 +19,7 @@ platform = espressif32@6.1.0 build_flags = -DCOMPONENT_EMBED_FILES=webapp_dist/index.html.gz:webapp_dist/zones.json.gz:webapp_dist/favicon.ico:webapp_dist/js/app.js.gz + -DPIOENV=\"$PIOENV\" -Wall -Wextra -Werror -std=c++17 -std=gnu++17 diff --git a/src/WebApi_sysstatus.cpp b/src/WebApi_sysstatus.cpp index 58af9079..fbb392d9 100644 --- a/src/WebApi_sysstatus.cpp +++ b/src/WebApi_sysstatus.cpp @@ -67,6 +67,7 @@ void WebApiSysstatusClass::onSystemStatus(AsyncWebServerRequest* request) snprintf(version, sizeof(version), "%d.%d.%d", CONFIG_VERSION >> 24 & 0xff, CONFIG_VERSION >> 16 & 0xff, CONFIG_VERSION >> 8 & 0xff); root["config_version"] = version; root["git_hash"] = AUTO_GIT_HASH; + root["pioenv"] = PIOENV; root["uptime"] = esp_timer_get_time() / 1000000; diff --git a/webapp/package.json b/webapp/package.json index 5b52459c..fd52900c 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -25,20 +25,20 @@ "@rushstack/eslint-patch": "^1.2.0", "@tsconfig/node18": "^2.0.0", "@types/bootstrap": "^5.2.6", - "@types/node": "^18.16.3", + "@types/node": "^18.16.6", "@types/spark-md5": "^3.0.2", "@vitejs/plugin-vue": "^4.2.1", "@vue/eslint-config-typescript": "^11.0.3", "@vue/tsconfig": "^0.3.2", - "eslint": "^8.39.0", - "eslint-plugin-vue": "^9.11.0", + "eslint": "^8.40.0", + "eslint-plugin-vue": "^9.11.1", "npm-run-all": "^4.1.5", "sass": "^1.62.1", - "terser": "^5.17.1", + "terser": "^5.17.3", "typescript": "^5.0.4", - "vite": "^4.3.4", + "vite": "^4.3.5", "vite-plugin-compression": "^0.5.1", - "vite-plugin-css-injected-by-js": "^3.1.0", - "vue-tsc": "^1.6.3" + "vite-plugin-css-injected-by-js": "^3.1.1", + "vue-tsc": "^1.6.4" } } diff --git a/webapp/src/components/FirmwareInfo.vue b/webapp/src/components/FirmwareInfo.vue index 2e3b90a7..0ff75140 100644 --- a/webapp/src/components/FirmwareInfo.vue +++ b/webapp/src/components/FirmwareInfo.vue @@ -22,6 +22,10 @@ {{ systemStatus.git_hash }} +