Browse Source
Merge pull request #18 from DanielR92/patch-5
Update some small issues
pull/1647/head
tictrick
8 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
10 additions and
4 deletions
-
src/platformio.ini
-
src/plugins/zeroExport/powermeter.h
-
src/web/RestApi.h
|
|
@ -28,7 +28,11 @@ lib_deps = |
|
|
|
https://github.com/esphome/ESPAsyncWebServer @ ^3.2.0 |
|
|
|
https://github.com/nRF24/RF24.git#v1.4.8 |
|
|
|
paulstoffregen/Time @ ^1.6.1 |
|
|
|
https://github.com/bertmelis/espMqttClient#v1.6.0 |
|
|
|
;https://github.com/bertmelis/espMqttClient#v1.6.0 |
|
|
|
|
|
|
|
;TODO: tmp. bug fix, please change it to original later |
|
|
|
https://github.com/bertmelis/espMqttClient.git#cb0c386 |
|
|
|
|
|
|
|
bblanchon/ArduinoJson @ ^6.21.3 |
|
|
|
https://github.com/JChristensen/Timezone @ ^1.2.4 |
|
|
|
olikraus/U8g2 @ ^2.35.9 |
|
|
|
|
|
@ -117,7 +117,8 @@ class powermeter { |
|
|
|
|
|
|
|
if (result) { |
|
|
|
bufferWrite(power, group); |
|
|
|
|
|
|
|
mCfg->groups[group].power = power; |
|
|
|
|
|
|
|
// MQTT - Powermeter
|
|
|
|
/// BUG: 002 Anfang - Muss dieser Teil raus? Führt er zu abstürzen wie BUG 001?
|
|
|
|
if (mMqtt->isConnected()) { |
|
|
@ -237,7 +238,8 @@ class powermeter { |
|
|
|
// }
|
|
|
|
|
|
|
|
bufferWrite(power, group); |
|
|
|
|
|
|
|
mCfg->groups[group].power = power; // TODO: join two sites together (PM & MQTT)
|
|
|
|
|
|
|
|
// MQTT - Powermeter
|
|
|
|
/// BUG: 001 Anfang - Dieser Teil ist deaktiviert weil er zu abstürzen der DTU führt
|
|
|
|
// if (mCfg->debug) {
|
|
|
|
|
|
@ -843,7 +843,7 @@ class RestApi { |
|
|
|
objGroup[F("pm_src")] = String(mConfig->plugin.zeroExport.groups[group].pm_src); |
|
|
|
objGroup[F("pm_jsonPath")] = String(mConfig->plugin.zeroExport.groups[group].pm_jsonPath); |
|
|
|
objGroup[F("pm_user")] = String(mConfig->plugin.zeroExport.groups[group].pm_user); |
|
|
|
objGroup[F("pm_pass")] = String(mConfig->plugin.zeroExport.groups[group].pm_pass); |
|
|
|
//objGroup[F("pm_pass")] = String(mConfig->plugin.zeroExport.groups[group].pm_pass); // for security reason
|
|
|
|
objGroup[F("pm_target")] = (uint8_t)mConfig->plugin.zeroExport.groups[group].pm_target; |
|
|
|
// Inverters
|
|
|
|
objGroup[F("max_inverters")] = ZEROEXPORT_GROUP_MAX_INVERTERS; |
|
|
|