iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix mqtt bug

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-03-22 01:50:31 +01:00
parent 96e207676f
commit 9a775cd9d4
10 changed files with 66 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cmd.ino
View File

@@ -604,7 +604,7 @@ void createViget (String viget_name, String page_name, String page_number, Stri
all_vigets += viget + "\r\n";
viget = "";
}
*/
String vidgetConfigWrite(String viget, String key, String value) {
if (viget == "") return "";
@@ -623,7 +623,7 @@ String vidgetConfigWrite(String viget, String key, String value) {
}
}
}
*/

7
Init.ino
View File

@@ -32,13 +32,16 @@ void All_init() {
void Device_init() {
//SENSORS-SECTION
ts.remove(ANALOG_);
ts.remove(LEVEL);
ts.remove(DALLAS);
ts.remove(DHTT);
ts.remove(DHTH);
//================
ts.remove(DHTC);
ts.remove(DHTP);
ts.remove(DHTD);
ts.remove(STEPPER1);
ts.remove(STEPPER2);
all_vigets = "";
txtExecution("firmware.config.txt");

13
Sensors.ino
View File

@@ -36,7 +36,6 @@ void analog() {
sendSTATUS("analog", String(analog));
if (client.connected()) {
Serial.println("[i] sensor 'analog' send date " + String(analog));
//web_print("sensor 'analog' send date " + String(analog));
}
// }
analog_old = analog;
@@ -84,7 +83,6 @@ void level() {
sendSTATUS("level", String(level));
if (client.connected()) {
Serial.println("[i] sensor tank 'level' send date " + String(level));
//web_print("sensor tank 'level' send date " + String(level));
}
//}
level_old = level;
@@ -116,7 +114,6 @@ void dallas() {
sendSTATUS("dallas", String(temp));
if (client.connected()) {
Serial.println("[i] sensor 'dallas' send date " + String(temp));
//web_print("sensor 'dallas' send date " + String(temp));
}
//}
temp_old = temp;
@@ -156,7 +153,6 @@ void dhtT() {
sendSTATUS("dhtT", String(value));
if (client.connected()) {
Serial.println("[i] sensor 'dhtT' send date " + String(value));
//web_print("sensor 'dhtT' send date " + String(value));
}
//}
value_old = value;
@@ -195,7 +191,6 @@ void dhtH() {
sendSTATUS("dhtH", String(value));
if (client.connected()) {
Serial.println("[i] sensor 'dhtH' send date " + String(value));
//web_print("sensor 'dhtH' send date " + String(value));
}
//}
value_old = value;
@@ -370,14 +365,6 @@ void logging() {
deleteOldDate("log.dallas.txt", jsonReadtoInt(optionJson, "dallas_logging_count"), jsonRead(configJson, "dallas"), false);
}, nullptr, true);
}
if (sensor_name == "ph") {
flagLoggingPh = true;
ts.remove(PH_LOG);
ts.add(PH_LOG, period_min.toInt() * 1000 * 60, [&](void*) {
deleteOldDate("log.ph.txt", jsonReadtoInt(optionJson, "ph_logging_count"), jsonRead(configJson, "ph"), false);
}, nullptr, true);
}
}
void deleteOldDate(String file, int seted_number_of_lines, String date_to_add, boolean date_time) {

5
Upgrade.ino
View File

@@ -41,7 +41,6 @@ void upgrade_firmware() {
configSetup_for_update = configSetup;
Serial.println("Start upgrade SPIFFS, please wait...");
//web_print("Start upgrade SPIFFS, please wait...");
WiFiClient client_for_upgrade;
@@ -63,8 +62,6 @@ void upgrade_firmware() {
Serial.println("SPIFFS upgrade done!");
Serial.println("Start upgrade BUILD, please wait...");
//web_print("SPIFFS upgrade done!");
//web_print("Start upgrade BUILD, please wait...");
#ifdef ESP32
//httpUpdate.rebootOnUpdate(true);
@@ -76,8 +73,6 @@ void upgrade_firmware() {
#endif
if (ret == HTTP_UPDATE_OK) {
//web_print("BUILD upgrade done!");
//web_print("Restart ESP....");
Serial.println("BUILD upgrade done!");
Serial.println("Restart ESP....");
ESP.restart();

4
data/config.json
View File

@@ -3,8 +3,8 @@
"chipID": "",
"ssidAP": "WiFi",
"passwordAP": "",
"ssid": "MW40V_782C",
"password": "05978600",
"ssid": "rise",
"password": "hostel3333",
"timezone": 3,
"mqttServer": "m12.cloudmqtt.com",
"mqttPort": 14053,

7
data/mqtt.json
View File

@@ -69,6 +69,13 @@
"type": "button",
"title":"Сохранить",
"action": "mqttSave?mqttServer=[[1]]&mqttPort=[[2]]&mqttPrefix=[[3]]&mqttUser=[[4]]&mqttPass=[[5]]",
"class": "btn btn-block btn-success",
"style": "width:100%;display:inline"
},
{
"type": "button",
"title":"Проверить соединение с MQTT",
"action": "mqttCheck",
"response":"[[my-block]]",
"class": "btn btn-block btn-success",
"style": "width:100%;display:inline"

5
esp32-esp8266_iot-manager_modules_firmware.ino
View File

@@ -59,7 +59,6 @@ void setup() {
Push_init();
Serial.println("[V] Push_init");
//--------------------------------------------------------------
Serial.print("[i] Date compiling: ");
Serial.println(DATE_COMPILING);
@@ -75,8 +74,7 @@ void setup() {
Serial.print("[i] Last firmware version: ");
Serial.println(new_version);
//Serial.println(scanWIFI());
just_load = false;
}
@@ -92,6 +90,7 @@ void loop() {
#endif
handleMQTT();
handle_connection();
handleCMD_loop();
handleButton();

2
main.ino
View File

@@ -271,7 +271,7 @@ void getMemoryLoad(String text) {
if (memory_load > 65) Serial.print("Attention!!! too match memory used!!!");
Serial.print(text + " memory used:");
Serial.print(String(memory_load) + "%; ");
Serial.print("memory remain:");
Serial.print("memory remain: ");
Serial.println(String(memory_remain) + " k bytes");
}

93
mqtt.ino
View File

@@ -1,8 +1,26 @@
//===============================================ИНИЦИАЛИЗАЦИЯ================================================
void MQTT_init() {
server.on("/mqttSave", HTTP_GET, [](AsyncWebServerRequest * request) {
ts.add(WIFI_MQTT_CONNECTION_CHECK, wifi_mqtt_reconnecting, [&](void*) {
up_time();
if (WiFi.status() == WL_CONNECTED) {
Serial.println("[V] WiFi-ok");
if (client.connected()) {
Serial.println("[V] MQTT-ok");
} else {
MQTT_Connecting();
if (!just_load) mqtt_lost_error++;
}
} else {
Serial.println("[E] Lost WiFi connection");
wifi_lost_error++;
ts.remove(WIFI_MQTT_CONNECTION_CHECK);
StartAPMode();
}
}, nullptr, true);
server.on("/mqttSave", HTTP_GET, [](AsyncWebServerRequest * request) {
if (request->hasArg("mqttServer")) {
jsonWrite(configSetup, "mqttServer", request->getParam("mqttServer")->value());
}
@@ -19,57 +37,25 @@ void MQTT_init() {
if (request->hasArg("mqttPass")) {
jsonWrite(configSetup, "mqttPass", request->getParam("mqttPass")->value());
}
saveConfig();
start_connection = true;
request->send(200, "text/text", "ok");
});
//client.disconnect();
MQTT_Connecting();
/*
int i = 0;
while (!client.connected() && i <= 25) {
delay(1000);
Serial.print(".");
i++;
}
*/
server.on("/mqttCheck", HTTP_GET, [](AsyncWebServerRequest * request) {
String tmp = "{}";
jsonWrite(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>" + stateMQTT());
jsonWrite(tmp, "class", "pop-up");
#ifdef ESP8266
request->send(200, "text/text", "ok");
#endif
#ifdef ESP32
request->send(200, "text/text", tmp);
#endif
});
}
MQTT_Connecting();
//проверка подключения к серверу
ts.add(WIFI_MQTT_CONNECTION_CHECK, wifi_mqtt_reconnecting, [&](void*) {
up_time();
if (WiFi.status() == WL_CONNECTED) {
Serial.println("[V] WiFi-ok");
if (client.connected()) {
Serial.println("[V] MQTT-ok");
//web_print("MQTT-ok");
} else {
MQTT_Connecting();
mqtt_lost_error++;
}
} else {
Serial.println("[E] Lost WiFi connection");
wifi_lost_error++;
ts.remove(WIFI_MQTT_CONNECTION_CHECK);
StartAPMode();
}
}, nullptr, false);
void handle_connection() {
if (start_connection) {
start_connection = false;
client.disconnect();
MQTT_Connecting();
}
}
//================================================ОБНОВЛЕНИЕ====================================================
@@ -85,10 +71,7 @@ void handleMQTT() {
boolean MQTT_Connecting() {
String mqtt_server = jsonRead(configSetup, "mqttServer");
if ((mqtt_server != "")) {
static boolean first = true;
if (!first) Serial.println("[E] Lost MQTT connection, start reconnecting");
//web_print("Lost MQTT connection, start reconnecting");
first = false;
Serial.println("[E] Lost MQTT connection, start reconnecting");
//ssl//espClient.setCACert(local_root_ca1);
client.setServer(mqtt_server.c_str(), jsonReadtoInt(configSetup, "mqttPort"));
if (WiFi.status() == WL_CONNECTED) {
@@ -96,16 +79,11 @@ boolean MQTT_Connecting() {
Serial.println("[V] Connecting to MQTT server commenced");
if (client.connect(chipID.c_str(), jsonRead(configSetup, "mqttUser").c_str(), jsonRead(configSetup, "mqttPass").c_str())) {
Serial.println("[V] MQTT connected");
//web_print("MQTT connected");
client.setCallback(callback);
client.subscribe(jsonRead(configSetup, "mqttPrefix").c_str()); // Для приема получения HELLOW и подтверждения связи
client.subscribe((jsonRead(configSetup, "mqttPrefix") + "/" + chipID + "/+/control").c_str()); // Подписываемся на топики control
client.subscribe((jsonRead(configSetup, "mqttPrefix") + "/" + chipID + "/order").c_str()); // Подписываемся на топики order
//client.subscribe((jsonRead(configSetup, "mqttPrefix") + "/" + chipID + "/test").c_str()); //Для приема получения work и подтверждения связи (для приложения mqtt IOT MQTT Panel)
client.subscribe((jsonRead(configSetup, "mqttPrefix") + "/ids").c_str()); // Подписываемся на топики ids
//sendMQTT("test", "work");
Serial.println("[V] Callback set, subscribe done");
//web_print("Callback set, subscribe done");
return true;
} else {
Serial.println("[E] try again in " + String(wifi_mqtt_reconnecting / 1000) + " sec");
@@ -115,7 +93,6 @@ boolean MQTT_Connecting() {
}
} else {
Serial.println("[E] No date for MQTT connection");
//web_print("No date for MQTT connection");
return false;
}
}
@@ -157,10 +134,10 @@ void outcoming_date() {
sendAllWigets();
sendAllData();
// if (flagLoggingAnalog) sendLogData("log.analog.txt", "loganalog");
// if (flagLoggingPh) sendLogData("log.ph.txt", "logph");
// if (flagLoggingDallas) sendLogData("log.dallas.txt", "logdallas");
// if (flagLoggingLevel) sendLogData("log.level.txt", "loglevel");
// if (flagLoggingAnalog) sendLogData("log.analog.txt", "loganalog");
// if (flagLoggingPh) sendLogData("log.ph.txt", "logph");
// if (flagLoggingDallas) sendLogData("log.dallas.txt", "logdallas");
// if (flagLoggingLevel) sendLogData("log.level.txt", "loglevel");
Serial.println("[V] Sending all date to iot manager completed");

21
set.h
View File

@@ -1,6 +1,8 @@
String firmware_version = "2.3.1";
String new_version;
//23560
//#define OTA_enable
//#define MDNS_enable
//#define WS_enable
@@ -70,13 +72,16 @@ AsyncWebServer server(80);
AsyncWebSocket ws("/ws");
#endif
AsyncEventSource events("/events");
//---------------------------------------------------------------
#include "time.h"
//---------------------------------------------------------------
#include <TickerScheduler.h>
TickerScheduler ts(30);
enum {ROUTER_SEARCHING, WIFI_MQTT_CONNECTION_CHECK, LEVEL, ANALOG_, DALLAS, DHTT, DHTH, DHTC, DHTP, DHTD, STEPPER1, STEPPER2, ANALOG_LOG, LEVEL_LOG, DALLAS_LOG, PH_LOG, CMD, TIMER_COUNTDOWN, TIMERS, TIME, STATISTICS, TEST};
enum {ROUTER_SEARCHING, WIFI_MQTT_CONNECTION_CHECK, LEVEL, ANALOG_, DALLAS, DHTT, DHTH, DHTC, DHTP, DHTD, STEPPER1, STEPPER2, ANALOG_LOG, LEVEL_LOG, DALLAS_LOG, CMD, TIMER_COUNTDOWN, TIMERS, TIME, STATISTICS, TEST};
//---------------------------------------------------------------
//ssl//#include "dependencies/WiFiClientSecure/WiFiClientSecure.h" //using older WiFiClientSecure
//#include "Ticker_for_TickerScheduler/Ticker/Ticker.h"
//---------------------------------------------------------------
#include <PubSubClient.h>
WiFiClient espClient;
//ssl//WiFiClientSecure espClient;
@@ -101,11 +106,11 @@ DallasTemperature sensors;
#include "DHTesp.h"
DHTesp dht;
//----------------------------------------------------------------
#include "Adafruit_Si7021.h" //https://github.com/adafruit/Adafruit_Si7021
Adafruit_Si7021 sensor_Si7021 = Adafruit_Si7021();
//#include "Adafruit_Si7021.h" //https://github.com/adafruit/Adafruit_Si7021
//Adafruit_Si7021 sensor_Si7021 = Adafruit_Si7021();
//-----------------------------------------------------------------
boolean just_load = true;
const char* hostName = "IoT Manager";
@@ -116,10 +121,8 @@ String optionJson = "{}";
String json = "{}";
String chipID = "";
//String prefix; //= "/IoTmanager";
String prex;
String ids;
//boolean busy;
String all_vigets = "";
String scenario;
@@ -143,7 +146,7 @@ int wifi_lost_error = 0;
int mqtt_lost_error = 0;
String var;
boolean upgrade_flag = false;
boolean get_url_flag = false;
boolean start_connection = false;