cpn(fix): Multi module DSM protocol options (#2724)
* cpn(fix): Multi module DSM protocol option check box * Add servo rate option for multi DSM * Use bitmap helper functions
This commit is contained in:
@@ -220,6 +220,7 @@ void TimerPanel::onModeChanged(int index)
|
|||||||
#define MASK_RF_RACING_MODE (1<<16)
|
#define MASK_RF_RACING_MODE (1<<16)
|
||||||
#define MASK_GHOST (1<<17)
|
#define MASK_GHOST (1<<17)
|
||||||
#define MASK_BAUDRATE (1<<18)
|
#define MASK_BAUDRATE (1<<18)
|
||||||
|
#define MASK_MULTI_DSM_OPT (1<<19)
|
||||||
|
|
||||||
quint8 ModulePanel::failsafesValueDisplayType = ModulePanel::FAILSAFE_DISPLAY_PERCENT;
|
quint8 ModulePanel::failsafesValueDisplayType = ModulePanel::FAILSAFE_DISPLAY_PERCENT;
|
||||||
|
|
||||||
@@ -492,8 +493,12 @@ void ModulePanel::update()
|
|||||||
mask |= MASK_CHANNELS_COUNT;
|
mask |= MASK_CHANNELS_COUNT;
|
||||||
else
|
else
|
||||||
module.channelsCount = 16;
|
module.channelsCount = 16;
|
||||||
if (pdef.optionsstr != nullptr)
|
if (pdef.optionsstr != nullptr) {
|
||||||
mask |= MASK_MULTIOPTION;
|
if (module.multi.rfProtocol == MODULE_SUBTYPE_MULTI_DSM2)
|
||||||
|
mask |= MASK_MULTI_DSM_OPT;
|
||||||
|
else
|
||||||
|
mask |= MASK_MULTIOPTION;
|
||||||
|
}
|
||||||
if (pdef.hasFailsafe || (module.multi.rfProtocol == MODULE_SUBTYPE_MULTI_FRSKY && (module.subType == 0 || module.subType == 2 || module.subType > 3 )))
|
if (pdef.hasFailsafe || (module.multi.rfProtocol == MODULE_SUBTYPE_MULTI_FRSKY && (module.subType == 0 || module.subType == 2 || module.subType > 3 )))
|
||||||
mask |= MASK_FAILSAFES;
|
mask |= MASK_FAILSAFES;
|
||||||
break;
|
break;
|
||||||
@@ -629,6 +634,10 @@ void ModulePanel::update()
|
|||||||
ui->multiProtocol->setVisible(mask & MASK_MULTIMODULE);
|
ui->multiProtocol->setVisible(mask & MASK_MULTIMODULE);
|
||||||
ui->label_option->setVisible(mask & MASK_MULTIOPTION);
|
ui->label_option->setVisible(mask & MASK_MULTIOPTION);
|
||||||
ui->optionValue->setVisible(mask & MASK_MULTIOPTION);
|
ui->optionValue->setVisible(mask & MASK_MULTIOPTION);
|
||||||
|
ui->lblChkOption->setVisible(mask & MASK_MULTI_DSM_OPT);
|
||||||
|
ui->chkOption->setVisible(mask & MASK_MULTI_DSM_OPT);
|
||||||
|
ui->lblCboOption->setVisible(mask & MASK_MULTI_DSM_OPT);
|
||||||
|
ui->cboOption->setVisible(mask & MASK_MULTI_DSM_OPT);
|
||||||
ui->disableTelem->setVisible(mask & MASK_MULTIMODULE);
|
ui->disableTelem->setVisible(mask & MASK_MULTIMODULE);
|
||||||
ui->disableChMap->setVisible(mask & MASK_MULTIMODULE);
|
ui->disableChMap->setVisible(mask & MASK_MULTIMODULE);
|
||||||
ui->lowPower->setVisible(mask & MASK_MULTIMODULE);
|
ui->lowPower->setVisible(mask & MASK_MULTIMODULE);
|
||||||
@@ -653,6 +662,16 @@ void ModulePanel::update()
|
|||||||
ui->label_option->setText(qApp->translate("Multiprotocols", qPrintable(pdef.optionsstr)));
|
ui->label_option->setText(qApp->translate("Multiprotocols", qPrintable(pdef.optionsstr)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (mask & MASK_MULTI_DSM_OPT) {
|
||||||
|
ui->lblChkOption->setText(qApp->translate("Multiprotocols", qPrintable(pdef.optionsstr)));
|
||||||
|
ui->chkOption->setChecked(Helpers::getBitmappedValue(module.multi.optionValue, 0));
|
||||||
|
ui->lblCboOption->setText(qApp->translate("Multiprotocols", "Servo update rate"));
|
||||||
|
ui->cboOption->clear();
|
||||||
|
ui->cboOption->addItems({"22ms", "11ms"});
|
||||||
|
ui->cboOption->setSizeAdjustPolicy(QComboBox::AdjustToContents);
|
||||||
|
ui->cboOption->setCurrentIndex(Helpers::getBitmappedValue(module.multi.optionValue, 1));
|
||||||
|
}
|
||||||
|
|
||||||
// Ghost settings fields
|
// Ghost settings fields
|
||||||
ui->raw12bits->setVisible(mask & MASK_GHOST);
|
ui->raw12bits->setVisible(mask & MASK_GHOST);
|
||||||
if (mask & MASK_GHOST) {
|
if (mask & MASK_GHOST) {
|
||||||
@@ -854,6 +873,42 @@ void ModulePanel::on_optionValue_editingFinished()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ModulePanel::on_chkOption_stateChanged(int state)
|
||||||
|
{
|
||||||
|
if (!lock) {
|
||||||
|
if (module.multi.rfProtocol == MODULE_SUBTYPE_MULTI_DSM2) {
|
||||||
|
unsigned int opt = (unsigned int)module.multi.optionValue;
|
||||||
|
if (Helpers::getBitmappedValue(opt, 0) != (state == Qt::Checked)) {
|
||||||
|
Helpers::setBitmappedValue(opt, (state == Qt::Checked), 0);
|
||||||
|
module.multi.optionValue = opt;
|
||||||
|
emit modified();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (module.multi.optionValue != (state == Qt::Checked)) {
|
||||||
|
module.multi.optionValue = (state == Qt::Checked);
|
||||||
|
emit modified();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModulePanel::on_cboOption_currentIndexChanged(int value)
|
||||||
|
{
|
||||||
|
if (!lock && value >= 0) {
|
||||||
|
if (module.multi.rfProtocol == MODULE_SUBTYPE_MULTI_DSM2) {
|
||||||
|
unsigned int opt = (unsigned int)module.multi.optionValue;
|
||||||
|
if (Helpers::getBitmappedValue(opt, 1) != (unsigned int)value) {
|
||||||
|
Helpers::setBitmappedValue(opt, value, 1);
|
||||||
|
module.multi.optionValue = opt;
|
||||||
|
emit modified();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (module.multi.optionValue != value) {
|
||||||
|
module.multi.optionValue = value;
|
||||||
|
emit modified();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void ModulePanel::onSubTypeChanged()
|
void ModulePanel::onSubTypeChanged()
|
||||||
{
|
{
|
||||||
const unsigned type = ui->multiSubType->currentData().toUInt();
|
const unsigned type = ui->multiSubType->currentData().toUInt();
|
||||||
|
|||||||
@@ -113,6 +113,8 @@ class ModulePanel : public ModelPanel
|
|||||||
void updateFailsafe(unsigned channel);
|
void updateFailsafe(unsigned channel);
|
||||||
void on_optionValue_editingFinished();
|
void on_optionValue_editingFinished();
|
||||||
void onClearAccessRxClicked();
|
void onClearAccessRxClicked();
|
||||||
|
void on_chkOption_stateChanged(int state);
|
||||||
|
void on_cboOption_currentIndexChanged(int value);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum FailsafeValueDisplayTypes { FAILSAFE_DISPLAY_PERCENT = 1, FAILSAFE_DISPLAY_USEC = 2 };
|
enum FailsafeValueDisplayTypes { FAILSAFE_DISPLAY_PERCENT = 1, FAILSAFE_DISPLAY_USEC = 2 };
|
||||||
|
|||||||
@@ -1057,7 +1057,7 @@
|
|||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="7" column="0" colspan="2">
|
<item row="9" column="0" colspan="2">
|
||||||
<spacer name="horizontalSpacer">
|
<spacer name="horizontalSpacer">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
@@ -1098,6 +1098,40 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="7" column="0">
|
||||||
|
<widget class="QLabel" name="lblChkOption">
|
||||||
|
<property name="text">
|
||||||
|
<string>Option check</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="7" column="1">
|
||||||
|
<widget class="QCheckBox" name="chkOption">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="8" column="0">
|
||||||
|
<widget class="QLabel" name="lblCboOption">
|
||||||
|
<property name="text">
|
||||||
|
<string>Option combo</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="8" column="1">
|
||||||
|
<widget class="QComboBox" name="cboOption">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="sizeAdjustPolicy">
|
||||||
|
<enum>QComboBox::AdjustToContents</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0" colspan="3">
|
<item row="1" column="0" colspan="3">
|
||||||
|
|||||||
Reference in New Issue
Block a user