From c9555e510cec4e4ad99aae2f30dc5de0c13220bd Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 2 Mar 2017 18:32:24 +0100 Subject: [PATCH] Allow datestamp for ARM 128x64 model backups (#4534) * Allow datestamp for x7 model backups * Add ability to restore too * Make this all 128x64 instead of x7 only --- radio/src/gui/128x64/model_select.cpp | 2 +- radio/src/gui/128x64/popups.h | 2 +- radio/src/storage/eeprom_rlc.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/128x64/model_select.cpp b/radio/src/gui/128x64/model_select.cpp index 19da27514..2120da3b5 100644 --- a/radio/src/gui/128x64/model_select.cpp +++ b/radio/src/gui/128x64/model_select.cpp @@ -332,7 +332,7 @@ void menuModelSelect(event_t event) if (event) reusableBuffer.modelsel.eepromfree = EeFsGetFree(); lcdDrawNumber(17*FW, 0, reusableBuffer.modelsel.eepromfree, RIGHT); #endif - + #if defined(PCBX7) drawScreenIndex(MENU_MODEL_SELECT, DIM(menuTabModel), 0); #elif defined(ROTARY_ENCODER_NAVIGATION) diff --git a/radio/src/gui/128x64/popups.h b/radio/src/gui/128x64/popups.h index 3966ee58b..edd1af77c 100644 --- a/radio/src/gui/128x64/popups.h +++ b/radio/src/gui/128x64/popups.h @@ -76,7 +76,7 @@ extern uint8_t warningInfoFlags; #define POPUP_MENU_START(func) do { popupMenuHandler = (func); AUDIO_KEY_PRESS(); } while (0) #define POPUP_MENU_MAX_LINES 12 #define MENU_MAX_DISPLAY_LINES 6 - #define MENU_LINE_LENGTH (LEN_MODEL_NAME+1) + #define MENU_LINE_LENGTH (LEN_MODEL_NAME+12) #define POPUP_MENU_SET_BSS_FLAG() #define POPUP_MENU_UNSET_BSS_FLAG() enum { diff --git a/radio/src/storage/eeprom_rlc.cpp b/radio/src/storage/eeprom_rlc.cpp index 122c47f33..7d3b3929a 100644 --- a/radio/src/storage/eeprom_rlc.cpp +++ b/radio/src/storage/eeprom_rlc.cpp @@ -519,7 +519,7 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc) len = sizeof(MODELS_PATH) + PSIZE(TR_MODEL) + 2; } -#if defined(RTCLOCK) && LCD_W >= 212 +#if defined(RTCLOCK) char * tmp = strAppendDate(&buf[len]); len = tmp - buf; #endif