Skip Bluetooth wait when Bluetooth is disabled (#10571)
Make the PowerFSM DARK-to-LS timeout immediate when Bluetooth support is compiled out or config.bluetooth.enabled is false. The configured wait_bluetooth_secs default behavior is unchanged when Bluetooth is enabled.
This commit is contained in:
co-authored by
GitHub
parent
88e0b78017
commit
f1b1e35a79
+18
-4
@@ -58,6 +58,23 @@ static bool isPowered()
|
|||||||
return !isPowerSavingMode && powerStatus && (!powerStatus->getHasBattery() || powerStatus->getHasUSB());
|
return !isPowerSavingMode && powerStatus && (!powerStatus->getHasBattery() || powerStatus->getHasUSB());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool isBluetoothEnabledForPowerFSM()
|
||||||
|
{
|
||||||
|
#if HAS_BLUETOOTH && !MESHTASTIC_EXCLUDE_BLUETOOTH
|
||||||
|
return config.bluetooth.enabled;
|
||||||
|
#else
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint32_t getBluetoothWaitMs()
|
||||||
|
{
|
||||||
|
if (!isBluetoothEnabledForPowerFSM())
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
return Default::getConfiguredOrDefaultMs(config.power.wait_bluetooth_secs, default_wait_bluetooth_secs);
|
||||||
|
}
|
||||||
|
|
||||||
#if defined(T5_S3_EPAPER_PRO)
|
#if defined(T5_S3_EPAPER_PRO)
|
||||||
static void t5BacklightOffForSleep()
|
static void t5BacklightOffForSleep()
|
||||||
{
|
{
|
||||||
@@ -429,10 +446,7 @@ void PowerFSM_setup()
|
|||||||
|
|
||||||
// If ESP32 and using power-saving, timer mover from DARK to light-sleep
|
// If ESP32 and using power-saving, timer mover from DARK to light-sleep
|
||||||
// Also serves purpose of the old DARK to DARK transition(?) See https://github.com/meshtastic/firmware/issues/3517
|
// Also serves purpose of the old DARK to DARK transition(?) See https://github.com/meshtastic/firmware/issues/3517
|
||||||
powerFSM.add_timed_transition(
|
powerFSM.add_timed_transition(&stateDARK, &stateLS, getBluetoothWaitMs(), NULL, "Bluetooth timeout");
|
||||||
&stateDARK, &stateLS,
|
|
||||||
Default::getConfiguredOrDefaultMs(config.power.wait_bluetooth_secs, default_wait_bluetooth_secs), NULL,
|
|
||||||
"Bluetooth timeout");
|
|
||||||
} else {
|
} else {
|
||||||
// If ESP32, but not using power-saving, check periodically if config has drifted out of stateDark
|
// If ESP32, but not using power-saving, check periodically if config has drifted out of stateDark
|
||||||
powerFSM.add_timed_transition(&stateDARK, &stateDARK,
|
powerFSM.add_timed_transition(&stateDARK, &stateDARK,
|
||||||
|
|||||||
Reference in New Issue
Block a user