From 9af3f8dcdc1fd9aadddd97d44bafe1c56a25ced0 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 15 Nov 2019 16:56:25 +0100
Subject: [PATCH] MODULE SUBTYPE lost after watchdog reset

---
 radio/src/storage/datacopy.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/radio/src/storage/datacopy.cpp b/radio/src/storage/datacopy.cpp
index 2a08dc373..6f307551d 100644
--- a/radio/src/storage/datacopy.cpp
+++ b/radio/src/storage/datacopy.cpp
@@ -1,4 +1,4 @@
-//This file was auto-generated by generate_datacopy.py script on Fri May 10 15:48:58 2019. Do not edit this file!
+//This file was auto-generated by generate_datacopy.py script on Fri Nov 15 16:54:14 2019. Do not edit this file!
 
 
 
@@ -183,6 +183,7 @@ void copyTelemetrySensor(A * dest, B * src)
   memcpy(dest->label, src->label, sizeof(dest->label));
   dest->subId = src->subId;
   dest->type = src->type;
+  dest->spare1 = src->spare1;
   dest->unit = src->unit;
   dest->prec = src->prec;
   dest->autoOffset = src->autoOffset;
@@ -190,7 +191,7 @@ void copyTelemetrySensor(A * dest, B * src)
   dest->logs = src->logs;
   dest->persistent = src->persistent;
   dest->onlyPositive = src->onlyPositive;
-  dest->spare = src->spare;
+  dest->spare2 = src->spare2;
   dest->param = src->param;
 }
 
@@ -214,6 +215,9 @@ void copyModuleData(A * dest, B * src)
   dest->rfProtocol = src->rfProtocol;
   dest->channelsStart = src->channelsStart;
   dest->channelsCount = src->channelsCount;
+  dest->failsafeMode = src->failsafeMode;
+  dest->subType = src->subType;
+  dest->invertedSerial = src->invertedSerial;
   copyModuleData_ppm(&dest->ppm, &src->ppm);
 }
 
@@ -316,19 +320,26 @@ void copyTrainerData(A * dest, B * src)
 template <class A, class B>
 void copyRadioData(A * dest, B * src)
 {
-  for (int i=0; i<13; i++) {
+  for (int i=0; i<15; i++) {
     copyCalibData(&dest->calib[i], &src->calib[i]);
   }
+  dest->backlightMode = src->backlightMode;
+  dest->antennaMode = src->antennaMode;
+  dest->disableRtcWarning = src->disableRtcWarning;
+  dest->spare1 = src->spare1;
   dest->stickMode = src->stickMode;
+  dest->timezone = src->timezone;
+  dest->adjustRTC = src->adjustRTC;
   dest->telemetryBaudrate = src->telemetryBaudrate;
   dest->splashSpares = src->splashSpares;
+  dest->hapticMode = src->hapticMode;
   dest->switchesDelay = src->switchesDelay;
   for (int i=0; i<64; i++) {
     copyCustomFunctionData(&dest->customFn[i], &src->customFn[i]);
   }
-  dest->slidersConfig = src->slidersConfig;
   dest->switchConfig = src->switchConfig;
   dest->potsConfig = src->potsConfig;
+  dest->slidersConfig = src->slidersConfig;
   memcpy(dest->ownerRegistrationID, src->ownerRegistrationID, sizeof(dest->ownerRegistrationID));
 }