merge (#1)

* 修复不填写mqtt led快闪的问题 * 更改保存电量时间为一小时，避免频繁写入flash qlwz#16 (comment) --------- Co-authored-by: 情留メ蚊子 <[email protected]> Co-authored-by: gitercn <[email protected]>
duchenpaul · Mar 15, 2023 · 52c2195 · 52c2195
1 parent bfa5020
commit 52c2195
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/esp_framework/src/Led.cpp b/lib/esp_framework/src/Led.cpp
@@ -45,7 +45,7 @@ void Led::loop()
         }
     }
 #ifndef DISABLE_MQTT
-    else if (!Mqtt::mqttClient.connected())
+    else if (globalConfig.mqtt.port != 0 && !Mqtt::mqttClient.connected())
     {
         if (Led::ledType != 1)
         {

diff --git a/src/DC1.cpp b/src/DC1.cpp
@@ -62,7 +62,7 @@ void DC1::init()
 
 bool DC1::moduleLed()
 {
-    if (WiFi.status() == WL_CONNECTED && Mqtt::mqttClient.connected())
+    if (WiFi.status() == WL_CONNECTED && (globalConfig.mqtt.port ==0 || Mqtt::mqttClient.connected()))
     {
         if (config.wifi_led == 0)
         {
@@ -658,7 +658,7 @@ void DC1::energyUpdate()
     {
         energyUpdateToday();
     }
-    if (perSecond % 301 == 0 && cse7766->Energy.kWhtoday > 0)
+    if (perSecond % 3600 == 0 && cse7766->Energy.kWhtoday > 0)
     {
         energySync();
         Config::saveConfig();
@@ -943,4 +943,4 @@ void DC1::reportPower()
         powerStatTopic[strlen(powerStatTopic) - 1] = ch + 49; // 48 + 1 + ch
         Mqtt::publish(powerStatTopic, bitRead(lastState, ch) ? "on" : "off", globalConfig.mqtt.retain);
     }
-}
+}