Merge a76e18a9d0 into b5a8e8f51b

* treewide: make 'ifdef DEBUG_PORT' guards also take into account DEBUG_MUTE

* stm32wl: Add a guard against having debug prints turned on without PIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF defined

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>

src/Power.cpp

@@ -82,6 +82,8 @@ static const uint8_t ext_chrg_detect_value = EXT_CHRG_DETECT_VALUE;
 #endif
 
 #if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+#include "main.h";
+uint8_t INA_ADDR_LOCAL;
 #if __has_include(<Adafruit_INA219.h>)
 INA219Sensor ina219Sensor;
 #else
@@ -474,7 +476,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
         if (hasINA()) {
             // get current flow from INA sensor - negative value means power flowing into the battery
             // default assuming  BATTERY+  <--> INA_VIN+ <--> SHUNT RESISTOR <--> INA_VIN- <--> LOAD
-            LOG_DEBUG("Using INA on I2C addr 0x%x for charging detection", config.power.device_battery_ina_address);
+            // LOG_DEBUG("Using INA on I2C addr 0x%x for charging detection", config.power.device_battery_ina_address);
+            LOG_DEBUG("Using INA on I2C addr 0x%x for charging detection", INA_ADDR_LOCAL);
 #if defined(INA_CHARGING_DETECTION_INVERT)
             return getINACurrent() > 0;
 #else
@@ -517,8 +520,29 @@ class AnalogBatteryLevel : public HasBatteryLevel
 #endif
 
 #if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+    /*
+        Read Voltage from INA using autodetect of addr first else use addr in config.power.device_battery_ina_address
+    */
     uint16_t getINAVoltage()
     {
+        if (!config.power.device_battery_ina_address) {
+            if (ina_found.type != ScanI2C::DeviceType::NONE) {
+                switch (ina_found.type) {
+                case ScanI2C::DeviceType::INA219:
+                    return ina219Sensor.getBusVoltageMv();
+                    break;
+                case ScanI2C::DeviceType::INA226:
+                    return ina226Sensor.getBusVoltageMv();
+                    break;
+                case ScanI2C::DeviceType::INA260:
+                    return ina260Sensor.getBusVoltageMv();
+                    break;
+                case ScanI2C::DeviceType::INA3221:
+                    return ina3221Sensor.getBusVoltageMv();
+                    break;
+                }
+            }
+        } else if (config.power.device_battery_ina_address) {
             if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219].first == config.power.device_battery_ina_address) {
                 return ina219Sensor.getBusVoltageMv();
             } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA226].first ==
@@ -531,11 +555,29 @@ class AnalogBatteryLevel : public HasBatteryLevel
                        config.power.device_battery_ina_address) {
                 return ina3221Sensor.getBusVoltageMv();
             }
+        }
         return 0;
     }
 
+    /*
+        Read Current from INA using autodetect of addr first else use addr in config.power.device_battery_ina_address
+    */
     int16_t getINACurrent()
     {
+        if (!config.power.device_battery_ina_address) {
+            if (ina_found.type != ScanI2C::DeviceType::NONE) {
+                switch (ina_found.type) {
+                case ScanI2C::DeviceType::INA219:
+                    return ina219Sensor.getCurrentMa();
+
+                case ScanI2C::DeviceType::INA226:
+                    return ina226Sensor.getCurrentMa();
+
+                case ScanI2C::DeviceType::INA3221:
+                    return ina3221Sensor.getCurrentMa();
+                }
+            }
+        } else if (config.power.device_battery_ina_address) {
             if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219].first == config.power.device_battery_ina_address) {
                 return ina219Sensor.getCurrentMa();
             } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA226].first ==
@@ -545,14 +587,43 @@ class AnalogBatteryLevel : public HasBatteryLevel
                        config.power.device_battery_ina_address) {
                 return ina3221Sensor.getCurrentMa();
             }
