Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-23 00:05:13 +03:00
Code Activity

Module names constants / strings changed again

Browse source
This commit is contained in:
Bertrand Songis 2019-05-28 16:05:25 +02:00
parent 780579054f
commit 8d0be6b748
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
18 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

14
radio/src/gui/128x64/model_setup.cpp
View file

@ -1034,7 +1034,7 @@ void menuModelSetup(event_t event)
else if (isModuleXJT(INTERNAL_MODULE)) { else if (isModuleXJT(INTERNAL_MODULE)) {
g_model.moduleData[INTERNAL_MODULE].rfProtocol = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].rfProtocol, 0, MODULE_SUBTYPE_PXX1_LAST, EE_MODEL, isRfProtocolAvailable); g_model.moduleData[INTERNAL_MODULE].rfProtocol = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].rfProtocol, 0, MODULE_SUBTYPE_PXX1_LAST, EE_MODEL, isRfProtocolAvailable);
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[0].type = MODULE_TYPE_PXX1_XJT; g_model.moduleData[0].type = MODULE_TYPE_XJT_PXX1;
g_model.moduleData[0].channelsStart = 0; g_model.moduleData[0].channelsStart = 0;
g_model.moduleData[0].channelsCount = defaultModuleChannels_M8(INTERNAL_MODULE); g_model.moduleData[0].channelsCount = defaultModuleChannels_M8(INTERNAL_MODULE);
} }
@ -1045,7 +1045,7 @@ void menuModelSetup(event_t event)
} }
#else #else
uint8_t index = 0; uint8_t index = 0;
if (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_PXX2_ISRM) { if (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_ISRM_PXX2) {
index = 1 + g_model.moduleData[INTERNAL_MODULE].subType; index = 1 + g_model.moduleData[INTERNAL_MODULE].subType;
} }
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_ISRM_PXX2_RF_PROTOCOLS, index, attr); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_ISRM_PXX2_RF_PROTOCOLS, index, attr);
@ -1054,7 +1054,7 @@ void menuModelSetup(event_t event)
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
memclear(&g_model.moduleData[INTERNAL_MODULE], sizeof(ModuleData)); memclear(&g_model.moduleData[INTERNAL_MODULE], sizeof(ModuleData));
if (index > 0) { if (index > 0) {
g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_PXX2_ISRM; g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_ISRM_PXX2;
g_model.moduleData[INTERNAL_MODULE].subType = index - 1; g_model.moduleData[INTERNAL_MODULE].subType = index - 1;
g_model.moduleData[INTERNAL_MODULE].channelsCount = defaultModuleChannels_M8(INTERNAL_MODULE); g_model.moduleData[INTERNAL_MODULE].channelsCount = defaultModuleChannels_M8(INTERNAL_MODULE);
} }
@ -1305,7 +1305,7 @@ void menuModelSetup(event_t event)
CHECK_INCDEC_MODELVAR_ZERO(event, moduleData.channelsStart, 32-8-moduleData.channelsCount); CHECK_INCDEC_MODELVAR_ZERO(event, moduleData.channelsStart, 32-8-moduleData.channelsCount);
break; break;
case 1: case 1:
CHECK_INCDEC_MODELVAR_CHECK(event, moduleData.channelsCount, -4, min<int8_t>(maxModuleChannels_M8(moduleIdx), 32-8-moduleData.channelsStart), moduleData.type == MODULE_TYPE_PXX2_ISRM ? isPxx2IsrmChannelsCountAllowed : nullptr); CHECK_INCDEC_MODELVAR_CHECK(event, moduleData.channelsCount, -4, min<int8_t>(maxModuleChannels_M8(moduleIdx), 32-8-moduleData.channelsStart), moduleData.type == MODULE_TYPE_ISRM_PXX2 ? isPxx2IsrmChannelsCountAllowed : nullptr);
if ((k == ITEM_MODEL_SETUP_EXTERNAL_MODULE_CHANNELS && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM)) { if ((k == ITEM_MODEL_SETUP_EXTERNAL_MODULE_CHANNELS && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM)) {
SET_DEFAULT_PPM_FRAME_LENGTH(moduleIdx); SET_DEFAULT_PPM_FRAME_LENGTH(moduleIdx);
} }
@ -1764,7 +1764,7 @@ void menuModelSetup(event_t event)
lcdDrawTextAlignedLeft(y, TR_MULTI_RFPOWER); lcdDrawTextAlignedLeft(y, TR_MULTI_RFPOWER);
if (isModuleR9M_FCC_VARIANT(moduleIdx)) { if (isModuleR9M_FCC_VARIANT(moduleIdx)) {
g_model.moduleData[moduleIdx].pxx.power = min((uint8_t)g_model.moduleData[moduleIdx].pxx.power, (uint8_t)R9M_FCC_POWER_MAX); // Lite FCC has only one setting g_model.moduleData[moduleIdx].pxx.power = min((uint8_t)g_model.moduleData[moduleIdx].pxx.power, (uint8_t)R9M_FCC_POWER_MAX); // Lite FCC has only one setting
if (g_model.moduleData[moduleIdx].type == MODULE_TYPE_PXX1_R9M_LITE) { // R9M lite FCC has only one power value, so displayed for info only if (g_model.moduleData[moduleIdx].type == MODULE_TYPE_R9M_LITE_PXX1) { // R9M lite FCC has only one power value, so displayed for info only
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_LITE_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_LITE_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT);
if (attr) if (attr)
REPEAT_LAST_CURSOR_MOVE(); REPEAT_LAST_CURSOR_MOVE();
@ -1775,7 +1775,7 @@ void menuModelSetup(event_t event)
CHECK_INCDEC_MODELVAR_ZERO(event, g_model.moduleData[moduleIdx].pxx.power, R9M_FCC_POWER_MAX); CHECK_INCDEC_MODELVAR_ZERO(event, g_model.moduleData[moduleIdx].pxx.power, R9M_FCC_POWER_MAX);
} }
} }
else if (g_model.moduleData[moduleIdx].type == MODULE_TYPE_PXX1_R9M_LITE) { else if (g_model.moduleData[moduleIdx].type == MODULE_TYPE_R9M_LITE_PXX1) {
g_model.moduleData[moduleIdx].pxx.power = min((uint8_t)g_model.moduleData[moduleIdx].pxx.power, (uint8_t)R9M_LITE_LBT_POWER_MAX); g_model.moduleData[moduleIdx].pxx.power = min((uint8_t)g_model.moduleData[moduleIdx].pxx.power, (uint8_t)R9M_LITE_LBT_POWER_MAX);
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_LITE_LBT_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_LITE_LBT_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr);
if (attr) { if (attr) {
@ -1788,7 +1788,7 @@ void menuModelSetup(event_t event)
reusableBuffer.moduleSetup.r9mPower = g_model.moduleData[moduleIdx].pxx.power; reusableBuffer.moduleSetup.r9mPower = g_model.moduleData[moduleIdx].pxx.power;
} }
} }
else if (g_model.moduleData[moduleIdx].type == MODULE_TYPE_PXX1_R9M) { else if (g_model.moduleData[moduleIdx].type == MODULE_TYPE_R9M_PXX1) {
g_model.moduleData[moduleIdx].pxx.power = min((uint8_t)g_model.moduleData[moduleIdx].pxx.power, (uint8_t)R9M_LBT_POWER_MAX); g_model.moduleData[moduleIdx].pxx.power = min((uint8_t)g_model.moduleData[moduleIdx].pxx.power, (uint8_t)R9M_LBT_POWER_MAX);
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_LBT_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_LBT_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr);
if (attr) { if (attr) {

4
radio/src/gui/212x64/model_setup.cpp
View file

@ -674,7 +674,7 @@ void menuModelSetup(event_t event)
if (attr && s_editMode>0) { if (attr && s_editMode>0) {
switch (menuHorizontalPosition) { switch (menuHorizontalPosition) {
case 0: case 0:
g_model.moduleData[INTERNAL_MODULE].type = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].type, MODULE_TYPE_NONE, MODULE_TYPE_PXX1_XJT, EE_MODEL, isModuleAvailable); g_model.moduleData[INTERNAL_MODULE].type = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].type, MODULE_TYPE_NONE, MODULE_TYPE_XJT_PXX1, EE_MODEL, isModuleAvailable);
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[INTERNAL_MODULE].rfProtocol = 0; g_model.moduleData[INTERNAL_MODULE].rfProtocol = 0;
g_model.moduleData[INTERNAL_MODULE].channelsStart = 0; g_model.moduleData[INTERNAL_MODULE].channelsStart = 0;
@ -698,7 +698,7 @@ void menuModelSetup(event_t event)
g_model.moduleData[INTERNAL_MODULE].rfProtocol = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].rfProtocol, -1, MODULE_SUBTYPE_PXX1_LAST, EE_MODEL, isRfProtocolAvailable); g_model.moduleData[INTERNAL_MODULE].rfProtocol = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].rfProtocol, -1, MODULE_SUBTYPE_PXX1_LAST, EE_MODEL, isRfProtocolAvailable);
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_PXX1_XJT; g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_XJT_PXX1;
g_model.moduleData[INTERNAL_MODULE].channelsStart = 0; g_model.moduleData[INTERNAL_MODULE].channelsStart = 0;
g_model.moduleData[INTERNAL_MODULE].channelsCount = defaultModuleChannels_M8(INTERNAL_MODULE); g_model.moduleData[INTERNAL_MODULE].channelsCount = defaultModuleChannels_M8(INTERNAL_MODULE);
if (g_model.moduleData[INTERNAL_MODULE].rfProtocol == MODULE_SUBTYPE_PXX1_OFF) if (g_model.moduleData[INTERNAL_MODULE].rfProtocol == MODULE_SUBTYPE_PXX1_OFF)

