Merge pull request #472 from EdgeTX/fix-mpm-option-title
[color] Fix MPM option title==nullptr
This commit is contained in:
@@ -687,58 +687,69 @@ class ModuleWindow : public FormGroup {
|
|||||||
const uint8_t multi_proto = g_model.moduleData[moduleIdx].getMultiProtocol();
|
const uint8_t multi_proto = g_model.moduleData[moduleIdx].getMultiProtocol();
|
||||||
if (MULTIMODULE_PROTOCOL_KNOWN(moduleIdx)) {
|
if (MULTIMODULE_PROTOCOL_KNOWN(moduleIdx)) {
|
||||||
// Multi optional feature row
|
// Multi optional feature row
|
||||||
const char *title = getMultiOptionTitle(moduleIdx);
|
const char *title = getMultiOptionTitleStatic(moduleIdx);
|
||||||
grid.nextLine();
|
if (title != nullptr) {
|
||||||
new StaticText(this, grid.getLabelSlot(true), title);
|
grid.nextLine();
|
||||||
|
new StaticText(this, grid.getLabelSlot(true), title);
|
||||||
|
|
||||||
//int optionValue = g_model.moduleData[moduleIdx].multi.optionValue;
|
// int optionValue =
|
||||||
int8_t min, max;
|
// g_model.moduleData[moduleIdx].multi.optionValue;
|
||||||
getMultiOptionValues(multi_proto, min, max);
|
int8_t min, max;
|
||||||
|
getMultiOptionValues(multi_proto, min, max);
|
||||||
|
|
||||||
|
if (title == STR_MULTI_RFPOWER) {
|
||||||
if (title == STR_MULTI_RFPOWER) {
|
new Choice(this, grid.getFieldSlot(2, 0), STR_MULTI_POWER, 0, 15,
|
||||||
new Choice(this, grid.getFieldSlot(2, 0), STR_MULTI_POWER, 0, 15,
|
GET_SET_DEFAULT(
|
||||||
GET_SET_DEFAULT(g_model.moduleData[moduleIdx].multi.optionValue));
|
g_model.moduleData[moduleIdx].multi.optionValue));
|
||||||
} else if (title == STR_MULTI_TELEMETRY) {
|
} else if (title == STR_MULTI_TELEMETRY) {
|
||||||
new Choice(this, grid.getFieldSlot(2, 0), STR_MULTI_TELEMETRY_MODE, min, max,
|
new Choice(this, grid.getFieldSlot(2, 0),
|
||||||
GET_SET_DEFAULT(g_model.moduleData[moduleIdx].multi.optionValue));
|
STR_MULTI_TELEMETRY_MODE, min, max,
|
||||||
} else if (title == STR_MULTI_WBUS) {
|
GET_SET_DEFAULT(
|
||||||
new Choice(this, grid.getFieldSlot(2, 0), STR_MULTI_WBUS_MODE, 0, 1,
|
g_model.moduleData[moduleIdx].multi.optionValue));
|
||||||
GET_SET_DEFAULT(g_model.moduleData[moduleIdx].multi.optionValue));
|
} else if (title == STR_MULTI_WBUS) {
|
||||||
} else if (multi_proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) {
|
new Choice(this, grid.getFieldSlot(2, 0), STR_MULTI_WBUS_MODE, 0,
|
||||||
auto edit = new NumberEdit(
|
1,
|
||||||
this, grid.getFieldSlot(2, 0), 50, 400,
|
GET_SET_DEFAULT(
|
||||||
GET_DEFAULT(
|
g_model.moduleData[moduleIdx].multi.optionValue));
|
||||||
50 + 5 * g_model.moduleData[moduleIdx].multi.optionValue),
|
} else if (multi_proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) {
|
||||||
SET_VALUE(g_model.moduleData[moduleIdx].multi.optionValue,
|
auto edit = new NumberEdit(
|
||||||
(newValue - 50) / 5));
|
this, grid.getFieldSlot(2, 0), 50, 400,
|
||||||
edit->setStep(5);
|
GET_DEFAULT(
|
||||||
} else if (multi_proto == MODULE_SUBTYPE_MULTI_DSM2) {
|
50 + 5 * g_model.moduleData[moduleIdx].multi.optionValue),
|
||||||
new CheckBox(
|
SET_VALUE(g_model.moduleData[moduleIdx].multi.optionValue,
|
||||||
this, grid.getFieldSlot(2, 0),
|
(newValue - 50) / 5));
|
||||||
[=]() {
|
edit->setStep(5);
|
||||||
return g_model.moduleData[moduleIdx].multi.optionValue & 0x01;
|
} else if (multi_proto == MODULE_SUBTYPE_MULTI_DSM2) {
|
||||||
},
|
new CheckBox(
|
||||||
[=](int16_t newValue) {
|
this, grid.getFieldSlot(2, 0),
|
||||||
g_model.moduleData[moduleIdx].multi.optionValue =
|
[=]() {
|
||||||
(g_model.moduleData[moduleIdx].multi.optionValue & 0xFE) +
|
return g_model.moduleData[moduleIdx].multi.optionValue &
|
||||||
newValue;
|
0x01;
|
||||||
});
|
},
|
||||||
} else {
|
[=](int16_t newValue) {
|
||||||
if (min == 0 && max == 1) {
|
g_model.moduleData[moduleIdx].multi.optionValue =
|
||||||
new CheckBox(this, grid.getFieldSlot(2, 0),
|
(g_model.moduleData[moduleIdx].multi.optionValue &
|
||||||
GET_SET_DEFAULT(g_model.moduleData[moduleIdx].multi.optionValue));
|
0xFE) +
|
||||||
|
newValue;
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
new NumberEdit(
|
if (min == 0 && max == 1) {
|
||||||
this, grid.getFieldSlot(2, 0), -128, 127,
|
new CheckBox(
|
||||||
GET_SET_DEFAULT(
|
this, grid.getFieldSlot(2, 0),
|
||||||
g_model.moduleData[moduleIdx].multi.optionValue));
|
GET_SET_DEFAULT(
|
||||||
|
g_model.moduleData[moduleIdx].multi.optionValue));
|
||||||
|
} else {
|
||||||
|
new NumberEdit(
|
||||||
|
this, grid.getFieldSlot(2, 0), -128, 127,
|
||||||
|
GET_SET_DEFAULT(
|
||||||
|
g_model.moduleData[moduleIdx].multi.optionValue));
|
||||||
|
|
||||||
// Show RSSI next to RF Freq Fine Tune
|
// Show RSSI next to RF Freq Fine Tune
|
||||||
if (getMultiOptionTitle(moduleIdx) == STR_MULTI_RFTUNE) {
|
if (title == STR_MULTI_RFTUNE) {
|
||||||
new DynamicNumber<int>(
|
new DynamicNumber<int>(
|
||||||
this, grid.getFieldSlot(2, 1),
|
this, grid.getFieldSlot(2, 1),
|
||||||
[] { return (int)TELEMETRY_RSSI(); }, 0, "RSSI: ", " db");
|
[] { return (int)TELEMETRY_RSSI(); }, 0, "RSSI: ", " db");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -782,7 +793,7 @@ class ModuleWindow : public FormGroup {
|
|||||||
GET_SET_DEFAULT(
|
GET_SET_DEFAULT(
|
||||||
g_model.moduleData[moduleIdx].multi.disableTelemetry));
|
g_model.moduleData[moduleIdx].multi.disableTelemetry));
|
||||||
|
|
||||||
if (MULTI_DISABLE_CHAN_MAP_ROW(moduleIdx) != HIDDEN_ROW) {
|
if (MULTI_DISABLE_CHAN_MAP_ROW_STATIC(moduleIdx) != HIDDEN_ROW) {
|
||||||
// Disable channel mapping
|
// Disable channel mapping
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
new StaticText(this, grid.getLabelSlot(true), STR_DISABLE_CH_MAP);
|
new StaticText(this, grid.getLabelSlot(true), STR_DISABLE_CH_MAP);
|
||||||
|
|||||||
@@ -1100,6 +1100,13 @@ const mm_protocol_definition *getMultiProtocolDefinition (uint8_t protocol)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(MULTIMODULE)
|
#if defined(MULTIMODULE)
|
||||||
|
const char * getMultiOptionTitleStatic(uint8_t moduleIdx)
|
||||||
|
{
|
||||||
|
const uint8_t multi_proto = g_model.moduleData[moduleIdx].getMultiProtocol();
|
||||||
|
const mm_protocol_definition * pdef = getMultiProtocolDefinition(multi_proto);
|
||||||
|
return pdef->optionsstr;
|
||||||
|
}
|
||||||
|
|
||||||
const char * getMultiOptionTitle(uint8_t moduleIdx)
|
const char * getMultiOptionTitle(uint8_t moduleIdx)
|
||||||
{
|
{
|
||||||
MultiModuleStatus &status = getMultiModuleStatus(moduleIdx);
|
MultiModuleStatus &status = getMultiModuleStatus(moduleIdx);
|
||||||
@@ -1110,10 +1117,7 @@ const char * getMultiOptionTitle(uint8_t moduleIdx)
|
|||||||
}
|
}
|
||||||
return mm_options_strings::options[status.optionDisp];
|
return mm_options_strings::options[status.optionDisp];
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
const uint8_t multi_proto = g_model.moduleData[moduleIdx].getMultiProtocol();
|
return getMultiOptionTitleStatic(moduleIdx);
|
||||||
const mm_protocol_definition * pdef = getMultiProtocolDefinition(multi_proto);
|
|
||||||
return pdef->optionsstr;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -220,6 +220,21 @@ inline uint8_t IF_ALLOW_RACING_MODE(int)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(MULTIMODULE)
|
#if defined(MULTIMODULE)
|
||||||
|
inline uint8_t MULTI_DISABLE_CHAN_MAP_ROW_STATIC(uint8_t moduleIdx)
|
||||||
|
{
|
||||||
|
if (!isModuleMultimodule(moduleIdx))
|
||||||
|
return HIDDEN_ROW;
|
||||||
|
|
||||||
|
uint8_t protocol = g_model.moduleData[moduleIdx].getMultiProtocol();
|
||||||
|
if (protocol < MODULE_SUBTYPE_MULTI_LAST) {
|
||||||
|
const mm_protocol_definition * pdef = getMultiProtocolDefinition(protocol);
|
||||||
|
if (pdef->disable_ch_mapping)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
return HIDDEN_ROW;
|
||||||
|
}
|
||||||
|
|
||||||
inline uint8_t MULTI_DISABLE_CHAN_MAP_ROW(uint8_t moduleIdx)
|
inline uint8_t MULTI_DISABLE_CHAN_MAP_ROW(uint8_t moduleIdx)
|
||||||
{
|
{
|
||||||
if (!isModuleMultimodule(moduleIdx))
|
if (!isModuleMultimodule(moduleIdx))
|
||||||
@@ -230,14 +245,7 @@ inline uint8_t MULTI_DISABLE_CHAN_MAP_ROW(uint8_t moduleIdx)
|
|||||||
return status.supportsDisableMapping() == true ? 0 : HIDDEN_ROW;
|
return status.supportsDisableMapping() == true ? 0 : HIDDEN_ROW;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8_t protocol = g_model.moduleData[moduleIdx].getMultiProtocol();
|
return MULTI_DISABLE_CHAN_MAP_ROW_STATIC(moduleIdx);
|
||||||
if (protocol < MODULE_SUBTYPE_MULTI_LAST) {
|
|
||||||
const mm_protocol_definition * pdef = getMultiProtocolDefinition(protocol);
|
|
||||||
if (pdef->disable_ch_mapping)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return HIDDEN_ROW;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
inline bool isMultiProtocolSelectable(int protocol)
|
inline bool isMultiProtocolSelectable(int protocol)
|
||||||
@@ -355,6 +363,7 @@ inline uint8_t MODULE_OPTION_ROW(uint8_t moduleIdx) {
|
|||||||
void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event,
|
void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event,
|
||||||
LcdFlags flags, uint8_t old_editMode);
|
LcdFlags flags, uint8_t old_editMode);
|
||||||
|
|
||||||
|
const char * getMultiOptionTitleStatic(uint8_t moduleIdx);
|
||||||
const char *getMultiOptionTitle(uint8_t moduleIdx);
|
const char *getMultiOptionTitle(uint8_t moduleIdx);
|
||||||
|
|
||||||
const char * writeScreenshot();
|
const char * writeScreenshot();
|
||||||
|
|||||||
Reference in New Issue
Block a user