From 661894f9f91db98a9b16897216d3f13aa8b3ecea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Tue, 31 Jan 2023 14:20:04 +0100
Subject: [PATCH] fix nRF52 and linter errors.

---
 src/DebugConfiguration.cpp     | 36 ----------------------------------
 src/DebugConfiguration.h       |  9 +++++----
 src/mesh/eth/ethClient.cpp     |  3 ++-
 src/mesh/http/WiFiAPClient.cpp |  2 +-
 4 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/src/DebugConfiguration.cpp b/src/DebugConfiguration.cpp
index 47cb21c98..bac67c591 100644
--- a/src/DebugConfiguration.cpp
+++ b/src/DebugConfiguration.cpp
@@ -128,31 +128,6 @@ bool Syslog::vlogf(uint16_t pri, const char *fmt, va_list args)
     return result;
 }
 
-bool Syslog::vlogf_P(uint16_t pri, PGM_P fmt_P, va_list args)
-{
-    char *message;
-    size_t initialLen;
-    size_t len;
-    bool result;
-
-    initialLen = strlen_P(fmt_P);
-
-    message = new char[initialLen + 1];
-
-    len = vsnprintf_P(message, initialLen + 1, fmt_P, args);
-    if (len > initialLen) {
-        delete[] message;
-        message = new char[len + 1];
-
-        vsnprintf(message, len + 1, fmt_P, args);
-    }
-
-    result = this->_sendLog(pri, message);
-
-    delete[] message;
-    return result;
-}
-
 bool Syslog::logf(uint16_t pri, const char *fmt, ...)
 {
     va_list args;
@@ -164,17 +139,6 @@ bool Syslog::logf(uint16_t pri, const char *fmt, ...)
     return result;
 }
 
-bool Syslog::logf_P(uint16_t pri, PGM_P fmt_P, ...)
-{
-    va_list args;
-    bool result;
-
-    va_start(args, fmt_P);
-    result = this->vlogf_P(pri, fmt_P, args);
-    va_end(args);
-    return result;
-}
-
 inline bool Syslog::_sendLog(uint16_t pri, const char *message)
 {
     int result;
diff --git a/src/DebugConfiguration.h b/src/DebugConfiguration.h
index 0e113813a..19f36e200 100644
--- a/src/DebugConfiguration.h
+++ b/src/DebugConfiguration.h
@@ -108,6 +108,10 @@
 // Default Bluetooth PIN
 #define defaultBLEPin 123456
 
+#if HAS_ETHERNET
+#include <RAK13800_W5100S.h>
+#endif
+
 class Syslog
 {
   private:
@@ -125,7 +129,7 @@ class Syslog
     bool _sendLog(uint16_t pri, const __FlashStringHelper *message);
 
   public:
-    Syslog(UDP &client);
+    explicit Syslog(UDP &client);
 
     Syslog &server(const char *server, uint16_t port);
     Syslog &server(IPAddress ip, uint16_t port);
@@ -143,11 +147,8 @@ class Syslog
     bool log(uint16_t pri, const char *message);
 
     bool vlogf(uint16_t pri, const char *fmt, va_list args) __attribute__((format(printf, 3, 0)));
-    bool vlogf_P(uint16_t pri, PGM_P fmt_P, va_list args) __attribute__((format(printf, 3, 0)));
 
     bool logf(uint16_t pri, const char *fmt, ...) __attribute__((format(printf, 3, 4)));
-
-    bool logf_P(uint16_t pri, PGM_P fmt_P, ...) __attribute__((format(printf, 3, 4)));
 };
 
 #endif
\ No newline at end of file
diff --git a/src/mesh/eth/ethClient.cpp b/src/mesh/eth/ethClient.cpp
index b31751e83..22365c647 100644
--- a/src/mesh/eth/ethClient.cpp
+++ b/src/mesh/eth/ethClient.cpp
@@ -2,6 +2,7 @@
 #include "NodeDB.h"
 #include "RTC.h"
 #include "concurrency/Periodic.h"
+#include "main.h"
 #include "mesh/api/ethServerAPI.h"
 #include "mqtt/MQTT.h"
 #include "target_specific.h"
@@ -54,7 +55,7 @@ static int32_t reconnectETH()
                     serverAddr = server.c_str();
                 }
                 syslog.server(serverAddr, serverPort);
-                syslog.deviceHostname(WiFi.getHostname());
+                syslog.deviceHostname(getDeviceName());
                 syslog.appName("Meshtastic");
                 syslog.defaultPriority(LOGLEVEL_USER);
                 syslog.enable();
diff --git a/src/mesh/http/WiFiAPClient.cpp b/src/mesh/http/WiFiAPClient.cpp
index 11f05f583..a1cf98bb3 100644
--- a/src/mesh/http/WiFiAPClient.cpp
+++ b/src/mesh/http/WiFiAPClient.cpp
@@ -152,7 +152,7 @@ static void onNetworkConnected()
                 serverAddr = server.c_str();
             }
             syslog.server(serverAddr, serverPort);
-            syslog.deviceHostname(WiFi.getHostname());
+            syslog.deviceHostname(getDeviceName());
             syslog.appName("Meshtastic");
             syslog.defaultPriority(LOGLEVEL_USER);
             syslog.enable();