mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-07 08:19:52 +03:00
count # TCP dropouts - https://github.com/proddy/EMS-ESP/issues/217
This commit is contained in:
@@ -18,7 +18,7 @@ union system_rtcmem_t {
|
|||||||
uint8_t stability_counter;
|
uint8_t stability_counter;
|
||||||
uint8_t reset_reason;
|
uint8_t reset_reason;
|
||||||
uint8_t boot_status;
|
uint8_t boot_status;
|
||||||
uint8_t _reserved_;
|
uint8_t dropout_counter;
|
||||||
} parts;
|
} parts;
|
||||||
uint32_t value;
|
uint32_t value;
|
||||||
};
|
};
|
||||||
@@ -294,6 +294,7 @@ void MyESP::_wifiCallback(justwifi_messages_t code, char * parameter) {
|
|||||||
|
|
||||||
if (code == MESSAGE_DISCONNECTED) {
|
if (code == MESSAGE_DISCONNECTED) {
|
||||||
myDebug_P(PSTR("[WIFI] Disconnected"));
|
myDebug_P(PSTR("[WIFI] Disconnected"));
|
||||||
|
_increaseSystemDropoutCounter(); // +1 to number of disconnects
|
||||||
_wifi_connected = false;
|
_wifi_connected = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -457,6 +458,7 @@ void MyESP::_mqtt_setup() {
|
|||||||
mqttClient.onDisconnect([this](AsyncMqttClientDisconnectReason reason) {
|
mqttClient.onDisconnect([this](AsyncMqttClientDisconnectReason reason) {
|
||||||
if (reason == AsyncMqttClientDisconnectReason::TCP_DISCONNECTED) {
|
if (reason == AsyncMqttClientDisconnectReason::TCP_DISCONNECTED) {
|
||||||
myDebug_P(PSTR("[MQTT] TCP Disconnected"));
|
myDebug_P(PSTR("[MQTT] TCP Disconnected"));
|
||||||
|
_increaseSystemDropoutCounter(); // +1 to number of disconnects
|
||||||
(_mqtt_callback_f)(MQTT_DISCONNECT_EVENT, nullptr, nullptr); // call callback with disconnect
|
(_mqtt_callback_f)(MQTT_DISCONNECT_EVENT, nullptr, nullptr); // call callback with disconnect
|
||||||
}
|
}
|
||||||
if (reason == AsyncMqttClientDisconnectReason::MQTT_IDENTIFIER_REJECTED) {
|
if (reason == AsyncMqttClientDisconnectReason::MQTT_IDENTIFIER_REJECTED) {
|
||||||
@@ -1068,6 +1070,12 @@ uint8_t MyESP::_getSystemStabilityCounter() {
|
|||||||
return data.parts.stability_counter;
|
return data.parts.stability_counter;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint8_t MyESP::_getSystemDropoutCounter() {
|
||||||
|
system_rtcmem_t data;
|
||||||
|
data.value = Rtcmem->sys;
|
||||||
|
return data.parts.dropout_counter;
|
||||||
|
}
|
||||||
|
|
||||||
void MyESP::_setSystemStabilityCounter(uint8_t counter) {
|
void MyESP::_setSystemStabilityCounter(uint8_t counter) {
|
||||||
system_rtcmem_t data;
|
system_rtcmem_t data;
|
||||||
data.value = Rtcmem->sys;
|
data.value = Rtcmem->sys;
|
||||||
@@ -1075,6 +1083,20 @@ void MyESP::_setSystemStabilityCounter(uint8_t counter) {
|
|||||||
Rtcmem->sys = data.value;
|
Rtcmem->sys = data.value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MyESP::_setSystemDropoutCounter(uint8_t counter) {
|
||||||
|
system_rtcmem_t data;
|
||||||
|
data.value = Rtcmem->sys;
|
||||||
|
data.parts.dropout_counter = counter;
|
||||||
|
Rtcmem->sys = data.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MyESP::_increaseSystemDropoutCounter() {
|
||||||
|
system_rtcmem_t data;
|
||||||
|
data.value = Rtcmem->sys;
|
||||||
|
data.parts.dropout_counter++;
|
||||||
|
Rtcmem->sys = data.value;
|
||||||
|
}
|
||||||
|
|
||||||
uint8_t MyESP::_getSystemResetReason() {
|
uint8_t MyESP::_getSystemResetReason() {
|
||||||
system_rtcmem_t data;
|
system_rtcmem_t data;
|
||||||
data.value = Rtcmem->sys;
|
data.value = Rtcmem->sys;
|
||||||
@@ -1302,6 +1324,7 @@ void MyESP::showSystemStats() {
|
|||||||
myDebug_P(PSTR(" [SYSTEM] Last reset info: %s"), (char *)ESP.getResetInfo().c_str());
|
myDebug_P(PSTR(" [SYSTEM] Last reset info: %s"), (char *)ESP.getResetInfo().c_str());
|
||||||
}
|
}
|
||||||
myDebug_P(PSTR(" [SYSTEM] Restart count: %d"), _getSystemStabilityCounter());
|
myDebug_P(PSTR(" [SYSTEM] Restart count: %d"), _getSystemStabilityCounter());
|
||||||
|
myDebug_P(PSTR(" [SYSTEM] # TCP disconnects: %d"), _getSystemDropoutCounter());
|
||||||
|
|
||||||
myDebug_P(PSTR(" [SYSTEM] rtcmem status: blocks:%u addr:0x%p"), RtcmemSize, Rtcmem);
|
myDebug_P(PSTR(" [SYSTEM] rtcmem status: blocks:%u addr:0x%p"), RtcmemSize, Rtcmem);
|
||||||
for (uint8_t block = 0; block < RtcmemSize; ++block) {
|
for (uint8_t block = 0; block < RtcmemSize; ++block) {
|
||||||
@@ -2918,6 +2941,8 @@ void MyESP::begin(const char * app_hostname, const char * app_name, const char *
|
|||||||
_setSystemCheck(false); // reset system check
|
_setSystemCheck(false); // reset system check
|
||||||
_heartbeatCheck(true); // force heartbeat
|
_heartbeatCheck(true); // force heartbeat
|
||||||
|
|
||||||
|
_setSystemDropoutCounter(0); // reset # TCP dropouts
|
||||||
|
|
||||||
SerialAndTelnet.flush();
|
SerialAndTelnet.flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -431,6 +431,10 @@ class MyESP {
|
|||||||
uint8_t _getSystemStabilityCounter();
|
uint8_t _getSystemStabilityCounter();
|
||||||
void _setSystemStabilityCounter(uint8_t counter);
|
void _setSystemStabilityCounter(uint8_t counter);
|
||||||
|
|
||||||
|
uint8_t _getSystemDropoutCounter();
|
||||||
|
void _setSystemDropoutCounter(uint8_t counter);
|
||||||
|
void _increaseSystemDropoutCounter();
|
||||||
|
|
||||||
void _setSystemResetReason(uint8_t reason);
|
void _setSystemResetReason(uint8_t reason);
|
||||||
uint8_t _getCustomResetReason();
|
uint8_t _getCustomResetReason();
|
||||||
void _setCustomResetReason(uint8_t reason);
|
void _setCustomResetReason(uint8_t reason);
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
#define APP_VERSION "1.9.3b1"
|
#define APP_VERSION "1.9.3b2"
|
||||||
|
|||||||
Reference in New Issue
Block a user