feat(radio): allow disabling USB charge while the radio is running (on compatible hardware) (#7564)
Co-authored-by: 3djc <3djc@gh.com> Co-authored-by: Claude Opus 5 <noreply@anthropic.com> Co-authored-by: Peter Feerick <5500713+pfeerick@users.noreply.github.com> Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
co-authored by
3djc
Claude Opus 5
Peter Feerick
Peter Feerick
parent
2baf75f3aa
commit
a51946c4e2
@@ -254,6 +254,7 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
|
||||
node["disableRssiPoweroffAlarm"] = (int)rhs.disableRssiPoweroffAlarm;
|
||||
node["disableTrainerPoweroffAlarm"] = (int)rhs.disableTrainerPoweroffAlarm;
|
||||
node["USBMode"] = rhs.usbMode;
|
||||
node["usbChargeDisabled"] = (int)rhs.usbChargeDisabled;
|
||||
node["hatsMode"] = hatsModeLut << rhs.hatsMode;
|
||||
node["stickDeadZone"] = rhs.stickDeadZone;
|
||||
node["jackMode"] = rhs.jackMode;
|
||||
@@ -542,6 +543,7 @@ bool convert<GeneralSettings>::decode(const Node& node, GeneralSettings& rhs)
|
||||
node["disableRssiPoweroffAlarm"] >> rhs.disableRssiPoweroffAlarm;
|
||||
node["disableTrainerPoweroffAlarm"] >> rhs.disableTrainerPoweroffAlarm;
|
||||
node["USBMode"] >> rhs.usbMode;
|
||||
node["usbChargeDisabled"] >> rhs.usbChargeDisabled;
|
||||
node["hatsMode"] >> hatsModeLut >> rhs.hatsMode;
|
||||
node["stickDeadZone"] >> rhs.stickDeadZone;
|
||||
node["jackMode"] >> rhs.jackMode;
|
||||
|
||||
@@ -318,6 +318,7 @@ class GeneralSettings {
|
||||
bool disableRssiPoweroffAlarm;
|
||||
bool disableTrainerPoweroffAlarm;
|
||||
unsigned int usbMode;
|
||||
bool usbChargeDisabled;
|
||||
unsigned int hatsMode;
|
||||
unsigned int stickDeadZone;
|
||||
unsigned int jackMode;
|
||||
|
||||
@@ -97,6 +97,17 @@ ui(new Ui::GeneralSetup)
|
||||
ui->adjustRTC->setChecked(generalSettings.adjustRTC);
|
||||
ui->usbModeCB->setCurrentIndex(generalSettings.usbMode);
|
||||
|
||||
// "Charge while radio on" is only available on RadioMaster radios
|
||||
// that expose the charger-enable pin (rm-h750 based targets).
|
||||
if (IS_RADIOMASTER_TX16SMK3(board) || IS_RADIOMASTER_TX15(board) ||
|
||||
IS_RADIOMASTER_GX15(board)) {
|
||||
ui->usbChargeChkB->setChecked(!generalSettings.usbChargeDisabled); // Default is zero=checked
|
||||
}
|
||||
else {
|
||||
ui->usbChargeLabel->hide();
|
||||
ui->usbChargeChkB->hide();
|
||||
}
|
||||
|
||||
if (IS_FLYSKY_EL18(board) || IS_FLYSKY_NV14(board) || IS_FAMILY_PL18(board)) {
|
||||
ui->hatsModeCB->setModel(panelFilteredModels->getItemModel(FIM_HATSMODE));
|
||||
ui->hatsModeCB->setField(generalSettings.hatsMode, this);
|
||||
@@ -384,6 +395,14 @@ void GeneralSetupPanel::on_usbModeCB_currentIndexChanged(int index)
|
||||
}
|
||||
}
|
||||
|
||||
void GeneralSetupPanel::on_usbChargeChkB_stateChanged(int)
|
||||
{
|
||||
if (!lock) {
|
||||
generalSettings.usbChargeDisabled = !ui->usbChargeChkB->isChecked();
|
||||
emit modified();
|
||||
}
|
||||
}
|
||||
|
||||
void GeneralSetupPanel::on_jackModeCB_currentIndexChanged(int index)
|
||||
{
|
||||
if (!lock) {
|
||||
|
||||
@@ -62,6 +62,7 @@ class GeneralSetupPanel : public GeneralPanel
|
||||
void on_hapticLengthCB_currentIndexChanged(int index);
|
||||
void on_backlightswCB_currentIndexChanged(int index);
|
||||
void on_usbModeCB_currentIndexChanged(int index);
|
||||
void on_usbChargeChkB_stateChanged(int);
|
||||
void on_jackModeCB_currentIndexChanged(int index);
|
||||
void on_backlightColor_SL_valueChanged();
|
||||
void on_mavbaud_CB_currentIndexChanged(int index);
|
||||
|
||||
@@ -392,7 +392,7 @@ Mode 4:
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="28" column="1">
|
||||
<item row="29" column="1">
|
||||
<widget class="QComboBox" name="ppm_units_CB">
|
||||
<property name="currentText">
|
||||
<string>0.--</string>
|
||||
@@ -414,7 +414,7 @@ Mode 4:
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="27" column="1">
|
||||
<item row="28" column="1">
|
||||
<widget class="AutoComboBox" name="hatsModeCB" native="true"/>
|
||||
</item>
|
||||
<item row="23" column="1">
|
||||
@@ -506,7 +506,7 @@ Acceptable values are 3v..12v</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="28" column="0">
|
||||
<item row="29" column="0">
|
||||
<widget class="QLabel" name="ppm_units_label">
|
||||
<property name="text">
|
||||
<string>PPM Units</string>
|
||||
@@ -854,7 +854,7 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="26" column="1">
|
||||
<item row="27" column="1">
|
||||
<widget class="QComboBox" name="jackModeCB">
|
||||
<item>
|
||||
<property name="text">
|
||||
@@ -897,6 +897,20 @@ p, li { white-space: pre-wrap; }
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="26" column="0">
|
||||
<widget class="QLabel" name="usbChargeLabel">
|
||||
<property name="text">
|
||||
<string>Charge while radio on</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="26" column="1">
|
||||
<widget class="QCheckBox" name="usbChargeChkB">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="17" column="0">
|
||||
<widget class="QLabel" name="label_15">
|
||||
<property name="sizePolicy">
|
||||
@@ -916,7 +930,7 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="27" column="0">
|
||||
<item row="28" column="0">
|
||||
<widget class="QLabel" name="hatsModeLabel">
|
||||
<property name="text">
|
||||
<string>Hats Mode</string>
|
||||
@@ -955,7 +969,7 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="26" column="0">
|
||||
<item row="27" column="0">
|
||||
<widget class="QLabel" name="jackModeLabel">
|
||||
<property name="text">
|
||||
<string>Jack Mode</string>
|
||||
@@ -1077,7 +1091,7 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="30" column="0">
|
||||
<item row="32" column="0">
|
||||
<spacer name="verticalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Orientation::Vertical</enum>
|
||||
@@ -1304,28 +1318,28 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="29" column="0">
|
||||
<item row="30" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>One log per day</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="29" column="1">
|
||||
<item row="30" column="1">
|
||||
<widget class="QCheckBox" name="chkOneLogPerDay">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="30" column="0">
|
||||
<item row="31" column="0">
|
||||
<widget class="QLabel" name="label_keyLockEnabled">
|
||||
<property name="text">
|
||||
<string>Key lock</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="30" column="1">
|
||||
<item row="31" column="1">
|
||||
<widget class="QCheckBox" name="chkKeyLockEnabled">
|
||||
<property name="text">
|
||||
<string/>
|
||||
|
||||
Reference in New Issue
Block a user