mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-09 09:19:51 +03:00
Merge branch 'emsesp:dev' into dev
This commit is contained in:
14
interface/package-lock.json
generated
14
interface/package-lock.json
generated
@@ -28,7 +28,7 @@
|
||||
"react": "^17.0.2",
|
||||
"react-app-rewired": "^2.1.11",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-dropzone": "^12.0.2",
|
||||
"react-dropzone": "^12.0.3",
|
||||
"react-icons": "^4.3.1",
|
||||
"react-router-dom": "^6.2.1",
|
||||
"react-scripts": "5.0.0",
|
||||
@@ -14232,9 +14232,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/react-dropzone": {
|
||||
"version": "12.0.2",
|
||||
"resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-12.0.2.tgz",
|
||||
"integrity": "sha512-wnU3+QZA9H5XqC+UNdEDs5YuB+XgJh5mQ9Bop4PUtN/2nKTGTpBbfkcsm9OVCYylBHak69Ezjzbhx/0Cb6OfjA==",
|
||||
"version": "12.0.3",
|
||||
"resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-12.0.3.tgz",
|
||||
"integrity": "sha512-7yIthjpO90A1A6EZxriuuHRz2WDgTjmMoAtf0k9PpFzsVK3zNxmDetUe0xgrxwjNH0HcJjePi8KOewmbdpdQCg==",
|
||||
"dependencies": {
|
||||
"attr-accept": "^2.2.2",
|
||||
"file-selector": "^0.4.0",
|
||||
@@ -27565,9 +27565,9 @@
|
||||
}
|
||||
},
|
||||
"react-dropzone": {
|
||||
"version": "12.0.2",
|
||||
"resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-12.0.2.tgz",
|
||||
"integrity": "sha512-wnU3+QZA9H5XqC+UNdEDs5YuB+XgJh5mQ9Bop4PUtN/2nKTGTpBbfkcsm9OVCYylBHak69Ezjzbhx/0Cb6OfjA==",
|
||||
"version": "12.0.3",
|
||||
"resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-12.0.3.tgz",
|
||||
"integrity": "sha512-7yIthjpO90A1A6EZxriuuHRz2WDgTjmMoAtf0k9PpFzsVK3zNxmDetUe0xgrxwjNH0HcJjePi8KOewmbdpdQCg==",
|
||||
"requires": {
|
||||
"attr-accept": "^2.2.2",
|
||||
"file-selector": "^0.4.0",
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"react": "^17.0.2",
|
||||
"react-app-rewired": "^2.1.11",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-dropzone": "^12.0.2",
|
||||
"react-dropzone": "^12.0.3",
|
||||
"react-icons": "^4.3.1",
|
||||
"react-router-dom": "^6.2.1",
|
||||
"react-scripts": "5.0.0",
|
||||
|
||||
@@ -600,8 +600,8 @@ void EMSESP::publish_device_values(uint8_t device_type) {
|
||||
Mqtt::publish(Mqtt::tag_to_topic(device_type, hc_tag), json);
|
||||
}
|
||||
}
|
||||
need_publish = false;
|
||||
}
|
||||
need_publish = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
#define EMSESP_APP_VERSION "3.4.0b4"
|
||||
#define EMSESP_APP_VERSION "3.4.0b5"
|
||||
|
||||
Reference in New Issue
Block a user