From 9d4af1146e8273645693405f83a88cc9574de697 Mon Sep 17 00:00:00 2001
From: Ric In New Mexico <78682404+RicInNewMexico@users.noreply.github.com>
Date: Fri, 17 Nov 2023 05:46:59 -0700
Subject: [PATCH] INA3221 bugfixes & refinement (#2944)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reorganized and refactored some INA3221 code
Added comments
Added missing shunt resistor value (100mΩ)
Added INA3221 Channel 1 to getINAVoltage() for device battery monitoring
	modified:   src/Power.cpp
	modified:   src/modules/Telemetry/PowerTelemetry.cpp
	modified:   src/modules/Telemetry/Sensor/INA3221Sensor.cpp
	modified:   src/modules/Telemetry/Sensor/INA3221Sensor.h
	modified:   src/power.h
---
 src/Power.cpp                                  |  4 ++++
 src/modules/Telemetry/PowerTelemetry.cpp       |  5 -----
 src/modules/Telemetry/Sensor/INA3221Sensor.cpp |  3 ++-
 src/modules/Telemetry/Sensor/INA3221Sensor.h   | 15 +++++++++------
 src/power.h                                    |  2 ++
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/Power.cpp b/src/Power.cpp
index 72bb38181..c7392c90b 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -52,6 +52,7 @@ static const adc_atten_t atten = ADC_ATTENUATION;
 #if HAS_TELEMETRY && !defined(ARCH_PORTDUINO)
 INA260Sensor ina260Sensor;
 INA219Sensor ina219Sensor;
+INA3221Sensor ina3221Sensor;
 #endif
 
 #ifdef HAS_PMU
@@ -286,6 +287,9 @@ class AnalogBatteryLevel : public HasBatteryLevel
         } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA260].first ==
                    config.power.device_battery_ina_address) {
             return ina260Sensor.getBusVoltageMv();
+        } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA3221].first ==
+                   config.power.device_battery_ina_address) {
+            return ina3221Sensor.getBusVoltageMv();
         }
         return 0;
     }
diff --git a/src/modules/Telemetry/PowerTelemetry.cpp b/src/modules/Telemetry/PowerTelemetry.cpp
index 53e26ee6a..032d7fc27 100644
--- a/src/modules/Telemetry/PowerTelemetry.cpp
+++ b/src/modules/Telemetry/PowerTelemetry.cpp
@@ -11,11 +11,6 @@
 #include "sleep.h"
 #include "target_specific.h"
 
-#if HAS_TELEMETRY && !defined(ARCH_PORTDUINO)
-#include "Sensor/INA3221Sensor.h"
-INA3221Sensor ina3221Sensor;
-#endif
-
 #define FAILED_STATE_SENSOR_READ_MULTIPLIER 10
 #define DISPLAY_RECEIVEID_MEASUREMENTS_ON_SCREEN true
 
diff --git a/src/modules/Telemetry/Sensor/INA3221Sensor.cpp b/src/modules/Telemetry/Sensor/INA3221Sensor.cpp
index 634f5a5c9..3269ba47a 100644
--- a/src/modules/Telemetry/Sensor/INA3221Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/INA3221Sensor.cpp
@@ -13,8 +13,9 @@ int32_t INA3221Sensor::runOnce()
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
     if (!status) {
-        ina3221.setAddr(INA3221_ADDR42_SDA);
+        ina3221.setAddr(INA3221_ADDR42_SDA); // i2c address 0x42
         ina3221.begin();
+        ina3221.setShuntRes(100, 100, 100); // 0.1 Ohm shunt resistors
         status = true;
     } else {
         status = true;
diff --git a/src/modules/Telemetry/Sensor/INA3221Sensor.h b/src/modules/Telemetry/Sensor/INA3221Sensor.h
index a1c0fb2a7..4c82fc34d 100644
--- a/src/modules/Telemetry/Sensor/INA3221Sensor.h
+++ b/src/modules/Telemetry/Sensor/INA3221Sensor.h
@@ -1,16 +1,19 @@
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
+#include "VoltageSensor.h"
 #include <INA3221.h>
 
-class INA3221Sensor : public TelemetrySensor
+class INA3221Sensor : public TelemetrySensor, VoltageSensor
 {
+  private:
+    INA3221 ina3221 = INA3221(INA3221_ADDR42_SDA);
+
+  protected:
+    void setup() override;
+
   public:
     INA3221Sensor();
     int32_t runOnce() override;
-    void setup() override;
     bool getMetrics(meshtastic_Telemetry *measurement) override;
-    virtual uint16_t getBusVoltageMv();
-
-  private:
-    INA3221 ina3221 = INA3221(INA3221_ADDR42_SDA);
+    virtual uint16_t getBusVoltageMv() override;
 };
\ No newline at end of file
diff --git a/src/power.h b/src/power.h
index e90e3f21b..54d98e715 100644
--- a/src/power.h
+++ b/src/power.h
@@ -25,8 +25,10 @@ extern RTC_NOINIT_ATTR uint64_t RTC_reg_b;
 #if HAS_TELEMETRY && !defined(ARCH_PORTDUINO)
 #include "modules/Telemetry/Sensor/INA219Sensor.h"
 #include "modules/Telemetry/Sensor/INA260Sensor.h"
+#include "modules/Telemetry/Sensor/INA3221Sensor.h"
 extern INA260Sensor ina260Sensor;
 extern INA219Sensor ina219Sensor;
+extern INA3221Sensor ina3221Sensor;
 #endif
 
 class Power : private concurrency::OSThread