From 2940ead5049604e75fcedf963a3b3cfb94ea9ee2 Mon Sep 17 00:00:00 2001
From: F4FPR <Bensam148@hotmail.com>
Date: Tue, 18 Aug 2026 19:40:42 +0200
Subject: [PATCH] Update ThinkNodeM6Board.h

---
 variants/thinknode_m6/ThinkNodeM6Board.h | 26 ++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/variants/thinknode_m6/ThinkNodeM6Board.h b/variants/thinknode_m6/ThinkNodeM6Board.h
index 1af952d2f..934794c9a 100644
--- a/variants/thinknode_m6/ThinkNodeM6Board.h
+++ b/variants/thinknode_m6/ThinkNodeM6Board.h
@@ -36,19 +36,33 @@ public:
     return "Elecrow ThinkNode M6";
   }
 
+  bool hasUsbPowerDetect() const override { return true; }
+
+  bool isUsbPowered() override {
+    // P0.13 is the dedicated USB / external power-detect line on the M6 PCB
+    // (same pin the Meshtastic M6 variant uses for USB detection).
+    return digitalRead(EXT_PWR_DETECT) == EXT_PWR_DETECT_VALUE;
+  }
+
+  bool hasSolarChargerDetect() const override { return true; }
+
+  bool isSolarChargerActive() override {
+    // P0.15 is the active-low solar-charger status line. It reports the
+    // charger's state, not photovoltaic voltage or current.
+    return digitalRead(EXT_CHRG_DETECT) == EXT_CHRG_DETECT_VALUE;
+  }
+
   bool isExternalPowered() override {
-    if (digitalRead(EXT_PWR_DETECT) == EXT_PWR_DETECT_VALUE ||
-        digitalRead(EXT_CHRG_DETECT) == EXT_CHRG_DETECT_VALUE) {
+    if (isUsbPowered() || isSolarChargerActive()) {
       return true;
     }
     return NRF52Board::isExternalPowered();
   }
 
   bool isChargerActive() override {
-    // The charge-status line covers solar input; external USB input is also a
-    // charging source, although the board cannot report charge completion.
-    return digitalRead(EXT_CHRG_DETECT) == EXT_CHRG_DETECT_VALUE ||
-           digitalRead(EXT_PWR_DETECT) == EXT_PWR_DETECT_VALUE;
+    // Preserve a generic charging indication while also exposing both
+    // source-specific states (USB / solar) separately through the CLI.
+    return isSolarChargerActive() || isUsbPowered();
   }
 
   void powerOff() override {