fix(MPM): Various UI elements for MPM opts weren't updating correctly (#2209)

* fix: Get current values for MPM options

* fix: Don't show sub-proto dropdown when empty

* Add suggested call to `update()`

* Add callback to refresh when subtype changed

* Trip `SetValueHandler` rather than setting value
Thank you to @raphaelcoeffic for the hint ;)

* fix: Saving values when changed is a good idea!

* Load option flags properly when using internal proto list

* NumberEdit fields don't implement LV_EVENT_VALUE_CHANGED, use update() instead

* Fix checkbox behaviour

* Fix autobind checkbox after switching away from DSM

* Fix more parameter needing update on MPM sub-proto changes

* fix: Also update servo rate if present

* fix: Channel mapping needs updating also

Co-authored-by: Raphael Coeffic <raphael.coeffic@frafos.com>
This commit is contained in:
Peter Feerick
2022-09-05 21:56:24 +10:00
committed by GitHub
co-authored by Raphael Coeffic
parent 07431c3432
commit b4e1ceb4f8
5 changed files with 136 additions and 40 deletions
+55 -18
View File
@@ -63,12 +63,16 @@ static const lv_coord_t col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(2),
static const lv_coord_t row_dsc[] = {LV_GRID_CONTENT, static const lv_coord_t row_dsc[] = {LV_GRID_CONTENT,
LV_GRID_TEMPLATE_LAST}; LV_GRID_TEMPLATE_LAST};
struct FailsafeChoice;
class ModuleWindow : public FormGroup class ModuleWindow : public FormGroup
{ {
public: public:
ModuleWindow(Window* parent, uint8_t moduleIdx); ModuleWindow(Window* parent, uint8_t moduleIdx);
void updateModule(); void updateModule();
void updateSubType(); void updateSubType();
void updateRxID();
void updateFailsafe();
uint8_t getModuleIdx() const { return moduleIdx; } uint8_t getModuleIdx() const { return moduleIdx; }
@@ -77,11 +81,12 @@ class ModuleWindow : public FormGroup
ModuleOptions* modOpts = nullptr; ModuleOptions* modOpts = nullptr;
ChannelRange* chRange = nullptr; ChannelRange* chRange = nullptr;
Window *rxID = nullptr; NumberEdit *rxID = nullptr;
TextButton *bindButton = nullptr; TextButton *bindButton = nullptr;
TextButton *rangeButton = nullptr; TextButton *rangeButton = nullptr;
TextButton *registerButton = nullptr; TextButton *registerButton = nullptr;
Window *fsLine = nullptr; Window *fsLine = nullptr;
FailsafeChoice* fsChoice = nullptr;
Choice *rfPower = nullptr; Choice *rfPower = nullptr;
StaticText *idUnique = nullptr; StaticText *idUnique = nullptr;
@@ -92,6 +97,10 @@ class ModuleWindow : public FormGroup
struct FailsafeChoice : public FormGroup { struct FailsafeChoice : public FormGroup {
FailsafeChoice(Window* parent, uint8_t moduleIdx); FailsafeChoice(Window* parent, uint8_t moduleIdx);
void update() const;
private:
lv_obj_t* c_obj;
}; };
static void fs_changed(lv_event_t* e) static void fs_changed(lv_event_t* e)
@@ -128,18 +137,33 @@ FailsafeChoice::FailsafeChoice(Window* parent, uint8_t moduleIdx) :
return 0; return 0;
}); });
auto c_obj = choice->getLvObj(); c_obj = choice->getLvObj();
auto btn_obj = btn->getLvObj(); auto btn_obj = btn->getLvObj();
lv_obj_add_event_cb(c_obj, fs_changed, LV_EVENT_VALUE_CHANGED, btn_obj); lv_obj_add_event_cb(c_obj, fs_changed, LV_EVENT_VALUE_CHANGED, btn_obj);
lv_event_send(c_obj, LV_EVENT_VALUE_CHANGED, nullptr); lv_event_send(c_obj, LV_EVENT_VALUE_CHANGED, nullptr);
} }
void FailsafeChoice::update() const
{
lv_event_send(c_obj, LV_EVENT_VALUE_CHANGED, nullptr);
}
static void mw_refresh_cb(lv_event_t* e)
{
auto mw = (ModuleWindow*)lv_event_get_user_data(e);
if (mw) {
mw->updateRxID();
mw->updateFailsafe();
}
}
ModuleWindow::ModuleWindow(Window* parent, uint8_t moduleIdx) : ModuleWindow::ModuleWindow(Window* parent, uint8_t moduleIdx) :
FormGroup(parent, rect_t{}), FormGroup(parent, rect_t{}),
moduleIdx(moduleIdx) moduleIdx(moduleIdx)
{ {
setFlexLayout(); setFlexLayout();
updateModule(); updateModule();
lv_obj_add_event_cb(lvobj, mw_refresh_cb, LV_EVENT_REFRESH, this);
} }
void ModuleWindow::updateIDStaticText(int mdIdx) void ModuleWindow::updateIDStaticText(int mdIdx)
@@ -170,6 +194,7 @@ void ModuleWindow::updateModule()
rangeButton = nullptr; rangeButton = nullptr;
registerButton = nullptr; registerButton = nullptr;
fsLine = nullptr; fsLine = nullptr;
fsChoice = nullptr;
rfPower = nullptr; rfPower = nullptr;
// Module parameters // Module parameters
@@ -202,7 +227,7 @@ void ModuleWindow::updateModule()
// Failsafe // Failsafe
fsLine = newLine(&grid); fsLine = newLine(&grid);
new StaticText(fsLine, rect_t{}, STR_FAILSAFE, 0, COLOR_THEME_PRIMARY1); new StaticText(fsLine, rect_t{}, STR_FAILSAFE, 0, COLOR_THEME_PRIMARY1);
new FailsafeChoice(fsLine, moduleIdx); fsChoice = new FailsafeChoice(fsLine, moduleIdx);
// PPM modules // PPM modules
if (isModulePPM(moduleIdx)) { if (isModulePPM(moduleIdx)) {
@@ -436,21 +461,9 @@ void ModuleWindow::updateSubType()
if (modOpts) modOpts->update(); if (modOpts) modOpts->update();
if (chRange) chRange->update(); if (chRange) chRange->update();
if (rxID) { updateRxID();
if (isModuleModelIndexAvailable(moduleIdx)) { updateFailsafe();
lv_obj_clear_flag(rxID->getLvObj(), LV_OBJ_FLAG_HIDDEN);
} else {
lv_obj_add_flag(rxID->getLvObj(), LV_OBJ_FLAG_HIDDEN);
}
}
if (fsLine) {
if (isModuleFailsafeAvailable(moduleIdx)) {
lv_obj_clear_flag(fsLine->getLvObj(), LV_OBJ_FLAG_HIDDEN);
} else {
lv_obj_add_flag(fsLine->getLvObj(), LV_OBJ_FLAG_HIDDEN);
}
}
if (rfPower) { if (rfPower) {
if (isModuleR9M_LBT(moduleIdx)) { if (isModuleR9M_LBT(moduleIdx)) {
rfPower->setValues(STR_R9M_LBT_POWER_VALUES); rfPower->setValues(STR_R9M_LBT_POWER_VALUES);
@@ -463,6 +476,30 @@ void ModuleWindow::updateSubType()
} }
} }
void ModuleWindow::updateRxID()
{
if (rxID) {
if (isModuleModelIndexAvailable(moduleIdx)) {
lv_obj_clear_flag(rxID->getLvObj(), LV_OBJ_FLAG_HIDDEN);
rxID->update();
} else {
lv_obj_add_flag(rxID->getLvObj(), LV_OBJ_FLAG_HIDDEN);
}
}
}
void ModuleWindow::updateFailsafe()
{
if (fsLine) {
if (isModuleFailsafeAvailable(moduleIdx)) {
lv_obj_clear_flag(fsLine->getLvObj(), LV_OBJ_FLAG_HIDDEN);
fsChoice->update();
} else {
lv_obj_add_flag(fsLine->getLvObj(), LV_OBJ_FLAG_HIDDEN);
}
}
}
#if defined(PCBNV14) #if defined(PCBNV14)
#define SIGNAL_POSTFIX #define SIGNAL_POSTFIX
#define SIGNAL_MESSAGE "SGNL" #define SIGNAL_MESSAGE "SGNL"
+65 -18
View File
@@ -27,6 +27,15 @@
#define SET_DIRTY() storageDirty(EE_MODEL) #define SET_DIRTY() storageDirty(EE_MODEL)
static void update_mpm_settings(lv_event_t* e)
{
MultimoduleSettings* ms = (MultimoduleSettings*)lv_event_get_user_data(e);
if (!ms) return;
ms->update();
lv_event_send(ms->getParent()->getLvObj(), LV_EVENT_REFRESH, nullptr);
}
struct MPMProtoOption : public FormGroup::Line struct MPMProtoOption : public FormGroup::Line
{ {
StaticText* label; StaticText* label;
@@ -82,37 +91,44 @@ void MPMProtoOption::update(const MultiRfProtocols::RfProto* rfProto, ModuleData
choice->setGetValueHandler(GET_DEFAULT(md->multi.optionValue)); choice->setGetValueHandler(GET_DEFAULT(md->multi.optionValue));
choice->setSetValueHandler(SET_DEFAULT(md->multi.optionValue)); choice->setSetValueHandler(SET_DEFAULT(md->multi.optionValue));
lv_obj_clear_flag(choice->getLvObj(), LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(choice->getLvObj(), LV_OBJ_FLAG_HIDDEN);
} else if (title == STR_MULTI_TELEMETRY) { lv_event_send(choice->getLvObj(), LV_EVENT_VALUE_CHANGED, nullptr);
} else if (title == STR_MULTI_TELEMETRY) { // e.g. Bayang
choice->setValues(STR_MULTI_TELEMETRY_MODE); choice->setValues(STR_MULTI_TELEMETRY_MODE);
choice->setMin(min); choice->setMin(min);
choice->setMax(max); choice->setMax(max);
choice->setGetValueHandler(GET_DEFAULT(md->multi.optionValue)); choice->setGetValueHandler(GET_DEFAULT(md->multi.optionValue));
choice->setSetValueHandler(SET_DEFAULT(md->multi.optionValue)); choice->setSetValueHandler(SET_DEFAULT(md->multi.optionValue));
lv_obj_clear_flag(choice->getLvObj(), LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(choice->getLvObj(), LV_OBJ_FLAG_HIDDEN);
} else if (title == STR_MULTI_WBUS) { lv_event_send(choice->getLvObj(), LV_EVENT_VALUE_CHANGED, nullptr);
} else if (title == STR_MULTI_WBUS) { // e.g. WFLY2 but may not be used anymore
choice->setValues(STR_MULTI_WBUS_MODE); choice->setValues(STR_MULTI_WBUS_MODE);
choice->setMin(0); choice->setMin(0);
choice->setMax(1); choice->setMax(1);
choice->setGetValueHandler(GET_DEFAULT(md->multi.optionValue)); choice->setGetValueHandler(GET_DEFAULT(md->multi.optionValue));
choice->setSetValueHandler(SET_DEFAULT(md->multi.optionValue)); choice->setSetValueHandler(SET_DEFAULT(md->multi.optionValue));
lv_obj_clear_flag(choice->getLvObj(), LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(choice->getLvObj(), LV_OBJ_FLAG_HIDDEN);
lv_event_send(choice->getLvObj(), LV_EVENT_VALUE_CHANGED, nullptr);
} else if (rfProto->proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) { } else if (rfProto->proto == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) {
edit->setMin(50); edit->setMin(50);
edit->setMax(400); edit->setMax(400);
edit->setGetValueHandler(GET_DEFAULT(50 + 5 * md->multi.optionValue)); edit->setGetValueHandler(GET_DEFAULT(50 + 5 * md->multi.optionValue));
edit->setSetValueHandler(SET_VALUE(md->multi.optionValue, (newValue - 50) / 5)); edit->setSetValueHandler(SET_VALUE(md->multi.optionValue, (newValue - 50) / 5));
edit->setStep(5); edit->setStep(5);
edit->update();
lv_obj_clear_flag(edit->getLvObj(), LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(edit->getLvObj(), LV_OBJ_FLAG_HIDDEN);
} else if (rfProto->proto == MODULE_SUBTYPE_MULTI_DSM2) { } else if (rfProto->proto == MODULE_SUBTYPE_MULTI_DSM2) {
cb->setGetValueHandler([=]() { return md->multi.optionValue & 0x01; }); cb->setGetValueHandler([=]() { return md->multi.optionValue & 0x01; });
cb->setSetValueHandler([=](int8_t newValue) { cb->setSetValueHandler([=](int8_t newValue) {
md->multi.optionValue = (md->multi.optionValue & 0xFE) + newValue; md->multi.optionValue = (md->multi.optionValue & 0xFE) + newValue;
SET_DIRTY();
}); });
cb->update();
lv_obj_clear_flag(cb->getLvObj(), LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(cb->getLvObj(), LV_OBJ_FLAG_HIDDEN);
} else { } else {
if (min == 0 && max == 1) { if (min == 0 && max == 1) {
cb->setGetValueHandler(GET_DEFAULT(md->multi.optionValue)); cb->setGetValueHandler(GET_DEFAULT(md->multi.optionValue));
cb->setSetValueHandler(SET_DEFAULT(md->multi.optionValue)); cb->setSetValueHandler(SET_DEFAULT(md->multi.optionValue));
cb->update();
lv_obj_clear_flag(cb->getLvObj(), LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(cb->getLvObj(), LV_OBJ_FLAG_HIDDEN);
} else { } else {
edit->setMin(-128); edit->setMin(-128);
@@ -120,7 +136,9 @@ void MPMProtoOption::update(const MultiRfProtocols::RfProto* rfProto, ModuleData
edit->setGetValueHandler(GET_DEFAULT(md->multi.optionValue)); edit->setGetValueHandler(GET_DEFAULT(md->multi.optionValue));
edit->setSetValueHandler(SET_DEFAULT(md->multi.optionValue)); edit->setSetValueHandler(SET_DEFAULT(md->multi.optionValue));
lv_obj_clear_flag(edit->getLvObj(), LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(edit->getLvObj(), LV_OBJ_FLAG_HIDDEN);
lv_obj_clear_flag(rssi->getLvObj(), LV_OBJ_FLAG_HIDDEN); edit->update();
if (title == STR_MULTI_RFTUNE)
lv_obj_clear_flag(rssi->getLvObj(), LV_OBJ_FLAG_HIDDEN);
} }
} }
} }
@@ -133,6 +151,13 @@ struct MPMSubtype : public FormGroup::Line
void update(const MultiRfProtocols::RfProto* rfProto, ModuleData* md); void update(const MultiRfProtocols::RfProto* rfProto, ModuleData* md);
}; };
static void subtype_event_cb(lv_event_t* e)
{
if (lv_event_get_param(e)) return;
auto obj = (lv_obj_t*)lv_event_get_user_data(e);
if (obj) lv_event_send(obj, LV_EVENT_VALUE_CHANGED, nullptr);
}
MPMSubtype::MPMSubtype(FormGroup* form, FlexGridLayout *layout, uint8_t moduleIdx) : MPMSubtype::MPMSubtype(FormGroup* form, FlexGridLayout *layout, uint8_t moduleIdx) :
FormGroup::Line(form, layout) FormGroup::Line(form, layout)
{ {
@@ -147,11 +172,13 @@ MPMSubtype::MPMSubtype(FormGroup* form, FlexGridLayout *layout, uint8_t moduleId
resetMultiProtocolsOptions(moduleIdx); resetMultiProtocolsOptions(moduleIdx);
SET_DIRTY(); SET_DIRTY();
}); });
lv_obj_add_event_cb(choice->getLvObj(), subtype_event_cb, LV_EVENT_VALUE_CHANGED, lvobj);
} }
void MPMSubtype::update(const MultiRfProtocols::RfProto* rfProto, ModuleData* md) void MPMSubtype::update(const MultiRfProtocols::RfProto* rfProto, ModuleData* md)
{ {
if (!rfProto) { if (!rfProto || rfProto->subProtos.size() == 0) {
lv_obj_add_flag(lvobj, LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(lvobj, LV_OBJ_FLAG_HIDDEN);
return; return;
} }
@@ -160,11 +187,17 @@ void MPMSubtype::update(const MultiRfProtocols::RfProto* rfProto, ModuleData* md
choice->setMax(rfProto->subProtos.size() - 1); choice->setMax(rfProto->subProtos.size() - 1);
lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_HIDDEN);
lv_event_send(choice->getLvObj(), LV_EVENT_VALUE_CHANGED, nullptr);
bool stop=true;
lv_event_send(choice->getLvObj(), LV_EVENT_VALUE_CHANGED, &stop);
} }
struct MPMServoRate : public FormGroup::Line { struct MPMServoRate : public FormGroup::Line {
MPMServoRate(FormGroup* form, FlexGridLayout* layout, uint8_t moduleIdx); MPMServoRate(FormGroup* form, FlexGridLayout* layout, uint8_t moduleIdx);
void update() const { lv_event_send(choice->getLvObj(), LV_EVENT_VALUE_CHANGED, nullptr); }
private:
Choice* choice;
}; };
static const char* _servoRates[] = {"22ms", "11ms"}; static const char* _servoRates[] = {"22ms", "11ms"};
@@ -176,17 +209,19 @@ MPMServoRate::MPMServoRate(FormGroup* form, FlexGridLayout *layout, uint8_t modu
new StaticText(this, rect_t{}, STR_MULTI_SERVOFREQ, 0, COLOR_THEME_PRIMARY1); new StaticText(this, rect_t{}, STR_MULTI_SERVOFREQ, 0, COLOR_THEME_PRIMARY1);
auto md = &g_model.moduleData[moduleIdx]; auto md = &g_model.moduleData[moduleIdx];
new Choice( choice = new Choice(this, rect_t{}, _servoRates, 0, 1, 0, 0);
this, rect_t{}, _servoRates, 0, 1,
[=]() { return (md->multi.optionValue & 0x02) >> 1; }, choice->setGetValueHandler(GET_DEFAULT((md->multi.optionValue & 0x02) >> 1));
[=](int16_t newValue) { choice->setSetValueHandler(SET_VALUE(
md->multi.optionValue = md->multi.optionValue, (md->multi.optionValue & 0xFD) + (newValue << 1)));
(md->multi.optionValue & 0xFD) + (newValue << 1);
});
} }
struct MPMAutobind : public FormGroup::Line { struct MPMAutobind : public FormGroup::Line {
MPMAutobind(FormGroup* form, FlexGridLayout* layout, uint8_t moduleIdx); MPMAutobind(FormGroup* form, FlexGridLayout* layout, uint8_t moduleIdx);
void update() const { cb->update(); }
private:
CheckBox* cb;
}; };
MPMAutobind::MPMAutobind(FormGroup* form, FlexGridLayout *layout, uint8_t moduleIdx) : MPMAutobind::MPMAutobind(FormGroup* form, FlexGridLayout *layout, uint8_t moduleIdx) :
@@ -196,13 +231,15 @@ MPMAutobind::MPMAutobind(FormGroup* form, FlexGridLayout *layout, uint8_t module
new StaticText(this, rect_t{}, STR_MULTI_AUTOBIND, 0, COLOR_THEME_PRIMARY1); new StaticText(this, rect_t{}, STR_MULTI_AUTOBIND, 0, COLOR_THEME_PRIMARY1);
auto md = &g_model.moduleData[moduleIdx]; auto md = &g_model.moduleData[moduleIdx];
new CheckBox(this, rect_t{}, GET_SET_DEFAULT(md->multi.autoBindMode)); cb = new CheckBox(this, rect_t{}, GET_SET_DEFAULT(md->multi.autoBindMode));
} }
struct MPMChannelMap : public FormGroup::Line struct MPMChannelMap : public FormGroup::Line
{ {
MPMChannelMap(FormGroup* form, FlexGridLayout *layout, uint8_t moduleIdx); MPMChannelMap(FormGroup* form, FlexGridLayout *layout, uint8_t moduleIdx);
void update(const MultiRfProtocols::RfProto* rfProto); void update(const MultiRfProtocols::RfProto* rfProto);
private:
CheckBox* cb;
}; };
MPMChannelMap::MPMChannelMap(FormGroup* form, FlexGridLayout *layout, uint8_t moduleIdx) : MPMChannelMap::MPMChannelMap(FormGroup* form, FlexGridLayout *layout, uint8_t moduleIdx) :
@@ -212,13 +249,14 @@ MPMChannelMap::MPMChannelMap(FormGroup* form, FlexGridLayout *layout, uint8_t mo
new StaticText(this, rect_t{}, STR_DISABLE_CH_MAP, 0, COLOR_THEME_PRIMARY1); new StaticText(this, rect_t{}, STR_DISABLE_CH_MAP, 0, COLOR_THEME_PRIMARY1);
auto md = &g_model.moduleData[moduleIdx]; auto md = &g_model.moduleData[moduleIdx];
new CheckBox(this, rect_t{}, GET_SET_DEFAULT(md->multi.disableMapping)); cb = new CheckBox(this, rect_t{}, GET_SET_DEFAULT(md->multi.disableMapping));
} }
void MPMChannelMap::update(const MultiRfProtocols::RfProto* rfProto) void MPMChannelMap::update(const MultiRfProtocols::RfProto* rfProto)
{ {
if (rfProto && rfProto->supportsDisableMapping()) { if (rfProto && rfProto->supportsDisableMapping()) {
lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_HIDDEN);
cb->update();
} else { } else {
lv_obj_add_flag(lvobj, LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(lvobj, LV_OBJ_FLAG_HIDDEN);
} }
@@ -254,7 +292,9 @@ MultimoduleSettings::MultimoduleSettings(Window *parent,
COLOR_THEME_PRIMARY1); COLOR_THEME_PRIMARY1);
st_line = new MPMSubtype(this, &grid, moduleIdx); st_line = new MPMSubtype(this, &grid, moduleIdx);
// TODO: set event cb on st_line->choice / LV_EVENT_VALUE_CHANGED ?
lv_obj_add_event_cb(st_line->getLvObj(), update_mpm_settings,
LV_EVENT_VALUE_CHANGED, this);
opt_line = new MPMProtoOption(this, &grid); opt_line = new MPMProtoOption(this, &grid);
sr_line = new MPMServoRate(this, &grid, moduleIdx); sr_line = new MPMServoRate(this, &grid, moduleIdx);
@@ -263,14 +303,17 @@ MultimoduleSettings::MultimoduleSettings(Window *parent,
// Low power mode // Low power mode
line = newLine(&grid); line = newLine(&grid);
new StaticText(line, rect_t{}, STR_MULTI_LOWPOWER, 0, COLOR_THEME_PRIMARY1); new StaticText(line, rect_t{}, STR_MULTI_LOWPOWER, 0, COLOR_THEME_PRIMARY1);
new CheckBox(line, rect_t{}, GET_SET_DEFAULT(md->multi.lowPowerMode)); lp_mode = new CheckBox(line, rect_t{}, GET_SET_DEFAULT(md->multi.lowPowerMode));
// Disable telemetry // Disable telemetry
line = newLine(&grid); line = newLine(&grid);
new StaticText(line, rect_t{}, STR_DISABLE_TELEM, 0, COLOR_THEME_PRIMARY1); new StaticText(line, rect_t{}, STR_DISABLE_TELEM, 0, COLOR_THEME_PRIMARY1);
new CheckBox(line, rect_t{}, GET_SET_DEFAULT(md->multi.disableTelemetry)); disable_telem = new CheckBox(line, rect_t{}, GET_SET_DEFAULT(md->multi.disableTelemetry));
cm_line = new MPMChannelMap(this, &grid, moduleIdx); cm_line = new MPMChannelMap(this, &grid, moduleIdx);
// Ensure elements properly initalised
update();
} }
void MultimoduleSettings::update() void MultimoduleSettings::update()
@@ -284,11 +327,15 @@ void MultimoduleSettings::update()
auto multi_proto = md->multi.rfProtocol; auto multi_proto = md->multi.rfProtocol;
if (multi_proto == MODULE_SUBTYPE_MULTI_DSM2) { if (multi_proto == MODULE_SUBTYPE_MULTI_DSM2) {
lv_obj_clear_flag(sr_line->getLvObj(), LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(sr_line->getLvObj(), LV_OBJ_FLAG_HIDDEN);
sr_line->update();
lv_obj_add_flag(ab_line->getLvObj(), LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(ab_line->getLvObj(), LV_OBJ_FLAG_HIDDEN);
} else { } else {
lv_obj_add_flag(sr_line->getLvObj(), LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(sr_line->getLvObj(), LV_OBJ_FLAG_HIDDEN);
lv_obj_clear_flag(ab_line->getLvObj(), LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(ab_line->getLvObj(), LV_OBJ_FLAG_HIDDEN);
ab_line->update();
} }
lp_mode->update();
disable_telem->update();
cm_line->update(rfProto); cm_line->update(rfProto);
} }
+6 -3
View File
@@ -22,6 +22,7 @@
#pragma once #pragma once
#include "form.h" #include "form.h"
#include "checkbox.h"
#include "module_setup.h" #include "module_setup.h"
struct ModuleData; struct ModuleData;
@@ -40,10 +41,12 @@ class MultimoduleSettings : public FormGroup, public ModuleOptions
MPMProtoOption* opt_line; MPMProtoOption* opt_line;
MPMServoRate* sr_line; MPMServoRate* sr_line;
MPMAutobind* ab_line; MPMAutobind* ab_line;
CheckBox* lp_mode;
CheckBox* disable_telem;
MPMChannelMap* cm_line; MPMChannelMap* cm_line;
public:
MultimoduleSettings(Window* parent, const FlexGridLayout& g,
uint8_t moduleIdx);
void update() override; void update() override;
public:
MultimoduleSettings(Window* parent, const FlexGridLayout& g, uint8_t moduleIdx);
}; };
+9
View File
@@ -400,6 +400,15 @@ void MultiRfProtocols::fillBuiltinProtos()
rfProto.flags = rfProto.flags =
(pdef->failsafe ? 0x01 : 0) | (pdef->disable_ch_mapping ? 0x02 : 0); (pdef->failsafe ? 0x01 : 0) | (pdef->disable_ch_mapping ? 0x02 : 0);
if (pdef->optionsstr != nullptr) {
for (uint8_t i = 0; i < getMaxMultiOptions(); i++) {
if (pdef->optionsstr == mm_options_strings::options[i]) {
rfProto.flags |= i << 4;
break;
}
}
}
if (pdef->subTypeString) { if (pdef->subTypeString) {
rfProto.fillSubProtoList(pdef->subTypeString, pdef->maxSubtype + 1); rfProto.fillSubProtoList(pdef->subTypeString, pdef->maxSubtype + 1);
} }