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

Fixed building without remote debug (#1084)

Browse Source
This commit is contained in:
Gunnar Skjold 2025-12-09 12:19:00 +01:00 committed by GitHub
parent ea91248e67
commit f323c5a4f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/AmsMqttHandler/include/AmsMqttHandler.h
View File

@ -25,7 +25,7 @@ public:
#if defined(AMS_REMOTE_DEBUG) #if defined(AMS_REMOTE_DEBUG)
AmsMqttHandler(MqttConfig& mqttConfig, RemoteDebug* debugger, char* buf, AmsFirmwareUpdater* updater) { AmsMqttHandler(MqttConfig& mqttConfig, RemoteDebug* debugger, char* buf, AmsFirmwareUpdater* updater) {
#else #else
AmsMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf) { AmsMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, AmsFirmwareUpdater* updater) {
#endif #endif
this->mqttConfig = mqttConfig; this->mqttConfig = mqttConfig;
this->mqttConfigChanged = true; this->mqttConfigChanged = true;

2
lib/DomoticzMqttHandler/include/DomoticzMqttHandler.h
View File

@ -17,7 +17,7 @@ public:
this->config = config; this->config = config;
}; };
#else #else
DomoticzMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, DomoticzConfig config) : AmsMqttHandler(mqttConfig, debugger, buf) { DomoticzMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, DomoticzConfig config, AmsFirmwareUpdater* updater) : AmsMqttHandler(mqttConfig, debugger, buf, updater) {
this->config = config; this->config = config;
}; };
#endif #endif

2
lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h
View File

@ -17,7 +17,7 @@ public:
#if defined(AMS_REMOTE_DEBUG) #if defined(AMS_REMOTE_DEBUG)
HomeAssistantMqttHandler(MqttConfig& mqttConfig, RemoteDebug* debugger, char* buf, uint8_t boardType, HomeAssistantConfig config, HwTools* hw, AmsFirmwareUpdater* updater, char* hostname) : AmsMqttHandler(mqttConfig, debugger, buf, updater) { HomeAssistantMqttHandler(MqttConfig& mqttConfig, RemoteDebug* debugger, char* buf, uint8_t boardType, HomeAssistantConfig config, HwTools* hw, AmsFirmwareUpdater* updater, char* hostname) : AmsMqttHandler(mqttConfig, debugger, buf, updater) {
#else #else
HomeAssistantMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, uint8_t boardType, HomeAssistantConfig config, HwTools* hw) : AmsMqttHandler(mqttConfig, debugger, buf) { HomeAssistantMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, uint8_t boardType, HomeAssistantConfig config, HwTools* hw, AmsFirmwareUpdater* updater, char* hostname) : AmsMqttHandler(mqttConfig, debugger, buf, updater) {
#endif #endif
this->boardType = boardType; this->boardType = boardType;
this->hw = hw; this->hw = hw;

2
lib/PassthroughMqttHandler/include/PassthroughMqttHandler.h
View File

@ -16,7 +16,7 @@ public:
this->topic = String(mqttConfig.publishTopic); this->topic = String(mqttConfig.publishTopic);
}; };
#else #else
PassthroughMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf) : AmsMqttHandler(mqttConfig, debugger, buf) { PassthroughMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, AmsFirmwareUpdater* updater) : AmsMqttHandler(mqttConfig, debugger, buf, updater) {
this->topic = String(mqttConfig.publishTopic); this->topic = String(mqttConfig.publishTopic);
}; };
#endif #endif

2
lib/RawMqttHandler/include/RawMqttHandler.h
View File

@ -17,7 +17,7 @@ public:
topic = String(mqttConfig.publishTopic); topic = String(mqttConfig.publishTopic);
}; };
#else #else
RawMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf) : AmsMqttHandler(mqttConfig, debugger, buf) { RawMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, AmsFirmwareUpdater* updater) : AmsMqttHandler(mqttConfig, debugger, buf, updater) {
full = mqttConfig.payloadFormat == 2; full = mqttConfig.payloadFormat == 2;
topic = String(mqttConfig.publishTopic); topic = String(mqttConfig.publishTopic);
}; };

4
platformio.ini
View File

