Module names constants / strings changed again

This commit is contained in:
Bertrand Songis
2019-05-28 16:05:25 +02:00
parent 780579054f
commit 8d0be6b748
18 changed files with 58 additions and 58 deletions
@@ -1059,7 +1059,7 @@ void convertModelData_216_to_217(ModelData &model)
}
#if defined(PCBTARANIS)
newModel.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_PXX1_XJT;
newModel.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_XJT_PXX1;
#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_PXX1_XJT || newModel.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PXX1_XJT) {
if (newModel.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_XJT_PXX1 || newModel.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_XJT_PXX1) {
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_PXX2_ISRM)
if (newModel.moduleData[i].type >= MODULE_TYPE_ISRM_PXX2)
newModel.moduleData[i].type += 1;
if (newModel.moduleData[i].type >= MODULE_TYPE_PXX2_R9M)
if (newModel.moduleData[i].type >= MODULE_TYPE_R9M_PXX2)
newModel.moduleData[i].type += 4;
}
+1 -1
View File
@@ -57,7 +57,7 @@ void preModelLoad()
static void fixUpModel()
{
// 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)
if (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_XJT_PXX1 && g_model.moduleData[INTERNAL_MODULE].rfProtocol == MODULE_SUBTYPE_PXX1_OFF)
g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_NONE;
}
#endif