+        }
         return 0;
     }
 
     bool hasINA()
+    /*
+        Use autodetect of addr first else use addr in config.power.device_battery_ina_address
+        Store INA addr in local variable for later use.
+    */
     {
         if (!config.power.device_battery_ina_address) {
-            return false;
+            if (ina_found.type != ScanI2C::DeviceType::NONE) {
+                INA_ADDR_LOCAL = ina_found.address.address;
+                switch (ina_found.type) {
+                case ScanI2C::DeviceType::INA219:
+                    if (!ina219Sensor.isInitialized())
+                        return ina219Sensor.runOnce() > 0;
+                    return ina219Sensor.isRunning();
+
+                case ScanI2C::DeviceType::INA226:
+                    if (!ina226Sensor.isInitialized())
+                        return ina226Sensor.runOnce() > 0;
+                    return ina226Sensor.isRunning();
+
+                case ScanI2C::DeviceType::INA260:
+                    if (!ina260Sensor.isInitialized())
+                        return ina260Sensor.runOnce() > 0;
+                    return ina260Sensor.isRunning();
+
+                case ScanI2C::DeviceType::INA3221:
+                    if (!ina3221Sensor.isInitialized())
+                        return ina3221Sensor.runOnce() > 0;
+                    return ina3221Sensor.isRunning();
                 }
+            }
+        } else if (config.power.device_battery_ina_address) {
+            INA_ADDR_LOCAL = config.power.device_battery_ina_address;
             if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219].first == config.power.device_battery_ina_address) {
                 if (!ina219Sensor.isInitialized())
                     return ina219Sensor.runOnce() > 0;
@@ -572,6 +643,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
                     return ina3221Sensor.runOnce() > 0;
                 return ina3221Sensor.isRunning();
             }
+        }
+        INA_ADDR_LOCAL = 0;
         return false;
     }
 #endif

src/detect/ScanI2C.cpp

@@ -41,6 +41,12 @@ ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const
     return firstOfOrNONE(9, types);
 }
 
+ScanI2C::FoundDevice ScanI2C::firstINA() const
+{
+    ScanI2C::DeviceType types[] = {INA219, INA226, INA260, INA3221};
+    return firstOfOrNONE(4, types);
+}
+
 ScanI2C::FoundDevice ScanI2C::firstAQI() const
 {
     ScanI2C::DeviceType types[] = {PMSA0031, SCD4X};

src/detect/ScanI2C.h

@@ -132,6 +132,8 @@ class ScanI2C
 
     FoundDevice firstAccelerometer() const;
 
+    FoundDevice firstINA() const;
+
     FoundDevice firstAQI() const;
 
     FoundDevice firstRGBLED() const;

src/main.cpp

@@ -194,9 +194,15 @@ ScanI2C::DeviceAddress rtc_found = ScanI2C::ADDRESS_NONE;
 ScanI2C::DeviceAddress accelerometer_found = ScanI2C::ADDRESS_NONE;
 // The I2C address of the RGB LED (if found)
 ScanI2C::FoundDevice rgb_found = ScanI2C::FoundDevice(ScanI2C::DeviceType::NONE, ScanI2C::ADDRESS_NONE);
+
+// The I2C address of the INA Module (if found)
+ScanI2C::FoundDevice ina_found = ScanI2C::FoundDevice(ScanI2C::DeviceType::NONE, ScanI2C::ADDRESS_NONE);
+ScanI2C::DeviceAddress ina_Address = ScanI2C::ADDRESS_NONE;
+
 /// The I2C address of our Air Quality Indicator (if found)
 ScanI2C::DeviceAddress aqi_found = ScanI2C::ADDRESS_NONE;
 
+
 #ifdef T_WATCH_S3
 Adafruit_DRV2605 drv;
 #endif
@@ -653,6 +659,12 @@ void setup()
     LOG_DEBUG("acc_info = %i", acc_info.type);
 #endif
 
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_PORTDUINO)
+    auto ina_Info = i2cScanner->firstINA();
+    //    ina_Address = ina_Info.type != ScanI2C::DeviceType::NONE ? ina_Info.address : ina_Address;
+    LOG_DEBUG("ina_info = %i", ina_Info.type);
+#endif
+
     scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::BME_680, meshtastic_TelemetrySensorType_BME680);
     scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::BME_280, meshtastic_TelemetrySensorType_BME280);
     scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::BMP_280, meshtastic_TelemetrySensorType_BMP280);

