piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Bsongis/horus flash external device (#4446)

Browse Source 
* CMake options changed to UNEXPECTED_SHUTDOWN=YES/NO and  PWR_BUTTON=PRESS/SWITCH

* [X12S / X10] Flash an external device is now OK
This commit is contained in:
Bertrand Songis
2017-02-12 21:04:46 +01:00
committed by Andre Bernet
parent 808d7749c7
commit b9bb831b7f
25 changed files with 107 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
+31 -12
View File
@@ -903,7 +903,7 @@ bool readonlyUnlocked()
#if defined(SPLASH)
void doSplash()
{
#if defined(PWR_BUTTON_DELAY)
#if defined(PWR_BUTTON_PRESS)
bool refresh = false;
#endif
@@ -948,7 +948,7 @@ void doSplash()
}
#endif
#if defined(PWR_BUTTON_DELAY)
#if defined(PWR_BUTTON_PRESS)
uint32_t pwr_check = pwrCheck();
if (pwr_check == e_power_off) {
break;
@@ -1147,7 +1147,7 @@ void checkTHR()
LED_ERROR_BEGIN();
RAISE_ALERT(STR_THROTTLEWARN, STR_THROTTLENOTIDLE, STR_PRESSANYKEYTOSKIP, AU_THROTTLE_ALERT);
#if defined(PWR_BUTTON_DELAY)
#if defined(PWR_BUTTON_PRESS)
bool refresh = false;
#endif
@@ -1159,7 +1159,7 @@ void checkTHR()
v = calibratedAnalogs[thrchn];
#if defined(PWR_BUTTON_DELAY)
#if defined(PWR_BUTTON_PRESS)
uint32_t pwr_check = pwrCheck();
if (pwr_check == e_power_off) {
break;
@@ -1207,13 +1207,15 @@ void checkAlarm() // added by Gohst
}
}
void alert(const pm_char * t, const pm_char * s ALERT_SOUND_ARG)
void alert(const pm_char * title, const pm_char * msg ALERT_SOUND_ARG)
{
LED_ERROR_BEGIN();
RAISE_ALERT(t, s, STR_PRESSANYKEY, sound);
TRACE("ALERT %s: %s", title, msg);
#if defined(PWR_BUTTON_DELAY)
RAISE_ALERT(title, msg, STR_PRESSANYKEY, sound);
#if defined(PWR_BUTTON_PRESS)
bool refresh = false;
#endif
@@ -1229,7 +1231,7 @@ void alert(const pm_char * t, const pm_char * s ALERT_SOUND_ARG)
wdt_reset();
#if defined(PWR_BUTTON_DELAY)
#if defined(PWR_BUTTON_PRESS)
uint32_t pwr_check = pwrCheck();
if (pwr_check == e_power_off) {
boardOff();
@@ -1238,7 +1240,7 @@ void alert(const pm_char * t, const pm_char * s ALERT_SOUND_ARG)
refresh = true;
}
else if (pwr_check == e_power_on && refresh) {
RAISE_ALERT(t, s, STR_PRESSANYKEY, AU_NONE);
RAISE_ALERT(title, msg, STR_PRESSANYKEY, AU_NONE);
refresh = false;
}
#else
@@ -2698,8 +2700,7 @@ int main()
#endif
}
#if defined(PWR_BUTTON_DELAY)
#if defined(PWR_BUTTON_PRESS)
uint32_t pwr_press_time = 0;
uint32_t pwrPressedDuration()
@@ -2737,7 +2738,7 @@ uint32_t pwrCheck()
if (g_eeGeneral.backlightMode != e_backlight_mode_off) {
BACKLIGHT_ENABLE();
}
if (get_tmr10ms() - pwr_press_time > PWR_PRESS_SHUTDOWN) {
if (get_tmr10ms() - pwr_press_time > PWR_PRESS_SHUTDOWN_DELAY) {
#if defined(SHUTDOWN_CONFIRMATION)
while (1) {
lcdRefreshWait();
@@ -2775,4 +2776,22 @@ uint32_t pwrCheck()
return e_power_on;
}
#elif defined(CPUARM)
uint32_t pwrCheck()
{
#if defined(SOFT_PWR_CTRL)
if (pwrPressed())
return e_power_on;
#endif
if (usbPlugged())
return e_power_usb;
#if defined(TRAINER_PWR)
if (TRAINER_CONNECTED())
return e_power_trainer;
#endif
return e_power_off;
}
#endif