github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-02-04 07:52:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automatic reboot when MQTT is lost (#1058)

Browse Source 
* Fixing board type overwrite, zmartcharge default issues and disabling entsoe

* Fixed Zmartcharge configuration issue

* Option to auto reboot if MQTT connection is lost
This commit is contained in:
Gunnar Skjold
2025-11-06 18:26:40 +01:00
committed by GitHub
parent eefbc08222
commit ffd8d46f2e
14 changed files with 81 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/AmsConfiguration/include/AmsConfiguration.h
View File

@@ -97,7 +97,8 @@ struct MqttConfig {
uint16_t stateUpdateInterval;
uint16_t timeout;
uint8_t keepalive;
}; // 685
uint8_t rebootMinutes;
}; // 684
struct WebConfig {
uint8_t security;

25
lib/AmsConfiguration/src/AmsConfiguration.cpp
View File

@@ -152,14 +152,17 @@ bool AmsConfiguration::getMqttConfig(MqttConfig& config) {
EEPROM.begin(EEPROM_SIZE);
EEPROM.get(CONFIG_MQTT_START, config);
EEPROM.end();
if(config.magic != 0x9C) {
if(config.magic != 0x7B) {
config.stateUpdate = false;
config.stateUpdateInterval = 10;
if(config.magic != 0xA5) { // New magic for 2.4.11
if(config.magic != 0x9C) {
if(config.magic != 0x7B) {
config.stateUpdate = false;
config.stateUpdateInterval = 10;
}
config.timeout = 1000;
config.keepalive = 60;
}
config.timeout = 1000;
config.keepalive = 60;
config.magic = 0x9C;
config.rebootMinutes = config.ssl ? 5 : 0;
config.magic = 0xA5;
}
return true;
} else {
@@ -182,6 +185,9 @@ bool AmsConfiguration::setMqttConfig(MqttConfig& config) {
mqttChanged |= config.ssl != existing.ssl;
mqttChanged |= config.stateUpdate != existing.stateUpdate;
mqttChanged |= config.stateUpdateInterval != existing.stateUpdateInterval;
mqttChanged |= config.timeout != existing.timeout;
mqttChanged |= config.keepalive != existing.keepalive;
mqttChanged |= config.rebootMinutes != existing.rebootMinutes;
} else {
mqttChanged = true;
}
@@ -196,6 +202,7 @@ bool AmsConfiguration::setMqttConfig(MqttConfig& config) {
if(config.timeout > 10000) config.timeout = 1000;
if(config.keepalive < 5) config.keepalive = 60;
if(config.keepalive > 240) config.keepalive = 60;
if(config.rebootMinutes > 240) config.rebootMinutes = 0;
EEPROM.begin(EEPROM_SIZE);
EEPROM.put(CONFIG_MQTT_START, config);
@@ -220,6 +227,7 @@ void AmsConfiguration::clearMqtt(MqttConfig& config) {
config.stateUpdateInterval = 10;
config.timeout = 1000;
config.keepalive = 60;
config.rebootMinutes = 0;
}
void AmsConfiguration::setMqttChanged() {
@@ -1246,6 +1254,9 @@ void AmsConfiguration::print(Print* debugger)
}
debugger->printf_P(PSTR("Payload format: %i\r\n"), mqtt.payloadFormat);
debugger->printf_P(PSTR("SSL: %s\r\n"), mqtt.ssl ? "Yes" : "No");
debugger->printf_P(PSTR("Timeout: %i\r\n"), mqtt.timeout);
debugger->printf_P(PSTR("Keep-alive: %i\r\n"), mqtt.keepalive);
debugger->printf_P(PSTR("Auto reboot minutes: %i\r\n"), mqtt.rebootMinutes);
} else {
debugger->printf_P(PSTR("Enabled: No\r\n"));
}