Compilation fixes after rebase

radio/src/gui/colorlcd/layout.h

@@ -44,19 +44,29 @@ struct LayoutPersistentData {
 
 class LayoutFactory
 {
-  public:
-    LayoutFactory(const char * id, const char * name);
-    const char * getId() const { return id; }
-    const char * getName() const { return name; }
-    virtual void drawThumb(BitmapBuffer * dc, uint16_t x, uint16_t y, LcdFlags flags) const = 0;
-    virtual const ZoneOption * getOptions() const = 0;
-    virtual WidgetsContainer * create(LayoutPersistentData * persistentData) const = 0;
-    virtual WidgetsContainer * load(LayoutPersistentData * persistentData) const = 0;
-    virtual void initPersistentData(LayoutPersistentData * persistentData) const = 0;
+ public:
+  LayoutFactory(const char* id, const char* name);
 
-  protected:
-    const char * id;
-    const char * name;
+  const char* getId() const { return id; }
+  const char* getName() const { return name; }
+
+  virtual void drawThumb(BitmapBuffer* dc, uint16_t x, uint16_t y,
+                         LcdFlags flags) const = 0;
+
+  virtual const ZoneOption* getOptions() const = 0;
+
+  virtual WidgetsContainer* create(
+      LayoutPersistentData* persistentData) const = 0;
+
+  virtual WidgetsContainer* load(
+      LayoutPersistentData* persistentData) const = 0;
+
+  virtual void initPersistentData(LayoutPersistentData* persistentData,
+                                  bool setDefault) const = 0;
+
+ protected:
+  const char* id;
+  const char* name;
 };
 
 WidgetsContainer * loadLayout(const char * name, LayoutPersistentData * persistentData);

radio/src/storage/conversions/conversions.cpp

@@ -22,7 +22,7 @@
 #include "opentx.h"
 #include "conversions.h"
 
-#if defined(COLORLCD)
+#if defined(COLORLCD) && !defined(SDCARD_YAML)
 #include "storage/modelslist.h"
 #include "storage/sdcard_common.h"
 

radio/src/storage/conversions/conversions_219_220.cpp

@@ -213,7 +213,7 @@ void convertModelData_219_to_220(ModelData &model)
 
   if (defaultLayout) {
     strcpy(newModel.screenData[0].LayoutId, defaultLayout->getId());
-    defaultLayout->initPersistentData(&newModel.screenData[0].layoutData);
+    defaultLayout->initPersistentData(&newModel.screenData[0].layoutData, true);
   }
 #endif
   free(oldModelAllocated);