Bsongis/accst support over pxx2 (#6455)

ACCST support over PXX2
This commit is contained in:
Bertrand Songis
2019-05-27 17:23:17 +02:00
committed by GitHub
parent bca162f4a5
commit 4d07faa8e0
46 changed files with 669 additions and 697 deletions
@@ -1059,7 +1059,7 @@ void convertModelData_216_to_217(ModelData &model)
}
#if defined(PCBTARANIS)
newModel.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_PXX_XJT;
newModel.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_PXX1_XJT;
#endif
newModel.moduleData[EXTERNAL_MODULE].type = oldModel.externalModule;
@@ -1140,7 +1140,7 @@ void convertModelData_217_to_218(ModelData &model)
for (int i=0; i<MAX_OUTPUT_CHANNELS; i++) {
newModel.limitData[i] = oldModel.limitData[i];
#if defined(PCBTARANIS)
if (newModel.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_PXX_XJT || newModel.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PXX_XJT) {
if (newModel.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_PXX1_XJT || newModel.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PXX1_XJT) {
newModel.limitData[i].ppmCenter = (oldModel.limitData[i].ppmCenter * 612) / 1024;
}
#endif
@@ -180,9 +180,9 @@ void convertModelData_218_to_219(ModelData &model)
for (int i=0; i<NUM_MODULES; i++) {
memcpy(&newModel.moduleData[i], &oldModel.moduleData[i], 4);
memcpy(((uint8_t *)&newModel.moduleData[i]) + 4, ((uint8_t *)&oldModel.moduleData[i]) + 64 + 4, 2);
if (newModel.moduleData[i].type >= MODULE_TYPE_ACCESS_ISRM)
if (newModel.moduleData[i].type >= MODULE_TYPE_PXX2_ISRM)
newModel.moduleData[i].type += 1;
if (newModel.moduleData[i].type >= MODULE_TYPE_ACCESS_R9M)
if (newModel.moduleData[i].type >= MODULE_TYPE_PXX2_R9M)
newModel.moduleData[i].type += 4;
}
+2 -2
View File
@@ -56,8 +56,8 @@ void preModelLoad()
#if defined(PCBTARANIS) || defined(PCBHORUS)
static void fixUpModel()
{
// Ensure that when rfProtocol is ACCST_RF_PROTO_OFF the type of the module is MODULE_TYPE_NONE
if (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_PXX_XJT && g_model.moduleData[INTERNAL_MODULE].rfProtocol == ACCST_RF_PROTO_OFF)
// Ensure that when rfProtocol is MODULE_SUBTYPE_PXX1_OFF the type of the module is MODULE_TYPE_NONE
if (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_PXX1_XJT && g_model.moduleData[INTERNAL_MODULE].rfProtocol == MODULE_SUBTYPE_PXX1_OFF)
g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_NONE;
}
#endif