2
radio/src/gui/212x64/model_telemetry.cpp
View file

@ -214,7 +214,7 @@ void menuModelTelemetryFrsky(event_t event)
case ITEM_TELEMETRY_RSSI_LABEL: case ITEM_TELEMETRY_RSSI_LABEL:
#if defined(MULTIMODULE) #if defined(MULTIMODULE)
if (g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_PXX1_XJT && if (g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_XJT_PXX1 &&
g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_MULTIMODULE && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_MULTIMODULE &&
g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol(false) == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol(false) == MODULE_SUBTYPE_MULTI_FS_AFHDS2A)
lcdDrawTextAlignedLeft(y, "RSNR"); lcdDrawTextAlignedLeft(y, "RSNR");

2
radio/src/gui/480x272/model_setup.cpp
View file

@ -943,7 +943,7 @@ bool menuModelSetup(event_t event)
else if (isModuleXJT(INTERNAL_MODULE)) { else if (isModuleXJT(INTERNAL_MODULE)) {
g_model.moduleData[INTERNAL_MODULE].rfProtocol = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].rfProtocol, MODULE_SUBTYPE_PXX1_ACCST_D16, MODULE_SUBTYPE_PXX1_LAST, EE_MODEL, isRfProtocolAvailable); g_model.moduleData[INTERNAL_MODULE].rfProtocol = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].rfProtocol, MODULE_SUBTYPE_PXX1_ACCST_D16, MODULE_SUBTYPE_PXX1_LAST, EE_MODEL, isRfProtocolAvailable);
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[0].type = MODULE_TYPE_PXX1_XJT; g_model.moduleData[0].type = MODULE_TYPE_XJT_PXX1;
g_model.moduleData[0].channelsStart = 0; g_model.moduleData[0].channelsStart = 0;
g_model.moduleData[0].channelsCount = defaultModuleChannels_M8(INTERNAL_MODULE); g_model.moduleData[0].channelsCount = defaultModuleChannels_M8(INTERNAL_MODULE);
} }

