diff --git a/src/MeshCore.h b/src/MeshCore.h
index e67371ef17..229794761a 100644
--- a/src/MeshCore.h
+++ b/src/MeshCore.h
@@ -74,6 +74,8 @@ class MainBoard {
 
   // Power management interface (boards with power management override these)
   virtual bool isExternalPowered() { return false; }
+  // True while a board can identify an active battery-charging source.
+  virtual bool isChargerActive() { return false; }
   virtual uint16_t getBootVoltage() { return 0; }
   virtual uint32_t getResetReason() const { return 0; }
   virtual const char* getResetReasonString(uint32_t reason) { return "Not available"; }
diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp
index b318bb58e8..d2a8b7076b 100644
--- a/src/helpers/CommonCLI.cpp
+++ b/src/helpers/CommonCLI.cpp
@@ -273,6 +273,11 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, char* command, char* re
       sprintf(reply, "%s (Build: %s)", _callbacks->getFirmwareVer(), _callbacks->getBuildDate());
     } else if (memcmp(command, "board", 5) == 0) {
       sprintf(reply, "%s", _board->getManufacturerName());
+    } else if (strcmp(command, "power") == 0) {
+      snprintf(reply, 160, "batt:%u mV ext:%s charger:%s",
+              (unsigned)_board->getBattMilliVolts(),
+              _board->isExternalPowered() ? "yes" : "no",
+              _board->isChargerActive() ? "yes" : "no");
     } else if (memcmp(command, "sensor get ", 11) == 0) {
       const char* key = command + 11;
       const char* val = _sensors->getSettingByKey(key);
diff --git a/variants/thinknode_m6/ThinkNodeM6Board.cpp b/variants/thinknode_m6/ThinkNodeM6Board.cpp
index 8ebae64c64..f83f274f96 100644
--- a/variants/thinknode_m6/ThinkNodeM6Board.cpp
+++ b/variants/thinknode_m6/ThinkNodeM6Board.cpp
@@ -15,6 +15,9 @@ void ThinkNodeM6Board::begin() {
   digitalWrite(P_LORA_TX_LED, LOW);
 #endif
 
+  pinMode(EXT_PWR_DETECT, INPUT);
+  pinMode(EXT_CHRG_DETECT, INPUT);
+
   delay(10); // give sx1262 some time to power up
 }
 
diff --git a/variants/thinknode_m6/ThinkNodeM6Board.h b/variants/thinknode_m6/ThinkNodeM6Board.h
index 78815e2c9c..1af952d2f1 100644
--- a/variants/thinknode_m6/ThinkNodeM6Board.h
+++ b/variants/thinknode_m6/ThinkNodeM6Board.h
@@ -36,6 +36,21 @@ class ThinkNodeM6Board : public NRF52BoardDCDC {
     return "Elecrow ThinkNode M6";
   }
 
+  bool isExternalPowered() override {
+    if (digitalRead(EXT_PWR_DETECT) == EXT_PWR_DETECT_VALUE ||
+        digitalRead(EXT_CHRG_DETECT) == EXT_CHRG_DETECT_VALUE) {
+      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;
+  }
+
   void powerOff() override {
 
     // turn off all leds, sd_power_system_off will not do this for us
diff --git a/variants/thinknode_m6/variant.h b/variants/thinknode_m6/variant.h
index 0a4025f3bd..3428fcd646 100644
--- a/variants/thinknode_m6/variant.h
+++ b/variants/thinknode_m6/variant.h
@@ -29,6 +29,12 @@
 
 #define AREF_VOLTAGE            (3.0)
 
+// External power and charger status lines.
+#define EXT_PWR_DETECT          (13)
+#define EXT_PWR_DETECT_VALUE    HIGH
+#define EXT_CHRG_DETECT         (15)
+#define EXT_CHRG_DETECT_VALUE   LOW
+
 ////////////////////////////////////////////////////////////////////////////////
 // Number of pins