rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-21 18:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

trunk roundhouse kick

Browse Source
This commit is contained in:
Thomas Göttgens
2023-01-21 14:34:29 +01:00
parent 6cf18b7d07
commit 51b2c431d9
234 changed files with 4989 additions and 5101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/sleep.cpp
View File

@@ -29,7 +29,8 @@ Observable<void *> preflightSleep;
/// Called to tell observers we are now entering sleep and you should prepare. Must return 0
/// notifySleep will be called for light or deep sleep, notifyDeepSleep is only called for deep sleep
/// notifyGPSSleep will be called when config.position.gps_enabled is set to 0 or from buttonthread when GPS_POWER_TOGGLE is enabled.
/// notifyGPSSleep will be called when config.position.gps_enabled is set to 0 or from buttonthread when GPS_POWER_TOGGLE is
/// enabled.
Observable<void *> notifySleep, notifyDeepSleep;
Observable<void *> notifyGPSSleep;
@@ -93,14 +94,14 @@ void setGPSPower(bool on)
LOG_INFO("Setting GPS power=%d\n", on);
#ifdef HAS_PMU
if (pmu_found && PMU){
if (pmu_found && PMU) {
uint8_t model = PMU->getChipModel();
if(model == XPOWERS_AXP2101){
if (model == XPOWERS_AXP2101) {
// t-beam-s3-core GNSS power channel
on ? PMU->enablePowerOutput(XPOWERS_ALDO4) : PMU->disablePowerOutput(XPOWERS_ALDO4);
}else if(model == XPOWERS_AXP192){
} else if (model == XPOWERS_AXP192) {
// t-beam GNSS power channel
on ? PMU->enablePowerOutput(XPOWERS_LDO3) : PMU->disablePowerOutput(XPOWERS_LDO3);
on ? PMU->enablePowerOutput(XPOWERS_LDO3) : PMU->disablePowerOutput(XPOWERS_LDO3);
}
}
#endif
@@ -163,7 +164,7 @@ static void waitEnterSleep()
}
// Code that still needs to be moved into notifyObservers
console->flush(); // send all our characters before we stop cpu clock
console->flush(); // send all our characters before we stop cpu clock
setBluetoothEnable(false); // has to be off before calling light sleep
notifySleep.notifyObservers(NULL);
@@ -171,32 +172,26 @@ static void waitEnterSleep()
void doGPSpowersave(bool on)
{
#ifdef HAS_PMU
if (on)
{
#ifdef HAS_PMU
if (on) {
LOG_INFO("Turning GPS back on\n");
gps->forceWake(1);
setGPSPower(1);
}
else
{
} else {
LOG_INFO("Turning off GPS chip\n");
notifyGPSSleep.notifyObservers(NULL);
setGPSPower(0);
}
#endif
#ifdef PIN_GPS_WAKE
if (on)
{
#endif
#ifdef PIN_GPS_WAKE
if (on) {
LOG_INFO("Waking GPS");
gps->forceWake(1);
}
else
{
} else {
LOG_INFO("GPS entering sleep");
notifyGPSSleep.notifyObservers(NULL);
}
#endif
#endif
}
void doDeepSleep(uint64_t msecToWake)
@@ -239,10 +234,10 @@ void doDeepSleep(uint64_t msecToWake)
// all the time.
uint8_t model = PMU->getChipModel();
if(model == XPOWERS_AXP2101){
if (model == XPOWERS_AXP2101) {
PMU->disablePowerOutput(XPOWERS_ALDO3); // lora radio power channel
}else if(model == XPOWERS_AXP192){
PMU->disablePowerOutput(XPOWERS_LDO2); // lora radio power channel
} else if (model == XPOWERS_AXP192) {
PMU->disablePowerOutput(XPOWERS_LDO2); // lora radio power channel
}
}
#endif
@@ -329,7 +324,6 @@ void enableModemSleep()
{
static esp_pm_config_esp32_t esp32_config; // filled with zeros because bss
#if CONFIG_IDF_TARGET_ESP32S3
esp32_config.max_freq_mhz = CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ;
#elif CONFIG_IDF_TARGET_ESP32S2