piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(cpn): User configurable audio mute in radio settings (#3735)

Browse Source 
* feat(cpn): User configurable audio mute in radio settings (#3710)

* CPN: user configurable audio mute in radio settings. Supports PR #3703

* make checkbox only visible for radios with AUDIO_MUTE_GPIO pin:

 - All color lcd radios (including NV14) except Horus X12S
 - TX12, TX12MK2, ZORRO, BOXER, T8, TLITE, TPRO, LR3PRO, COMMANDO8

* chore: Add Companion translations

---------

Co-authored-by: Michael <mha1@users.noreply.github.com>
This commit is contained in:
Peter Feerick
2023-07-01 18:22:14 +10:00
committed by GitHub
co-authored by Michael
parent 461dcc9fa9
commit 632eceba6d
22 changed files with 102 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/boards.cpp
+5
View File
@@ -561,6 +561,11 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
case HasExternalModuleSupport:
return (IS_STM32(board) && !IS_RADIOMASTER_T8(board));
case HasAudioMuteGPIO:
// All color lcd (including NV14) except Horus X12S
// TX12, TX12MK2, ZORRO, BOXER, T8, TLITE, TPRO, LR3PRO, COMMANDO8
return (IS_FAMILY_HORUS_OR_T16(board) && !IS_HORUS_X12S(board)) || IS_FAMILY_T12(board);
case SportMaxBaudRate:
if (IS_FAMILY_T16(board) || IS_FLYSKY_NV14(board) || IS_TARANIS_X7_ACCESS(board) ||
(IS_TARANIS(board) && !IS_TARANIS_XLITE(board) && !IS_TARANIS_X7(board) && !IS_TARANIS_X9LITE(board)))
companion/src/firmwares/boards.h
+1
View File
@@ -156,6 +156,7 @@ namespace Board {
HasSDCard,
HasInternalModuleSupport,
HasExternalModuleSupport,
HasAudioMuteGPIO,
SportMaxBaudRate
};
companion/src/firmwares/edgetx/yaml_generalsettings.cpp
+2
View File
@@ -210,6 +210,7 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
node["countryCode"] = rhs.countryCode;
node["noJitterFilter"] = (int)rhs.noJitterFilter;
node["disableRtcWarning"] = (int)rhs.rtcCheckDisable; // TODO: verify
node["audioMuteEnable"] = (int)rhs.muteIfNoSound;
node["keysBacklight"] = (int)rhs.keysBacklight;
node["rotEncMode"] = (int)rhs.rotEncMode;
node["imperial"] = rhs.imperial;
@@ -428,6 +429,7 @@ bool convert<GeneralSettings>::decode(const Node& node, GeneralSettings& rhs)
node["jitterFilter"] >> rhs.noJitterFilter; // PR1363 : read old name and
node["noJitterFilter"] >> rhs.noJitterFilter; // new, but don't write old
node["disableRtcWarning"] >> rhs.rtcCheckDisable; // TODO: verify
node["audioMuteEnable"] >> rhs.muteIfNoSound;
node["keysBacklight"] >> rhs.keysBacklight;
node["rotEncDirection"] >> rhs.rotEncMode; // PR2045: read old name and
node["rotEncMode"] >> rhs.rotEncMode; // new, but don't write old
companion/src/firmwares/generalsettings.h
+1
View File
@@ -247,6 +247,7 @@ class GeneralSettings {
unsigned int countryCode;
bool noJitterFilter;
bool rtcCheckDisable;
bool muteIfNoSound;
bool keysBacklight;
unsigned int rotEncMode;
unsigned int imperial;
companion/src/generaledit/hardware.cpp
+8
View File
@@ -174,6 +174,14 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
addParams();
}
if (Boards::getCapability(board, Board::HasAudioMuteGPIO)) {
addLabel(tr("Mute if no sound"));
AutoCheckBox *muteIfNoSound = new AutoCheckBox(this);
muteIfNoSound->setField(generalSettings.muteIfNoSound, this, false);
params->append(muteIfNoSound);
addParams();
}
if (firmware->getCapability(HasBluetooth)) {
addLabel(tr("Bluetooth"));
companion/src/translations/companion_cs.ts
+5
View File
@@ -6196,6 +6196,11 @@ Are you sure ?</source>
<source>ADC Filter</source>
<translation type="unfinished">ADC filtr</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation>Ztlumení, pokud není slyšet zvuk</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>
companion/src/translations/companion_da.ts
+5
View File
@@ -4983,6 +4983,11 @@ Er du sikker?</translation>
<source>ADC Filter</source>
<translation>ADC-filter</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation>Audio fra, hvis der ikke gives lyd</translation>
</message>
<message>
<source>S.Port Power</source>
<translation>S.Port spænding</translation>
companion/src/translations/companion_de.ts
+5
View File
@@ -6179,6 +6179,11 @@ Sind Sie sicher?</translation>
<source>ADC Filter</source>
<translation type="unfinished">ADC-Filter</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation>Geräuschunterdrückung</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>
companion/src/translations/companion_en.ts
+5
View File
@@ -6103,6 +6103,11 @@ Are you sure ?</source>
<source>ADC Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>
companion/src/translations/companion_es.ts
+5
View File
@@ -6247,6 +6247,11 @@ Esta función no puede ser deshabilitada en la radio.
<source>ADC Filter</source>
<translation type="unfinished">Filtro ADC</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>
companion/src/translations/companion_fi.ts
+5
View File
@@ -6234,6 +6234,11 @@ Are you sure ?</source>
<source>ADC Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>
companion/src/translations/companion_fr.ts
+5
View File
@@ -6246,6 +6246,11 @@ Cette fonction ne peut pas être désactivée sur la radio.
<source>ADC Filter</source>
<translation type="unfinished">Filtre ADC</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation>Muet si pas de son</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>
companion/src/translations/companion_he.ts
+5
View File
@@ -6103,6 +6103,11 @@ Are you sure ?</source>
<source>ADC Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation>השתקת קול</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>
companion/src/translations/companion_it.ts
+5
View File
@@ -6229,6 +6229,11 @@ Are you sure ?</source>
<source>ADC Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation>Muto senza suono</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>
companion/src/translations/companion_ja.ts
+5
View File
@@ -6231,6 +6231,11 @@ Are you sure ?</source>
<source>ADC Filter</source>
<translation type="unfinished">ADCフィルター</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>
companion/src/translations/companion_nl.ts
+5
View File
@@ -6103,6 +6103,11 @@ Are you sure ?</source>
<source>ADC Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>
companion/src/translations/companion_pl.ts
+5
View File
@@ -6216,6 +6216,11 @@ Are you sure ?</source>
<source>ADC Filter</source>
<translation type="unfinished">Filtr ADC</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>
companion/src/translations/companion_pt.ts
+5
View File
@@ -6103,6 +6103,11 @@ Are you sure ?</source>
<source>ADC Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>
companion/src/translations/companion_ru.ts
+5
View File
@@ -6167,6 +6167,11 @@ Are you sure ?</source>
<source>ADC Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>
companion/src/translations/companion_sv.ts
+5
View File
@@ -4983,6 +4983,11 @@ att fungera. Detta går inte att ändra från radion.
<source>ADC Filter</source>
<translation>ADC-filter</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation>Audio av om inget ljud</translation>
</message>
<message>
<source>S.Port Power</source>
<translation>S.Port strömkälla</translation>
companion/src/translations/companion_zh_CN.ts
+5
View File
@@ -6293,6 +6293,11 @@ Are you sure ?</source>
<source>ADC Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation>音频停播时自动静音</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>
companion/src/translations/companion_zh_TW.ts
+5
View File
@@ -6293,6 +6293,11 @@ Are you sure ?</source>
<source>ADC Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="178"/>
<source>Mute if no sound</source>
<translation>音頻停播時自動靜音</translation>
</message>
<message>
<location filename="../generaledit/hardware.cpp" line="198"/>
<source>Internal RF</source>