From faaa5b928a0b310e4678f26c484895681c77aed2 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 28 Aug 2021 09:50:19 +0200 Subject: [PATCH] define away COLORLCD specifics --- radio/src/storage/conversions/conversions.cpp | 6 ++++++ radio/src/storage/sdcard_common.cpp | 3 +++ 2 files changed, 9 insertions(+) diff --git a/radio/src/storage/conversions/conversions.cpp b/radio/src/storage/conversions/conversions.cpp index 8f8666cf7..f3b0ce343 100644 --- a/radio/src/storage/conversions/conversions.cpp +++ b/radio/src/storage/conversions/conversions.cpp @@ -30,6 +30,7 @@ static void drawProgressScreen(const char* filename, int progress, int total) { +#if defined(COLORLCD) OpenTxTheme* l_theme = static_cast(theme); lcd->reset(); @@ -46,18 +47,23 @@ static void drawProgressScreen(const char* filename, int progress, int total) WDG_RESET(); lcdRefresh(); +#else + // TODO: BW progress screen +#endif } void convertRadioData(int version) { TRACE("convertRadioData(%d)", version); +#if defined(COLORLCD) // the theme has not been loaded before static_cast(theme)->load(); // Init backlight mode before entering alert screens requiredBacklightBright = BACKLIGHT_FORCED_ON; g_eeGeneral.blOffBright = 20; +#endif RAISE_ALERT(STR_STORAGE_WARNING, STR_SDCARD_CONVERSION_REQUIRE, NULL, AU_NONE); diff --git a/radio/src/storage/sdcard_common.cpp b/radio/src/storage/sdcard_common.cpp index b2d2aadff..d53fa9ef6 100644 --- a/radio/src/storage/sdcard_common.cpp +++ b/radio/src/storage/sdcard_common.cpp @@ -187,6 +187,7 @@ void storageReadAll() } } +#if !defined(COLORLCD) void checkModelIdUnique(uint8_t index, uint8_t module) { if (isModuleXJTD8(module)) @@ -203,3 +204,5 @@ void checkModelIdUnique(uint8_t index, uint8_t module) } } } +#endif +