Merge from 2.3
This commit is contained in:
@@ -568,7 +568,6 @@ void checkSwitches()
|
||||
#endif
|
||||
|
||||
while (true) {
|
||||
|
||||
#if defined(PCBFRSKY)
|
||||
#define GETADC_COUNT 1
|
||||
#endif
|
||||
@@ -728,6 +727,8 @@ void checkSwitches()
|
||||
#if defined(PWR_BUTTON_PRESS)
|
||||
uint32_t power = pwrCheck();
|
||||
if (power == e_power_off) {
|
||||
drawSleepBitmap();
|
||||
boardOff();
|
||||
break;
|
||||
}
|
||||
else if (power == e_power_press) {
|
||||
@@ -746,7 +747,7 @@ void checkSwitches()
|
||||
|
||||
doLoopCommonActions();
|
||||
|
||||
wdt_reset();
|
||||
WDG_RESET();
|
||||
|
||||
RTOS_WAIT_MS(10);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user