From dc29a32f02057cea8f68c3c05862522095313a49 Mon Sep 17 00:00:00 2001 From: "bsongis@gmail.com" Date: Sun, 15 Sep 2013 18:54:26 +0000 Subject: [PATCH] [Taranis] Bitmap not reloaded after Copy/Move/Delete/Restore - forgotten files --- src/eeprom_rlc.cpp | 6 ++++++ src/eeprom_rlc.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/eeprom_rlc.cpp b/src/eeprom_rlc.cpp index 1301894de..dae5401d6 100644 --- a/src/eeprom_rlc.cpp +++ b/src/eeprom_rlc.cpp @@ -1067,4 +1067,10 @@ void eeSwapModels(uint8_t id1, uint8_t id2) memcpy(&modelHeaders[id1], &modelHeaders[id2], sizeof(ModelHeader)); memcpy(&modelHeaders[id2], tmp, sizeof(ModelHeader)); } + +void eeDeleteModel(uint8_t idx) +{ + EFile::rm(FILE_MODEL(idx)); + memset(&modelHeaders[idx], 0, sizeof(ModelHeader)); +} #endif diff --git a/src/eeprom_rlc.h b/src/eeprom_rlc.h index f49d1d97d..5c7683bb2 100644 --- a/src/eeprom_rlc.h +++ b/src/eeprom_rlc.h @@ -221,14 +221,14 @@ inline void eeFlush() { theFile.flush(); } #define DISPLAY_PROGRESS_BAR(x) #endif -#define eeDeleteModel(x) EFile::rm(FILE_MODEL(x)) - #if defined(CPUARM) bool eeCopyModel(uint8_t dst, uint8_t src); void eeSwapModels(uint8_t id1, uint8_t id2); +void eeDeleteModel(uint8_t idx); #else #define eeCopyModel(dst, src) theFile.copy(FILE_MODEL(dst), FILE_MODEL(src)) #define eeSwapModels(id1, id2) EFile::swap(FILE_MODEL(id1), FILE_MODEL(id2)) +#define eeDeleteModel(idx) EFile::rm(FILE_MODEL(idx)) #endif #if defined(SDCARD)