andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 07:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #935 from proddy/dev

Browse Source 
update packages, minor bug in
This commit is contained in:
Proddy
2023-01-29 12:17:53 +01:00
committed by GitHub
parent 381afcbb6d e4358ba489
commit 74b961ab29
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
interface/package-lock.json generated
View File

@@ -12,7 +12,7 @@
"@emotion/styled": "^11.10.5",
"@msgpack/msgpack": "^2.8.0",
"@mui/icons-material": "^5.11.0",
"@mui/material": "^5.11.5",
"@mui/material": "^5.11.6",
"@table-library/react-table-library": "4.0.23",
"@types/lodash": "^4.14.191",
"@types/node": "^18.11.18",
@@ -20,8 +20,7 @@
"@types/react-dom": "^18.0.10",
"@types/react-router-dom": "^5.3.3",
"async-validator": "^4.2.5",
"axios": "^1.2.3",
"http-proxy-middleware": "^2.0.6",
"axios": "^1.2.6",
"jwt-decode": "^3.1.2",
"lodash": "^4.17.21",
"notistack": "^2.0.8",
@@ -30,13 +29,14 @@
"react-dom": "^18.2.0",
"react-dropzone": "^14.2.3",
"react-icons": "^4.7.1",
"react-router-dom": "^6.7.0",
"react-router-dom": "^6.8.0",
"react-scripts": "5.0.1",
"sockette": "^2.0.6",
"typesafe-i18n": "^5.20.0",
"typescript": "^4.9.4"
},
"devDependencies": {
"http-proxy-middleware": "^2.0.6",
"nodemon": "^2.0.20",
"npm-run-all": "^4.1.5"
}
@@ -3082,9 +3082,9 @@
}
},
"node_modules/@mui/base": {
"version": "5.0.0-alpha.114",
"resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.114.tgz",
"integrity": "sha512-ZpsG2I+zTOAnVTj3Un7TxD2zKRA2OhEPGMcWs/9ylPlS6VuGQSXowPooZiqarjT7TZ0+1bOe8titk/t8dLFiGw==",
"version": "5.0.0-alpha.115",
"resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.115.tgz",
"integrity": "sha512-OGQ84whT/yNYd6xKCGGS6MxqEfjVjk5esXM7HP6bB2Rim7QICUapxZt4nm8q39fpT08rNDkv3xPVqDDwRdRg1g==",
"dependencies": {
"@babel/runtime": "^7.20.7",
"@emotion/is-prop-valid": "^1.2.0",
@@ -3114,9 +3114,9 @@
}
},
"node_modules/@mui/core-downloads-tracker": {
"version": "5.11.5",
"resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.5.tgz",
"integrity": "sha512-MIuWGjitOsugpRhp64CQY3ZEVMIu9M/L9ioql6QLSkz73+bGIlC9FEhfi670/GZ8pQIIGmtiGGwofYzlwEWjig==",
"version": "5.11.6",
"resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.6.tgz",
"integrity": "sha512-lbD3qdafBOf2dlqKhOcVRxaPAujX+9UlPC6v8iMugMeAXe0TCgU3QbGXY3zrJsu6ex64WYDpH4y1+WOOBmWMuA==",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/mui"
@@ -3148,13 +3148,13 @@
}
},
"node_modules/@mui/material": {
"version": "5.11.5",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-5.11.5.tgz",
"integrity": "sha512-5fzjBbRYaB5MoEpvA32oalAWltOZ3/kSyuovuVmPc6UF6AG42lTtbdMLpdCygurFSGUMZYTg4Cjij52fKlDDgg==",
"version": "5.11.6",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-5.11.6.tgz",
"integrity": "sha512-MzkkL5KC2PCkFiv8cLpkzgLUPXSrAtnvJBR0emV7mLVWbkwV3n5832vjBx154B6R032fHjFTziTh7YEb50nK6Q==",
"dependencies": {
"@babel/runtime": "^7.20.7",
"@mui/base": "5.0.0-alpha.114",
"@mui/core-downloads-tracker": "^5.11.5",
"@mui/base": "5.0.0-alpha.115",
"@mui/core-downloads-tracker": "^5.11.6",
"@mui/system": "^5.11.5",
"@mui/types": "^7.2.3",
"@mui/utils": "^5.11.2",
@@ -3449,9 +3449,9 @@
}
},
"node_modules/@remix-run/router": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.3.0.tgz",
"integrity": "sha512-nwQoYb3m4DDpHTeOwpJEuDt8lWVcujhYYSFGLluC+9es2PyLjm+jjq3IeRBQbwBtPLJE/lkuHuGHr8uQLgmJRA==",
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.3.1.tgz",
"integrity": "sha512-+eun1Wtf72RNRSqgU7qM2AMX/oHp+dnx7BHk1qhK5ZHzdHTUU4LA1mGG1vT+jMc8sbhG3orvsfOmryjzx2PzQw==",
"engines": {
"node": ">=14"
}
@@ -5076,9 +5076,9 @@
}
},
"node_modules/axios": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz",
"integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==",
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz",
"integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==",
"dependencies": {
"follow-redirects": "^1.15.0",
"form-data": "^4.0.0",
@@ -14884,11 +14884,11 @@
}
},
"node_modules/react-router": {
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.7.0.tgz",
"integrity": "sha512-KNWlG622ddq29MAM159uUsNMdbX8USruoKnwMMQcs/QWZgFUayICSn2oB7reHce1zPj6CG18kfkZIunSSRyGHg==",
"version": "6.8.0",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.8.0.tgz",
"integrity": "sha512-760bk7y3QwabduExtudhWbd88IBbuD1YfwzpuDUAlJUJ7laIIcqhMvdhSVh1Fur1PE8cGl84L0dxhR3/gvHF7A==",
"dependencies": {
"@remix-run/router": "1.3.0"
"@remix-run/router": "1.3.1"
},
"engines": {
"node": ">=14"
@@ -14898,12 +14898,12 @@
}
},
"node_modules/react-router-dom": {
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.7.0.tgz",
"integrity": "sha512-jQtXUJyhso3kFw430+0SPCbmCmY1/kJv8iRffGHwHy3CkoomGxeYzMkmeSPYo6Egzh3FKJZRAL22yg5p2tXtfg==",
"version": "6.8.0",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.8.0.tgz",
"integrity": "sha512-hQouduSTywGJndE86CXJ2h7YEy4HYC6C/uh19etM+79FfQ6cFFFHnHyDlzO4Pq0eBUI96E4qVE5yUjA00yJZGQ==",
"dependencies": {
"@remix-run/router": "1.3.0",
"react-router": "6.7.0"
"@remix-run/router": "1.3.1",
"react-router": "6.8.0"
},
"engines": {
"node": ">=14"

10
interface/package.json
View File

@@ -8,7 +8,7 @@
"@emotion/styled": "^11.10.5",
"@msgpack/msgpack": "^2.8.0",
"@mui/icons-material": "^5.11.0",
"@mui/material": "^5.11.5",
"@mui/material": "^5.11.6",
"@table-library/react-table-library": "4.0.23",
"@types/lodash": "^4.14.191",
"@types/node": "^18.11.18",
@@ -16,8 +16,7 @@
"@types/react-dom": "^18.0.10",
"@types/react-router-dom": "^5.3.3",
"async-validator": "^4.2.5",
"axios": "^1.2.3",
"http-proxy-middleware": "^2.0.6",
"axios": "^1.2.6",
"jwt-decode": "^3.1.2",
"lodash": "^4.17.21",
"notistack": "^2.0.8",
@@ -26,7 +25,7 @@
"react-dom": "^18.2.0",
"react-dropzone": "^14.2.3",
"react-icons": "^4.7.1",
"react-router-dom": "^6.7.0",
"react-router-dom": "^6.8.0",
"react-scripts": "5.0.1",
"sockette": "^2.0.6",
"typesafe-i18n": "^5.20.0",
@@ -99,6 +98,7 @@
},
"devDependencies": {
"nodemon": "^2.0.20",
"npm-run-all": "^4.1.5"
"npm-run-all": "^4.1.5",
"http-proxy-middleware": "^2.0.6"
}
}

2
src/mqtt.cpp
View File

@@ -643,7 +643,7 @@ void Mqtt::ha_status() {
}
publish_system_ha_sensor_config(DeviceValueType::STRING, "EMS Bus", "bus_status", DeviceValueUOM::NONE);
publish_system_ha_sensor_config(DeviceValueType::INT, "Uptime", "uptime", DeviceValueUOM::NONE);
publish_system_ha_sensor_config(DeviceValueType::STRING, "Uptime", "uptime", DeviceValueUOM::NONE);
publish_system_ha_sensor_config(DeviceValueType::INT, "Uptime (sec)", "uptime_sec", DeviceValueUOM::SECONDS);
publish_system_ha_sensor_config(DeviceValueType::BOOL, "NTP status", "ntp_status", DeviceValueUOM::CONNECTIVITY);
publish_system_ha_sensor_config(DeviceValueType::INT, "Free memory", "freemem", DeviceValueUOM::KB);