Build option to disable remote debug

2026-04-15 00:38:00 +00:00 · 2024-06-07 18:48:26 +02:00
parent 93e55f457a
commit 59bf0ce066
36 changed files with 784 additions and 169 deletions
--- a/lib/AmsDataStorage/include/AmsDataStorage.h
+++ b/lib/AmsDataStorage/include/AmsDataStorage.h
@@ -8,7 +8,9 @@
 #define _AMSDATASTORAGE_H
 #include "Arduino.h"
 #include "AmsData.h"
+#if defined(AMS_REMOTE_DEBUG)
 #include "RemoteDebug.h"
+#endif
 #include "Timezone.h"

 struct DayDataPoints5 {
@@ -53,7 +55,11 @@ struct MonthDataPoints {

 class AmsDataStorage {
 public:
+    #if defined(AMS_REMOTE_DEBUG)
    AmsDataStorage(RemoteDebug*);
+    #else
+    AmsDataStorage(Stream*);
+    #endif
    void setTimezone(Timezone*);
    bool update(AmsData*);
    uint32_t getHourImport(uint8_t);
@@ -100,7 +106,11 @@ private:
        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
        10
    };
+    #if defined(AMS_REMOTE_DEBUG)
    RemoteDebug* debugger;
+    #else
+    Stream* debugger;
+    #endif
 };

 #endif
--- a/lib/AmsDataStorage/src/AmsDataStorage.cpp
+++ b/lib/AmsDataStorage/src/AmsDataStorage.cpp
@@ -10,7 +10,11 @@
 #include "AmsStorage.h"
 #include "FirmwareVersion.h"

+#if defined(AMS_REMOTE_DEBUG)
 AmsDataStorage::AmsDataStorage(RemoteDebug* debugger) {
+#else
+AmsDataStorage::AmsDataStorage(Stream* debugger) {
+#endif
    day.version = 6;
    day.accuracy = 1;
    month.version = 7;
--- a/lib/AmsMqttHandler/include/AmsMqttHandler.h
+++ b/lib/AmsMqttHandler/include/AmsMqttHandler.h
@@ -21,6 +21,7 @@

 class AmsMqttHandler {
 public:
+    #if defined(AMS_REMOTE_DEBUG)
    AmsMqttHandler(MqttConfig& mqttConfig, RemoteDebug* debugger, char* buf) {
        this->mqttConfig = mqttConfig;
    	this->mqttConfigChanged = true;
@@ -28,6 +29,15 @@ public:
        this->json = buf;
        mqtt.dropOverflow(true);
    };
+    #else
+    AmsMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf) {
+        this->mqttConfig = mqttConfig;
+    	this->mqttConfigChanged = true;
+        this->debugger = debugger;
+        this->json = buf;
+        mqtt.dropOverflow(true);
+    };
+    #endif

    void setCaVerification(bool);
    void setConfig(MqttConfig& mqttConfig);
@@ -55,7 +65,11 @@ public:
    };

 protected:
+    #if defined(AMS_REMOTE_DEBUG)
    RemoteDebug* debugger;
+    #else
+    Stream* debugger;
+    #endif
    MqttConfig mqttConfig;
    bool mqttConfigChanged = true;
    MQTTClient mqtt = MQTTClient(256);
--- a/lib/AmsMqttHandler/src/AmsMqttHandler.cpp
+++ b/lib/AmsMqttHandler/src/AmsMqttHandler.cpp
@@ -114,19 +114,31 @@ bool AmsMqttHandler::connect() {
 	// Connect to a unsecure or secure MQTT server
 	if ((strlen(mqttConfig.username) == 0 && mqtt.connect(mqttConfig.clientId)) ||
 		(strlen(mqttConfig.username) > 0 && mqtt.connect(mqttConfig.clientId, mqttConfig.username, mqttConfig.password))) {
-		if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Successfully connected to MQTT\n"));
+		#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Successfully connected to MQTT\n"));
 		mqtt.onMessage(std::bind(&AmsMqttHandler::onMessage, this, std::placeholders::_1, std::placeholders::_2));
 		if(strlen(mqttConfig.subscribeTopic) > 0) {
-			if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("  Subscribing to [%s]\n"), mqttConfig.subscribeTopic);
+			#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("  Subscribing to [%s]\n"), mqttConfig.subscribeTopic);
 			if(!mqtt.subscribe(mqttConfig.subscribeTopic)) {
-				if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("  Unable to subscribe to to [%s]\n"), mqttConfig.subscribeTopic);
+				#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("  Unable to subscribe to to [%s]\n"), mqttConfig.subscribeTopic);
 			}
 		}
 		mqtt.publish(statusTopic, "online", true, 0);
        mqtt.loop();
        return true;
 	} else {
-		if (debugger->isActive(RemoteDebug::ERROR)) {
+		#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+{
 			debugger->printf_P(PSTR("Failed to connect to MQTT: %d\n"), mqtt.lastError());
 			#if defined(ESP8266)
 				if(mqttSecureClient) {
--- a/lib/CloudConnector/include/CloudConnector.h
+++ b/lib/CloudConnector/include/CloudConnector.h
@@ -7,7 +7,9 @@
 #ifndef _CLOUDCONNECTOR_H
 #define _CLOUDCONNECTOR_H

+#if defined(AMS_REMOTE_DEBUG)
 #include "RemoteDebug.h"
+#endif
 #include "mbedtls/ssl.h"
 #include "mbedtls/platform.h"
 #include "mbedtls/net.h"
@@ -51,7 +53,11 @@ struct CloudData {

 class CloudConnector {
 public:
+    #if defined(AMS_REMOTE_DEBUG)
    CloudConnector(RemoteDebug*);
+    #else
+    CloudConnector(Stream*);
+    #endif
    bool setup(CloudConfig& config, MeterConfig& meter, SystemConfig& system, NtpConfig& ntp, HwTools* hw, ResetDataContainer* rdc);
    void setMqttHandler(AmsMqttHandler* mqttHandler);
    void update(AmsData& data, EnergyAccounting& ea);
@@ -62,7 +68,11 @@ public:
    String generateSeed();

 private:
+    #if defined(AMS_REMOTE_DEBUG)
    RemoteDebug* debugger = NULL;
+    #else
+    Stream* debugger = NULL;
+    #endif
    HwTools* hw = NULL;
    ConnectionHandler* ch = NULL;
    ResetDataContainer* rdc = NULL;
--- a/lib/CloudConnector/src/CloudConnector.cpp
+++ b/lib/CloudConnector/src/CloudConnector.cpp
@@ -23,7 +23,11 @@
 #include "esp32s3/rom/rtc.h"
 #endif

+#if defined(AMS_REMOTE_DEBUG)
 CloudConnector::CloudConnector(RemoteDebug* debugger) {
+#else
+CloudConnector::CloudConnector(Stream* debugger) {
+#endif
    this->debugger = debugger;

    http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
@@ -85,7 +89,10 @@ bool CloudConnector::init() {
        strcpy_P(config.hostname, PSTR("cloud.amsleser.no"));

        snprintf_P(clearBuffer, CC_BUF_SIZE, PSTR("http://%s/hub/cloud/public.key"), config.hostname);
-        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(CloudConnector) Downloading public key from %s\n"), clearBuffer);
+        #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("(CloudConnector) Downloading public key from %s\n"), clearBuffer);
        #if defined(ESP8266)
        WiFiClient client;
        client.setTimeout(5000);
@@ -121,18 +128,36 @@ bool CloudConnector::init() {
                                                &entropy, (const unsigned char *) pers,
                                                strlen(pers));
                    if(ret != 0) {
-                        if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("mbedtls_ctr_drbg_seed return code: %d\n"), ret);
+                        #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("mbedtls_ctr_drbg_seed return code: %d\n"), ret);
                    }
                    return ret == 0;
                } else {
-                    if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf("RSA public key read error: ");
+                    #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf("RSA public key read error: ");
                    mbedtls_strerror(error_code, clearBuffer, CC_BUF_SIZE);
-                    if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf("%s\n", clearBuffer);
+                    #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf("%s\n", clearBuffer);
                }
            } else {
-                if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("(CloudConnector) Communication error, returned status: %d\n"), status);
-                if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf(http.errorToString(status).c_str());
-                if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf(http.getString().c_str());
+                #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("(CloudConnector) Communication error, returned status: %d\n"), status);
+                #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf(http.errorToString(status).c_str());
+                #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::DEBUG))
+#endif
+debugger->printf(http.getString().c_str());

                http.end();
            }
@@ -146,13 +171,19 @@ void CloudConnector::update(AmsData& data, EnergyAccounting& ea) {
    unsigned long now = millis();
    if(now-lastUpdate < config.interval*1000) return;
    if(!ESPRandom::isValidV4Uuid(config.clientId)) {
-        if(debugger->isActive(RemoteDebug::WARNING)) debugger->printf_P(PSTR("(CloudConnector) Client ID is not valid\n"));
+        #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::WARNING))
+#endif
+debugger->printf_P(PSTR("(CloudConnector) Client ID is not valid\n"));
        return;
    }
    if(data.getListType() < 2) return;

    if(!initialized && !init()) {
-        if(debugger->isActive(RemoteDebug::WARNING)) debugger->printf_P(PSTR("Unable to initialize cloud connector\n"));
+        #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::WARNING))
+#endif
+debugger->printf_P(PSTR("Unable to initialize cloud connector\n"));
        return;
    }
    initialized = true;
@@ -372,9 +403,15 @@ void CloudConnector::update(AmsData& data, EnergyAccounting& ea) {
    if(rsa == nullptr) return;
    int ret = mbedtls_rsa_check_pubkey(rsa);
    if(ret != 0) {
-        if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("mbedtls_rsa_pkcs1_encrypt return code: %d\n"), ret);
+        #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("mbedtls_rsa_pkcs1_encrypt return code: %d\n"), ret);
        mbedtls_strerror(ret, clearBuffer, CC_BUF_SIZE);
-        if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("%s\n"), clearBuffer);
+        #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("%s\n"), clearBuffer);
        return;
    }
    memset(encryptedBuffer, 0, rsa->len);
@@ -388,9 +425,15 @@ void CloudConnector::update(AmsData& data, EnergyAccounting& ea) {
            udp.write(encryptedBuffer, rsa->len);
            delay(1);
        } else {
-            if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("mbedtls_rsa_pkcs1_encrypt return code: %d\n"), ret);
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("mbedtls_rsa_pkcs1_encrypt return code: %d\n"), ret);
            mbedtls_strerror(ret, clearBuffer, CC_BUF_SIZE);
-            if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("%s\n"), clearBuffer);
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("%s\n"), clearBuffer);
        }
    }
    udp.endPacket();
