Merge pull request #2275 from proddy/dev

minor updates
This commit is contained in:
Proddy
2024-12-02 22:12:29 +01:00
committed by GitHub
4 changed files with 90 additions and 86 deletions

View File

@@ -31,7 +31,7 @@
"async-validator": "^4.2.5",
"jwt-decode": "^4.0.0",
"mime-types": "^2.1.35",
"preact": "^10.25.0",
"preact": "^10.25.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-icons": "^5.3.0",
@@ -57,8 +57,8 @@
"prettier": "^3.4.1",
"rollup-plugin-visualizer": "^5.12.0",
"terser": "^5.36.0",
"typescript-eslint": "8.16.0",
"vite": "^6.0.1",
"typescript-eslint": "8.17.0",
"vite": "^6.0.2",
"vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^5.1.3"
},

View File

@@ -1516,15 +1516,15 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/eslint-plugin@npm:8.16.0":
version: 8.16.0
resolution: "@typescript-eslint/eslint-plugin@npm:8.16.0"
"@typescript-eslint/eslint-plugin@npm:8.17.0":
version: 8.17.0
resolution: "@typescript-eslint/eslint-plugin@npm:8.17.0"
dependencies:
"@eslint-community/regexpp": "npm:^4.10.0"
"@typescript-eslint/scope-manager": "npm:8.16.0"
"@typescript-eslint/type-utils": "npm:8.16.0"
"@typescript-eslint/utils": "npm:8.16.0"
"@typescript-eslint/visitor-keys": "npm:8.16.0"
"@typescript-eslint/scope-manager": "npm:8.17.0"
"@typescript-eslint/type-utils": "npm:8.17.0"
"@typescript-eslint/utils": "npm:8.17.0"
"@typescript-eslint/visitor-keys": "npm:8.17.0"
graphemer: "npm:^1.4.0"
ignore: "npm:^5.3.1"
natural-compare: "npm:^1.4.0"
@@ -1535,44 +1535,44 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/b03612b726ee5aff631cd50e05ceeb06a522e64465e4efdc134e3a27a09406b959ef7a05ec4acef1956b3674dc4fedb6d3a62ce69382f9e30c227bd4093003e5
checksum: 10c0/d78778173571a9a1370345bc2aa3e850235a489d16b8a8b5ba3086b988bbef7549bdae38e509d7a679ba3179c688cc5a408376b158be402770836e94ffc9602d
languageName: node
linkType: hard
"@typescript-eslint/parser@npm:8.16.0":
version: 8.16.0
resolution: "@typescript-eslint/parser@npm:8.16.0"
"@typescript-eslint/parser@npm:8.17.0":
version: 8.17.0
resolution: "@typescript-eslint/parser@npm:8.17.0"
dependencies:
"@typescript-eslint/scope-manager": "npm:8.16.0"
"@typescript-eslint/types": "npm:8.16.0"
"@typescript-eslint/typescript-estree": "npm:8.16.0"
"@typescript-eslint/visitor-keys": "npm:8.16.0"
"@typescript-eslint/scope-manager": "npm:8.17.0"
"@typescript-eslint/types": "npm:8.17.0"
"@typescript-eslint/typescript-estree": "npm:8.17.0"
"@typescript-eslint/visitor-keys": "npm:8.17.0"
debug: "npm:^4.3.4"
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/e49c6640a7a863a16baecfbc5b99392a4731e9c7e9c9aaae4efbc354e305485fe0f39a28bf0acfae85bc01ce37fe0cc140fd315fdaca8b18f9b5e0addff8ceae
checksum: 10c0/2543deadf01302a92d3b6f58a4c14f98d8936c4d976e7da05e3bb65608f19d8de93b25282e343c304eca3e3f37f2ac23e97fa9c11c6edff36dd2d4f6b601a630
languageName: node
linkType: hard
"@typescript-eslint/scope-manager@npm:8.16.0":
version: 8.16.0
resolution: "@typescript-eslint/scope-manager@npm:8.16.0"
"@typescript-eslint/scope-manager@npm:8.17.0":
version: 8.17.0
resolution: "@typescript-eslint/scope-manager@npm:8.17.0"
dependencies:
"@typescript-eslint/types": "npm:8.16.0"
"@typescript-eslint/visitor-keys": "npm:8.16.0"
checksum: 10c0/23b7c738b83f381c6419a36e6ca951944187e3e00abb8e012bce8041880410fe498303e28bdeb0e619023a69b14cf32a5ec1f9427c5382807788cd8e52a46a6e
"@typescript-eslint/types": "npm:8.17.0"
"@typescript-eslint/visitor-keys": "npm:8.17.0"
checksum: 10c0/0c08d14240bad4b3f6874f08ba80b29db1a6657437089a6f109db458c544d835bcdc06ba9140bb4f835233ba4326d9a86e6cf6bdb5209960d2f7025aa3191f4f
languageName: node
linkType: hard
"@typescript-eslint/type-utils@npm:8.16.0":
version: 8.16.0
resolution: "@typescript-eslint/type-utils@npm:8.16.0"
"@typescript-eslint/type-utils@npm:8.17.0":
version: 8.17.0
resolution: "@typescript-eslint/type-utils@npm:8.17.0"
dependencies:
"@typescript-eslint/typescript-estree": "npm:8.16.0"
"@typescript-eslint/utils": "npm:8.16.0"
"@typescript-eslint/typescript-estree": "npm:8.17.0"
"@typescript-eslint/utils": "npm:8.17.0"
debug: "npm:^4.3.4"
ts-api-utils: "npm:^1.3.0"
peerDependencies:
@@ -1580,23 +1580,23 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/24c0e815c8bdf99bf488c7528bd6a7c790e8b3b674cb7fb075663afc2ee26b48e6f4cf7c0d14bb21e2376ca62bd8525cbcb5688f36135b00b62b1d353d7235b9
checksum: 10c0/6138ec71b5692d4b5e0bf3d7f66a6fa4e91ddea7031907b0ac45a7693df0a2f4cc5bca7218311e0639620d636ceb7efec83a137dfcd5938304d873b774fcc8bd
languageName: node
linkType: hard
"@typescript-eslint/types@npm:8.16.0":
version: 8.16.0
resolution: "@typescript-eslint/types@npm:8.16.0"
checksum: 10c0/141e257ab4060a9c0e2e14334ca14ab6be713659bfa38acd13be70a699fb5f36932a2584376b063063ab3d723b24bc703dbfb1ce57d61d7cfd7ec5bd8a975129
"@typescript-eslint/types@npm:8.17.0":
version: 8.17.0
resolution: "@typescript-eslint/types@npm:8.17.0"
checksum: 10c0/26b1bf9dfc3ee783c85c6f354b84c28706d5689d777f3ff2de2cb496e45f9d0189c0d561c03ccbc8b24712438be17cf63dd0871ff3ca2083e7f48749770d1893
languageName: node
linkType: hard
"@typescript-eslint/typescript-estree@npm:8.16.0":
version: 8.16.0
resolution: "@typescript-eslint/typescript-estree@npm:8.16.0"
"@typescript-eslint/typescript-estree@npm:8.17.0":
version: 8.17.0
resolution: "@typescript-eslint/typescript-estree@npm:8.17.0"
dependencies:
"@typescript-eslint/types": "npm:8.16.0"
"@typescript-eslint/visitor-keys": "npm:8.16.0"
"@typescript-eslint/types": "npm:8.17.0"
"@typescript-eslint/visitor-keys": "npm:8.17.0"
debug: "npm:^4.3.4"
fast-glob: "npm:^3.3.2"
is-glob: "npm:^4.0.3"
@@ -1606,34 +1606,34 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/f28fea5af4798a718b6735d1758b791a331af17386b83cb2856d89934a5d1693f7cb805e73c3b33f29140884ac8ead9931b1d7c3de10176fa18ca7a346fe10d0
checksum: 10c0/523013f9b5cf2c58c566868e4c3b0b9ac1b4807223a6d64e2a7c58e01e53b6587ba61f1a8241eade361f3f426d6057657515473176141ef8aebb352bc0d223ce
languageName: node
linkType: hard
"@typescript-eslint/utils@npm:8.16.0":
version: 8.16.0
resolution: "@typescript-eslint/utils@npm:8.16.0"
"@typescript-eslint/utils@npm:8.17.0":
version: 8.17.0
resolution: "@typescript-eslint/utils@npm:8.17.0"
dependencies:
"@eslint-community/eslint-utils": "npm:^4.4.0"
"@typescript-eslint/scope-manager": "npm:8.16.0"
"@typescript-eslint/types": "npm:8.16.0"
"@typescript-eslint/typescript-estree": "npm:8.16.0"
"@typescript-eslint/scope-manager": "npm:8.17.0"
"@typescript-eslint/types": "npm:8.17.0"
"@typescript-eslint/typescript-estree": "npm:8.17.0"
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/1e61187eef3da1ab1486d2a977d8f3b1cb8ef7fa26338500a17eb875ca42a8942ef3f2241f509eef74cf7b5620c109483afc7d83d5b0ab79b1e15920f5a49818
checksum: 10c0/a9785ae5f7e7b51d521dc3f48b15093948e4fcd03352c0b60f39bae366cbc935947d215f91e2ae3182d52fa6affb5ccbb50feff487bd1209011f3e0da02cdf07
languageName: node
linkType: hard
"@typescript-eslint/visitor-keys@npm:8.16.0":
version: 8.16.0
resolution: "@typescript-eslint/visitor-keys@npm:8.16.0"
"@typescript-eslint/visitor-keys@npm:8.17.0":
version: 8.17.0
resolution: "@typescript-eslint/visitor-keys@npm:8.17.0"
dependencies:
"@typescript-eslint/types": "npm:8.16.0"
"@typescript-eslint/types": "npm:8.17.0"
eslint-visitor-keys: "npm:^4.2.0"
checksum: 10c0/537df37801831aa8d91082b2adbffafd40305ed4518f0e7d3cbb17cc466d8b9ac95ac91fa232e7fe585d7c522d1564489ec80052ebb2a6ab9bbf89ef9dd9b7bc
checksum: 10c0/9144c4e4a63034fb2031a0ee1fc77e80594f30cab3faafa9a1f7f83782695774dd32fac8986f260698b4e150b4dd52444f2611c07e4c101501f08353eb47c82c
languageName: node
linkType: hard
@@ -1664,7 +1664,7 @@ __metadata:
formidable: "npm:^3.5.2"
jwt-decode: "npm:^4.0.0"
mime-types: "npm:^2.1.35"
preact: "npm:^10.25.0"
preact: "npm:^10.25.1"
prettier: "npm:^3.4.1"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
@@ -1675,8 +1675,8 @@ __metadata:
terser: "npm:^5.36.0"
typesafe-i18n: "npm:^5.26.2"
typescript: "npm:^5.7.2"
typescript-eslint: "npm:8.16.0"
vite: "npm:^6.0.1"
typescript-eslint: "npm:8.17.0"
vite: "npm:^6.0.2"
vite-plugin-imagemin: "npm:^0.6.1"
vite-tsconfig-paths: "npm:^5.1.3"
languageName: unknown
@@ -2102,9 +2102,9 @@ __metadata:
linkType: hard
"caniuse-lite@npm:^1.0.30001669":
version: 1.0.30001684
resolution: "caniuse-lite@npm:1.0.30001684"
checksum: 10c0/446485ca3d9caf408a339a44636a86a2b119ec247492393ae661cd93dccd6668401dd2dfec1e149be4e44563cd1e23351b44453a52fa2c2f19e2bf3287c865f6
version: 1.0.30001685
resolution: "caniuse-lite@npm:1.0.30001685"
checksum: 10c0/cd0dcc5080dd0f3502d68938fbbe15383ae9176cc9b87016587f4abd1099298df04324818c126cda16cd7082bc3b8f91d15fa1918f8484fb964147f4c69efa28
languageName: node
linkType: hard
@@ -2692,9 +2692,9 @@ __metadata:
linkType: hard
"electron-to-chromium@npm:^1.5.41":
version: 1.5.67
resolution: "electron-to-chromium@npm:1.5.67"
checksum: 10c0/bcd21c3961267fd733973586045a38d41f697e6821e7624cdd39d48fd744d9bd93ec7db59abbafeb464861218b959a920892cfaa719bff4441d1d49f8dcdff94
version: 1.5.68
resolution: "electron-to-chromium@npm:1.5.68"
checksum: 10c0/02cfa3043280e4f8e003724fadee30fa8cdb5f6df1be51627b1ad34f66a8d4fb51b3d3863647620075c02b21c8ff99bc2afe55142a2b4742b1f9d523c11b25a3
languageName: node
linkType: hard
@@ -5051,8 +5051,8 @@ __metadata:
linkType: hard
"node-gyp@npm:latest":
version: 10.2.0
resolution: "node-gyp@npm:10.2.0"
version: 10.3.1
resolution: "node-gyp@npm:10.3.1"
dependencies:
env-paths: "npm:^2.2.0"
exponential-backoff: "npm:^3.1.1"
@@ -5066,7 +5066,7 @@ __metadata:
which: "npm:^4.0.0"
bin:
node-gyp: bin/node-gyp.js
checksum: 10c0/00630d67dbd09a45aee0a5d55c05e3916ca9e6d427ee4f7bc392d2d3dc5fad7449b21fc098dd38260a53d9dcc9c879b36704a1994235d4707e7271af7e9a835b
checksum: 10c0/87c3b50e1f6f5256b5d2879a8c064eefa53ed444bad2a20870be43bc189db7cbffe22c30af056046c6d904181d73881b1726fd391d2f6f79f89b991019f195ea
languageName: node
linkType: hard
@@ -5550,10 +5550,10 @@ __metadata:
languageName: node
linkType: hard
"preact@npm:^10.25.0":
version: 10.25.0
resolution: "preact@npm:10.25.0"
checksum: 10c0/703e021e7a268aea929e9c896484608e18dd9f5aa62c71d3205fedf69269d9592e4cfe17adda78ca4cec1f5f0057a062300daeeb477333ba2005a4d9e3fbc970
"preact@npm:^10.25.1":
version: 10.25.1
resolution: "preact@npm:10.25.1"
checksum: 10c0/bc9255b20931781ed4b26f9d294ba2ec433dc6df8248d802a82a32b3841eb64cd5a70948a814f3793eb9eae7f95a556ec5573b63c62221534533a26db6a71fcb
languageName: node
linkType: hard
@@ -6741,19 +6741,19 @@ __metadata:
languageName: node
linkType: hard
"typescript-eslint@npm:8.16.0":
version: 8.16.0
resolution: "typescript-eslint@npm:8.16.0"
"typescript-eslint@npm:8.17.0":
version: 8.17.0
resolution: "typescript-eslint@npm:8.17.0"
dependencies:
"@typescript-eslint/eslint-plugin": "npm:8.16.0"
"@typescript-eslint/parser": "npm:8.16.0"
"@typescript-eslint/utils": "npm:8.16.0"
"@typescript-eslint/eslint-plugin": "npm:8.17.0"
"@typescript-eslint/parser": "npm:8.17.0"
"@typescript-eslint/utils": "npm:8.17.0"
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/3da9401d6c2416b9d95c96a41a9423a5379d233a120cd3304e2c03f191d350ce91cf0c7e60017f7b10c93b4cc1190592702735735b771c1ce1bf68f71a9f1647
checksum: 10c0/b148525769b9afa789ad3c2d52249fa78e67a225d48d17f2f0117b0e8b52566112be3a35de6cd26bcaffba3114be87c1070f7f4b4e2b730c059668fec4a530bc
languageName: node
linkType: hard
@@ -6942,9 +6942,9 @@ __metadata:
languageName: node
linkType: hard
"vite@npm:^6.0.1":
version: 6.0.1
resolution: "vite@npm:6.0.1"
"vite@npm:^6.0.2":
version: 6.0.2
resolution: "vite@npm:6.0.2"
dependencies:
esbuild: "npm:^0.24.0"
fsevents: "npm:~2.3.3"
@@ -6990,7 +6990,7 @@ __metadata:
optional: true
bin:
vite: bin/vite.js
checksum: 10c0/e4d853eb9042ff29fa4d7cee1484738faaee4b1d9dcf786a94783bebb736b39af0afa7ac1a209000530638098d0a1b240b51f509d32addb028b222453f862916
checksum: 10c0/45fc609f2bc5fb5beb5a8e2cad9ad6c2edce229a922f6fc1270ea2a9d75819482edcc0f77c85b4a7abdad7eb69ce6a4f26131925d47cdc0778fc15d1bbc3b6a2
languageName: node
linkType: hard

