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

wifi reconnection bug fixed

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-10-02 01:14:45 +03:00
parent 8a80d509c7
commit 7472863b05
23 changed files with 150 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Consts.h
View File

@@ -2,7 +2,7 @@
//=================Firmeare=================
#define FIRMWARE_NAME "esp8266-iotm"
#define FIRMWARE_VERSION 245
#define FIRMWARE_VERSION 246
#define FLASH_4MB true
//=================System===================

16
include/MqttClient.h
View File

@@ -2,14 +2,12 @@
#include <Arduino.h>
namespace MqttClient {
void init();
boolean connect();
void reconnect();
void loop();
void subscribe();
void mqttInit();
boolean mqttConnect();
void mqttReconnect();
void mqttLoop();
void mqttSubscribe();
boolean publish(const String& topic, const String& data);
boolean publishData(const String& topic, const String& data);
@@ -21,7 +19,5 @@ boolean publishStatus(const String& topic, const String& data);
void publishWidgets();
void publishState();
void handleSubscribedUpdates(char* topic, uint8_t* payload, size_t length);
void mqttCallback(char* topic, uint8_t* payload, size_t length);
const String getStateStr();
} // namespace MqttClient

4
include/Utils/WiFiUtils.h
View File

@@ -4,9 +4,9 @@
boolean isNetworkActive();
void startSTAMode();
void routerConnect();
bool startAPMode();
boolean scanWiFi(String ssid);
boolean RouterFind(String ssid);

2
include/items/ButtonInClass.h
View File

@@ -47,7 +47,7 @@ class ButtonInClass : public LineParsing {
void switchChangeVirtual(String key, String state) {
eventGen(key, "");
jsonWriteInt(configLiveJson, key, state.toInt());
MqttClient::publishStatus(key, state);
publishStatus(key, state);
}
};

2
include/items/ButtonOutClass.h
View File

@@ -33,7 +33,7 @@ class ButtonOutClass : public LineParsing {
}
eventGen(key, "");
jsonWriteInt(configLiveJson, key, state.toInt());
MqttClient::publishStatus(key, state);
publishStatus(key, state);
}
};

4
include/items/InputClass.h
View File

@@ -18,13 +18,13 @@ class InputClass : public LineParsing {
void inputSetFloat(String key, String state) {
eventGen(key, "");
jsonWriteFloat(configLiveJson, key, state.toFloat());
MqttClient::publishStatus(key, state);
publishStatus(key, state);
}
void inputSetStr(String key, String state) {
eventGen(key, "");
jsonWriteStr(configLiveJson, key, state);
MqttClient::publishStatus(key, state);
publishStatus(key, state);
}
};

2
include/items/OutputTextClass.h
View File

@@ -17,7 +17,7 @@ class OutputTextClass : public LineParsing {
state.replace("#", " ");
eventGen(key, "");
jsonWriteStr(configLiveJson, key, state);
MqttClient::publishStatus(key, state);
publishStatus(key, state);
}
};
extern OutputTextClass myOutputText;

2
include/items/PwmOutClass.h
View File

@@ -24,7 +24,7 @@ class PwmOutClass : public LineParsing {
analogWrite(pinInt, state.toInt());
eventGen(key, "");
jsonWriteInt(configLiveJson, key, state.toInt());
MqttClient::publishStatus(key, state);
publishStatus(key, state);
}
};

2
include/items/SensorAnalogClass.h
View File

@@ -30,7 +30,7 @@ class SensorAnalogClass : public SensorConvertingClass {
float valueFl = this->correction(key, value);
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
MqttClient::publishStatus(key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
return value;
}

6
include/items/SensorBme280Class.h
View File

@@ -27,7 +27,7 @@ class SensorBme280Class : public SensorConvertingClass {
float valueFl = this->correction(key, value);
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
MqttClient::publishStatus(key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
}
@@ -37,7 +37,7 @@ class SensorBme280Class : public SensorConvertingClass {
float valueFl = this->correction(key, value);
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
MqttClient::publishStatus(key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
}
@@ -48,7 +48,7 @@ class SensorBme280Class : public SensorConvertingClass {
float valueFl = this->correction(key, value);
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
MqttClient::publishStatus(key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
}
};

4
include/items/SensorBmp280Class.h
View File

@@ -28,7 +28,7 @@ class SensorBmp280Class : public SensorConvertingClass {
float valueFl = this->correction(key, value);
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
MqttClient::publishStatus(key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
}
@@ -41,7 +41,7 @@ class SensorBmp280Class : public SensorConvertingClass {
float valueFl = this->correction(key, value);
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
MqttClient::publishStatus(key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
}
};

2
include/items/SensorDallasClass.h
View File

@@ -36,7 +36,7 @@ class SensorDallasClass : public SensorConvertingClass {
float valueFl = this->correction(key, value);
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
MqttClient::publishStatus(key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
}
}

4
include/items/SensorDhtClass.h
View File

@@ -43,7 +43,7 @@ class SensorDhtClass : public SensorConvertingClass {
float valueFl = this->correction(key, value);
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
MqttClient::publishStatus(key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
} else {
Serial.println("[E] sensor '" + key);
@@ -67,7 +67,7 @@ class SensorDhtClass : public SensorConvertingClass {
float valueFl = this->correction(key, value);
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
MqttClient::publishStatus(key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
} else {
Serial.println("[E] sensor '" + key);

2
include/items/SensorModbusClass.h
View File

@@ -37,7 +37,7 @@
// int valueFl = this->correction(key, value);
// eventGen(key, "");
// jsonWriteStr(configLiveJson, key, String(valueFl));
// MqttClient::publishStatus(key, String(valueFl));
// publishStatus(key, String(valueFl));
// Serial.println("I sensor '" + key + "' data: " + String(valueFl) + ", Slave dev addr: " + String(slaveAddress) + ", Register: " + String(regAddress));
// }
//

2
include/items/SensorUltrasonicClass.h
View File

@@ -34,7 +34,7 @@ class SensorUltrasonic : public SensorConvertingClass {
float valueFl = this->correction(key, value);
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
MqttClient::publishStatus(key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
}
};