Turn off external module while changing type (#6902)
Turn off ext module while changing types
This commit is contained in:
@@ -369,6 +369,8 @@ void menuModelSetup(event_t event)
|
|||||||
if (event == EVT_ENTRY || event == EVT_ENTRY_UP) {
|
if (event == EVT_ENTRY || event == EVT_ENTRY_UP) {
|
||||||
memclear(&reusableBuffer.moduleSetup, sizeof(reusableBuffer.moduleSetup));
|
memclear(&reusableBuffer.moduleSetup, sizeof(reusableBuffer.moduleSetup));
|
||||||
reusableBuffer.moduleSetup.r9mPower = g_model.moduleData[EXTERNAL_MODULE].pxx.power;
|
reusableBuffer.moduleSetup.r9mPower = g_model.moduleData[EXTERNAL_MODULE].pxx.power;
|
||||||
|
reusableBuffer.moduleSetup.previousType = g_model.moduleData[EXTERNAL_MODULE].type;
|
||||||
|
reusableBuffer.moduleSetup.newType = g_model.moduleData[EXTERNAL_MODULE].type;
|
||||||
#if defined(INTERNAL_MODULE_PXX1) && defined(EXTERNAL_ANTENNA)
|
#if defined(INTERNAL_MODULE_PXX1) && defined(EXTERNAL_ANTENNA)
|
||||||
reusableBuffer.moduleSetup.antennaMode = g_model.moduleData[INTERNAL_MODULE].pxx.antennaMode;
|
reusableBuffer.moduleSetup.antennaMode = g_model.moduleData[INTERNAL_MODULE].pxx.antennaMode;
|
||||||
#endif
|
#endif
|
||||||
@@ -828,7 +830,7 @@ void menuModelSetup(event_t event)
|
|||||||
|
|
||||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_TYPE:
|
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_TYPE:
|
||||||
lcdDrawTextAlignedLeft(y, INDENT TR_MODE);
|
lcdDrawTextAlignedLeft(y, INDENT TR_MODE);
|
||||||
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_EXTERNAL_MODULE_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].type, menuHorizontalPosition==0 ? attr : 0);
|
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_EXTERNAL_MODULE_PROTOCOLS, reusableBuffer.moduleSetup.newType, menuHorizontalPosition==0 ? attr : 0);
|
||||||
if (isModuleXJT(EXTERNAL_MODULE))
|
if (isModuleXJT(EXTERNAL_MODULE))
|
||||||
lcdDrawTextAtIndex(lcdNextPos + 3, y, STR_XJT_ACCST_RF_PROTOCOLS, 1+g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==1 ? attr : 0);
|
lcdDrawTextAtIndex(lcdNextPos + 3, y, STR_XJT_ACCST_RF_PROTOCOLS, 1+g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==1 ? attr : 0);
|
||||||
else if (isModuleDSM2(EXTERNAL_MODULE))
|
else if (isModuleDSM2(EXTERNAL_MODULE))
|
||||||
@@ -846,24 +848,25 @@ void menuModelSetup(event_t event)
|
|||||||
#endif
|
#endif
|
||||||
#if defined(PCBTARANIS)
|
#if defined(PCBTARANIS)
|
||||||
if (attr && menuHorizontalPosition == 0) {
|
if (attr && menuHorizontalPosition == 0) {
|
||||||
if (s_editMode > 0)
|
if (s_editMode > 0) {
|
||||||
EXTERNAL_MODULE_OFF();
|
g_model.moduleData[EXTERNAL_MODULE].type = MODULE_TYPE_NONE;
|
||||||
else
|
}
|
||||||
if(g_model.moduleData[EXTERNAL_MODULE].type != MODULE_TYPE_NONE)
|
else if (reusableBuffer.moduleSetup.newType != reusableBuffer.moduleSetup.previousType) {
|
||||||
EXTERNAL_MODULE_ON();
|
g_model.moduleData[EXTERNAL_MODULE].type = reusableBuffer.moduleSetup.newType;
|
||||||
|
reusableBuffer.moduleSetup.previousType = reusableBuffer.moduleSetup.newType;
|
||||||
|
setModuleType(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type);
|
||||||
|
}
|
||||||
|
else if (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_NONE) {
|
||||||
|
g_model.moduleData[EXTERNAL_MODULE].type = reusableBuffer.moduleSetup.newType;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (attr) {
|
if (attr) {
|
||||||
if (s_editMode > 0) {
|
if (s_editMode > 0) {
|
||||||
switch (menuHorizontalPosition) {
|
switch (menuHorizontalPosition) {
|
||||||
case 0:
|
case 0:
|
||||||
{
|
reusableBuffer.moduleSetup.newType = checkIncDec(event, reusableBuffer.moduleSetup.newType, MODULE_TYPE_NONE, MODULE_TYPE_MAX, EE_MODEL, isExternalModuleAvailable);
|
||||||
uint8_t moduleType = checkIncDec(event, g_model.moduleData[EXTERNAL_MODULE].type, MODULE_TYPE_NONE, MODULE_TYPE_MAX, EE_MODEL, isExternalModuleAvailable);
|
break;
|
||||||
if (checkIncDec_Ret) {
|
|
||||||
setModuleType(EXTERNAL_MODULE, moduleType);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
if (isModuleDSM2(EXTERNAL_MODULE)) {
|
if (isModuleDSM2(EXTERNAL_MODULE)) {
|
||||||
|
|||||||
@@ -385,6 +385,8 @@ void menuModelSetup(event_t event)
|
|||||||
if (event == EVT_ENTRY || event == EVT_ENTRY_UP) {
|
if (event == EVT_ENTRY || event == EVT_ENTRY_UP) {
|
||||||
memclear(&reusableBuffer.moduleSetup, sizeof(reusableBuffer.moduleSetup));
|
memclear(&reusableBuffer.moduleSetup, sizeof(reusableBuffer.moduleSetup));
|
||||||
reusableBuffer.moduleSetup.r9mPower = g_model.moduleData[EXTERNAL_MODULE].pxx.power;
|
reusableBuffer.moduleSetup.r9mPower = g_model.moduleData[EXTERNAL_MODULE].pxx.power;
|
||||||
|
reusableBuffer.moduleSetup.previousType = g_model.moduleData[EXTERNAL_MODULE].type;
|
||||||
|
reusableBuffer.moduleSetup.newType = g_model.moduleData[EXTERNAL_MODULE].type;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (defined(DSM2) || defined(PXX))
|
#if (defined(DSM2) || defined(PXX))
|
||||||
@@ -804,7 +806,7 @@ void menuModelSetup(event_t event)
|
|||||||
|
|
||||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_TYPE:
|
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_TYPE:
|
||||||
lcdDrawTextAlignedLeft(y, INDENT TR_MODE);
|
lcdDrawTextAlignedLeft(y, INDENT TR_MODE);
|
||||||
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_EXTERNAL_MODULE_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].type, menuHorizontalPosition==0 ? attr : 0);
|
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_EXTERNAL_MODULE_PROTOCOLS, reusableBuffer.moduleSetup.newType, menuHorizontalPosition==0 ? attr : 0);
|
||||||
if (isModuleXJT(EXTERNAL_MODULE))
|
if (isModuleXJT(EXTERNAL_MODULE))
|
||||||
lcdDrawTextAtIndex(lcdNextPos + 3, y, STR_XJT_ACCST_RF_PROTOCOLS, 1+g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==1 ? attr : 0);
|
lcdDrawTextAtIndex(lcdNextPos + 3, y, STR_XJT_ACCST_RF_PROTOCOLS, 1+g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==1 ? attr : 0);
|
||||||
else if (isModuleDSM2(EXTERNAL_MODULE))
|
else if (isModuleDSM2(EXTERNAL_MODULE))
|
||||||
@@ -831,23 +833,24 @@ void menuModelSetup(event_t event)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (attr && menuHorizontalPosition == 0) {
|
if (attr && menuHorizontalPosition == 0) {
|
||||||
if (s_editMode > 0)
|
if (s_editMode > 0) {
|
||||||
EXTERNAL_MODULE_OFF();
|
g_model.moduleData[EXTERNAL_MODULE].type = MODULE_TYPE_NONE;
|
||||||
else
|
}
|
||||||
if(g_model.moduleData[EXTERNAL_MODULE].type != MODULE_TYPE_NONE)
|
else if (reusableBuffer.moduleSetup.newType != reusableBuffer.moduleSetup.previousType) {
|
||||||
EXTERNAL_MODULE_ON();
|
g_model.moduleData[EXTERNAL_MODULE].type = reusableBuffer.moduleSetup.newType;
|
||||||
|
reusableBuffer.moduleSetup.previousType = reusableBuffer.moduleSetup.newType;
|
||||||
|
setModuleType(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type);
|
||||||
|
}
|
||||||
|
else if (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_NONE) {
|
||||||
|
g_model.moduleData[EXTERNAL_MODULE].type = reusableBuffer.moduleSetup.newType;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (attr) {
|
if (attr) {
|
||||||
if (s_editMode > 0) {
|
if (s_editMode > 0) {
|
||||||
switch (menuHorizontalPosition) {
|
switch (menuHorizontalPosition) {
|
||||||
case 0:
|
case 0:
|
||||||
{
|
reusableBuffer.moduleSetup.newType = checkIncDec(event, reusableBuffer.moduleSetup.newType, MODULE_TYPE_NONE, MODULE_TYPE_MAX, EE_MODEL, isExternalModuleAvailable);
|
||||||
uint8_t moduleType = checkIncDec(event, g_model.moduleData[EXTERNAL_MODULE].type, MODULE_TYPE_NONE, MODULE_TYPE_MAX, EE_MODEL, isExternalModuleAvailable);
|
|
||||||
if (checkIncDec_Ret) {
|
|
||||||
setModuleType(EXTERNAL_MODULE, moduleType);
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
if (isModuleDSM2(EXTERNAL_MODULE)) {
|
if (isModuleDSM2(EXTERNAL_MODULE)) {
|
||||||
|
|||||||
@@ -618,6 +618,8 @@ bool menuModelSetup(event_t event)
|
|||||||
if (event == EVT_ENTRY || event == EVT_ENTRY_UP) {
|
if (event == EVT_ENTRY || event == EVT_ENTRY_UP) {
|
||||||
memclear(&reusableBuffer.moduleSetup, sizeof(reusableBuffer.moduleSetup));
|
memclear(&reusableBuffer.moduleSetup, sizeof(reusableBuffer.moduleSetup));
|
||||||
reusableBuffer.moduleSetup.r9mPower = g_model.moduleData[EXTERNAL_MODULE].pxx.power;
|
reusableBuffer.moduleSetup.r9mPower = g_model.moduleData[EXTERNAL_MODULE].pxx.power;
|
||||||
|
reusableBuffer.moduleSetup.previousType = g_model.moduleData[EXTERNAL_MODULE].type;
|
||||||
|
reusableBuffer.moduleSetup.newType = g_model.moduleData[EXTERNAL_MODULE].type;
|
||||||
#if defined(INTERNAL_MODULE_PXX1) && defined(EXTERNAL_ANTENNA)
|
#if defined(INTERNAL_MODULE_PXX1) && defined(EXTERNAL_ANTENNA)
|
||||||
reusableBuffer.moduleSetup.antennaMode = g_model.moduleData[INTERNAL_MODULE].pxx.antennaMode;
|
reusableBuffer.moduleSetup.antennaMode = g_model.moduleData[INTERNAL_MODULE].pxx.antennaMode;
|
||||||
#endif
|
#endif
|
||||||
@@ -1030,7 +1032,7 @@ bool menuModelSetup(event_t event)
|
|||||||
#endif
|
#endif
|
||||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_TYPE:
|
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_TYPE:
|
||||||
lcdDrawText(MENUS_MARGIN_LEFT + INDENT_WIDTH, y, STR_MODE);
|
lcdDrawText(MENUS_MARGIN_LEFT + INDENT_WIDTH, y, STR_MODE);
|
||||||
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_EXTERNAL_MODULE_PROTOCOLS, g_model.moduleData[moduleIdx].type, menuHorizontalPosition==0 ? attr : 0);
|
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_EXTERNAL_MODULE_PROTOCOLS, moduleIdx == EXTERNAL_MODULE ? reusableBuffer.moduleSetup.newType : g_model.moduleData[INTERNAL_MODULE].type, menuHorizontalPosition==0 ? attr : 0);
|
||||||
if (isModuleXJT(moduleIdx))
|
if (isModuleXJT(moduleIdx))
|
||||||
lcdDrawTextAtIndex(MODEL_SETUP_3RD_COLUMN, y, STR_XJT_ACCST_RF_PROTOCOLS, 1+g_model.moduleData[moduleIdx].subType, (menuHorizontalPosition==1 ? attr : 0));
|
lcdDrawTextAtIndex(MODEL_SETUP_3RD_COLUMN, y, STR_XJT_ACCST_RF_PROTOCOLS, 1+g_model.moduleData[moduleIdx].subType, (menuHorizontalPosition==1 ? attr : 0));
|
||||||
else if (isModuleDSM2(moduleIdx))
|
else if (isModuleDSM2(moduleIdx))
|
||||||
@@ -1054,28 +1056,36 @@ bool menuModelSetup(event_t event)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (attr && menuHorizontalPosition == 0 && moduleIdx == EXTERNAL_MODULE) {
|
if (attr && menuHorizontalPosition == 0 && moduleIdx == EXTERNAL_MODULE) {
|
||||||
if (s_editMode > 0)
|
if (s_editMode > 0) {
|
||||||
EXTERNAL_MODULE_OFF();
|
g_model.moduleData[EXTERNAL_MODULE].type = MODULE_TYPE_NONE;
|
||||||
else
|
}
|
||||||
if(g_model.moduleData[EXTERNAL_MODULE].type != MODULE_TYPE_NONE)
|
else if (reusableBuffer.moduleSetup.newType != reusableBuffer.moduleSetup.previousType) {
|
||||||
EXTERNAL_MODULE_ON();
|
g_model.moduleData[EXTERNAL_MODULE].type = reusableBuffer.moduleSetup.newType;
|
||||||
|
reusableBuffer.moduleSetup.previousType = reusableBuffer.moduleSetup.newType;
|
||||||
|
setModuleType(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type);
|
||||||
|
}
|
||||||
|
else if (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_NONE) {
|
||||||
|
g_model.moduleData[EXTERNAL_MODULE].type = reusableBuffer.moduleSetup.newType;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (attr) {
|
if (attr) {
|
||||||
if (s_editMode > 0) {
|
if (s_editMode > 0) {
|
||||||
switch (menuHorizontalPosition) {
|
switch (menuHorizontalPosition) {
|
||||||
case 0:
|
case 0: {
|
||||||
{
|
|
||||||
#if defined(HARDWARE_INTERNAL_MODULE)
|
#if defined(HARDWARE_INTERNAL_MODULE)
|
||||||
IsValueAvailable checkFun = moduleIdx == 0 ? isInternalModuleAvailable : isExternalModuleAvailable;
|
if (moduleIdx == INTERNAL_MODULE) {
|
||||||
#else
|
uint8_t moduleType = checkIncDec(event, g_model.moduleData[moduleIdx].type, MODULE_TYPE_NONE, MODULE_TYPE_MAX, EE_MODEL,
|
||||||
IsValueAvailable checkFun = isExternalModuleAvailable;
|
isInternalModuleAvailable);
|
||||||
#endif
|
if (checkIncDec_Ret) {
|
||||||
uint8_t moduleType = checkIncDec(event, g_model.moduleData[moduleIdx].type, MODULE_TYPE_NONE, MODULE_TYPE_MAX, EE_MODEL, checkFun);
|
setModuleType(moduleIdx, moduleType);
|
||||||
if (checkIncDec_Ret) {
|
}
|
||||||
setModuleType(moduleIdx, moduleType);
|
|
||||||
}
|
}
|
||||||
break;
|
else
|
||||||
|
#endif
|
||||||
|
reusableBuffer.moduleSetup.newType = checkIncDec(event, reusableBuffer.moduleSetup.newType, MODULE_TYPE_NONE, MODULE_TYPE_MAX, EE_MODEL,
|
||||||
|
isExternalModuleAvailable);
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
if (isModuleDSM2(moduleIdx))
|
if (isModuleDSM2(moduleIdx))
|
||||||
CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].rfProtocol, DSM2_PROTO_LP45, DSM2_PROTO_DSMX);
|
CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].rfProtocol, DSM2_PROTO_LP45, DSM2_PROTO_DSMX);
|
||||||
|
|||||||
@@ -1109,6 +1109,8 @@ union ReusableBuffer
|
|||||||
char msg[64];
|
char msg[64];
|
||||||
uint8_t r9mPower;
|
uint8_t r9mPower;
|
||||||
int8_t antennaMode;
|
int8_t antennaMode;
|
||||||
|
uint8_t previousType;
|
||||||
|
uint8_t newType;
|
||||||
BindInformation bindInformation;
|
BindInformation bindInformation;
|
||||||
struct {
|
struct {
|
||||||
union {
|
union {
|
||||||
|
|||||||
Reference in New Issue
Block a user