From c82068115fa2e002d70e65e612fc45faf792fd3a Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Wed, 18 Jun 2014 22:19:57 +0200 Subject: [PATCH 1/3] Fixes #115 - added date and time to backup filename --- radio/src/eeprom_rlc.cpp | 7 ++++++- radio/src/opentx.h | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/radio/src/eeprom_rlc.cpp b/radio/src/eeprom_rlc.cpp index dfa968e8d..3c42a6712 100644 --- a/radio/src/eeprom_rlc.cpp +++ b/radio/src/eeprom_rlc.cpp @@ -582,7 +582,7 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc) len = i+1; if (len) { if (buf[i]) - buf[i] = idx2char(buf[i]); + buf[i] = idx2char(buf[i]); else buf[i] = '_'; } @@ -597,6 +597,11 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc) len = sizeof(MODELS_PATH) + PSIZE(TR_MODEL) + 2; } +#if defined(RTCLOCK) + char * tmp = strAppendDate(&buf[len], true); + len = tmp - buf; +#endif + strcpy_P(&buf[len], STR_MODELS_EXT); #ifdef SIMU diff --git a/radio/src/opentx.h b/radio/src/opentx.h index a43085a59..4e13a2fbe 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -1513,7 +1513,7 @@ union ReusableBuffer uint16_t eepromfree; #if defined(SDCARD) char menu_bss[MENU_MAX_LINES][MENU_LINE_LENGTH]; - char mainname[42]; // because reused for SD backup / restore + char mainname[sizeof(menu_bss)]; // because reused for SD backup / restore #else char mainname[LEN_MODEL_NAME]; #endif From 1e917da05e69ef7ea6820f2bb7af4ffd3de7dc1e Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Wed, 18 Jun 2014 22:22:15 +0200 Subject: [PATCH 2/3] RTC time initialization in simulator --- radio/src/simpgmspace.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/radio/src/simpgmspace.cpp b/radio/src/simpgmspace.cpp index a527660ff..b8ef7beff 100644 --- a/radio/src/simpgmspace.cpp +++ b/radio/src/simpgmspace.cpp @@ -39,6 +39,9 @@ #include #include #include +#if defined(RTCLOCK) + #include +#endif #if defined WIN32 || !defined __GNUC__ #include @@ -352,7 +355,10 @@ void StartMainThread(bool tests) #endif g_tmr10ms = 0; - +#if defined(RTCLOCK) + g_rtcTime = time(0); +#endif + main_thread_running = (tests ? 1 : 2); pthread_create(&main_thread_pid, NULL, &main_thread, NULL); } From fd9f3ad8be092f3c273da247f21c14b57e0b1e6b Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Thu, 19 Jun 2014 06:53:53 +0200 Subject: [PATCH 3/3] Bad indentaton and reduced buffer size --- radio/src/opentx.h | 2 +- radio/src/simpgmspace.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 4e13a2fbe..ff436c52f 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -1513,7 +1513,7 @@ union ReusableBuffer uint16_t eepromfree; #if defined(SDCARD) char menu_bss[MENU_MAX_LINES][MENU_LINE_LENGTH]; - char mainname[sizeof(menu_bss)]; // because reused for SD backup / restore + char mainname[45]; // because reused for SD backup / restore, max backup filename 44 chars: "/MODELS/MODEL0134353-2014-06-19-04-51-27.bin" #else char mainname[LEN_MODEL_NAME]; #endif diff --git a/radio/src/simpgmspace.cpp b/radio/src/simpgmspace.cpp index b8ef7beff..c72a1c6c7 100644 --- a/radio/src/simpgmspace.cpp +++ b/radio/src/simpgmspace.cpp @@ -40,7 +40,7 @@ #include #include #if defined(RTCLOCK) - #include + #include #endif #if defined WIN32 || !defined __GNUC__