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

Merge pull request #1108 from proddy/dev

Browse Source 
fix standalone
This commit is contained in:
Proddy
2023-03-08 12:01:24 +05:30
committed by GitHub
parent e1e8c1064a ab798bee12
commit c16b9968e1
6 changed files with 159 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
interface/package.json
View File

@@ -23,7 +23,7 @@
"@emotion/styled": "^11.10.6", "@emotion/styled": "^11.10.6",
"@msgpack/msgpack": "^2.8.0", "@msgpack/msgpack": "^2.8.0",
"@mui/icons-material": "^5.11.11", "@mui/icons-material": "^5.11.11",
"@mui/material": "^5.11.11", "@mui/material": "^5.11.12",
"@remix-run/router": "^1.3.3", "@remix-run/router": "^1.3.3",
"@table-library/react-table-library": "4.0.29", "@table-library/react-table-library": "4.0.29",
"@types/lodash-es": "^4.17.6", "@types/lodash-es": "^4.17.6",
@@ -38,7 +38,7 @@
"jwt-decode": "^3.1.2", "jwt-decode": "^3.1.2",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"mime-types": "^2.1.35", "mime-types": "^2.1.35",
"notistack": "^2.0.8", "notistack": "^3.0.0",
"react": "latest", "react": "latest",
"react-dom": "latest", "react-dom": "latest",
"react-dropzone": "^14.2.3", "react-dropzone": "^14.2.3",
@@ -51,11 +51,11 @@
"devDependencies": { "devDependencies": {
"@types/mime-types": "^2", "@types/mime-types": "^2",
"@types/styled-components": "^5", "@types/styled-components": "^5",
"@typescript-eslint/eslint-plugin": "^5.54.0", "@typescript-eslint/eslint-plugin": "^5.54.1",
"@typescript-eslint/parser": "^5.54.0", "@typescript-eslint/parser": "^5.54.1",
"@vitejs/plugin-react-swc": "^3.2.0", "@vitejs/plugin-react-swc": "^3.2.0",
"eslint": "^8.35.0", "eslint": "^8.35.0",
"eslint-config-prettier": "^8.6.0", "eslint-config-prettier": "^8.7.0",
"eslint-import-resolver-typescript": "^3.5.3", "eslint-import-resolver-typescript": "^3.5.3",
"eslint-plugin-deprecation": "^1.3.3", "eslint-plugin-deprecation": "^1.3.3",
"eslint-plugin-import": "^2.27.5", "eslint-plugin-import": "^2.27.5",

207
interface/yarn.lock
View File

@@ -698,10 +698,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/core-downloads-tracker@npm:^5.11.11": "@mui/core-downloads-tracker@npm:^5.11.12":
version: 5.11.11 version: 5.11.12
resolution: "@mui/core-downloads-tracker@npm:5.11.11" resolution: "@mui/core-downloads-tracker@npm:5.11.12"
checksum: 8c79c1a760eee497fb65f867117251adaaca435a8813394c6bf3d014d5e26148af1ff89beef2f50cea76c43412b722d3bd78bc71d8fc85aadcd57c8b22f17ec6 checksum: db9f8497da36455bcd6590aceae0a364fe3107db6067d96612e3b0d8993bc3e0f0d66dbe6fd09d2d99b5a811b20d019682cb96a39d7570948cd644f4f8a32404
languageName: node languageName: node
linkType: hard linkType: hard
@@ -721,16 +721,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/material@npm:^5.11.11": "@mui/material@npm:^5.11.12":
version: 5.11.11 version: 5.11.12
resolution: "@mui/material@npm:5.11.11" resolution: "@mui/material@npm:5.11.12"
dependencies: dependencies:
"@babel/runtime": ^7.21.0 "@babel/runtime": ^7.21.0
"@mui/base": 5.0.0-alpha.119 "@mui/base": 5.0.0-alpha.119
"@mui/core-downloads-tracker": ^5.11.11 "@mui/core-downloads-tracker": ^5.11.12
"@mui/system": ^5.11.11 "@mui/system": ^5.11.12
"@mui/types": ^7.2.3 "@mui/types": ^7.2.3
"@mui/utils": ^5.11.11 "@mui/utils": ^5.11.12
"@types/react-transition-group": ^4.4.5 "@types/react-transition-group": ^4.4.5
clsx: ^1.2.1 clsx: ^1.2.1
csstype: ^3.1.1 csstype: ^3.1.1
@@ -750,16 +750,16 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: 132af11ab4aff98c2c98dd22f10dcbc58221a8b3949f9ff3747c76362acaf1b2fb07ce8afd1a12ed905ebf1a7f778f7eb508a08d63fe56ea2bd703699e51e5cf checksum: 0bc03f700683e0a0d234c3b2d2a9ccd875af2bef5fce1946f1409afbb3fb69043c77a96ad9c6cd8f942ef793b8a198aaefe058a31d38c0452711841e2bd51c03
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/private-theming@npm:^5.11.11": "@mui/private-theming@npm:^5.11.12":
version: 5.11.11 version: 5.11.12
resolution: "@mui/private-theming@npm:5.11.11" resolution: "@mui/private-theming@npm:5.11.12"
dependencies: dependencies:
"@babel/runtime": ^7.21.0 "@babel/runtime": ^7.21.0
"@mui/utils": ^5.11.11 "@mui/utils": ^5.11.12
prop-types: ^15.8.1 prop-types: ^15.8.1
peerDependencies: peerDependencies:
"@types/react": ^17.0.0 || ^18.0.0 "@types/react": ^17.0.0 || ^18.0.0
@@ -767,7 +767,7 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: e1db9423d000fc377201dd74a78f8f1cb627fade1b17f83171d4d8a18c1f9bb24e5fa86b1e08e3766961a0be23f84d87a6323da25e9bc08fc21b44288fa8d2b9 checksum: 02bee3bd2ae5223e92bdc0c9464386d587adabc7ed24a3fb3aa4659dad189bf02935b482fa56ad431c51fc1ede79bed24b921e0db26f965ad593ebeed2251a26
languageName: node languageName: node
linkType: hard linkType: hard
@@ -792,15 +792,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/system@npm:^5.11.11": "@mui/system@npm:^5.11.12":
version: 5.11.11 version: 5.11.12
resolution: "@mui/system@npm:5.11.11" resolution: "@mui/system@npm:5.11.12"
dependencies: dependencies:
"@babel/runtime": ^7.21.0 "@babel/runtime": ^7.21.0
"@mui/private-theming": ^5.11.11 "@mui/private-theming": ^5.11.12
"@mui/styled-engine": ^5.11.11 "@mui/styled-engine": ^5.11.11
"@mui/types": ^7.2.3 "@mui/types": ^7.2.3
"@mui/utils": ^5.11.11 "@mui/utils": ^5.11.12
clsx: ^1.2.1 clsx: ^1.2.1
csstype: ^3.1.1 csstype: ^3.1.1
prop-types: ^15.8.1 prop-types: ^15.8.1
@@ -816,7 +816,7 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: 4f91a2855e50d8cac629424f9cd8bac2aa2c81d0a307d6a6db552f035da28e3b7916fc3a5d7aa98e448962cf06f4ff066f8cbf37ac39886cffd27f755ea2a012 checksum: a357b26b34ba3fe9aa6d2e826e94a9e8c6fe4bb4d20ac77b7a8688ff414ac7df77ff537837dd36e20aa9be8b9bb9c1ecab6ad2af057b152e1d0c9ea3234aefbf
languageName: node languageName: node
linkType: hard linkType: hard
@@ -847,6 +847,21 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/utils@npm:^5.11.12":
version: 5.11.12
resolution: "@mui/utils@npm:5.11.12"
dependencies:
"@babel/runtime": ^7.21.0
"@types/prop-types": ^15.7.5
"@types/react-is": ^16.7.1 || ^17.0.0
prop-types: ^15.8.1
react-is: ^18.2.0
peerDependencies:
react: ^17.0.0 || ^18.0.0
checksum: aa65847c5ab3ae69f0fb156b1b79adbf6285270de4ff1fa87e098930988aa8d88ef00b5bf12c62e75c77077a9f1b84a150edae8637ca416e6c4c0edff8092d90
languageName: node
linkType: hard
"@nodelib/fs.scandir@npm:2.1.5": "@nodelib/fs.scandir@npm:2.1.5":
version: 2.1.5 version: 2.1.5
resolution: "@nodelib/fs.scandir@npm:2.1.5" resolution: "@nodelib/fs.scandir@npm:2.1.5"
@@ -1429,13 +1444,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/eslint-plugin@npm:^5.54.0": "@typescript-eslint/eslint-plugin@npm:^5.54.1":
version: 5.54.0 version: 5.54.1
resolution: "@typescript-eslint/eslint-plugin@npm:5.54.0" resolution: "@typescript-eslint/eslint-plugin@npm:5.54.1"
dependencies: dependencies:
"@typescript-eslint/scope-manager": 5.54.0 "@typescript-eslint/scope-manager": 5.54.1
"@typescript-eslint/type-utils": 5.54.0 "@typescript-eslint/type-utils": 5.54.1
"@typescript-eslint/utils": 5.54.0 "@typescript-eslint/utils": 5.54.1
debug: ^4.3.4 debug: ^4.3.4
grapheme-splitter: ^1.0.4 grapheme-splitter: ^1.0.4
ignore: ^5.2.0 ignore: ^5.2.0
@@ -1449,7 +1464,7 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 4fdb520b8e0f6b9eb878206ddfa4212522f170d1507d7aba8a975159a198efa37af6d2d17982dd560317452d0748f2e2da5dd7347b172bc4446d1c5562ce2e94 checksum: 76476c08ca0142a9bf6e2381f5cd1c037d86fbafa9c0dded4a97bd3b23b5962dd2c3943bade11b21d674195674f0e36dbf80faa15a1906f5a2ca1f699baf1dd5
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1464,20 +1479,20 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/parser@npm:^5.54.0": "@typescript-eslint/parser@npm:^5.54.1":
version: 5.54.0 version: 5.54.1
resolution: "@typescript-eslint/parser@npm:5.54.0" resolution: "@typescript-eslint/parser@npm:5.54.1"
dependencies: dependencies:
"@typescript-eslint/scope-manager": 5.54.0 "@typescript-eslint/scope-manager": 5.54.1
"@typescript-eslint/types": 5.54.0 "@typescript-eslint/types": 5.54.1
"@typescript-eslint/typescript-estree": 5.54.0 "@typescript-eslint/typescript-estree": 5.54.1
debug: ^4.3.4 debug: ^4.3.4
peerDependencies: peerDependencies:
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 368d6dd85be42c3f518f0ddeed23ecd1d3c9484a77ae291ee4e08e2703ed379bed613bde014cd8ab2a3e06e85dd8aef201112ae5e3d2a07deba29ae80bb1fe06 checksum: f466513d306ca926b97c2cec1eebaf2cd15d45bd5633a4358f23ba9a4de1b0ec4630b1c20abc395943934ed1d2ef65f545fd6737c317a7abe579612101e8a83f
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1491,12 +1506,22 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/type-utils@npm:5.54.0": "@typescript-eslint/scope-manager@npm:5.54.1":
version: 5.54.0 version: 5.54.1
resolution: "@typescript-eslint/type-utils@npm:5.54.0" resolution: "@typescript-eslint/scope-manager@npm:5.54.1"
dependencies: dependencies:
"@typescript-eslint/typescript-estree": 5.54.0 "@typescript-eslint/types": 5.54.1
"@typescript-eslint/utils": 5.54.0 "@typescript-eslint/visitor-keys": 5.54.1
checksum: 9add24cf3a7852634ad0680a827646860ac4698a6ac8aae31e8b781e29f59e84b51f0cdaacffd0747811012647f01b51969d988da9b302ead374ceebffbe204b
languageName: node
linkType: hard
"@typescript-eslint/type-utils@npm:5.54.1":
version: 5.54.1
resolution: "@typescript-eslint/type-utils@npm:5.54.1"
dependencies:
"@typescript-eslint/typescript-estree": 5.54.1
"@typescript-eslint/utils": 5.54.1
debug: ^4.3.4 debug: ^4.3.4
tsutils: ^3.21.0 tsutils: ^3.21.0
peerDependencies: peerDependencies:
@@ -1504,7 +1529,7 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 9cb5b52c7277bdf74b9ea3282fc40f41fda90ea4b1d33039044476e43cf05a766b1294e7d45f429594f2776828f7d17729cfa4ea027315f3df883e748ba57514 checksum: 0073838b782b7f4619775be124ca6643fec43a2d56043eaf3ceb100960a5193f14ac747b28ce17a5c9ac643fdee8abda82a7d905c81521358de7b27a2dcbc9af
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1515,6 +1540,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/types@npm:5.54.1":
version: 5.54.1
resolution: "@typescript-eslint/types@npm:5.54.1"
checksum: 84a8f725cfa10646af389659e09c510c38d82c65960c7b613f844a264acc0e197471cba03f3e8f4b6411bc35dca28922c8352a7bd44621411c73fd6dd4096da2
languageName: node
linkType: hard
"@typescript-eslint/typescript-estree@npm:5.54.0": "@typescript-eslint/typescript-estree@npm:5.54.0":
version: 5.54.0 version: 5.54.0
resolution: "@typescript-eslint/typescript-estree@npm:5.54.0" resolution: "@typescript-eslint/typescript-estree@npm:5.54.0"
@@ -1533,6 +1565,24 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/typescript-estree@npm:5.54.1":
version: 5.54.1
resolution: "@typescript-eslint/typescript-estree@npm:5.54.1"
dependencies:
"@typescript-eslint/types": 5.54.1
"@typescript-eslint/visitor-keys": 5.54.1
debug: ^4.3.4
globby: ^11.1.0
is-glob: ^4.0.3
semver: ^7.3.7
tsutils: ^3.21.0
peerDependenciesMeta:
typescript:
optional: true
checksum: ea42bdb4832fa96fa1121237c9b664ac4506e2836646651e08a8542c8601d78af6c288779707f893ca4c884221829bb7d7b4b43c4a9c3ed959519266d03a139b
languageName: node
linkType: hard
"@typescript-eslint/utils@npm:5.54.0": "@typescript-eslint/utils@npm:5.54.0":
version: 5.54.0 version: 5.54.0
resolution: "@typescript-eslint/utils@npm:5.54.0" resolution: "@typescript-eslint/utils@npm:5.54.0"
@@ -1551,6 +1601,24 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/utils@npm:5.54.1":
version: 5.54.1
resolution: "@typescript-eslint/utils@npm:5.54.1"
dependencies:
"@types/json-schema": ^7.0.9
"@types/semver": ^7.3.12
"@typescript-eslint/scope-manager": 5.54.1
"@typescript-eslint/types": 5.54.1
"@typescript-eslint/typescript-estree": 5.54.1
eslint-scope: ^5.1.1
eslint-utils: ^3.0.0
semver: ^7.3.7
peerDependencies:
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
checksum: 8f428ea4d338ce85d55fd0c9ae2b217b323f29f51b7c9f8077fef7001ca21d28b032c5e5165b67ae6057aef69edb0e7a164c3c483703be6f3e4e574248bbc399
languageName: node
linkType: hard
"@typescript-eslint/visitor-keys@npm:5.54.0": "@typescript-eslint/visitor-keys@npm:5.54.0":
version: 5.54.0 version: 5.54.0
resolution: "@typescript-eslint/visitor-keys@npm:5.54.0" resolution: "@typescript-eslint/visitor-keys@npm:5.54.0"
@@ -1561,6 +1629,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/visitor-keys@npm:5.54.1":
version: 5.54.1
resolution: "@typescript-eslint/visitor-keys@npm:5.54.1"
dependencies:
"@typescript-eslint/types": 5.54.1
eslint-visitor-keys: ^3.3.0
checksum: 3a691abd2a43b86a0c41526d14a2afcc93a2e0512b5f8b9ec43f6029c493870808036eae5ee4fc655d26e1999017c4a4dffb241f47c36c2a1238ec9fbd08719c
languageName: node
linkType: hard
"@vitejs/plugin-react-swc@npm:^3.2.0": "@vitejs/plugin-react-swc@npm:^3.2.0":
version: 3.2.0 version: 3.2.0
resolution: "@vitejs/plugin-react-swc@npm:3.2.0" resolution: "@vitejs/plugin-react-swc@npm:3.2.0"
@@ -1699,7 +1777,7 @@ __metadata:
"@emotion/styled": ^11.10.6 "@emotion/styled": ^11.10.6
"@msgpack/msgpack": ^2.8.0 "@msgpack/msgpack": ^2.8.0
"@mui/icons-material": ^5.11.11 "@mui/icons-material": ^5.11.11
"@mui/material": ^5.11.11 "@mui/material": ^5.11.12
"@remix-run/router": ^1.3.3 "@remix-run/router": ^1.3.3
"@table-library/react-table-library": 4.0.29 "@table-library/react-table-library": 4.0.29
"@types/lodash-es": ^4.17.6 "@types/lodash-es": ^4.17.6
@@ -1709,14 +1787,14 @@ __metadata:
"@types/react-dom": ^18.0.11 "@types/react-dom": ^18.0.11
"@types/react-router-dom": ^5.3.3 "@types/react-router-dom": ^5.3.3
"@types/styled-components": ^5 "@types/styled-components": ^5
"@typescript-eslint/eslint-plugin": ^5.54.0 "@typescript-eslint/eslint-plugin": ^5.54.1
"@typescript-eslint/parser": ^5.54.0 "@typescript-eslint/parser": ^5.54.1
"@vitejs/plugin-react-swc": ^3.2.0 "@vitejs/plugin-react-swc": ^3.2.0
"@yarnpkg/pnpify": ^4.0.0-rc.40 "@yarnpkg/pnpify": ^4.0.0-rc.40
async-validator: ^4.2.5 async-validator: ^4.2.5
axios: ^1.3.4 axios: ^1.3.4
eslint: ^8.35.0 eslint: ^8.35.0
eslint-config-prettier: ^8.6.0 eslint-config-prettier: ^8.7.0
eslint-import-resolver-typescript: ^3.5.3 eslint-import-resolver-typescript: ^3.5.3
eslint-plugin-deprecation: ^1.3.3 eslint-plugin-deprecation: ^1.3.3
eslint-plugin-import: ^2.27.5 eslint-plugin-import: ^2.27.5
@@ -1727,7 +1805,7 @@ __metadata:
lodash-es: ^4.17.21 lodash-es: ^4.17.21
mime-types: ^2.1.35 mime-types: ^2.1.35
nodemon: ^2.0.21 nodemon: ^2.0.21
notistack: ^2.0.8 notistack: ^3.0.0
npm-run-all: ^4.1.5 npm-run-all: ^4.1.5
prettier: ^2.8.4 prettier: ^2.8.4
react: latest react: latest
@@ -2816,14 +2894,14 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"eslint-config-prettier@npm:^8.6.0": "eslint-config-prettier@npm:^8.7.0":
version: 8.6.0 version: 8.7.0
resolution: "eslint-config-prettier@npm:8.6.0" resolution: "eslint-config-prettier@npm:8.7.0"
peerDependencies: peerDependencies:
eslint: ">=7.0.0" eslint: ">=7.0.0"
bin: bin:
eslint-config-prettier: bin/cli.js eslint-config-prettier: bin/cli.js
checksum: ff0d0dfc839a556355422293428637e8d35693de58dabf8638bf0b6529131a109d0b2ade77521aa6e54573bb842d7d9d322e465dd73dd61c7590fa3834c3fa81 checksum: b05bc7f2296ce3e0925c14147849706544870e0382d38af2352d709a6cf8521bdaff2bd8e5021f1780e570775a8ffa1d2bac28b8065d90d43a3f1f98fd26ce52
languageName: node languageName: node
linkType: hard linkType: hard
@@ -3493,6 +3571,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"goober@npm:^2.0.33":
version: 2.1.12
resolution: "goober@npm:2.1.12"
peerDependencies:
csstype: ^3.0.10
checksum: 5945cbe92413031b8859d9087d125a744149e237c8bcf6c15db1998ee3d1b6d680ee4a47dd420f95684b76f72eebc34e98155e8a1cb06748d00cbdc05ede186d
languageName: node
linkType: hard
"gopd@npm:^1.0.1": "gopd@npm:^1.0.1":
version: 1.0.1 version: 1.0.1
resolution: "gopd@npm:1.0.1" resolution: "gopd@npm:1.0.1"
@@ -4615,24 +4702,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"notistack@npm:^2.0.8": "notistack@npm:^3.0.0":
version: 2.0.8 version: 3.0.0
resolution: "notistack@npm:2.0.8" resolution: "notistack@npm:3.0.0"
dependencies: dependencies:
clsx: ^1.1.0 clsx: ^1.1.0
hoist-non-react-statics: ^3.3.0 goober: ^2.0.33
peerDependencies: peerDependencies:
"@emotion/react": ^11.4.1
"@emotion/styled": ^11.3.0
"@mui/material": ^5.0.0
react: ^16.8.0 || ^17.0.0 || ^18.0.0 react: ^16.8.0 || ^17.0.0 || ^18.0.0
react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
peerDependenciesMeta: checksum: e061b965aa36f69051150321bec89c28709da683a73e35ec54599d24930c11d29ecb020700a3017bb53abacc59742d6663ff1e66958ca2dec9e41d1e06f0cf32
"@emotion/react":
optional: true
"@emotion/styled":
optional: true
checksum: f95952ea7209840f6f05a65e74f0fb4e7a1bb321753b2955ae6052f2205d47a6a3c50a42b72db11eac2fc491c4105b4687bed89e79287399530973fa133a5380
languageName: node languageName: node
linkType: hard linkType: hard

6
src/mqtt.cpp
View File

@@ -647,12 +647,14 @@ void Mqtt::ha_status() {
snprintf(topic, sizeof(topic), "binary_sensor/%s/system_status/config", mqtt_basename_.c_str()); snprintf(topic, sizeof(topic), "binary_sensor/%s/system_status/config", mqtt_basename_.c_str());
Mqtt::queue_ha(topic, doc.as<JsonObject>()); // publish the config payload with retain flag Mqtt::queue_ha(topic, doc.as<JsonObject>()); // publish the config payload with retain flag
// create the sensors - must match the MQTT payload keys // create the sensors - must match the MQTT payload keys
// these are all from the heartbeat MQTT topic // these are all from the heartbeat MQTT topic
#ifndef EMSESP_STANDALONE
if (!EMSESP::system_.ethernet_connected() || WiFi.isConnected()) { if (!EMSESP::system_.ethernet_connected() || WiFi.isConnected()) {
publish_system_ha_sensor_config(DeviceValueType::INT, "WiFi RSSI", "rssi", DeviceValueUOM::DBM); publish_system_ha_sensor_config(DeviceValueType::INT, "WiFi RSSI", "rssi", DeviceValueUOM::DBM);
publish_system_ha_sensor_config(DeviceValueType::INT, "WiFi strength", "wifistrength", DeviceValueUOM::PERCENT); publish_system_ha_sensor_config(DeviceValueType::INT, "WiFi strength", "wifistrength", DeviceValueUOM::PERCENT);
} }
#endif
publish_system_ha_sensor_config(DeviceValueType::STRING, "EMS Bus", "bus_status", DeviceValueUOM::NONE); publish_system_ha_sensor_config(DeviceValueType::STRING, "EMS Bus", "bus_status", DeviceValueUOM::NONE);
publish_system_ha_sensor_config(DeviceValueType::STRING, "Uptime", "uptime", DeviceValueUOM::NONE); publish_system_ha_sensor_config(DeviceValueType::STRING, "Uptime", "uptime", DeviceValueUOM::NONE);

3
src/system.cpp
View File

@@ -58,7 +58,8 @@ namespace emsesp {
// in Debug mode use one language (en) to save flash memory needed for the tests // in Debug mode use one language (en) to save flash memory needed for the tests
const char * const languages[] = {EMSESP_LOCALE_EN}; const char * const languages[] = {EMSESP_LOCALE_EN};
#else #else
const char * const languages[] = {EMSESP_LOCALE_EN, EMSESP_LOCALE_DE, EMSESP_LOCALE_NL, EMSESP_LOCALE_SV, EMSESP_LOCALE_PL, EMSESP_LOCALE_NO, EMSESP_LOCALE_FR, EMSESP_LOCALE_TR}; const char * const languages[] =
{EMSESP_LOCALE_EN, EMSESP_LOCALE_DE, EMSESP_LOCALE_NL, EMSESP_LOCALE_SV, EMSESP_LOCALE_PL, EMSESP_LOCALE_NO, EMSESP_LOCALE_FR, EMSESP_LOCALE_TR};
#endif #endif
static constexpr uint8_t NUM_LANGUAGES = sizeof(languages) / sizeof(const char *); static constexpr uint8_t NUM_LANGUAGES = sizeof(languages) / sizeof(const char *);

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.6.0-dev.3" #define EMSESP_APP_VERSION "3.6.0-dev.4"

4
yarn.lock Normal file
View File

@@ -0,0 +1,4 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1