From d773da1a30d34730acb6ab862774fedf5a38d72f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 30 Dec 2025 19:31:02 +0000 Subject: [PATCH 1/3] Initial plan From f51338dd0fa946ec0e24120bfbab531be622cc05 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 30 Dec 2025 19:53:23 +0000 Subject: [PATCH 2/3] Fix Arduino compilation errors by resolving namespace conflicts - Remove duplicate Notecard.h and ArduinoJson.h includes from sketches - Remove conflicting NOTECARD_I2C_ADDRESS/FREQUENCY constant definitions - Resolve Stream class namespace conflict between arduino:: and mbed:: - Replace 'using namespace mbed;' with specific type declarations - Add using declarations for arduino::Stream, arduino::Print, mbed::LittleFileSystem, mbed::BlockDevice, and mbed::Watchdog - All three sketches (Client, Server, Viewer) now compile successfully Co-authored-by: dorkmo <1923070+dorkmo@users.noreply.github.com> --- .../TankAlarm-112025-Client-BluesOpta.ino | 4 ---- TankAlarm-112025-Common/src/TankAlarm_Platform.h | 8 +++++++- .../TankAlarm-112025-Server-BluesOpta.ino | 1 - .../TankAlarm-112025-Viewer-BluesOpta.ino | 1 - 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/TankAlarm-112025-Client-BluesOpta/TankAlarm-112025-Client-BluesOpta.ino b/TankAlarm-112025-Client-BluesOpta/TankAlarm-112025-Client-BluesOpta.ino index dd9c3ef..74c8d48 100644 --- a/TankAlarm-112025-Client-BluesOpta/TankAlarm-112025-Client-BluesOpta.ino +++ b/TankAlarm-112025-Client-BluesOpta/TankAlarm-112025-Client-BluesOpta.ino @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -291,9 +290,6 @@ static float getDistanceConversionFactor(const char* unit) { return 1.0f; // Default: assume inches } -static const uint8_t NOTECARD_I2C_ADDRESS = 0x17; -static const uint32_t NOTECARD_I2C_FREQUENCY = 400000UL; - // Object types - what is being monitored enum ObjectType : uint8_t { OBJECT_TANK = 0, // Liquid storage tank (level monitoring) diff --git a/TankAlarm-112025-Common/src/TankAlarm_Platform.h b/TankAlarm-112025-Common/src/TankAlarm_Platform.h index 7fce9e6..c49c4c0 100644 --- a/TankAlarm-112025-Common/src/TankAlarm_Platform.h +++ b/TankAlarm-112025-Common/src/TankAlarm_Platform.h @@ -39,7 +39,13 @@ #include #include #include - using namespace mbed; + // Bring specific mbed types into global namespace + using mbed::LittleFileSystem; + using mbed::BlockDevice; + using mbed::Watchdog; + // Bring arduino types into global namespace for library compatibility + using arduino::Stream; + using arduino::Print; #define TANKALARM_FILESYSTEM_AVAILABLE #define TANKALARM_WATCHDOG_AVAILABLE #define TANKALARM_POSIX_FILE_IO_AVAILABLE diff --git a/TankAlarm-112025-Server-BluesOpta/TankAlarm-112025-Server-BluesOpta.ino b/TankAlarm-112025-Server-BluesOpta/TankAlarm-112025-Server-BluesOpta.ino index 323fdc6..972d40d 100644 --- a/TankAlarm-112025-Server-BluesOpta/TankAlarm-112025-Server-BluesOpta.ino +++ b/TankAlarm-112025-Server-BluesOpta/TankAlarm-112025-Server-BluesOpta.ino @@ -24,7 +24,6 @@ #include #include #include -#include #include #if defined(ARDUINO_OPTA) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4) #include diff --git a/TankAlarm-112025-Viewer-BluesOpta/TankAlarm-112025-Viewer-BluesOpta.ino b/TankAlarm-112025-Viewer-BluesOpta/TankAlarm-112025-Viewer-BluesOpta.ino index da46f54..48128bd 100644 --- a/TankAlarm-112025-Viewer-BluesOpta/TankAlarm-112025-Viewer-BluesOpta.ino +++ b/TankAlarm-112025-Viewer-BluesOpta/TankAlarm-112025-Viewer-BluesOpta.ino @@ -20,7 +20,6 @@ #include #include #include -#include #include #if defined(ARDUINO_OPTA) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4) #include From 8f9f87c650f6ce000a6a83476221585a3cad0049 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 30 Dec 2025 19:54:39 +0000 Subject: [PATCH 3/3] Final verification - all sketches compile successfully Co-authored-by: dorkmo <1923070+dorkmo@users.noreply.github.com> --- _codeql_detected_source_root | 1 + 1 file changed, 1 insertion(+) create mode 120000 _codeql_detected_source_root diff --git a/_codeql_detected_source_root b/_codeql_detected_source_root new file mode 120000 index 0000000..945c9b4 --- /dev/null +++ b/_codeql_detected_source_root @@ -0,0 +1 @@ +. \ No newline at end of file