Skip to content

Fix namespace conflicts in TankAlarm 112025 Arduino sketches #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dorkmo merged 3 commits into from
Dec 30, 2025
Merged

Fix namespace conflicts in TankAlarm 112025 Arduino sketches #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d773da1
Initial plan
Copilot Dec 30, 2025
f51338d
Fix Arduino compilation errors by resolving namespace conflicts
Copilot Dec 30, 2025
8f9f87c
Final verification - all sketches compile successfully
Copilot Dec 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions TankAlarm-112025-Client-BluesOpta/TankAlarm-112025-Client-BluesOpta.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include <Arduino.h>
#include <Wire.h>
#include <ArduinoJson.h>
#include <Notecard.h>
#include <memory>
#include <math.h>
#include <string.h>
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 7 additions & 1 deletion TankAlarm-112025-Common/src/TankAlarm_Platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@
#include <LittleFileSystem.h>
#include <BlockDevice.h>
#include <mbed.h>
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
Expand Down
1 change: 0 additions & 1 deletion TankAlarm-112025-Server-BluesOpta/TankAlarm-112025-Server-BluesOpta.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <Arduino.h>
#include <Wire.h>
#include <ArduinoJson.h>
#include <Notecard.h>
#include <memory>
#if defined(ARDUINO_OPTA) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4)
#include <PortentaEthernet.h>
Expand Down
1 change: 0 additions & 1 deletion TankAlarm-112025-Viewer-BluesOpta/TankAlarm-112025-Viewer-BluesOpta.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include <Arduino.h>
#include <Wire.h>
#include <ArduinoJson.h>
#include <Notecard.h>
#include <memory>
#if defined(ARDUINO_OPTA) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4)
#include <PortentaEthernet.h>
Expand Down
1 change: 1 addition & 0 deletions _codeql_detected_source_root
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.
Loading