28
radio/src/gui/gui_common.cpp
View file

@ -555,11 +555,11 @@ bool isModuleUSingSport(uint8_t moduleBay, uint8_t moduleType)
case MODULE_TYPE_PPM: case MODULE_TYPE_PPM:
case MODULE_TYPE_DSM2: case MODULE_TYPE_DSM2:
case MODULE_TYPE_MULTIMODULE: case MODULE_TYPE_MULTIMODULE:
case MODULE_TYPE_PXX2_R9M_LITE: case MODULE_TYPE_R9M_LITE_PXX2:
case MODULE_TYPE_PXX2_R9M_LITE_PRO: case MODULE_TYPE_R9M_LITE_PRO_PXX2:
return false; return false;
case MODULE_TYPE_PXX2_ISRM: case MODULE_TYPE_ISRM_PXX2:
if (moduleBay == EXTERNAL_MODULE) if (moduleBay == EXTERNAL_MODULE)
return false; return false;
@ -579,15 +579,15 @@ bool isInternalModuleAvailable(int moduleType)
return true; return true;
#if defined(PXX1) && defined(INTERNAL_MODULE_PXX1) #if defined(PXX1) && defined(INTERNAL_MODULE_PXX1)
if (moduleType == MODULE_TYPE_PXX1_XJT) if (moduleType == MODULE_TYPE_XJT_PXX1)
return !isModuleUSingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type); return !isModuleUSingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type);
#else #else
if (moduleType == MODULE_TYPE_PXX1_XJT) if (moduleType == MODULE_TYPE_XJT_PXX1)
return false; return false;
#endif #endif
#if defined(PXX2) #if defined(PXX2)
if (moduleType == MODULE_TYPE_PXX2_ISRM) if (moduleType == MODULE_TYPE_ISRM_PXX2)
#if defined(INTMODULE_USART) #if defined(INTMODULE_USART)
return true; return true;
#else #else
@ -602,30 +602,30 @@ bool isInternalModuleAvailable(int moduleType)
bool isExternalModuleAvailable(int moduleType) bool isExternalModuleAvailable(int moduleType)
{ {
#if !defined(PCBXLITE) && !defined(PCBX9LITE) #if !defined(PCBXLITE) && !defined(PCBX9LITE)
if (moduleType == MODULE_TYPE_PXX1_R9M_LITE || moduleType == MODULE_TYPE_PXX2_R9M_LITE || moduleType == MODULE_TYPE_PXX2_R9M_LITE_PRO) if (moduleType == MODULE_TYPE_R9M_LITE_PXX1 || moduleType == MODULE_TYPE_R9M_LITE_PXX2 || moduleType == MODULE_TYPE_R9M_LITE_PRO_PXX2)
return false; return false;
#endif #endif
#if !defined(PXX1) #if !defined(PXX1)
if (moduleType == MODULE_TYPE_PXX1_XJT || moduleType == MODULE_TYPE_PXX1_R9M || moduleType == MODULE_TYPE_PXX1_R9M_LITE) if (moduleType == MODULE_TYPE_XJT_PXX1 || moduleType == MODULE_TYPE_R9M_PXX1 || moduleType == MODULE_TYPE_R9M_LITE_PXX1)
return false; return false;
#endif #endif
#if !defined(XJT) #if !defined(XJT)
if (moduleType == MODULE_TYPE_PXX1_XJT) if (moduleType == MODULE_TYPE_XJT_PXX1)
return false; return false;
#endif #endif
#if !defined(R9M_SIZE_STD) #if !defined(R9M_SIZE_STD)
if (moduleType == MODULE_TYPE_PXX1_R9M) if (moduleType == MODULE_TYPE_R9M_PXX1)
return false; return false;
#endif #endif
if (moduleType == MODULE_TYPE_PXX2_ISRM || moduleType == MODULE_TYPE_PXX2_R9M) if (moduleType == MODULE_TYPE_ISRM_PXX2 || moduleType == MODULE_TYPE_R9M_PXX2)
return false; return false;
#if !defined(PXX2) #if !defined(PXX2)
if (moduleType == MODULE_TYPE_PXX2_R9M || moduleType == MODULE_TYPE_PXX2_R9M_LITE || moduleType == MODULE_TYPE_PXX2_R9M_LITE_PRO) { if (moduleType == MODULE_TYPE_R9M_PXX2 || moduleType == MODULE_TYPE_R9M_LITE_PXX2 || moduleType == MODULE_TYPE_R9M_LITE_PRO_PXX2) {
return false; return false;
} }
#endif #endif
@ -676,10 +676,10 @@ bool isRfProtocolAvailable(int protocol)
} }
#endif #endif
#if defined(PCBTARANIS) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
if (protocol != MODULE_SUBTYPE_PXX1_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PXX1_R9M) { if (protocol != MODULE_SUBTYPE_PXX1_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_R9M_PXX1) {
return false; return false;
} }
if (protocol != MODULE_SUBTYPE_PXX1_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PXX2_R9M) { if (protocol != MODULE_SUBTYPE_PXX1_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_R9M_PXX2) {
return false; return false;
} }
#endif #endif

