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

Merge with latest 2.3

Browse Source
This commit is contained in:
Bertrand Songis
2020-01-14 17:34:13 +01:00
parent ee3e256ed6 27d88bfb93
commit e7f15ee113
21 changed files with 170 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/main.cpp
+4 -3
View File
@@ -201,7 +201,8 @@ void checkEeprom()
{
#if defined(RTC_BACKUP_RAM) && !defined(SIMU)
if (TIME_TO_BACKUP_RAM()) {
rambackupWrite();
if (!globalData.unexpectedShutdown)
rambackupWrite();
rambackupDirtyMsk = 0;
}
#endif
@@ -522,10 +523,10 @@ void perMain()
periodicTick();
DEBUG_TIMER_STOP(debugTimerPerMain1);
if (mainRequestFlags & (1 << REQUEST_FLIGHT_RESET)) {
if (mainRequestFlags & (1u << REQUEST_FLIGHT_RESET)) {
TRACE("Executing requested Flight Reset");
flightReset();
mainRequestFlags &= ~(1 << REQUEST_FLIGHT_RESET);
mainRequestFlags &= ~(1u << REQUEST_FLIGHT_RESET);
}
checkBacklight();