mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-08 14:12:05 +00:00
Merge branch 'master' into store-and-forward
This commit is contained in:
commit
aca9ceebfa
@ -218,8 +218,8 @@ static int32_t ledBlinkCount = 0;
|
|||||||
static int32_t elecrowLedBlinker()
|
static int32_t elecrowLedBlinker()
|
||||||
{
|
{
|
||||||
// are we in alert buzzer mode?
|
// are we in alert buzzer mode?
|
||||||
|
#if HAS_BUTTON
|
||||||
if (buttonThread->isBuzzing()) {
|
if (buttonThread->isBuzzing()) {
|
||||||
|
|
||||||
// blink LED three times for 3 seconds, then 3 times for a second, with one second pause
|
// blink LED three times for 3 seconds, then 3 times for a second, with one second pause
|
||||||
if (ledBlinkCount % 2) { // odd means LED OFF
|
if (ledBlinkCount % 2) { // odd means LED OFF
|
||||||
ledBlink.set(false);
|
ledBlink.set(false);
|
||||||
@ -242,6 +242,7 @@ static int32_t elecrowLedBlinker()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
#endif
|
||||||
ledBlinkCount = 0;
|
ledBlinkCount = 0;
|
||||||
if (config.device.led_heartbeat_disabled)
|
if (config.device.led_heartbeat_disabled)
|
||||||
return 1000;
|
return 1000;
|
||||||
@ -262,7 +263,9 @@ static int32_t elecrowLedBlinker()
|
|||||||
if (!powerStatus->getIsCharging() && powerStatus->getBatteryChargePercent() < 10) {
|
if (!powerStatus->getIsCharging() && powerStatus->getBatteryChargePercent() < 10) {
|
||||||
return 250;
|
return 250;
|
||||||
}
|
}
|
||||||
|
#if HAS_BUTTON
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
return 1000;
|
return 1000;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user