2
radio/src/gui/gui_common.h
View file

@ -160,7 +160,7 @@ const mm_protocol_definition *getMultiProtocolDefinition (uint8_t protocol);
#define EXTERNAL_MODULE_OPTION_ROW (isModuleR9M(EXTERNAL_MODULE) || isModuleSBUS(EXTERNAL_MODULE) ? TITLE_ROW : MULTIMODULE_OPTIONS_ROW) #define EXTERNAL_MODULE_OPTION_ROW (isModuleR9M(EXTERNAL_MODULE) || isModuleSBUS(EXTERNAL_MODULE) ? TITLE_ROW : MULTIMODULE_OPTIONS_ROW)
#define EXTERNAL_MODULE_POWER_ROW (isModuleMultimodule(EXTERNAL_MODULE) || isModuleR9M(EXTERNAL_MODULE)) ? (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PXX1_R9M_LITE ? TITLE_ROW : (uint8_t) 0) : HIDDEN_ROW #define EXTERNAL_MODULE_POWER_ROW (isModuleMultimodule(EXTERNAL_MODULE) || isModuleR9M(EXTERNAL_MODULE)) ? (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_R9M_LITE_PXX1 ? TITLE_ROW : (uint8_t) 0) : HIDDEN_ROW
void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event, LcdFlags flags); void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event, LcdFlags flags);

