3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-07 14:15:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #18 from DanielR92/patch-5

Browse source 
Update some small issues
This commit is contained in:
tictrick 2024-05-29 22:17:24 +02:00 • committed by GitHub
commit 848ed04163
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/platformio.ini
View file

@ -28,7 +28,11 @@ lib_deps =
https://github.com/esphome/ESPAsyncWebServer @ ^3.2.0 https://github.com/esphome/ESPAsyncWebServer @ ^3.2.0
https://github.com/nRF24/RF24.git#v1.4.8 https://github.com/nRF24/RF24.git#v1.4.8
paulstoffregen/Time @ ^1.6.1 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 bblanchon/ArduinoJson @ ^6.21.3
https://github.com/JChristensen/Timezone @ ^1.2.4 https://github.com/JChristensen/Timezone @ ^1.2.4
olikraus/U8g2 @ ^2.35.9 olikraus/U8g2 @ ^2.35.9

6
src/plugins/zeroExport/powermeter.h
View file

@ -117,7 +117,8 @@ class powermeter {
if (result) { if (result) {
bufferWrite(power, group); bufferWrite(power, group);
mCfg->groups[group].power = power;
// MQTT - Powermeter // MQTT - Powermeter
/// BUG: 002 Anfang - Muss dieser Teil raus? Führt er zu abstürzen wie BUG 001? /// BUG: 002 Anfang - Muss dieser Teil raus? Führt er zu abstürzen wie BUG 001?
if (mMqtt->isConnected()) { if (mMqtt->isConnected()) {
@ -237,7 +238,8 @@ class powermeter {
// } // }
bufferWrite(power, group); bufferWrite(power, group);
mCfg->groups[group].power = power; // TODO: join two sites together (PM & MQTT)
// MQTT - Powermeter // MQTT - Powermeter
/// BUG: 001 Anfang - Dieser Teil ist deaktiviert weil er zu abstürzen der DTU führt /// BUG: 001 Anfang - Dieser Teil ist deaktiviert weil er zu abstürzen der DTU führt
// if (mCfg->debug) { // if (mCfg->debug) {

2
src/web/RestApi.h
View file

@ -843,7 +843,7 @@ class RestApi {
objGroup[F("pm_src")] = String(mConfig->plugin.zeroExport.groups[group].pm_src); 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_jsonPath")] = String(mConfig->plugin.zeroExport.groups[group].pm_jsonPath);
objGroup[F("pm_user")] = String(mConfig->plugin.zeroExport.groups[group].pm_user); 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; objGroup[F("pm_target")] = (uint8_t)mConfig->plugin.zeroExport.groups[group].pm_target;
// Inverters // Inverters
objGroup[F("max_inverters")] = ZEROEXPORT_GROUP_MAX_INVERTERS; objGroup[F("max_inverters")] = ZEROEXPORT_GROUP_MAX_INVERTERS;