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

[sky9x] All fields in SD info submenu now displayed

Browse Source 
[sky9x] Model Backup / Restore should be ok
[sky9x] SD unmounted when USB masstorage
[sky9x / gruvin9x] Header added to Model Backups
[sky9x / gruvin9x] Log file closed when Logging function stopped
+ Cleaning session
This commit is contained in:
bsongis
2012-09-28 16:02:13 +00:00
parent d8be36e2f4
commit 121c41719d
429 changed files with 467 additions and 78062 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logs.cpp
+25 -6
View File
@@ -45,8 +45,8 @@ const pm_char * openLogs()
DIR folder;
char filename[24];
// close any file left open. E.G. Changing models with log switch still on.
if (g_oLogFile.fs) f_close(&g_oLogFile);
if (!sd_card_mounted())
return STR_NO_SDCARD;
strcpy_P(filename, STR_LOGS_PATH);
@@ -130,16 +130,25 @@ void closeLogs()
lastLogTime = 0;
}
// when disk full
void writeLogs()
{
static const pm_char * error_displayed = NULL;
if (isFunctionActive(FUNC_LOGS) && logDelay > 0) {
tmr10ms_t tmr10ms = get_tmr10ms();
if (lastLogTime == 0 || (tmr10ms_t)(tmr10ms - lastLogTime) >= (tmr10ms_t)logDelay*10) {
lastLogTime = tmr10ms;
if (!g_oLogFile.fs) {
if (!sd_card_mounted() || openLogs() != 0)
const pm_char * result = openLogs();
if (result != NULL) {
if (result != error_displayed) {
error_displayed = result;
s_global_warning = result;
}
return;
}
}
#if defined(PCBV4)
@@ -183,12 +192,14 @@ void writeLogs()
#endif
#if defined(WS_HOW_HIGH)
if (g_model.frsky.usrProto == USR_PROTO_WS_HOW_HIGH)
if (g_model.frsky.usrProto == USR_PROTO_WS_HOW_HIGH) {
f_printf(&g_oLogFile, "%d,", frskyData.hub.baroAltitude_bp);
}
#endif
for (uint8_t i=0; i<NUM_STICKS+NUM_POTS; i++)
for (uint8_t i=0; i<NUM_STICKS+NUM_POTS; i++) {
f_printf(&g_oLogFile, "%d,", calibratedStick[i]);
}
f_printf(&g_oLogFile, "%d,", keyState(SW_ThrCt));
f_printf(&g_oLogFile, "%d,", keyState(SW_RuddDR));
@@ -198,9 +209,17 @@ void writeLogs()
f_printf(&g_oLogFile, "%d,", keyState(SW_ID2));
f_printf(&g_oLogFile, "%d,", keyState(SW_AileDR));
f_printf(&g_oLogFile, "%d,", keyState(SW_Gear));
f_printf(&g_oLogFile, "%d\n", keyState(SW_Trainer));
if (f_printf(&g_oLogFile, "%d\n", keyState(SW_Trainer)) < 0 && !error_displayed) {
error_displayed = STR_SDCARD_ERROR;
s_global_warning = STR_SDCARD_ERROR;
}
}
}
else {
error_displayed = NULL;
if (g_oLogFile.fs)
closeLogs();
}
}