Display options comming from module on 212 too (#7108)
This commit is contained in:
@@ -1232,10 +1232,25 @@ void menuModelSetup(event_t event)
|
|||||||
int optionValue = g_model.moduleData[moduleIdx].multi.optionValue;
|
int optionValue = g_model.moduleData[moduleIdx].multi.optionValue;
|
||||||
|
|
||||||
const uint8_t multi_proto = g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol();
|
const uint8_t multi_proto = g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol();
|
||||||
const mm_protocol_definition *pdef = getMultiProtocolDefinition(multi_proto);
|
if (multi_proto < MODULE_SUBTYPE_MULTI_LAST) {
|
||||||
if (pdef->optionsstr)
|
const mm_protocol_definition * pdef = getMultiProtocolDefinition(multi_proto);
|
||||||
lcdDrawText(INDENT_WIDTH, y, pdef->optionsstr);
|
if (pdef->optionsstr)
|
||||||
|
lcdDrawText(INDENT_WIDTH, y, pdef->optionsstr);
|
||||||
|
if (pdef->optionsstr == STR_MULTI_RFTUNE) {
|
||||||
|
lcdDrawText(MODEL_SETUP_3RD_COLUMN+22, y, "RSSI(", LEFT);
|
||||||
|
lcdDrawNumber(lcdLastRightPos, y, TELEMETRY_RSSI(), LEFT);
|
||||||
|
lcdDrawText(lcdLastRightPos, y, ")", LEFT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
MultiModuleStatus &status = getMultiModuleStatus(moduleIdx);
|
||||||
|
lcdDrawText(INDENT_WIDTH, y, mm_options_strings::options[status.optionDisp]);
|
||||||
|
if (attr && status.optionDisp == 2) {
|
||||||
|
lcdDrawText(MODEL_SETUP_3RD_COLUMN+22, y, "RSSI(", LEFT);
|
||||||
|
lcdDrawNumber(lcdLastRightPos, y, TELEMETRY_RSSI(), LEFT);
|
||||||
|
lcdDrawText(lcdLastRightPos, y, ")", LEFT);
|
||||||
|
}
|
||||||
|
}
|
||||||
if (multi_proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A)
|
if (multi_proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A)
|
||||||
optionValue = 50 + 5 * optionValue;
|
optionValue = 50 + 5 * optionValue;
|
||||||
|
|
||||||
@@ -1249,11 +1264,6 @@ void menuModelSetup(event_t event)
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].multi.optionValue, -128, 127);
|
CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].multi.optionValue, -128, 127);
|
||||||
if (pdef->optionsstr == STR_MULTI_RFTUNE) {
|
|
||||||
lcdDrawText(MODEL_SETUP_3RD_COLUMN+22, y, "RSSI(", LEFT);
|
|
||||||
lcdDrawNumber(lcdLastRightPos, y, TELEMETRY_RSSI(), LEFT);
|
|
||||||
lcdDrawText(lcdLastRightPos, y, ")", LEFT);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user