Introduce T-pro and function switches handling

radio/src/storage/conversions/CMakeLists.txt

@@ -1,8 +1,11 @@
 set(STORAGE_CONVERSIONS 219)
 
-if(PCB STREQUAL X7 AND PCBREV STREQUAL ZORRO)
-  set(STORAGE_CONVERSIONS 221)
+if(PCB STREQUAL X7)
+  if(PCBREV STREQUAL ZORRO OR PCBREV STREQUAL TPRO)
+    set(STORAGE_CONVERSIONS 221)
+  endif()
 endif()
+message("Storage conversion: ${STORAGE_CONVERSIONS}")
 
 if(STORAGE_CONVERSIONS)
   add_definitions(-DSTORAGE_CONVERSIONS=${STORAGE_CONVERSIONS})

radio/src/storage/conversions/conversions_219_220.cpp

@@ -35,6 +35,8 @@
   #include <storage/sdcard_common.h>
 #endif
 
+#if STORAGE_CONVERSIONS < 220
+
 //
 // Summary of all changes between 219 & 220
 //
@@ -349,3 +351,5 @@ const char* convertRadioData_219_to_220()
   return nullptr;
 }
 #endif
+
+#endif

radio/src/storage/conversions/conversions_220_221.cpp

@@ -44,6 +44,8 @@ namespace yaml_conv_220 {
     const YamlNode* get_partialmodel_nodes();
 };
 
+#if STORAGE_CONVERSIONS < 221
+
 #if defined(STORAGE_MODELSLIST)
 
 void patchFilenameToYaml(char* str);
@@ -184,3 +186,5 @@ const char* convertRadioData_220_to_221()
 }
 
 #endif
+
+#endif

radio/src/storage/conversions/yaml/dataconstants_220.h

@@ -92,6 +92,8 @@
 
 #if defined(PCBXLITES) || defined(PCBXLITE)
 #define STORAGE_NUM_SWITCHES 6
+#elif defined(RADIO_TPRO)
+#define STORAGE_NUM_SWITCHES 10
 #elif defined(RADIO_TLITE) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_TX12) || defined(RADIO_T8) || defined(PCBX7ACCESS) || defined(PCBX7)
 #define STORAGE_NUM_SWITCHES 8
 #elif defined(PCBX9LITES)

radio/src/storage/conversions/yaml/datastructs_220.h

@@ -999,6 +999,9 @@ static inline void check_struct()
 #elif defined(PCBXLITE)
   CHKSIZE(RadioData, 859);
   CHKSIZE(ModelData, 6157);
+#elif defined(RADIO_TPRO)
+  CHKSIZE(RadioData, 860);
+  CHKSIZE(ModelData, 6157);
 #elif defined(PCBX7)
   CHKSIZE(RadioData, 865);
   CHKSIZE(ModelData, 6157);