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

[Taranis] USB bug fixes

Browse Source 
[Taranis] DSM2 continued
This commit is contained in:
bsongis@gmail.com
2013-06-26 15:22:21 +00:00
parent b1389ee87a
commit b15030afc3
8 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/opentx.cpp
+15 -13
View File
@@ -3635,25 +3635,27 @@ void perMain()
}
#endif
// TODO merge these 2 branches
if (!usbPlugged()) {
// TODO merge these 2 branches
#if defined(PCBSKY9X)
if (Eeprom32_process_state != E32_IDLE)
ee32_process();
else if (TIME_TO_WRITE())
eeCheck(false);
if (Eeprom32_process_state != E32_IDLE)
ee32_process();
else if (TIME_TO_WRITE())
eeCheck(false);
#elif defined(CPUARM)
if (theFile.isWriting())
theFile.nextWriteStep();
else if (TIME_TO_WRITE())
eeCheck(false);
#else
if (!eeprom_buffer_size) {
if (theFile.isWriting())
theFile.nextWriteStep();
else if (TIME_TO_WRITE())
eeCheck(false);
}
#else
if (!eeprom_buffer_size) {
if (theFile.isWriting())
theFile.nextWriteStep();
else if (TIME_TO_WRITE())
eeCheck(false);
}
#endif
}
#if defined(SDCARD)
sdMountPoll();
@@ -3773,7 +3775,7 @@ void perMain()
const char *warn = s_warning;
uint8_t menu = s_menu_count;
if (EEPROM_MASSSTORAGE()) {
if (usbPlugged()) {
menuMainView(0);
}
else {