View File

@@ -1390,3 +1390,10 @@ pumpmod
valvereturn
deltatret
errordisp
commandsfunctions
hideled
analogenabled
dhwx
ahsx
roomflow
roomload

View File

@@ -1398,12 +1398,6 @@ bool System::command_service(const char * cmd, const char * value) {
return StateUpdateResult::CHANGED;
});
ok = true;
} else if (!strcmp(cmd, "ap/enabled")) {
EMSESP::esp8266React.getAPSettingsService()->update([&](APSettings & Settings) {
Settings.provisionMode = b ? 0 : 2;
return StateUpdateResult::CHANGED;
});
ok = true;
} else if (!strcmp(cmd, "syslog/enabled")) {
EMSESP::webSettingsService.update([&](WebSettings & settings) {
settings.syslog_enabled = b;
@@ -1761,11 +1755,14 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output
node["analogEnabled"] = settings.analog_enabled;
node["telnetEnabled"] = settings.telnet_enabled;
node["maxWebLogBuffer"] = settings.weblog_buffer;
/*
#if defined(EMSESP_UNITY)
node["webLogBuffer"] = 0;
#else
node["webLogBuffer"] = EMSESP::webLogService.num_log_messages();
#endif
*/
node["modbusEnabled"] = settings.modbus_enabled;
node["forceHeatingOff"] = settings.boiler_heatingoff;
node["developerMode"] = settings.developer_mode;