src/main.h

@@ -35,6 +35,8 @@ extern bool kb_found;
 extern ScanI2C::DeviceAddress rtc_found;
 extern ScanI2C::DeviceAddress accelerometer_found;
 extern ScanI2C::FoundDevice rgb_found;
+// extern ScanI2C::DeviceAddress ina_Address;
+extern ScanI2C::FoundDevice ina_found;
 extern ScanI2C::DeviceAddress aqi_found;
 
 extern bool eink_found;

src/mesh/Router.cpp

@@ -224,9 +224,10 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
     if (!config.lora.override_duty_cycle && myRegion->dutyCycle < 100) {
         float hourlyTxPercent = airTime->utilizationTXPercent();
         if (hourlyTxPercent > myRegion->dutyCycle) {
-#ifdef DEBUG_PORT
             uint8_t silentMinutes = airTime->getSilentMinutes(hourlyTxPercent, myRegion->dutyCycle);
+
             LOG_WARN("Duty cycle limit exceeded. Aborting send for now, you can send again in %d mins", silentMinutes);
+
             meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
             cn->has_reply_id = true;
             cn->reply_id = p->id;
@@ -234,7 +235,7 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
             cn->time = getValidTime(RTCQualityFromNet);
             sprintf(cn->message, "Duty cycle limit exceeded. You can send again in %d mins", silentMinutes);
             service->sendClientNotification(cn);
-#endif
+
             meshtastic_Routing_Error err = meshtastic_Routing_Error_DUTY_CYCLE_LIMIT;
             if (isFromUs(p)) { // only send NAK to API, not to the mesh
                 abortSendAndNak(err, p);

src/modules/ReplyModule.cpp

@@ -8,7 +8,7 @@
 meshtastic_MeshPacket *ReplyModule::allocReply()
 {
     assert(currentRequest); // should always be !NULL
-#ifdef DEBUG_PORT
+#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
     auto req = *currentRequest;
     auto &p = req.decoded;
     // The incoming message is in p.payload

src/modules/Telemetry/AirQualityTelemetry.cpp

@@ -121,7 +121,7 @@ int32_t AirQualityTelemetryModule::runOnce()
 bool AirQualityTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
 {
     if (t->which_variant == meshtastic_Telemetry_air_quality_metrics_tag) {
-#ifdef DEBUG_PORT
+#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
         const char *sender = getSenderShortName(mp);
 
         LOG_INFO("(Received from %s): pm10_standard=%i, pm25_standard=%i, pm100_standard=%i", sender,

src/modules/Telemetry/DeviceTelemetry.cpp

@@ -49,7 +49,7 @@ bool DeviceTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &
         return false;
 
     if (t->which_variant == meshtastic_Telemetry_device_metrics_tag) {
-#ifdef DEBUG_PORT
+#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
         const char *sender = getSenderShortName(mp);
 
         LOG_INFO("(Received from %s): air_util_tx=%f, channel_utilization=%f, battery_level=%i, voltage=%f", sender,

src/modules/Telemetry/EnvironmentTelemetry.cpp

@@ -502,7 +502,7 @@ void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSt
 bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
 {
     if (t->which_variant == meshtastic_Telemetry_environment_metrics_tag) {
-#ifdef DEBUG_PORT
+#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
         const char *sender = getSenderShortName(mp);
 
         LOG_INFO("(Received from %s): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, "

src/modules/Telemetry/HealthTelemetry.cpp

@@ -149,7 +149,7 @@ void HealthTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *
 bool HealthTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
 {
     if (t->which_variant == meshtastic_Telemetry_health_metrics_tag) {
-#ifdef DEBUG_PORT
+#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
         const char *sender = getSenderShortName(mp);
 
         LOG_INFO("(Received from %s): temperature=%f, heart_bpm=%d, spO2=%d,", sender, t->variant.health_metrics.temperature,

src/modules/Telemetry/HostMetrics.cpp

@@ -27,7 +27,7 @@ bool HostMetricsModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp,
         return false;
 
     if (t->which_variant == meshtastic_Telemetry_host_metrics_tag) {
-#ifdef DEBUG_PORT
+#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
         const char *sender = getSenderShortName(mp);
         if (t->variant.host_metrics.has_user_string)
             t->variant.host_metrics.user_string[sizeof(t->variant.host_metrics.user_string) - 1] = '\0';

src/modules/Telemetry/PowerTelemetry.cpp

@@ -168,7 +168,7 @@ void PowerTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *s
 bool PowerTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
 {
     if (t->which_variant == meshtastic_Telemetry_power_metrics_tag) {
-#ifdef DEBUG_PORT
+#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
         const char *sender = getSenderShortName(mp);
 
         LOG_INFO("(Received from %s): ch1_voltage=%.1f, ch1_current=%.1f, ch2_voltage=%.1f, ch2_current=%.1f, "

src/modules/TextMessageModule.cpp

@@ -9,7 +9,7 @@ TextMessageModule *textMessageModule;
 
 ProcessMessage TextMessageModule::handleReceived(const meshtastic_MeshPacket &mp)
 {
-#ifdef DEBUG_PORT
+#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
     auto &p = mp.decoded;
     LOG_INFO("Received text msg from=0x%0x, id=0x%x, msg=%.*s", mp.from, mp.id, p.payload.size, p.payload.bytes);
 #endif

src/modules/TraceRouteModule.cpp

@@ -232,7 +232,7 @@ void TraceRouteModule::appendMyIDandSNR(meshtastic_RouteDiscovery *updated, floa
 
 void TraceRouteModule::printRoute(meshtastic_RouteDiscovery *r, uint32_t origin, uint32_t dest, bool isTowardsDestination)
 {
-#ifdef DEBUG_PORT
+#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
     std::string route = "Route traced:\n";
     route += vformat("0x%x --> ", origin);
     for (uint8_t i = 0; i < r->route_count; i++) {

src/modules/WaypointModule.cpp

@@ -16,7 +16,7 @@ WaypointModule *waypointModule;
 
 ProcessMessage WaypointModule::handleReceived(const meshtastic_MeshPacket &mp)
 {
-#ifdef DEBUG_PORT
+#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
     auto &p = mp.decoded;
     LOG_INFO("Received waypoint msg from=0x%0x, id=0x%x, msg=%.*s", mp.from, mp.id, p.payload.size, p.payload.bytes);
 #endif

src/platform/stm32wl/architecture.h

@@ -32,3 +32,8 @@
 #define SX126X_DIO1 1001
 #define SX126X_RESET 1003
 #define SX126X_BUSY 1004
+
+#if !defined(DEBUG_MUTE) && !defined(PIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF)
+#error                                                                                                                           \
+    "You MUST enable PIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF if debug prints are enabled. printf will print uninitialized garbage instead of floats."
+#endif

src/sleep.cpp

@@ -131,7 +131,7 @@ void initDeepSleep()
       support busted boards, assume button one was pressed wakeButtons = ((uint64_t)1) << buttons.gpios[0];
       */
 
-#ifdef DEBUG_PORT
+#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
     // If we booted because our timer ran out or the user pressed reset, send those as fake events
     RESET_REASON hwReason = rtc_get_reset_reason(0);