--- a/lib/ConnectionHandler/include/EthernetConnectionHandler.h
+++ b/lib/ConnectionHandler/include/EthernetConnectionHandler.h
@@ -9,13 +9,19 @@

 #include "ConnectionHandler.h"
 #include <Arduino.h>
+#if defined(AMS_REMOTE_DEBUG)
 #include "RemoteDebug.h"
+#endif

 #define CONNECTION_TIMEOUT 30000

 class EthernetConnectionHandler : public ConnectionHandler {
 public:
+    #if defined(AMS_REMOTE_DEBUG)
    EthernetConnectionHandler(RemoteDebug* debugger);
+    #else
+    EthernetConnectionHandler(Stream* debugger);
+    #endif

    bool connect(NetworkConfig config, SystemConfig sys);
    void disconnect(unsigned long reconnectDelay);
@@ -33,7 +39,11 @@ public:
    #endif

 private:
+    #if defined(AMS_REMOTE_DEBUG)
    RemoteDebug* debugger;
+    #else
+    Stream* debugger;
+    #endif
    NetworkConfig config;

    bool connected = false;
--- a/lib/ConnectionHandler/include/WiFiAccessPointConnectionHandler.h
+++ b/lib/ConnectionHandler/include/WiFiAccessPointConnectionHandler.h
@@ -9,12 +9,18 @@

 #include "ConnectionHandler.h"
 #include <Arduino.h>
+#if defined(AMS_REMOTE_DEBUG)
 #include "RemoteDebug.h"
+#endif
 #include <DNSServer.h>

 class WiFiAccessPointConnectionHandler : public ConnectionHandler {
 public:
+    #if defined(AMS_REMOTE_DEBUG)
    WiFiAccessPointConnectionHandler(RemoteDebug* debugger);
+    #else
+    WiFiAccessPointConnectionHandler(Stream* debugger);
+    #endif

    bool connect(NetworkConfig config, SystemConfig sys);
    void disconnect(unsigned long reconnectDelay);
@@ -32,7 +38,11 @@ public:
    #endif

 private:
+    #if defined(AMS_REMOTE_DEBUG)
    RemoteDebug* debugger;
+    #else
+    Stream* debugger;
+    #endif
    NetworkConfig config;

    DNSServer dnsServer;
--- a/lib/ConnectionHandler/include/WiFiClientConnectionHandler.h
+++ b/lib/ConnectionHandler/include/WiFiClientConnectionHandler.h
@@ -9,7 +9,9 @@

 #include "ConnectionHandler.h"
 #include <Arduino.h>
+#if defined(AMS_REMOTE_DEBUG)
 #include "RemoteDebug.h"
+#endif

 #define CONNECTION_TIMEOUT 30000
 #define RECONNECT_TIMEOUT 5000
@@ -20,7 +22,11 @@ esp_err_t set_esp_interface_ip(esp_interface_t interface, IPAddress local_ip=INA

 class WiFiClientConnectionHandler : public ConnectionHandler {
 public:
+    #if defined(AMS_REMOTE_DEBUG)
    WiFiClientConnectionHandler(RemoteDebug* debugger);
+    #else
+    WiFiClientConnectionHandler(Stream* debugger);
+    #endif

    bool connect(NetworkConfig config, SystemConfig sys);
    void disconnect(unsigned long reconnectDelay);
@@ -38,7 +44,11 @@ public:
    #endif

 private:
+    #if defined(AMS_REMOTE_DEBUG)
    RemoteDebug* debugger;
+    #else
+    Stream* debugger;
+    #endif
    NetworkConfig config;
    bool busPowered = false;
    bool firstConnect = true;
--- a/lib/ConnectionHandler/src/EthernetConnectionHandler.cpp
+++ b/lib/ConnectionHandler/src/EthernetConnectionHandler.cpp
@@ -12,7 +12,11 @@
 #include <lwip/dns.h>
 #endif

+#if defined(AMS_REMOTE_DEBUG)
 EthernetConnectionHandler::EthernetConnectionHandler(RemoteDebug* debugger) {
+#else
+EthernetConnectionHandler::EthernetConnectionHandler(Stream* debugger) {
+#endif
    this->debugger = debugger;
    this->mode = NETWORK_MODE_ETH_CLIENT;
 }
@@ -59,7 +63,10 @@ bool EthernetConnectionHandler::connect(NetworkConfig config, SystemConfig sys)
        } else if(sys.boardType == 244) {
            return false; // TODO
        } else {
-			if (debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("Board type %d incompatible with ETH\n"), sys.boardType);
+			#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("Board type %d incompatible with ETH\n"), sys.boardType);
            return false;
        }

@@ -68,7 +75,10 @@ bool EthernetConnectionHandler::connect(NetworkConfig config, SystemConfig sys)
            digitalWrite(ethEnablePin, 1);
        }

-        if (debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Connecting to Ethernet\n"));
+        #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Connecting to Ethernet\n"));

        if(ETH.begin(ethAddr, ethPowerPin, ethMdc, ethMdio, ethType, ethClkMode)) {
            #if defined(ESP32)
@@ -97,7 +107,10 @@ bool EthernetConnectionHandler::connect(NetworkConfig config, SystemConfig sys)
                }
            }
        } else {
-			if (debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("Unable to start Ethernet\n"));
+			#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("Unable to start Ethernet\n"));
        }
    }
    #endif
@@ -105,7 +118,10 @@ bool EthernetConnectionHandler::connect(NetworkConfig config, SystemConfig sys)
 }

 void EthernetConnectionHandler::disconnect(unsigned long reconnectDelay) {
-	if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("Disconnecting!\n"));
+	#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("Disconnecting!\n"));
 }

 bool EthernetConnectionHandler::isConnected() {
@@ -117,12 +133,18 @@ void EthernetConnectionHandler::eventHandler(WiFiEvent_t event, WiFiEventInfo_t
    switch(event) {
        case ARDUINO_EVENT_ETH_CONNECTED:
            connected = true;
-            if(debugger->isActive(RemoteDebug::INFO)) {
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+{
                debugger->printf_P(PSTR("Successfully connected to Ethernet!\n"));
            }
            break;
        case ARDUINO_EVENT_ETH_GOT_IP:
-            if(debugger->isActive(RemoteDebug::INFO)) {
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+{
                debugger->printf_P(PSTR("IP:  %s\n"), getIP().toString().c_str());
                debugger->printf_P(PSTR("GW:  %s\n"), getGateway().toString().c_str());
 				for(uint8_t i = 0; i < 3; i++) {
@@ -132,7 +154,10 @@ void EthernetConnectionHandler::eventHandler(WiFiEvent_t event, WiFiEventInfo_t
            }
 			break;
 		case ARDUINO_EVENT_ETH_GOT_IP6: {
-            if(debugger->isActive(RemoteDebug::INFO)) {
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+{
 				IPv6Address ipv6 = getIPv6();
 				if(ipv6 == IPv6Address()) {
 					// No IP
@@ -153,7 +178,10 @@ void EthernetConnectionHandler::eventHandler(WiFiEvent_t event, WiFiEventInfo_t
 		}
        case ARDUINO_EVENT_ETH_DISCONNECTED:
            connected = false;
-            if(debugger->isActive(RemoteDebug::WARNING)) {
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::WARNING))
+#endif
+{
                debugger->printf_P(PSTR("Ethernet was disconnected!\n"));
            }
            break;
--- a/lib/ConnectionHandler/src/WiFiAccessPointConnectionHandler.cpp
+++ b/lib/ConnectionHandler/src/WiFiAccessPointConnectionHandler.cpp
@@ -6,7 +6,11 @@

 #include "WiFiAccessPointConnectionHandler.h"

+#if defined(AMS_REMOTE_DEBUG)
 WiFiAccessPointConnectionHandler::WiFiAccessPointConnectionHandler(RemoteDebug* debugger) {
+#else
+WiFiAccessPointConnectionHandler::WiFiAccessPointConnectionHandler(Stream* debugger) {
+#endif
    this->debugger = debugger;
    this->mode = NETWORK_MODE_WIFI_AP;
 }
@@ -42,22 +46,37 @@ void WiFiAccessPointConnectionHandler::eventHandler(WiFiEvent_t event, WiFiEvent
    IPAddress stationIP;
    switch(event) {
        case ARDUINO_EVENT_WIFI_AP_START:
-            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("WiFi access point started with SSID %s\n"), config.ssid);
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("WiFi access point started with SSID %s\n"), config.ssid);
            break;
 	    case ARDUINO_EVENT_WIFI_AP_STOP:
-            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("WiFi access point stopped!\n"));
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("WiFi access point stopped!\n"));
            break;
 	    case ARDUINO_EVENT_WIFI_AP_STACONNECTED:
            memcpy(mac, info.wifi_ap_staconnected.mac, 6);
-            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Client connected to AP, client MAC: %02x:%02x:%02x:%02x:%02x:%02x\n"), mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Client connected to AP, client MAC: %02x:%02x:%02x:%02x:%02x:%02x\n"), mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
            break;
 	    case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED:
            memcpy(mac, info.wifi_ap_staconnected.mac, 6);
-            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Client disconnected from AP, client MAC: %02x:%02x:%02x:%02x:%02x:%02x\n"), mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Client disconnected from AP, client MAC: %02x:%02x:%02x:%02x:%02x:%02x\n"), mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
            break;
 	    case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED:
            stationIP = info.wifi_ap_staipassigned.ip.addr;
-            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Client was assigned IP %s\n"), stationIP.toString().c_str());
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Client was assigned IP %s\n"), stationIP.toString().c_str());
            break;
    }
 }
--- a/lib/ConnectionHandler/src/WiFiClientConnectionHandler.cpp
+++ b/lib/ConnectionHandler/src/WiFiClientConnectionHandler.cpp
@@ -10,7 +10,11 @@
 #include <lwip/dns.h>
 #endif

+#if defined(AMS_REMOTE_DEBUG)
 WiFiClientConnectionHandler::WiFiClientConnectionHandler(RemoteDebug* debugger) {
+#else
+WiFiClientConnectionHandler::WiFiClientConnectionHandler(Stream* debugger) {
+#endif
    this->debugger = debugger;
    this->mode = NETWORK_MODE_WIFI_CLIENT;
 }
@@ -28,14 +32,20 @@ bool WiFiClientConnectionHandler::connect(NetworkConfig config, SystemConfig sys
 		}

 		if(WiFi.getMode() != WIFI_OFF) {
-			if (debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Not connected to WiFi, closing resources\n"));
+			#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Not connected to WiFi, closing resources\n"));

 			disconnect(RECONNECT_TIMEOUT);
 			return false;
 		}
 		timeout = CONNECTION_TIMEOUT;

-		if (debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Connecting to WiFi network: %s\n"), config.ssid);
+		#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Connecting to WiFi network: %s\n"), config.ssid);
 		switch(sys.boardType) {
 			case 2: // spenceme
 			case 3: // Pow-K UART0
@@ -111,7 +121,10 @@ bool WiFiClientConnectionHandler::connect(NetworkConfig config, SystemConfig sys
 			}
 			yield();
 		} else {
-			if (debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("Unable to start WiFi\n"));
+			#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("Unable to start WiFi\n"));
 		}
        return true;
  	}
@@ -208,7 +221,10 @@ void WiFiClientConnectionHandler::wifi_sta_config(wifi_config_t * wifi_config, c
 #endif

 void WiFiClientConnectionHandler::disconnect(unsigned long reconnectDelay) {
-	if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("Disconnecting!\n"));
+	#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("Disconnecting!\n"));
 	#if defined(ESP8266)
 		WiFiClient::stopAll();
 	#endif
@@ -235,7 +251,10 @@ void WiFiClientConnectionHandler::eventHandler(WiFiEvent_t event, WiFiEventInfo_
 			}
 			break;
 		case ARDUINO_EVENT_WIFI_STA_CONNECTED:
-            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Successfully connected to WiFi!\n"));
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Successfully connected to WiFi!\n"));
 			if(config.ipv6 && !WiFi.enableIpV6()) {
 				debugger->printf_P(PSTR("Unable to enable IPv6\n"));
 			}
@@ -246,7 +265,10 @@ void WiFiClientConnectionHandler::eventHandler(WiFiEvent_t event, WiFiEventInfo_
 						wifi_phy_mode_t phyMode;
 						if(esp_wifi_sta_get_negotiated_phymode(&phyMode) == ESP_OK) {
 							if(phyMode > WIFI_PHY_MODE_11B) {
-								if (debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("WiFi supports better rates than 802.11b, disabling\n"));
+								#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("WiFi supports better rates than 802.11b, disabling\n"));
 								config.use11b = false;
 								configChanged = true;
 								return;
@@ -284,7 +306,10 @@ void WiFiClientConnectionHandler::eventHandler(WiFiEvent_t event, WiFiEventInfo_
            #endif
 			break;
 		case ARDUINO_EVENT_WIFI_STA_GOT_IP: {
-            if(debugger->isActive(RemoteDebug::INFO)) {
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+{
                debugger->printf_P(PSTR("IP:  %s\n"), getIP().toString().c_str());
                debugger->printf_P(PSTR("GW:  %s\n"), getGateway().toString().c_str());
 				for(uint8_t i = 0; i < 3; i++) {
@@ -295,7 +320,10 @@ void WiFiClientConnectionHandler::eventHandler(WiFiEvent_t event, WiFiEventInfo_
 			break;
        }
 		case ARDUINO_EVENT_WIFI_STA_GOT_IP6: {
-            if(debugger->isActive(RemoteDebug::INFO)) {
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+{
 				IPv6Address ipv6 = getIPv6();
 				if(ipv6 == IPv6Address()) {
 					// No IP
@@ -322,7 +350,10 @@ void WiFiClientConnectionHandler::eventHandler(WiFiEvent_t event, WiFiEventInfo_
 					break;
 				default:
 					if(strlen(descr) > 0) {
-						if(debugger->isActive(RemoteDebug::WARNING)) {
+						#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::WARNING))
+#endif
+{
 							debugger->printf_P(PSTR("WiFi disconnected, reason %s\n"), descr);
 						}
 						disconnect(RECONNECT_TIMEOUT);
--- a/lib/DomoticzMqttHandler/include/DomoticzMqttHandler.h
+++ b/lib/DomoticzMqttHandler/include/DomoticzMqttHandler.h
@@ -12,9 +12,15 @@

 class DomoticzMqttHandler : public AmsMqttHandler {
 public:
+    #if defined(AMS_REMOTE_DEBUG)
    DomoticzMqttHandler(MqttConfig& mqttConfig, RemoteDebug* debugger, char* buf, DomoticzConfig config) : AmsMqttHandler(mqttConfig, debugger, buf) {
        this->config = config;
    };
+    #else
+    DomoticzMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, DomoticzConfig config) : AmsMqttHandler(mqttConfig, debugger, buf) {
+        this->config = config;
+    };
+    #endif
    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, PriceService* ps);
    bool publishTemperatures(AmsConfiguration*, HwTools*);
    bool publishPrices(PriceService*);
--- a/lib/EnergyAccounting/include/EnergyAccounting.h
+++ b/lib/EnergyAccounting/include/EnergyAccounting.h
@@ -80,7 +80,11 @@ struct EnergyAccountingRealtimeData {

 class EnergyAccounting {
 public:
+    #if defined(AMS_REMOTE_DEBUG)
    EnergyAccounting(RemoteDebug*, EnergyAccountingRealtimeData*);
+    #else
+    EnergyAccounting(Stream*, EnergyAccountingRealtimeData*);
+    #endif
    void setup(AmsDataStorage *ds, EnergyAccountingConfig *config);
    void setPriceService(PriceService *ps);
    void setTimezone(Timezone*);
@@ -123,7 +127,11 @@ public:
    float getPriceForHour(uint8_t d, uint8_t h);

 private:
+    #if defined(AMS_REMOTE_DEBUG)
    RemoteDebug* debugger = NULL;
+    #else
+    Stream* debugger = NULL;
+    #endif
    bool init = false, initPrice = false;
    AmsDataStorage *ds = NULL;
    PriceService *ps = NULL;
--- a/lib/EnergyAccounting/src/EnergyAccounting.cpp
+++ b/lib/EnergyAccounting/src/EnergyAccounting.cpp
@@ -9,7 +9,11 @@
 #include "AmsStorage.h"
 #include "FirmwareVersion.h"

+#if defined(AMS_REMOTE_DEBUG)
 EnergyAccounting::EnergyAccounting(RemoteDebug* debugger, EnergyAccountingRealtimeData* rtd) {
+#else
+EnergyAccounting::EnergyAccounting(Stream* Stream, EnergyAccountingRealtimeData* rtd) {
+#endif
    data.version = 1;
    this->debugger = debugger;
    if(rtd->magic != 0x6A) {
--- a/lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h
+++ b/lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h
@@ -14,7 +14,11 @@

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

        l1Init = l2Init = l2eInit = l3Init = l3eInit = l4Init = l4eInit = rtInit = rteInit = pInit = sInit = rInit = false;
--- a/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp
+++ b/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp
@@ -617,7 +617,10 @@ bool HomeAssistantMqttHandler::publishRaw(String data) {
 void HomeAssistantMqttHandler::onMessage(String &topic, String &payload) {
    if(topic.equals(statusTopic)) {
        if(payload.equals("online")) {
- 			if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Received online status from HA, resetting sensor status\n"));
+ 			#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Received online status from HA, resetting sensor status\n"));
            l1Init = l2Init = l2eInit = l3Init = l3eInit = l4Init = l4eInit = rtInit = rteInit = pInit = sInit = rInit = false;
            for(uint8_t i = 0; i < 32; i++) tInit[i] = false;
            for(uint8_t i = 0; i < 38; i++) prInit[i] = false;
--- a/lib/JsonMqttHandler/include/JsonMqttHandler.h
+++ b/lib/JsonMqttHandler/include/JsonMqttHandler.h
@@ -11,9 +11,15 @@

 class JsonMqttHandler : public AmsMqttHandler {
 public:
+    #if defined(AMS_REMOTE_DEBUG)
    JsonMqttHandler(MqttConfig& mqttConfig, RemoteDebug* debugger, char* buf, HwTools* hw) : AmsMqttHandler(mqttConfig, debugger, buf) {
        this->hw = hw;
    };
+    #else
+    JsonMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, HwTools* hw) : AmsMqttHandler(mqttConfig, debugger, buf) {
+        this->hw = hw;
+    };
+    #endif
    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, PriceService* ps);
    bool publishTemperatures(AmsConfiguration*, HwTools*);
    bool publishPrices(PriceService*);
--- a/lib/PriceService/include/PriceService.h
+++ b/lib/PriceService/include/PriceService.h
@@ -11,7 +11,9 @@

 #include "TimeLib.h"
 #include "Timezone.h"
+#if defined(AMS_REMOTE_DEBUG)
 #include "RemoteDebug.h"
+#endif
 #include "AmsConfiguration.h"
 #include "EntsoeA44Parser.h"

@@ -63,7 +65,11 @@ struct PricePart {

 class PriceService {
 public:
+    #if defined(AMS_REMOTE_DEBUG)
    PriceService(RemoteDebug*);
+    #else
+    PriceService(Stream*);
+    #endif
    void setup(PriceServiceConfig&);
    bool loop();

@@ -88,7 +94,11 @@ public:
    bool save();

 private:
+    #if defined(AMS_REMOTE_DEBUG)
    RemoteDebug* debugger;
+    #else
+    Stream* debugger;
+    #endif
    PriceServiceConfig* config = NULL;
    HTTPClient* http = NULL;

--- a/lib/PriceService/src/PriceService.cpp
+++ b/lib/PriceService/src/PriceService.cpp
@@ -20,7 +20,11 @@
 #include <esp_task_wdt.h>
 #endif

+#if defined(AMS_REMOTE_DEBUG)
 PriceService::PriceService(RemoteDebug* Debug) : priceConfig(std::vector<PriceConfig>()) {
+#else
+PriceService::PriceService(Stream* Debug) : priceConfig(std::vector<PriceConfig>()) {
+#endif
    this->buf = (char*) malloc(BufferSize);

    debugger = Debug;
@@ -323,9 +327,18 @@ bool PriceService::retrieve(const char* url, Stream* doc) {
                } else {
                    nextFetchDelayMinutes = 2;
                }
-                if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("(PriceService) Communication error, returned status: %d\n"), status);
-                if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf(http->errorToString(status).c_str());
-                if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf(http->getString().c_str());
+                #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("(PriceService) Communication error, returned status: %d\n"), status);
+                #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf(http->errorToString(status).c_str());
+                #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::DEBUG))
+#endif
+debugger->printf(http->getString().c_str());

                http->end();
                return false;
@@ -371,13 +384,19 @@ float PriceService::getCurrencyMultiplier(const char* from, const char* to, time
            }
        }
        if(currencyMultiplier != 0) {
-            if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(PriceService) Resulting currency multiplier: %.4f\n"), currencyMultiplier);
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::DEBUG))
+#endif
+debugger->printf_P(PSTR("(PriceService) Resulting currency multiplier: %.4f\n"), currencyMultiplier);
            tmElements_t tm;
            breakTime(t, tm);
            lastCurrencyFetch = now + (SECS_PER_DAY * 1000) - (((((tm.Hour * 60) + tm.Minute) * 60) + tm.Second) * 1000) + (3600000 * 6) + (tomorrowFetchMinute * 60);
            this->currencyMultiplier = currencyMultiplier;
        } else {
-            if(debugger->isActive(RemoteDebug::WARNING)) debugger->printf_P(PSTR("(PriceService) Multiplier ended in success, but without value\n"));
+            #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::WARNING))
+#endif
+debugger->printf_P(PSTR("(PriceService) Multiplier ended in success, but without value\n"));
            lastCurrencyFetch = now + (SECS_PER_HOUR * 1000);
            if(this->currencyMultiplier == 1) return 0;
        }
@@ -407,8 +426,14 @@ PricesContainer* PriceService::fetchPrices(time_t t) {
            ESP.wdtFeed();
        #endif

-        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(PriceService) Fetching prices for %02d.%02d.%04d\n"), tm.Day, tm.Month, tm.Year+1970);
-        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(PriceService)  url: %s\n"), buf);
+        #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("(PriceService) Fetching prices for %02d.%02d.%04d\n"), tm.Day, tm.Month, tm.Year+1970);
+        #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::DEBUG))
+#endif
+debugger->printf_P(PSTR("(PriceService)  url: %s\n"), buf);
        EntsoeA44Parser a44;
        if(retrieve(buf, &a44) && a44.getPoint(0) != PRICE_NO_VALUE) {
            PricesContainer* ret = new PricesContainer();
@@ -429,8 +454,14 @@ PricesContainer* PriceService::fetchPrices(time_t t) {
            tm.Day,
            config->currency
        );
-        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(PriceService) Fetching prices for %02d.%02d.%04d\n"), tm.Day, tm.Month, tm.Year+1970);
-        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(PriceService)  url: %s\n"), buf);
+        #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("(PriceService) Fetching prices for %02d.%02d.%04d\n"), tm.Day, tm.Month, tm.Year+1970);
+        #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::DEBUG))
+#endif
+debugger->printf_P(PSTR("(PriceService)  url: %s\n"), buf);
        #if defined(ESP8266)
        WiFiClient client;
        client.setTimeout(5000);
@@ -471,7 +502,10 @@ PricesContainer* PriceService::fetchPrices(time_t t) {
                } else {
                    lastError = gcmRet;
                    nextFetchDelayMinutes = 60;
-                    if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("(PriceService) Error code while decrypting prices: %d\n"), gcmRet);
+                    #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("(PriceService) Error code while decrypting prices: %d\n"), gcmRet);
                }
            } else {
                lastError = status;
@@ -482,12 +516,21 @@ PricesContainer* PriceService::fetchPrices(time_t t) {
                } else {
                    nextFetchDelayMinutes = 5;
                }
-                if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("(PriceService) Communication error, returned status: %d\n"), status);
-                if(debugger->isActive(RemoteDebug::ERROR)) {
+                #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("(PriceService) Communication error, returned status: %d\n"), status);
+                #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+{
                    debugger->printf(http->errorToString(status).c_str());
                    debugger->println();
                }
-                if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf(http->getString().c_str());
+                #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::DEBUG))
+#endif
+debugger->printf(http->getString().c_str());

                http->end();
            }
@@ -539,11 +582,17 @@ void PriceService::cropPriceConfig(uint8_t size) {

 bool PriceService::save() {
    if(!LittleFS.begin()) {
-        if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("(PriceService) Unable to load LittleFS\n"));
+        #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("(PriceService) Unable to load LittleFS\n"));
        return false;
    }

-    if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(PriceService) Saving price config\n"));
+    #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("(PriceService) Saving price config\n"));

    PriceConfig pc;
    File file = LittleFS.open(FILE_PRICE_CONF, "w");
@@ -565,13 +614,19 @@ bool PriceService::save() {

 bool PriceService::load() {
    if(!LittleFS.begin()) {
-        if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("(PriceService) Unable to load LittleFS\n"));
+        #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("(PriceService) Unable to load LittleFS\n"));
        return false;
    }
    if(!LittleFS.exists(FILE_PRICE_CONF)) {
        return false;
    }
-    if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(PriceService) Loading price config\n"));
+    #if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("(PriceService) Loading price config\n"));

    this->priceConfig.clear();

--- a/lib/RawMqttHandler/include/RawMqttHandler.h
+++ b/lib/RawMqttHandler/include/RawMqttHandler.h
@@ -11,10 +11,17 @@

 class RawMqttHandler : public AmsMqttHandler {
 public:
+    #if defined(AMS_REMOTE_DEBUG)
    RawMqttHandler(MqttConfig& mqttConfig, RemoteDebug* debugger, char* buf) : AmsMqttHandler(mqttConfig, debugger, buf) {
        full = mqttConfig.payloadFormat == 2;
        topic = String(mqttConfig.publishTopic);
    };
+    #else
+    RawMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf) : AmsMqttHandler(mqttConfig, debugger, buf) {
+        full = mqttConfig.payloadFormat == 2;
+        topic = String(mqttConfig.publishTopic);
+    };
+    #endif
    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, PriceService* ps);
    bool publishTemperatures(AmsConfiguration*, HwTools*);
    bool publishPrices(PriceService*);
--- a/lib/SvelteUi/include/AmsWebServer.h
+++ b/lib/SvelteUi/include/AmsWebServer.h
@@ -16,7 +16,9 @@
 #include "AmsDataStorage.h"
 #include "EnergyAccounting.h"
 #include "Uptime.h"
+#if defined(AMS_REMOTE_DEBUG)
 #include "RemoteDebug.h"
+#endif
 #include "PriceService.h"
 #include "RealtimePlot.h"
 #include "ConnectionHandler.h"
@@ -46,7 +48,11 @@

 class AmsWebServer {
 public:
+	#if defined(AMS_REMOTE_DEBUG)
 	AmsWebServer(uint8_t* buf, RemoteDebug* Debug, HwTools* hw, ResetDataContainer* rdc);
+	#else
+	AmsWebServer(uint8_t* buf, Stream* Debug, HwTools* hw, ResetDataContainer* rdc);
+	#endif
    void setup(AmsConfiguration*, GpioConfig*, AmsData*, AmsDataStorage*, EnergyAccounting*, RealtimePlot*);
    void loop();
 	#if defined(_CLOUDCONNECTOR_H)
@@ -61,7 +67,11 @@ public:
 	void setConnectionHandler(ConnectionHandler* ch);

 private:
-	RemoteDebug* debugger;
+    #if defined(AMS_REMOTE_DEBUG)
+    RemoteDebug* debugger;
+    #else
+    Stream* debugger;
+    #endif
 	ResetDataContainer* rdc;
 	bool mqttEnabled = false;
 	int maxPwr = 0;
--- a/lib/SvelteUi/src/AmsWebServer.cpp
+++ b/lib/SvelteUi/src/AmsWebServer.cpp
@@ -51,7 +51,11 @@
 #include "esp32s3/rom/rtc.h"
 #endif

+#if defined(AMS_REMOTE_DEBUG)
 AmsWebServer::AmsWebServer(uint8_t* buf, RemoteDebug* Debug, HwTools* hw, ResetDataContainer* rdc) {
+#else
+AmsWebServer::AmsWebServer(uint8_t* buf, Stream* Debug, HwTools* hw, ResetDataContainer* rdc) {
+#endif
 	this->debugger = Debug;
 	this->hw = hw;
 	this->buf = (char*) buf;
@@ -83,7 +87,10 @@ void AmsWebServer::setup(AmsConfiguration* config, GpioConfig* gpioConfig, AmsDa
 		if(context.length() == 1) {
 			context = "";
 		} else {
-			if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Using context path: '%s'\n"), context.c_str());
+			#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Using context path: '%s'\n"), context.c_str());
 		}
 	}

@@ -229,7 +236,10 @@ bool AmsWebServer::checkSecurity(byte level, bool send401) {

 		access = providedPwd.equals(expectedBase64);
 		if(!access) {
-			if(debugger->isActive(RemoteDebug::WARNING)) debugger->printf_P(PSTR("Unsuccessful login: '%s'\n"), providedPwd.c_str());
+			#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::WARNING))
+#endif
+debugger->printf_P(PSTR("Unsuccessful login: '%s'\n"), providedPwd.c_str());
 		}
 	}

@@ -242,7 +252,10 @@ bool AmsWebServer::checkSecurity(byte level, bool send401) {
 }

 void AmsWebServer::notFound() {
-	if(debugger->isActive(RemoteDebug::WARNING)) debugger->printf_P(PSTR("URI '%s' was not found\n"), server.uri().c_str());
+	#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::WARNING))
+#endif
+debugger->printf_P(PSTR("URI '%s' was not found\n"), server.uri().c_str());

 	server.sendHeader(HEADER_CACHE_CONTROL, CACHE_CONTROL_NO_CACHE);
 	server.sendHeader(HEADER_PRAGMA, PRAGMA_NO_CACHE);
@@ -453,7 +466,10 @@ void AmsWebServer::sysinfoJson() {
 		if(ds != NULL) {
 			ds->save();
 		}
-		if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Rebooting\n"));
+		#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Rebooting\n"));
 		debugger->flush();
 		delay(1000);
 		rdc->cause = 1;
@@ -1377,11 +1393,15 @@ void AmsWebServer::handleSave() {
 			if(!pass.equals("***")) {
 				strcpy(webConfig.password, pass.c_str());
 			}
+			#if defined(AMS_REMOTE_DEBUG)
 			debugger->setPassword(webConfig.password);
+			#endif
 		} else {
 			memset(webConfig.username, 0, 37);
 			memset(webConfig.password, 0, 37);
+			#if defined(AMS_REMOTE_DEBUG)
 			debugger->setPassword(F(""));
+			#endif
 		}
 		strcpy(webConfig.context, server.arg(F("gc")).c_str());
 		config->setWebConfig(webConfig);
@@ -1444,6 +1464,7 @@ void AmsWebServer::handleSave() {
 		debug.serial = server.hasArg(F("ds")) && server.arg(F("ds")) == F("true");
 		debug.level = server.arg(F("dl")).toInt();

+		#if defined(AMS_REMOTE_DEBUG)
 		if(debug.telnet || debug.serial) {
 			if(webConfig.security > 0) {
 				debugger->setPassword(webConfig.password);
@@ -1461,6 +1482,7 @@ void AmsWebServer::handleSave() {
 		} else if(active) {
 			performRestart = true;
 		}
+		#endif
 		config->setDebugConfig(debug);
 	}

@@ -1580,14 +1602,23 @@ void AmsWebServer::handleSave() {
 			ps->cropPriceConfig(count);
 			ps->save();
 		} else {
-			if(debugger->isActive(RemoteDebug::WARNING)) debugger->printf_P(PSTR("Price service missing...\n"));
+			#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::WARNING))
+#endif
+debugger->printf_P(PSTR("Price service missing...\n"));
 		}
 	}

-	if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Saving configuration now...\n"));
+	#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Saving configuration now...\n"));

 	if (config->save()) {
-		if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Successfully saved.\n"));
+		#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Successfully saved.\n"));
 		if(config->isNetworkConfigChanged() || performRestart) {
 			performRestart = true;
 		} else {
@@ -1612,7 +1643,10 @@ void AmsWebServer::handleSave() {
 		if(ds != NULL) {
 			ds->save();
 		}
-		if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Rebooting\n"));
+		#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Rebooting\n"));
 		debugger->flush();
 		delay(1000);
 		rdc->cause = 2;
@@ -1630,7 +1664,10 @@ void AmsWebServer::reboot() {
 	server.handleClient();
 	delay(250);

-	if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Rebooting\n"));
+	#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Rebooting\n"));
 	debugger->flush();
 	delay(1000);	rdc->cause = 3;

@@ -1784,7 +1821,10 @@ void AmsWebServer::firmwareUpload() {
 	if(upload.status == UPLOAD_FILE_START) {
        String filename = upload.filename;
 		if(filename.isEmpty()) {
-			if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("No file, falling back to post\n"));
+			#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("No file, falling back to post\n"));
 			return;
 		}
        if(!filename.endsWith(F(".bin"))) {
@@ -1810,10 +1850,16 @@ HTTPUpload& AmsWebServer::uploadFile(const char* path) {
    HTTPUpload& upload = server.upload();
    if(upload.status == UPLOAD_FILE_START) {
 		if(uploading) {
-			if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("Upload already in progress\n"));
+			#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("Upload already in progress\n"));
 			server.send_P(500, MIME_HTML, PSTR("<html><body><h1>Upload already in progress!</h1></body></html>"));
 		} else if (!LittleFS.begin()) {
-			if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("An Error has occurred while mounting LittleFS\n"));
+			#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("An Error has occurred while mounting LittleFS\n"));
 			server.send_P(500, MIME_HTML, PSTR("<html><body><h1>Unable to mount LittleFS!</h1></body></html>"));
 		} else {
 			uploading = true;
@@ -1832,7 +1878,10 @@ HTTPUpload& AmsWebServer::uploadFile(const char* path) {
 				file.close();
 				LittleFS.remove(path);

-				if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("An Error has occurred while writing file\n"));
+				#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::ERROR))
+#endif
+debugger->printf_P(PSTR("An Error has occurred while writing file\n"));
 				snprintf_P(buf, BufferSize, RESPONSE_JSON,
 					"false",
 					"File size does not match",
@@ -1888,7 +1937,10 @@ void AmsWebServer::factoryResetPost() {
 	server.handleClient();
 	delay(250);

-	if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Rebooting\n"));
+	#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Rebooting\n"));
 	debugger->flush();
 	delay(1000);
 	rdc->cause = 5;
@@ -2477,7 +2529,10 @@ void AmsWebServer::configFileUpload() {
 			if(ds != NULL) {
 				ds->save();
 			}
-			if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Rebooting\n"));
+			#if defined(AMS_REMOTE_DEBUG)
+if (debugger->isActive(RemoteDebug::INFO))
+#endif
+debugger->printf_P(PSTR("Rebooting\n"));
 			debugger->flush();
 			delay(1000);
 			rdc->cause = 6;