From 74b63eca0b1216a220e35046e2946c87da8e0a6e Mon Sep 17 00:00:00 2001 From: 3djc Date: Wed, 3 Apr 2019 12:27:05 +0200 Subject: [PATCH] Datacopy update --- radio/src/storage/datacopy.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/radio/src/storage/datacopy.cpp b/radio/src/storage/datacopy.cpp index f2718ffaa..c8f8607a5 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 Tue Mar 19 19:58:50 2019. Do not edit this file! +//This file was auto-generated by generate_datacopy.py script on Wed Apr 3 12:26:41 2019. Do not edit this file! @@ -179,7 +179,7 @@ template void copyTelemetrySensor(A * dest, B * src) { dest->id = src->id; - dest->instance = src->instance; + copyTelemetrySensor_frskyInstance(&dest->frskyInstance, &src->frskyInstance); memcpy(dest->label, src->label, sizeof(dest->label)); dest->type = src->type; dest->unit = src->unit; @@ -205,12 +205,6 @@ void copyTrainerModuleData(A * dest, B * src) dest->pulsePol = src->pulsePol; } -template -void copyReceiverData(A * dest, B * src) -{ - memcpy(dest->name, src->name, sizeof(dest->name)); -} - template void copyModuleData(A * dest, B * src) { @@ -284,9 +278,6 @@ void copyModelData(A * dest, B * src) for (int i=0; i<2; i++) { copyModuleData(&dest->moduleData[i], &src->moduleData[i]); } - for (int i=0; i<10; i++) { - copyReceiverData(&dest->receiverData[i], &src->receiverData[i]); - } memcpy(dest->failsafeChannels, src->failsafeChannels, sizeof(dest->failsafeChannels)); copyTrainerModuleData(&dest->trainerData, &src->trainerData); memcpy(dest->modelRegistrationID, src->modelRegistrationID, sizeof(dest->modelRegistrationID)); @@ -349,6 +340,13 @@ void copyCustomFunctionData_all(A * dest, B * src) dest->param = src->param; } +template +void copyTelemetrySensor_frskyInstance(A * dest, B * src) +{ + dest->physID = src->physID; + dest->rxIndex = src->rxIndex; +} + template void copyModuleData_r9m(A * dest, B * src) {