2
radio/src/opentx.cpp
View file

@ -473,7 +473,7 @@ void modelDefault(uint8_t id)
#endif #endif
#if defined(HARDWARE_INTERNAL_MODULE) #if defined(HARDWARE_INTERNAL_MODULE)
g_model.moduleData[INTERNAL_MODULE].type = IS_PXX2_INTERNAL_ENABLED() ? MODULE_TYPE_PXX2_ISRM : MODULE_TYPE_PXX1_XJT; g_model.moduleData[INTERNAL_MODULE].type = IS_PXX2_INTERNAL_ENABLED() ? MODULE_TYPE_ISRM_PXX2 : MODULE_TYPE_XJT_PXX1;
g_model.moduleData[INTERNAL_MODULE].channelsCount = defaultModuleChannels_M8(INTERNAL_MODULE); g_model.moduleData[INTERNAL_MODULE].channelsCount = defaultModuleChannels_M8(INTERNAL_MODULE);
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
g_model.moduleData[EXTERNAL_MODULE].type = MODULE_TYPE_PPM; g_model.moduleData[EXTERNAL_MODULE].type = MODULE_TYPE_PPM;

14
radio/src/pulses/modules_constants.h
View file

@ -1,16 +1,16 @@
enum ModuleType { enum ModuleType {
MODULE_TYPE_NONE = 0, MODULE_TYPE_NONE = 0,
MODULE_TYPE_PPM, MODULE_TYPE_PPM,
MODULE_TYPE_PXX1_XJT, MODULE_TYPE_XJT_PXX1,
MODULE_TYPE_PXX2_ISRM, MODULE_TYPE_ISRM_PXX2,
MODULE_TYPE_DSM2, MODULE_TYPE_DSM2,
MODULE_TYPE_CROSSFIRE, MODULE_TYPE_CROSSFIRE,
MODULE_TYPE_MULTIMODULE, MODULE_TYPE_MULTIMODULE,
MODULE_TYPE_PXX1_R9M, MODULE_TYPE_R9M_PXX1,
MODULE_TYPE_PXX2_R9M, MODULE_TYPE_R9M_PXX2,
MODULE_TYPE_PXX1_R9M_LITE, MODULE_TYPE_R9M_LITE_PXX1,
MODULE_TYPE_PXX2_R9M_LITE, MODULE_TYPE_R9M_LITE_PXX2,
MODULE_TYPE_PXX2_R9M_LITE_PRO, MODULE_TYPE_R9M_LITE_PRO_PXX2,
MODULE_TYPE_SBUS, MODULE_TYPE_SBUS,
MODULE_TYPE_MAX = MODULE_TYPE_SBUS, MODULE_TYPE_MAX = MODULE_TYPE_SBUS,
MODULE_TYPE_COUNT MODULE_TYPE_COUNT

10
radio/src/pulses/modules_helpers.h
View file

@ -51,17 +51,17 @@ inline bool isModuleMultimoduleDSM2(uint8_t)
inline bool isModuleXJT(uint8_t idx) inline bool isModuleXJT(uint8_t idx)
{ {
return g_model.moduleData[idx].type == MODULE_TYPE_PXX1_XJT; return g_model.moduleData[idx].type == MODULE_TYPE_XJT_PXX1;
} }
inline bool isModuleXJT2(uint8_t idx) inline bool isModuleXJT2(uint8_t idx)
{ {
return g_model.moduleData[idx].type == MODULE_TYPE_PXX2_ISRM; return g_model.moduleData[idx].type == MODULE_TYPE_ISRM_PXX2;
} }
inline bool isModuleXJTVariant(uint8_t idx) inline bool isModuleXJTVariant(uint8_t idx)
{ {
return g_model.moduleData[idx].type == MODULE_TYPE_PXX1_XJT || g_model.moduleData[idx].type == MODULE_TYPE_PXX2_ISRM; return g_model.moduleData[idx].type == MODULE_TYPE_XJT_PXX1 || g_model.moduleData[idx].type == MODULE_TYPE_ISRM_PXX2;
} }
@ -105,12 +105,12 @@ inline bool isModulePPM(uint8_t idx)
inline bool isModuleR9M(uint8_t idx) inline bool isModuleR9M(uint8_t idx)
{ {
return g_model.moduleData[idx].type == MODULE_TYPE_PXX1_R9M || g_model.moduleData[idx].type == MODULE_TYPE_PXX1_R9M_LITE; return g_model.moduleData[idx].type == MODULE_TYPE_R9M_PXX1 || g_model.moduleData[idx].type == MODULE_TYPE_R9M_LITE_PXX1;
} }
inline bool isModuleR9M2(uint8_t idx) inline bool isModuleR9M2(uint8_t idx)
{ {
return g_model.moduleData[idx].type == MODULE_TYPE_PXX2_R9M || g_model.moduleData[idx].type == MODULE_TYPE_PXX2_R9M_LITE || g_model.moduleData[idx].type == MODULE_TYPE_PXX2_R9M_LITE_PRO; return g_model.moduleData[idx].type == MODULE_TYPE_R9M_PXX2 || g_model.moduleData[idx].type == MODULE_TYPE_R9M_LITE_PXX2 || g_model.moduleData[idx].type == MODULE_TYPE_R9M_LITE_PRO_PXX2;
} }

14
radio/src/pulses/pulses.cpp
View file

@ -54,7 +54,7 @@ uint8_t getRequiredProtocol(uint8_t module)
protocol = PROTOCOL_CHANNELS_PPM; protocol = PROTOCOL_CHANNELS_PPM;
break; break;
case MODULE_TYPE_PXX1_XJT: case MODULE_TYPE_XJT_PXX1:
#if defined(INTMODULE_USART) #if defined(INTMODULE_USART)
if (module == INTERNAL_MODULE) { if (module == INTERNAL_MODULE) {
protocol = PROTOCOL_CHANNELS_PXX1_SERIAL; protocol = PROTOCOL_CHANNELS_PXX1_SERIAL;
@ -63,18 +63,18 @@ uint8_t getRequiredProtocol(uint8_t module)
#endif #endif
// no break // no break
case MODULE_TYPE_PXX1_R9M: case MODULE_TYPE_R9M_PXX1:
protocol = PROTOCOL_CHANNELS_PXX1_PULSES; protocol = PROTOCOL_CHANNELS_PXX1_PULSES;
break; break;
case MODULE_TYPE_PXX1_R9M_LITE: case MODULE_TYPE_R9M_LITE_PXX1:
protocol = PROTOCOL_CHANNELS_PXX1_SERIAL; protocol = PROTOCOL_CHANNELS_PXX1_SERIAL;
break; break;
case MODULE_TYPE_PXX2_ISRM: case MODULE_TYPE_ISRM_PXX2:
case MODULE_TYPE_PXX2_R9M: case MODULE_TYPE_R9M_PXX2:
case MODULE_TYPE_PXX2_R9M_LITE: case MODULE_TYPE_R9M_LITE_PXX2:
case MODULE_TYPE_PXX2_R9M_LITE_PRO: case MODULE_TYPE_R9M_LITE_PRO_PXX2:
protocol = PROTOCOL_CHANNELS_PXX2; protocol = PROTOCOL_CHANNELS_PXX2;
break; break;

2
radio/src/pulses/pulses.h
View file

@ -411,5 +411,5 @@ enum R9MLBTPowerValues {
}; };
#define BIND_CH9TO16_ALLOWED(idx) (!isModuleR9M_LBT(idx) || g_model.moduleData[idx].pxx.power != R9M_LBT_POWER_25) #define BIND_CH9TO16_ALLOWED(idx) (!isModuleR9M_LBT(idx) || g_model.moduleData[idx].pxx.power != R9M_LBT_POWER_25)
#define BIND_TELEM_ALLOWED(idx) (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PXX1_R9M) ? (!(IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) && (!isModuleR9M_LBT(idx) || g_model.moduleData[idx].pxx.power < R9M_LBT_POWER_200)) : (!(IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) && (!isModuleR9M_LBT(idx) || g_model.moduleData[idx].pxx.power < R9M_LITE_LBT_POWER_100)) #define BIND_TELEM_ALLOWED(idx) (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_R9M_PXX1) ? (!(IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) && (!isModuleR9M_LBT(idx) || g_model.moduleData[idx].pxx.power < R9M_LBT_POWER_200)) : (!(IS_TELEMETRY_INTERNAL_MODULE() && moduleIdx == EXTERNAL_MODULE) && (!isModuleR9M_LBT(idx) || g_model.moduleData[idx].pxx.power < R9M_LITE_LBT_POWER_100))
#endif // _PULSES_H_ #endif // _PULSES_H_

2
radio/src/pulses/pxx2.cpp
View file

@ -354,7 +354,7 @@ void Pxx2Pulses::setupFrame(uint8_t module)
setupRegisterFrame(module); setupRegisterFrame(module);
break; break;
case MODULE_MODE_BIND: case MODULE_MODE_BIND:
if (g_model.moduleData[module].type == MODULE_TYPE_PXX2_ISRM && g_model.moduleData[module].subType != MODULE_SUBTYPE_ISRM_PXX2_ACCESS) if (g_model.moduleData[module].type == MODULE_TYPE_ISRM_PXX2 && g_model.moduleData[module].subType != MODULE_SUBTYPE_ISRM_PXX2_ACCESS)
setupAccstBindFrame(module); setupAccstBindFrame(module);
else else
setupAccessBindFrame(module); setupAccessBindFrame(module);

4
radio/src/storage/conversions/conversions_216_218.cpp
View file

@ -1059,7 +1059,7 @@ void convertModelData_216_to_217(ModelData &model)
} }
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
newModel.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_PXX1_XJT; newModel.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_XJT_PXX1;
#endif #endif
newModel.moduleData[EXTERNAL_MODULE].type = oldModel.externalModule; 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++) { for (int i=0; i<MAX_OUTPUT_CHANNELS; i++) {
newModel.limitData[i] = oldModel.limitData[i]; newModel.limitData[i] = oldModel.limitData[i];
#if defined(PCBTARANIS) #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; newModel.limitData[i].ppmCenter = (oldModel.limitData[i].ppmCenter * 612) / 1024;
} }
#endif #endif

