period_min add to json, mqtt

dontsovcmc · Feb 25, 2021 · 3cb079b · 3cb079b
1 parent e31437f
commit 3cb079b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/ESP8266/src/UserClass.cpp b/ESP8266/src/UserClass.cpp
@@ -47,6 +47,7 @@ bool UserClass::sendNewData(const Settings &settings, const SlaveData &data, con
     root["setuptime"] =     settings.setup_time;
     root["adc0"] =          data.adc0;
     root["adc1"] =          data.adc1;
+    root["period_min"] =    settings.wakeup_per_min;
 
     serializeJson(root, jsonBody);
     LOG_INFO(FPSTR(S_SND), "JSON size:\t" << jsonBody.length());

diff --git a/ESP8266/src/sender_mqtt.h b/ESP8266/src/sender_mqtt.h
@@ -59,7 +59,8 @@ bool send_mqtt(const Settings &sett, const SlaveData &data, const CalculatedData
         client.publish((topic + "setuptime").c_str(), String(sett.setup_time).c_str(), true);
         client.publish((topic + "adc0").c_str(), String(data.adc0).c_str(), true);
         client.publish((topic + "adc1").c_str(), String(data.adc1).c_str(), true);
-
+        client.publish((topic + "period_min").c_str(), String(sett.wakeup_per_min).c_str(), true);
+
         client.disconnect();
         return true;
     }  else {

diff --git a/ESP8266/src/setup.h b/ESP8266/src/setup.h
@@ -193,8 +193,12 @@ struct Settings
     uint32_t ip;
     uint32_t gateway;
     uint32_t mask;
-
+
+    /*
+    Период пробуждение для отправки данных, мин
+    */
     uint16_t wakeup_per_min;
+
     /*
     Зарезервируем кучу места, чтобы не писать конвертер конфигураций.
     Будет актуально для On-the-Air обновлений