From 986d70db6ad344318dfff44de3b6c39e2c5337c5 Mon Sep 17 00:00:00 2001
From: Martin Emrich <6672718+MartinEmrich@users.noreply.github.com>
Date: Mon, 12 Jan 2026 16:52:39 +0100
Subject: [PATCH] Pioarduino preparation (#9223)

* Resolve naming conflict of Syslog class with namespace

* do not include libpax headers if pax counter is excluded

* clean only top-level sdkconfigs, keep them in the variants directories

* Fix code formatting
---
 .gitignore                           | 2 +-
 src/DebugConfiguration.cpp           | 5 ++++-
 src/DebugConfiguration.h             | 6 +++++-
 src/RedirectablePrint.cpp            | 2 +-
 src/mesh/eth/ethClient.cpp           | 2 +-
 src/mesh/wifi/WiFiAPClient.cpp       | 2 +-
 src/modules/esp32/PaxcounterModule.h | 4 ++--
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 06e8c472f..769603202 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,5 +48,5 @@ arduino-lib-builder*
 dependencies.lock
 idf_component.yml
 CMakeLists.txt
-sdkconfig.*
+/sdkconfig.*
 .dummy/*
diff --git a/src/DebugConfiguration.cpp b/src/DebugConfiguration.cpp
index d65c4f1e8..08c7abc04 100644
--- a/src/DebugConfiguration.cpp
+++ b/src/DebugConfiguration.cpp
@@ -41,7 +41,8 @@ extern "C" void logLegacy(const char *level, const char *fmt, ...)
 }
 
 #if HAS_NETWORKING
-
+namespace meshtastic
+{
 Syslog::Syslog(UDP &client)
 {
     this->_client = &client;
@@ -195,4 +196,6 @@ inline bool Syslog::_sendLog(uint16_t pri, const char *appName, const char *mess
     return true;
 }
 
+}; // namespace meshtastic
+
 #endif
diff --git a/src/DebugConfiguration.h b/src/DebugConfiguration.h
index 98bbe0f72..eac6260fc 100644
--- a/src/DebugConfiguration.h
+++ b/src/DebugConfiguration.h
@@ -162,6 +162,8 @@ extern "C" void logLegacy(const char *level, const char *fmt, ...);
 
 #if HAS_NETWORKING
 
+namespace meshtastic
+{
 class Syslog
 {
   private:
@@ -195,4 +197,6 @@ class Syslog
     bool vlogf(uint16_t pri, const char *appName, const char *fmt, va_list args) __attribute__((format(printf, 3, 0)));
 };
 
-#endif // HAS_NETWORKING
\ No newline at end of file
+}; // namespace meshtastic
+
+#endif // HAS_NETWORKING
diff --git a/src/RedirectablePrint.cpp b/src/RedirectablePrint.cpp
index 895dcb147..e15d56912 100644
--- a/src/RedirectablePrint.cpp
+++ b/src/RedirectablePrint.cpp
@@ -18,7 +18,7 @@
 #endif
 
 #if HAS_NETWORKING
-extern Syslog syslog;
+extern meshtastic::Syslog syslog;
 #endif
 void RedirectablePrint::rpInit()
 {
diff --git a/src/mesh/eth/ethClient.cpp b/src/mesh/eth/ethClient.cpp
index 2b4f63512..a811ec16c 100644
--- a/src/mesh/eth/ethClient.cpp
+++ b/src/mesh/eth/ethClient.cpp
@@ -21,7 +21,7 @@ uint32_t ntp_renew = 0;
 #endif
 
 EthernetUDP syslogClient;
-Syslog syslog(syslogClient);
+meshtastic::Syslog syslog(syslogClient);
 
 bool ethStartupComplete = 0;
 
diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp
index 45944872e..a95dfa58f 100644
--- a/src/mesh/wifi/WiFiAPClient.cpp
+++ b/src/mesh/wifi/WiFiAPClient.cpp
@@ -58,7 +58,7 @@ bool needReconnect = true;   // If we create our reconnector, run it once at the
 bool isReconnecting = false; // If we are currently reconnecting
 
 WiFiUDP syslogClient;
-Syslog syslog(syslogClient);
+meshtastic::Syslog syslog(syslogClient);
 
 Periodic *wifiReconnect;
 
diff --git a/src/modules/esp32/PaxcounterModule.h b/src/modules/esp32/PaxcounterModule.h
index ebd6e7191..50656e32e 100644
--- a/src/modules/esp32/PaxcounterModule.h
+++ b/src/modules/esp32/PaxcounterModule.h
@@ -2,7 +2,7 @@
 
 #include "ProtobufModule.h"
 #include "configuration.h"
-#if defined(ARCH_ESP32)
+#if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_PAXCOUNTER
 #include "../mesh/generated/meshtastic/paxcount.pb.h"
 #include "NodeDB.h"
 #include <libpax_api.h>
@@ -35,4 +35,4 @@ class PaxcounterModule : private concurrency::OSThread, public ProtobufModule<me
 };
 
 extern PaxcounterModule *paxcounterModule;
-#endif
\ No newline at end of file
+#endif