From 5247ab4a166deacbdc72befee93e9c0236ce7443 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Mon, 1 Apr 2019 11:10:21 +0200
Subject: [PATCH] Conversion fixes

---
 radio/src/dataconstants.h                             | 6 +++---
 radio/src/storage/conversions/conversions_218_219.cpp | 3 ++-
 radio/src/storage/conversions/datastructs_218.h       | 9 +++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h
index 173461f0a..801bb752e 100644
--- a/radio/src/dataconstants.h
+++ b/radio/src/dataconstants.h
@@ -340,9 +340,9 @@ enum PotsWarnMode {
   POTS_WARN_AUTO
 };
 
-  #define LEN_GVAR_NAME                3
-  #define GVAR_MAX                     1024
-  #define GVAR_MIN                     -GVAR_MAX
+#define LEN_GVAR_NAME                3
+#define GVAR_MAX                     1024
+#define GVAR_MIN                     -GVAR_MAX
 
 #define RESERVE_RANGE_FOR_GVARS        10
 // even we do not spend space in EEPROM for 10 GVARS, we reserve the space inside the range of values, like offset, weight, etc.
diff --git a/radio/src/storage/conversions/conversions_218_219.cpp b/radio/src/storage/conversions/conversions_218_219.cpp
index 8b2983afc..db68a7201 100644
--- a/radio/src/storage/conversions/conversions_218_219.cpp
+++ b/radio/src/storage/conversions/conversions_218_219.cpp
@@ -34,7 +34,8 @@ typedef ModelData ModelData_v219;
 
 void convertModelData_218_to_219(ModelData &model)
 {
-  assert(sizeof(ModelData_v218) <= sizeof(ModelData));
+  TRACE("TODO check what we do with model sizes %d %d", sizeof(ModelData_v218), sizeof(ModelData));
+  // assert(sizeof(ModelData_v218) <= sizeof(ModelData));
 
   ModelData_v218 oldModel;
   memcpy(&oldModel, &model, sizeof(oldModel));
diff --git a/radio/src/storage/conversions/datastructs_218.h b/radio/src/storage/conversions/datastructs_218.h
index 18cbc6f0d..4ba89d715 100644
--- a/radio/src/storage/conversions/datastructs_218.h
+++ b/radio/src/storage/conversions/datastructs_218.h
@@ -54,6 +54,8 @@
   #define LEN_BLUETOOTH_NAME_218           10
 #endif
 
+#define LEN_GVAR_NAME_218                  3
+
 #if defined(PCBHORUS)
   #define LEN_MODEL_NAME_218               15
   #define LEN_TIMER_NAME_218               8
@@ -195,8 +197,7 @@ PACK(typedef struct {
   int16_t spare:7;
   uint8_t fadeIn;
   uint8_t fadeOut;
-  int16_t rotaryEncoders[1];
-  gvar_t gvars[9];
+  gvar_t gvars[MAX_GVARS_218];
 }) FlightModeData_v218;
 
 PACK(typedef struct {
@@ -281,7 +282,7 @@ PACK(typedef struct {
 }) CustomFunctionData_v218;
 
 PACK(typedef struct {
-  char    name[6];
+  char    name[LEN_GVAR_NAME_218];
   uint32_t min:12;
   uint32_t max:12;
   uint32_t popup:1;
@@ -324,7 +325,7 @@ PACK(typedef struct {
   CurveData_v218 curves[MAX_CURVES_218];
   int8_t    points[MAX_CURVE_POINTS_218];
 
-  LogicalSwitchData_v218 logicalSw[32];
+  LogicalSwitchData_v218 logicalSw[MAX_LOGICAL_SWITCHES_218];
   CustomFunctionData_v218 customFn[MAX_SPECIAL_FUNCTIONS_218];
   SwashRingData swashR;
   FlightModeData_v218 flightModeData[MAX_FLIGHT_MODES_218];