From 0ba688c25f059c073c21d8df98f0c82eefd9878c Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphaelcoeffic@users.noreply.github.com>
Date: Tue, 21 Jun 2022 08:02:10 +0200
Subject: [PATCH] Fixes related to storage conversions removal (#2074)

---
 radio/src/CMakeLists.txt                              | 10 ++++++----
 radio/src/storage/conversions/conversions_219_220.cpp |  4 ++--
 radio/src/storage/sdcard_yaml.cpp                     |  4 ++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index 62a5fe694..dc0272f80 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -150,6 +150,8 @@ include(gui/CMakeLists.txt)
 
 set(SRC ${SRC} storage/storage_common.cpp)
 
+include(storage/conversions/CMakeLists.txt)
+
 if(${STORAGE} STREQUAL SDCARD)
   set(SRC ${SRC} storage/sdcard_common.cpp)
   if(${STORAGE_FORMAT} STREQUAL RAW)
@@ -160,8 +162,10 @@ if(${STORAGE} STREQUAL SDCARD)
     add_definitions(-DSDCARD_YAML)
     include(storage/yaml/CMakeLists.txt)
     if (${STORAGE_CONVERT} STREQUAL EEPROM_RLC)
-      set(SRC ${SRC} storage/eeprom_rlc.cpp)
-      add_definitions(-DEEPROM_RLC)
+      if (STORAGE_CONVERSIONS LESS 221)
+        set(SRC ${SRC} storage/eeprom_rlc.cpp)
+        add_definitions(-DEEPROM_RLC)
+      endif()
     else(${STORAGE_CONVERT} STREQUAL RAW)
       set(SRC ${SRC} storage/sdcard_raw.cpp)
     endif()
@@ -186,8 +190,6 @@ elseif(${STORAGE} STREQUAL EEPROM)
 endif()
 
 
-include(storage/conversions/CMakeLists.txt)
-
 if(RTC_BACKUP_RAM)
   add_definitions(-DRTC_BACKUP_RAM)
   set(SRC ${SRC} storage/rlc.cpp)
diff --git a/radio/src/storage/conversions/conversions_219_220.cpp b/radio/src/storage/conversions/conversions_219_220.cpp
index efbaaa7c7..4f3c6bdff 100644
--- a/radio/src/storage/conversions/conversions_219_220.cpp
+++ b/radio/src/storage/conversions/conversions_219_220.cpp
@@ -19,6 +19,8 @@
  * GNU General Public License for more details.
  */
 
+#if STORAGE_CONVERSIONS < 220
+
 #include <cstdlib>
 #include <cstring>
 
@@ -35,8 +37,6 @@
   #include <storage/sdcard_common.h>
 #endif
 
-#if STORAGE_CONVERSIONS < 220
-
 //
 // Summary of all changes between 219 & 220
 //
diff --git a/radio/src/storage/sdcard_yaml.cpp b/radio/src/storage/sdcard_yaml.cpp
index 30bc69d58..a23d99731 100644
--- a/radio/src/storage/sdcard_yaml.cpp
+++ b/radio/src/storage/sdcard_yaml.cpp
@@ -107,6 +107,7 @@ const char * loadRadioSettings()
 {
     FILINFO fno;
     if (f_stat(RADIO_SETTINGS_YAML_PATH, &fno) != FR_OK) {
+#if STORAGE_CONVERSIONS < 221
 #if defined(STORAGE_MODELSLIST)
       uint8_t version;
       const char* error = loadFileBin(RADIO_SETTINGS_PATH, nullptr, 0, &version);
@@ -126,6 +127,9 @@ const char * loadRadioSettings()
       eeConvert(versions[0]);
 #else
   #error "Unsupported conversion format"
+#endif
+#else
+      return "no radio settings";
 #endif
     }