From 67f9ceb76d3141f12ae76828925c21e7caca6062 Mon Sep 17 00:00:00 2001
From: Mathew Kamkar <578302+matkam@users.noreply.github.com>
Date: Tue, 9 Jun 2026 21:40:59 -0700
Subject: [PATCH 1/2] factory default address for INA260 sensor

---
 src/helpers/sensors/EnvironmentSensorManager.cpp | 2 +-
 variants/rak4631/platformio.ini                  | 1 +
 variants/station_g2/platformio.ini               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/helpers/sensors/EnvironmentSensorManager.cpp b/src/helpers/sensors/EnvironmentSensorManager.cpp
index 73842d9eeb..05cd494ee6 100644
--- a/src/helpers/sensors/EnvironmentSensorManager.cpp
+++ b/src/helpers/sensors/EnvironmentSensorManager.cpp
@@ -120,7 +120,7 @@ static Adafruit_INA219 INA219(TELEM_INA219_ADDRESS);
 
 #if ENV_INCLUDE_INA260
 #ifndef TELEM_INA260_ADDRESS
-#define TELEM_INA260_ADDRESS    0x41      // INA260 single channel current sensor I2C address
+#define TELEM_INA260_ADDRESS    0x40      // INA260 single channel current sensor I2C address (factory default: A0=GND, A1=GND)
 #endif
 #include <Adafruit_INA260.h>
 static Adafruit_INA260 INA260;
diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
index 2bbba31463..602485cd36 100644
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -25,6 +25,7 @@ build_flags = ${nrf52_base.build_flags}
   -D ENV_INCLUDE_RAK12035=1
   -UENV_INCLUDE_BME680
   -D ENV_INCLUDE_BME680_BSEC=1
+  -D TELEM_INA260_ADDRESS=0x41
 build_src_filter = ${nrf52_base.build_src_filter}
   +<../variants/rak4631>
   +<helpers/sensors>
diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini
index 6432b52386..9da581cddb 100644
--- a/variants/station_g2/platformio.ini
+++ b/variants/station_g2/platformio.ini
@@ -228,7 +228,7 @@ build_flags =
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"mypwd"'
-  -D OFFLINE_QUEUE_SIZE=256  
+  -D OFFLINE_QUEUE_SIZE=256
 ; -D MESH_PACKET_LOGGING=1
 ; -D MESH_DEBUG=1
 build_src_filter = ${Station_G2.build_src_filter}

From 7c186610320e9fa67fb803d230d12eb327769837 Mon Sep 17 00:00:00 2001
From: Mathew Kamkar <578302+matkam@users.noreply.github.com>
Date: Tue, 9 Jun 2026 21:53:55 -0700
Subject: [PATCH 2/2] revert rak4631 assumption

---
 variants/rak4631/platformio.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
index 602485cd36..2bbba31463 100644
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -25,7 +25,6 @@ build_flags = ${nrf52_base.build_flags}
   -D ENV_INCLUDE_RAK12035=1
   -UENV_INCLUDE_BME680
   -D ENV_INCLUDE_BME680_BSEC=1
-  -D TELEM_INA260_ADDRESS=0x41
 build_src_filter = ${nrf52_base.build_src_filter}
   +<../variants/rak4631>
   +<helpers/sensors>