修复没有连接MQTT下载HA配置文件错误

qlwz · Feb 17, 2020 · f5d2244 · f5d2244
1 parent 28480ad
commit f5d2244
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/esp_framework/src/Framework.cpp b/lib/esp_framework/src/Framework.cpp
@@ -124,15 +124,15 @@ void Framework::setup()
     }
     else
     {
+        Mqtt::setClient(Wifi::wifiClient);
+        Mqtt::mqttSetConnectedCallback(connectedCallback);
+        Mqtt::mqttSetLoopCallback(callback);
         module->init();
         tickerPerSecond = new Ticker();
         tickerPerSecond->attach(1, tickerPerSecondDo);
         Http::begin();
         Wifi::connectWifi();
         Rtc::init();
-        Mqtt::setClient(Wifi::wifiClient);
-        Mqtt::mqttSetConnectedCallback(connectedCallback);
-        Mqtt::mqttSetLoopCallback(callback);
     }
 }
 

diff --git a/nanopb/DC1Config.proto b/nanopb/DC1Config.proto
@@ -20,7 +20,7 @@ message DC1ConfigMessage {
     uint32 energy_kWhtoday = 25 [(nanopb).int_size = IS_64];
     uint32 energy_kWhyesterday = 26 [(nanopb).int_size = IS_64];
     uint32 energy_kWhtotal = 27 [(nanopb).int_size = IS_64];
-    uint32 energy_kWhdoy = 28 [(nanopb).int_size = IS_16];  
+    uint32 energy_kWhdoy = 28 [(nanopb).int_size = IS_16];
     uint32 energy_kWhtotal_time = 29 [(nanopb).int_size = IS_32];
 
 }
diff --git a/src/DC1.cpp b/src/DC1.cpp
@@ -52,6 +52,7 @@ void DC1::init()
         }
     }
     energyInit();
+    powerTopic = Mqtt::getStatTopic(F("POWER"));
 }
 
 bool DC1::moduleLed()
@@ -158,7 +159,6 @@ void DC1::mqttCallback(String topicStr, String str)
 
 void DC1::mqttConnected()
 {
-    powerTopic = Mqtt::getStatTopic(F("POWER"));
     if (globalConfig.mqtt.discovery)
     {
         mqttDiscovery(true);