4
radio/src/storage/conversions/conversions_218_219.cpp
View file

@ -180,9 +180,9 @@ void convertModelData_218_to_219(ModelData &model)
for (int i=0; i<NUM_MODULES; i++) { for (int i=0; i<NUM_MODULES; i++) {
memcpy(&newModel.moduleData[i], &oldModel.moduleData[i], 4); memcpy(&newModel.moduleData[i], &oldModel.moduleData[i], 4);
memcpy(((uint8_t *)&newModel.moduleData[i]) + 4, ((uint8_t *)&oldModel.moduleData[i]) + 64 + 4, 2); 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; 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; newModel.moduleData[i].type += 4;
} }

2
radio/src/storage/storage_common.cpp
View file

@ -57,7 +57,7 @@ void preModelLoad()
static void fixUpModel() static void fixUpModel()
{ {
// Ensure that when rfProtocol is MODULE_SUBTYPE_PXX1_OFF the type of the module is MODULE_TYPE_NONE // 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; g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_NONE;
} }
#endif #endif

2
radio/src/targets/taranis/extmodule_driver.cpp
View file

@ -214,7 +214,7 @@ extern "C" void EXTMODULE_USART_IRQHandler(void)
void extmodulePxx2Start() void extmodulePxx2Start()
{ {
extmoduleInvertedSerialStart(g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PXX2_R9M_LITE_PRO ? 450000 : 230400); extmoduleInvertedSerialStart(g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_R9M_LITE_PRO_PXX2 ? 450000 : 230400);
} }
#else #else
void extmodulePxx2Start() void extmodulePxx2Start()