@ -2,7 +2,7 @@
extra_configs = platformio-user.ini extra_configs = platformio-user.ini
[common] [common]
lib_deps = EEPROM, LittleFS, DNSServer, 256dpi/MQTT@2.5.2, OneWireNg@0.13.3, DallasTemperature@4.0.4, https://github.com/gskjold/RemoteDebug.git, PaulStoffregen/Time@1.6.1, JChristensen/Timezone@1.2.4, bblanchon/ArduinoJson@7.0.4, FirmwareVersion, AmsConfiguration, AmsData, AmsDataStorage, HwTools, Uptime, AmsDecoder, PriceService, EnergyAccounting, AmsFirmwareUpdater, AmsJsonGenerator, AmsMqttHandler, RawMqttHandler, JsonMqttHandler, DomoticzMqttHandler, HomeAssistantMqttHandler, PassthroughMqttHandler, RealtimePlot, ConnectionHandler, MeterCommunicators lib_deps = EEPROM, LittleFS, DNSServer, 256dpi/MQTT@2.5.2, OneWireNg@0.13.3, DallasTemperature@4.0.4, https://github.com/gskjold/RemoteDebug.git, PaulStoffregen/Time@1.6.1, JChristensen/Timezone@1.2.4, FirmwareVersion, AmsConfiguration, AmsData, AmsDataStorage, HwTools, Uptime, AmsDecoder, PriceService, EnergyAccounting, AmsFirmwareUpdater, AmsJsonGenerator, AmsMqttHandler, RawMqttHandler, JsonMqttHandler, DomoticzMqttHandler, HomeAssistantMqttHandler, PassthroughMqttHandler, RealtimePlot, ConnectionHandler, MeterCommunicators
lib_ignore = OneWire lib_ignore = OneWire
extra_scripts = extra_scripts =
pre:scripts/addversion.py pre:scripts/addversion.py
@ -19,7 +19,7 @@ build_flags =
-fexceptions -fexceptions
[esp32] [esp32]
lib_deps = WiFi, Ethernet, ESPmDNS, WiFiClientSecure, HTTPClient, FS, WebServer, ESP32 Async UDP, ESP32SSDP, mulmer89/ESPRandom@1.5.0, ${common.lib_deps}, CloudConnector, ZmartCharge, SvelteUi lib_deps = WiFi, Ethernet, ESPmDNS, WiFiClientSecure, HTTPClient, FS, WebServer, ESP32 Async UDP, ESP32SSDP, mulmer89/ESPRandom@1.5.0, ${common.lib_deps}, bblanchon/ArduinoJson@7.0.4, CloudConnector, ZmartCharge, SvelteUi
[env:esp8266] [env:esp8266]
platform = espressif8266@4.2.1 platform = espressif8266@4.2.1

26
src/AmsToMqttBridge.cpp
View File

@ -655,7 +655,7 @@ void loop() {
} }
communicationTime += handleWebserver(); communicationTime += handleWebserver();
if(communicationTime > 10 && updater.getProgress() >= 0) { if(communicationTime > 25 && updater.getProgress() >= 0) {
debugI_P(PSTR("Communication is active (%dms), forcing updater to wait"), communicationTime); debugI_P(PSTR("Communication is active (%dms), forcing updater to wait"), communicationTime);
} else { } else {
handleUpdater(); handleUpdater();
@ -1044,7 +1044,13 @@ void handleMeterConfig() {
debugE_P(PSTR("Unknown meter source selected: %d"), meterConfig.source); debugE_P(PSTR("Unknown meter source selected: %d"), meterConfig.source);
} }
ws.setMeterConfig(meterConfig.distributionSystem, meterConfig.mainFuse, meterConfig.productionCapacity); ws.setMeterConfig(meterConfig.distributionSystem, meterConfig.mainFuse, meterConfig.productionCapacity);
if(mc != NULL && Debug.isActive(RemoteDebug::DEBUG)) { if(mc != NULL &&
#if defined(AMS_REMOTE_DEBUG)
Debug.isActive(RemoteDebug::DEBUG)
#else
false // Never send debug data
#endif
) {
mc->setMqttHandlerForDebugging(mqttHandler); mc->setMqttHandlerForDebugging(mqttHandler);
} }
config.ackMeterChanged(); config.ackMeterChanged();
@ -1563,7 +1569,13 @@ void postConnect() {
if(!debug.telnet) { if(!debug.telnet) {
Debug.stop(); Debug.stop();
} }
if(mc != NULL && Debug.isActive(RemoteDebug::DEBUG)) { if(mc != NULL &&
#if defined(AMS_REMOTE_DEBUG)
Debug.isActive(RemoteDebug::DEBUG)
#else
false // Never send debug data
#endif
) {
mc->setMqttHandlerForDebugging(mqttHandler); mc->setMqttHandlerForDebugging(mqttHandler);
} }
} else { } else {
@ -1695,7 +1707,13 @@ void MQTT_connect() {
} }
} }
ws.setMqttHandler(mqttHandler); ws.setMqttHandler(mqttHandler);
if(mc != NULL && Debug.isActive(RemoteDebug::DEBUG)) { if(mc != NULL &&
#if defined(AMS_REMOTE_DEBUG)
Debug.isActive(RemoteDebug::DEBUG)
#else
false // Never send debug data
#endif
) {
mc->setMqttHandlerForDebugging(mqttHandler); mc->setMqttHandlerForDebugging(mqttHandler);
} }