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

Merge branch 'master' into patch1

Browse Source
This commit is contained in:
Thomas Göttgens
2022-07-31 16:14:33 +02:00
committed by GitHub
parent dcc6a4b5e7 97684c6c73
commit edd6f049cf
67 changed files with 496 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/shutdown.h
View File

@@ -8,16 +8,16 @@ void powerCommandsCheck()
{
if (rebootAtMsec && millis() > rebootAtMsec) {
DEBUG_MSG("Rebooting\n");
#ifndef NO_ESP32
#if defined(ARCH_ESP32)
ESP.restart();
#elif NRF52_SERIES
#elif defined(ARCH_NRF52)
NVIC_SystemReset();
#else
DEBUG_MSG("FIXME implement reboot for this platform");
#endif
}
#if NRF52_SERIES
#if defined(ARCH_NRF52)
if (shutdownAtMsec) {
screen->startShutdownScreen();
playBeep();
@@ -40,7 +40,7 @@ void powerCommandsCheck()
playShutdownMelody();
power->shutdown();
}
#elif NRF52_SERIES
#elif defined(ARCH_NRF52)
playShutdownMelody();
power->shutdown();
#else