[color] MPM options: use static options rather than the dynamic ones
This is necessary until a broader solution is found to display real-time info coming from the MPM.
This commit is contained in:
@@ -687,7 +687,7 @@ 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);
|
||||||
if (title != nullptr) {
|
if (title != nullptr) {
|
||||||
grid.nextLine();
|
grid.nextLine();
|
||||||
new StaticText(this, grid.getLabelSlot(true), title);
|
new StaticText(this, grid.getLabelSlot(true), title);
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -355,6 +355,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