2
radio/src/telemetry/telemetry.h
View file

@ -238,7 +238,7 @@ extern Fifo<uint8_t, LUA_TELEMETRY_INPUT_FIFO_SIZE> * luaInputTelemetryFifo;
#endif #endif
#if defined(STM32) #if defined(STM32)
#define IS_TELEMETRY_INTERNAL_MODULE() (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_PXX1_XJT) #define IS_TELEMETRY_INTERNAL_MODULE() (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_XJT_PXX1)
#else #else
#define IS_TELEMETRY_INTERNAL_MODULE() (false) #define IS_TELEMETRY_INTERNAL_MODULE() (false)
#endif #endif

6
radio/src/tests/conversions.cpp
View file

@ -47,7 +47,7 @@ TEST(Conversions, ConversionX9DPFrom22)
EXPECT_EQ(SWASH_TYPE_120X, g_model.swashR.type); EXPECT_EQ(SWASH_TYPE_120X, g_model.swashR.type);
EXPECT_EQ(10, g_model.flightModeData[0].gvars[0]); EXPECT_EQ(10, g_model.flightModeData[0].gvars[0]);
EXPECT_ZSTREQ("Tes", g_model.gvars[0].name); EXPECT_ZSTREQ("Tes", g_model.gvars[0].name);
EXPECT_EQ(MODULE_TYPE_PXX1_R9M, g_model.moduleData[EXTERNAL_MODULE].type); EXPECT_EQ(MODULE_TYPE_R9M_PXX1, g_model.moduleData[EXTERNAL_MODULE].type);
EXPECT_EQ(MODULE_SUBTYPE_R9M_FCC, g_model.moduleData[EXTERNAL_MODULE].subType); EXPECT_EQ(MODULE_SUBTYPE_R9M_FCC, g_model.moduleData[EXTERNAL_MODULE].subType);
EXPECT_ZSTREQ("Thr", g_model.inputNames[0]); EXPECT_ZSTREQ("Thr", g_model.inputNames[0]);
EXPECT_ZSTREQ("Tes", g_model.telemetrySensors[0].label); EXPECT_ZSTREQ("Tes", g_model.telemetrySensors[0].label);
@ -66,7 +66,7 @@ TEST(Conversions, ConversionX7From22)
eeLoadModel(0); eeLoadModel(0);
EXPECT_ZSTREQ("Test", g_model.header.name); EXPECT_ZSTREQ("Test", g_model.header.name);
EXPECT_EQ(MODULE_TYPE_PXX1_R9M, g_model.moduleData[EXTERNAL_MODULE].type); EXPECT_EQ(MODULE_TYPE_R9M_PXX1, g_model.moduleData[EXTERNAL_MODULE].type);
EXPECT_EQ(MODULE_SUBTYPE_R9M_EU, g_model.moduleData[EXTERNAL_MODULE].subType); EXPECT_EQ(MODULE_SUBTYPE_R9M_EU, g_model.moduleData[EXTERNAL_MODULE].subType);
EXPECT_EQ(80, g_model.mixData[0].weight); EXPECT_EQ(80, g_model.mixData[0].weight);
EXPECT_EQ(80, g_model.expoData[0].weight); EXPECT_EQ(80, g_model.expoData[0].weight);
@ -111,7 +111,7 @@ TEST(Conversions, ConversionHorusFrom22)
EXPECT_ZSTREQ("Tes", g_model.flightModeData[0].name); EXPECT_ZSTREQ("Tes", g_model.flightModeData[0].name);
EXPECT_EQ(10, g_model.flightModeData[0].gvars[0]); EXPECT_EQ(10, g_model.flightModeData[0].gvars[0]);
EXPECT_ZSTREQ("Tes", g_model.gvars[0].name); EXPECT_ZSTREQ("Tes", g_model.gvars[0].name);
EXPECT_EQ(MODULE_TYPE_PXX1_R9M, g_model.moduleData[EXTERNAL_MODULE].type); EXPECT_EQ(MODULE_TYPE_R9M_PXX1, g_model.moduleData[EXTERNAL_MODULE].type);
EXPECT_EQ(MODULE_SUBTYPE_R9M_EU, g_model.moduleData[EXTERNAL_MODULE].subType); EXPECT_EQ(MODULE_SUBTYPE_R9M_EU, g_model.moduleData[EXTERNAL_MODULE].subType);
EXPECT_ZSTREQ("Rud", g_model.inputNames[0]); EXPECT_ZSTREQ("Rud", g_model.inputNames[0]);
EXPECT_ZSTREQ("Tes", g_model.telemetrySensors[0].label); EXPECT_ZSTREQ("Tes", g_model.telemetrySensors[0].label);