From e323755990049215883c92b783b42299805b04ff Mon Sep 17 00:00:00 2001 From: Specter242 Date: Fri, 27 Feb 2026 22:12:12 -0500 Subject: [PATCH 1/2] sensecap solar: add poweroff command and board power/LED parity --- docs/nrf52_power_management.md | 2 +- src/helpers/CommonCLI.cpp | 4 +- .../sensecap_solar/SenseCapSolarBoard.cpp | 52 ++++++++++++++++++- variants/sensecap_solar/SenseCapSolarBoard.h | 24 +++++++++ variants/sensecap_solar/platformio.ini | 6 ++- variants/sensecap_solar/variant.h | 8 ++- 6 files changed, 89 insertions(+), 7 deletions(-) diff --git a/docs/nrf52_power_management.md b/docs/nrf52_power_management.md index ebe9bbbea..9c7416b3d 100644 --- a/docs/nrf52_power_management.md +++ b/docs/nrf52_power_management.md @@ -42,7 +42,7 @@ Shutdown reason codes (stored in GPREGRET2): | RAK WisMesh Tag | No | No | No | | Heltec Mesh Solar | No | No | No | | LilyGo T-Echo / T-Echo Lite | No | No | No | -| SenseCAP Solar | No | No | No | +| SenseCAP Solar | Yes | Yes | Yes | | WIO Tracker L1 / L1 E-Ink | No | No | No | | WIO WM1110 | No | No | No | | Mesh Pocket | No | No | No | diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp index 6dcf7018e..e72307a19 100644 --- a/src/helpers/CommonCLI.cpp +++ b/src/helpers/CommonCLI.cpp @@ -194,7 +194,9 @@ uint8_t CommonCLI::buildAdvertData(uint8_t node_type, uint8_t* app_data) { } void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, char* reply) { - if (memcmp(command, "reboot", 6) == 0) { + if (memcmp(command, "poweroff", 8) == 0 || memcmp(command, "shutdown", 8) == 0) { + _board->powerOff(); // doesn't return + } else if (memcmp(command, "reboot", 6) == 0) { _board->reboot(); // doesn't return } else if (memcmp(command, "clkreboot", 9) == 0) { // Reset clock diff --git a/variants/sensecap_solar/SenseCapSolarBoard.cpp b/variants/sensecap_solar/SenseCapSolarBoard.cpp index c08830359..b9dd2503d 100644 --- a/variants/sensecap_solar/SenseCapSolarBoard.cpp +++ b/variants/sensecap_solar/SenseCapSolarBoard.cpp @@ -3,8 +3,43 @@ #include "SenseCapSolarBoard.h" +#ifdef NRF52_POWER_MANAGEMENT +const PowerMgtConfig power_config = { + .lpcomp_ain_channel = PWRMGT_LPCOMP_AIN, + .lpcomp_refsel = PWRMGT_LPCOMP_REFSEL, + .voltage_bootlock = PWRMGT_VOLTAGE_BOOTLOCK +}; + +void SenseCapSolarBoard::initiateShutdown(uint8_t reason) { + bool enable_lpcomp = (reason == SHUTDOWN_REASON_LOW_VOLTAGE || + reason == SHUTDOWN_REASON_BOOT_PROTECT); + + pinMode(VBAT_ENABLE, OUTPUT); + digitalWrite(VBAT_ENABLE, enable_lpcomp ? LOW : HIGH); + + if (enable_lpcomp) { + configureVoltageWake(power_config.lpcomp_ain_channel, power_config.lpcomp_refsel); + } + + enterSystemOff(reason); +} +#endif // NRF52_POWER_MANAGEMENT + void SenseCapSolarBoard::begin() { - NRF52Board::begin(); + NRF52BoardDCDC::begin(); + + pinMode(BATTERY_PIN, INPUT); + pinMode(VBAT_ENABLE, OUTPUT); + digitalWrite(VBAT_ENABLE, LOW); + analogReadResolution(12); + analogReference(AR_INTERNAL_3_0); + delay(50); + +#ifdef PIN_USER_BTN + pinMode(PIN_USER_BTN, INPUT_PULLUP); +#elif defined(PIN_BUTTON1) + pinMode(PIN_BUTTON1, INPUT_PULLUP); +#endif #if defined(PIN_WIRE_SDA) && defined(PIN_WIRE_SCL) Wire.setPins(PIN_WIRE_SDA, PIN_WIRE_SCL); @@ -12,10 +47,23 @@ void SenseCapSolarBoard::begin() { Wire.begin(); +#ifdef LED_GREEN + pinMode(LED_GREEN, OUTPUT); + digitalWrite(LED_GREEN, HIGH); +#endif +#ifdef LED_BLUE + pinMode(LED_BLUE, OUTPUT); + digitalWrite(LED_BLUE, LOW); +#endif + #ifdef P_LORA_TX_LED pinMode(P_LORA_TX_LED, OUTPUT); digitalWrite(P_LORA_TX_LED, LOW); #endif +#ifdef NRF52_POWER_MANAGEMENT + checkBootVoltage(&power_config); +#endif + delay(10); // give sx1262 some time to power up -} \ No newline at end of file +} diff --git a/variants/sensecap_solar/SenseCapSolarBoard.h b/variants/sensecap_solar/SenseCapSolarBoard.h index 67215b8e0..839c1963f 100644 --- a/variants/sensecap_solar/SenseCapSolarBoard.h +++ b/variants/sensecap_solar/SenseCapSolarBoard.h @@ -5,6 +5,11 @@ #include class SenseCapSolarBoard : public NRF52BoardDCDC { +protected: +#ifdef NRF52_POWER_MANAGEMENT + void initiateShutdown(uint8_t reason) override; +#endif + public: SenseCapSolarBoard() : NRF52Board("SENSECAP_SOLAR_OTA") {} void begin(); @@ -31,4 +36,23 @@ class SenseCapSolarBoard : public NRF52BoardDCDC { const char* getManufacturerName() const override { return "Seeed SenseCap Solar"; } + + void powerOff() override { + digitalWrite(LED_GREEN, LOW); + digitalWrite(LED_BLUE, LOW); + +#ifdef PIN_USER_BTN + while (digitalRead(PIN_USER_BTN) == LOW); + nrf_gpio_cfg_sense_input(digitalPinToInterrupt(g_ADigitalPinMap[PIN_USER_BTN]), NRF_GPIO_PIN_NOPULL, NRF_GPIO_PIN_SENSE_LOW); +#elif defined(PIN_BUTTON1) + while (digitalRead(PIN_BUTTON1) == LOW); + nrf_gpio_cfg_sense_input(digitalPinToInterrupt(g_ADigitalPinMap[PIN_BUTTON1]), NRF_GPIO_PIN_NOPULL, NRF_GPIO_PIN_SENSE_LOW); +#endif + +#ifdef NRF52_POWER_MANAGEMENT + initiateShutdown(SHUTDOWN_REASON_USER); +#else + sd_power_system_off(); +#endif + } }; diff --git a/variants/sensecap_solar/platformio.ini b/variants/sensecap_solar/platformio.ini index d4fb7b442..e69b651f7 100644 --- a/variants/sensecap_solar/platformio.ini +++ b/variants/sensecap_solar/platformio.ini @@ -10,13 +10,15 @@ build_flags = ${nrf52_base.build_flags} -I src/helpers/nrf52 -UENV_INCLUDE_GPS -D NRF52_PLATFORM=1 + -D NRF52_POWER_MANAGEMENT -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper - -D P_LORA_TX_LED=12 + -D P_LORA_TX_LED=11 -D P_LORA_DIO_1=1 -D P_LORA_RESET=2 -D P_LORA_BUSY=3 -D P_LORA_NSS=4 + -D PIN_USER_BTN=PIN_BUTTON1 -D LORA_TX_POWER=22 -D SX126X_RXEN=5 -D SX126X_TXEN=RADIOLIB_NC @@ -96,4 +98,4 @@ build_src_filter = ${SenseCap_Solar.build_src_filter} +<../examples/companion_radio/*.cpp> lib_deps = ${SenseCap_Solar.lib_deps} - densaugeo/base64 @ ~1.4.0 \ No newline at end of file + densaugeo/base64 @ ~1.4.0 diff --git a/variants/sensecap_solar/variant.h b/variants/sensecap_solar/variant.h index 76494f48e..537c90247 100644 --- a/variants/sensecap_solar/variant.h +++ b/variants/sensecap_solar/variant.h @@ -32,6 +32,7 @@ // Buttons #define PIN_BUTTON1 (13) #define PIN_BUTTON2 (20) +#define PIN_USER_BTN PIN_BUTTON1 #define VBAT_ENABLE (19) // Output LOW to enable reading of the BAT voltage. @@ -41,6 +42,11 @@ #define ADC_MULTIPLIER (3.0F) // 1M, 512k divider bridge #define ADC_RESOLUTION (12) +// nRF52 power management settings +#define PWRMGT_VOLTAGE_BOOTLOCK (3300) // Won't boot below this voltage (mV) +#define PWRMGT_LPCOMP_AIN (7) // AIN7 = P0.31 = BATTERY_PIN +#define PWRMGT_LPCOMP_REFSEL (2) // 3/8 VDD (~3.38-3.71V) + // Serial interfaces #define PIN_SERIAL1_RX (7) #define PIN_SERIAL1_TX (6) @@ -82,4 +88,4 @@ #define EXTERNAL_FLASH_DEVICES P25Q16H #define EXTERNAL_FLASH_USE_QSPI -#endif \ No newline at end of file +#endif From e08dcbdd03a77c2d6421b574427bf9c459c943a1 Mon Sep 17 00:00:00 2001 From: Specter242 Date: Fri, 27 Feb 2026 22:51:19 -0500 Subject: [PATCH 2/2] sensecap solar: stabilize wake pin and add button hold poweroff --- examples/simple_repeater/main.cpp | 20 ++++++++++++++++++++ variants/sensecap_solar/SenseCapSolarBoard.h | 6 ++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/examples/simple_repeater/main.cpp b/examples/simple_repeater/main.cpp index d226d1fa7..e37078ce5 100644 --- a/examples/simple_repeater/main.cpp +++ b/examples/simple_repeater/main.cpp @@ -23,6 +23,11 @@ static char command[160]; unsigned long lastActive = 0; // mark last active time unsigned long nextSleepinSecs = 120; // next sleep in seconds. The first sleep (if enabled) is after 2 minutes from boot +#if defined(PIN_USER_BTN) && defined(_SEEED_SENSECAP_SOLAR_H_) +static unsigned long userBtnDownAt = 0; +#define USER_BTN_HOLD_OFF_MILLIS 1500 +#endif + void setup() { Serial.begin(115200); delay(1000); @@ -127,6 +132,21 @@ void loop() { command[0] = 0; // reset command buffer } +#if defined(PIN_USER_BTN) && defined(_SEEED_SENSECAP_SOLAR_H_) + // Hold the user button to power off the SenseCAP Solar repeater. + int btnState = digitalRead(PIN_USER_BTN); + if (btnState == LOW) { + if (userBtnDownAt == 0) { + userBtnDownAt = millis(); + } else if ((unsigned long)(millis() - userBtnDownAt) >= USER_BTN_HOLD_OFF_MILLIS) { + Serial.println("Powering off..."); + board.powerOff(); // does not return + } + } else { + userBtnDownAt = 0; + } +#endif + the_mesh.loop(); sensors.loop(); #ifdef DISPLAY_CLASS diff --git a/variants/sensecap_solar/SenseCapSolarBoard.h b/variants/sensecap_solar/SenseCapSolarBoard.h index 839c1963f..50447fbaa 100644 --- a/variants/sensecap_solar/SenseCapSolarBoard.h +++ b/variants/sensecap_solar/SenseCapSolarBoard.h @@ -43,10 +43,12 @@ class SenseCapSolarBoard : public NRF52BoardDCDC { #ifdef PIN_USER_BTN while (digitalRead(PIN_USER_BTN) == LOW); - nrf_gpio_cfg_sense_input(digitalPinToInterrupt(g_ADigitalPinMap[PIN_USER_BTN]), NRF_GPIO_PIN_NOPULL, NRF_GPIO_PIN_SENSE_LOW); + // Keep pull-up enabled in system-off so the wake line doesn't float low. + nrf_gpio_cfg_sense_input(digitalPinToInterrupt(g_ADigitalPinMap[PIN_USER_BTN]), NRF_GPIO_PIN_PULLUP, NRF_GPIO_PIN_SENSE_LOW); #elif defined(PIN_BUTTON1) while (digitalRead(PIN_BUTTON1) == LOW); - nrf_gpio_cfg_sense_input(digitalPinToInterrupt(g_ADigitalPinMap[PIN_BUTTON1]), NRF_GPIO_PIN_NOPULL, NRF_GPIO_PIN_SENSE_LOW); + // Keep pull-up enabled in system-off so the wake line doesn't float low. + nrf_gpio_cfg_sense_input(digitalPinToInterrupt(g_ADigitalPinMap[PIN_BUTTON1]), NRF_GPIO_PIN_PULLUP, NRF_GPIO_PIN_SENSE_LOW); #endif #ifdef NRF52_POWER_MANAGEMENT