Merge pull request #3789 from opentx/projectkk2glider/issue_3771_sd_lockup

Projectkk2glider/issue 3771 sd lockup
This commit is contained in:
Bertrand Songis
2016-09-11 22:36:01 +02:00
committed by GitHub
28 changed files with 692 additions and 778 deletions
+1 -1
View File
@@ -101,7 +101,7 @@ void menuRadioSdManager(event_t _event)
if (warningResult) {
warningResult = 0;
showMessageBox(STR_FORMATTING);
closeLogs();
logsClose();
#if defined(PCBSKY9X)
Card_state = SD_ST_DATA;
#endif
+1 -1
View File
@@ -348,7 +348,7 @@ void menuModelSensor(event_t event)
case SENSOR_FIELD_LOGS:
ON_OFF_MENU_ITEM(sensor->logs, SENSOR_2ND_COLUMN, y, STR_LOGS, attr, event);
if (attr && checkIncDec_Ret) {
closeLogs();
logsClose();
}
break;
+1 -1
View File
@@ -163,7 +163,7 @@ void menuRadioSdManager(event_t _event)
if (warningResult) {
warningResult = 0;
showMessageBox(STR_FORMATTING);
closeLogs();
logsClose();
audioQueue.stopSD();
if (f_mkfs(0, 1, 0) == FR_OK) {
f_chdir("/");
+1 -1
View File
@@ -358,7 +358,7 @@ bool menuModelSensor(event_t event)
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_LOGS);
sensor->logs = editCheckBox(sensor->logs, SENSOR_2ND_COLUMN, y, attr, event);
if (attr && checkIncDec_Ret) {
closeLogs();
logsClose();
}
break;
}
+1 -1
View File
@@ -153,7 +153,7 @@ bool menuRadioSdManager(event_t _event)
if (warningResult) {
warningResult = 0;
showMessageBox(STR_FORMATTING);
closeLogs();
logsClose();
audioQueue.stopSD();
if (f_mkfs(0, 1, 0) == FR_OK) {
f_chdir("/");
+2 -2
View File
@@ -217,8 +217,8 @@ bool menuStatsTraces(event_t event)
lcdDrawNumber(STATS_TRACES_EVENT_POS, y, te->event, LEADING0|LEFT, 3);
// data
lcdDrawSizedText(STATS_TRACES_DATA_POS, y, "0x", 2);
lcdDrawHexNumber(STATS_TRACES_DATA_POS + 20, y, (uint16_t)(te->data >> 16));
lcdDrawHexNumber(STATS_TRACES_DATA_POS+ 60, y, (uint16_t)(te->data & 0xFFFF));
lcdDrawHexNumber(lcdNextPos, y, (uint16_t)(te->data >> 16));
lcdDrawHexNumber(lcdNextPos, y, (uint16_t)(te->data & 0xFFFF));
}
}