pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 17:42:48 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix: device PMU shutdown (part 2) (#3596)

Browse Source 
* fix: device PMU shutdown (part 2)

* fix error + enable nimble deinit
This commit is contained in:
Manuel 2024-04-12 02:39:07 +02:00 committed by GitHub
parent a4a8556aa2
commit 927d07e2c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Power.cpp
View File

@ -500,12 +500,7 @@ void Power::shutdown()
{ {
LOG_INFO("Shutting down\n"); LOG_INFO("Shutting down\n");
#ifdef HAS_PMU #if defined(ARCH_NRF52) || defined(ARCH_ESP32)
if (pmu_found == true) {
PMU->setChargingLedMode(XPOWERS_CHG_LED_OFF);
PMU->shutdown();
}
#elif defined(ARCH_NRF52) || defined(ARCH_ESP32)
#ifdef PIN_LED1 #ifdef PIN_LED1
ledOff(PIN_LED1); ledOff(PIN_LED1);
#endif #endif

4
src/nimble/NimbleBluetooth.cpp
View File

@ -113,8 +113,8 @@ void NimbleBluetooth::shutdown()
pAdvertising->reset(); pAdvertising->reset();
pAdvertising->stop(); pAdvertising->stop();
#if defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_WIRELESS_PAPER_V1_0) #if defined(ARCH_ESP32)
// Saving of ~1mA // Saving of ~1mA for esp32-s3 and 0.1mA for esp32
// Probably applicable to other ESP32 boards - unverified // Probably applicable to other ESP32 boards - unverified
NimBLEDevice::deinit(); NimBLEDevice::deinit();
#endif #endif

39
src/sleep.cpp
View File

@ -245,6 +245,22 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
digitalWrite(VEXT_ENABLE, 1); // turn off the display power digitalWrite(VEXT_ENABLE, 1); // turn off the display power
#endif #endif
#ifdef ARCH_ESP32
if (shouldLoraWake(msecToWake)) {
enableLoraInterrupt();
}
#ifdef BUTTON_PIN
// Avoid leakage through button pin
pinMode(BUTTON_PIN, INPUT);
gpio_hold_en((gpio_num_t)BUTTON_PIN);
#endif
// LoRa CS (RADIO_NSS) needs to stay HIGH, even during deep sleep
pinMode(LORA_CS, OUTPUT);
digitalWrite(LORA_CS, HIGH);
gpio_hold_en((gpio_num_t)LORA_CS);
#endif
#ifdef HAS_PMU #ifdef HAS_PMU
if (pmu_found && PMU) { if (pmu_found && PMU) {
// Obsolete comment: from back when we we used to receive lora packets while CPU was in deep sleep. // Obsolete comment: from back when we we used to receive lora packets while CPU was in deep sleep.
@ -257,6 +273,7 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
// If we want to leave the radio receiving in would be 11.5mA current draw, but most of the time it is just waiting // If we want to leave the radio receiving in would be 11.5mA current draw, but most of the time it is just waiting
// in its sequencer (true?) so the average power draw should be much lower even if we were listinging for packets // in its sequencer (true?) so the average power draw should be much lower even if we were listinging for packets
// all the time. // all the time.
PMU->setChargingLedMode(XPOWERS_CHG_LED_OFF);
uint8_t model = PMU->getChipModel(); uint8_t model = PMU->getChipModel();
if (model == XPOWERS_AXP2101) { if (model == XPOWERS_AXP2101) {
@ -271,25 +288,15 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
// t-beam v1.1 radio power channel // t-beam v1.1 radio power channel
PMU->disablePowerOutput(XPOWERS_LDO2); // lora radio power channel PMU->disablePowerOutput(XPOWERS_LDO2); // lora radio power channel
} }
if (msecToWake == portMAX_DELAY) {
LOG_INFO("PMU shutdown.\n");
console->flush();
PMU->shutdown();
}
} }
#endif #endif
#ifdef ARCH_ESP32 console->flush();
if (shouldLoraWake(msecToWake)) {
enableLoraInterrupt();
}
#if defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_WIRELESS_PAPER_V1_0) // Applicable to most ESP32 boards?
// Avoid leakage through button pin
pinMode(BUTTON_PIN, INPUT);
rtc_gpio_hold_en((gpio_num_t)BUTTON_PIN);
// LoRa CS (RADIO_NSS) needs to stay HIGH, even during deep sleep
pinMode(LORA_CS, OUTPUT);
digitalWrite(LORA_CS, HIGH);
rtc_gpio_hold_en((gpio_num_t)LORA_CS);
#endif
#endif
cpuDeepSleep(msecToWake); cpuDeepSleep(msecToWake);
} }