From aa61e1ba196e8e69f9268583c27f4762729eacf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Charpentier?= Date: Mon, 19 Apr 2021 15:19:59 +0200 Subject: [PATCH 01/14] Updated French Translation (#8458) * Updated French Translation. --- companion/src/translations/companion_fr.ts | 113 +++++++++++---------- 1 file changed, 59 insertions(+), 54 deletions(-) diff --git a/companion/src/translations/companion_fr.ts b/companion/src/translations/companion_fr.ts index 2a6eea996..d94e9785d 100644 --- a/companion/src/translations/companion_fr.ts +++ b/companion/src/translations/companion_fr.ts @@ -2233,7 +2233,7 @@ Si vous avez un fichier de sauvegarde des paramètres, vous pouvez l'import OpenTX ne supporte pas cette fonction sur cette carte - + OpenTX doesn't accept this radio protocol OpenTX ne supporte pas ce protocole radio @@ -8975,28 +8975,33 @@ Mixage actif par défaut si non-renseigné. Maître/Multi - + Disable Telemetry Désactiver la télémétrie - + + Racing Mode + Mode Course/Racing + + + Disable Ch. Map Désactiver "Mapping" des VOIES - + Show values in: Afficher les valeurs en: - + % abbreviation for percent - + μs abbreviation for microseconds @@ -9084,7 +9089,7 @@ Mixage actif par défaut si non-renseigné. ID d'enregistrement - + Failsafe Positions Positions Failsafe @@ -9137,100 +9142,100 @@ Mixage actif par défaut si non-renseigné. Négative - + Trainer Port Port écolage - + Internal Radio System Module HF interne - + External Radio Module Module HF externe - + Extra Radio System Module HF supplémentaire - + Radio System Module HF - + 10mW - 16CH 10mW - 16 VOIES - - + + 100mW - 16CH 100mW - 16 VOIES - + 500mW - 16CH 500mW - 16 VOIES - + Auto <= 1W - 16CH Auto <= 1W - 16 VOIES - - + + 25mW - 8CH 25mW - 8 VOIES - - + + 25mW - 16CH 25mW - 16 VOIES - + 200mW - 16CH (no telemetry) 200mW - 16 VOIES (pas de télémétrie) - + 500mW - 16CH (no telemetry) 500mW - 16 VOIES (pas de télémétrie) - + 100mW - 16CH (no telemetry) 100mW - 16 VOIES (pas de télémétrie) - + 25 mW - + 100 mW - + 500 mW - + 1 W - + 2 W @@ -9238,42 +9243,42 @@ Mixage actif par défaut si non-renseigné. ModulePanel - + Value Valeur - + Hold Maintien - + No Pulse Pas d'impulsion - + Ask Demander - + Internal Interne - + Internal + External Interne + Externe - + External Externe - + Bind on channel Bind avec VOIE @@ -11031,87 +11036,87 @@ Si cette option est cochée, la voie des gaz est inversée: le ralenti est &apo SetupPanel - + Popup menu available Menu contextuel disponible - + Timer %1 Chrono %1 - + Profile Settings Paramètres du profil - + SD structure path not specified or invalid Chemin de la structure SD non spécifié ou invalide - + Copy Copier - + Cut Couper - + Paste Coller - + Clear Effacer - + Insert Insérer - + Delete Supprimer - + Move Up Monter - + Move Down Descendre - + Clear All Effacer Tout - + Clear Timer. Are you sure? Effacer le Chrono. Êtes-vous sûr? - + Clear all Timers. Are you sure? Effacer tous les Chronos. Êtes-vous sûr? - + Cut Timer. Are you sure? Couper le Chrono. Êtes-vous sûr? - + Delete Timer. Are you sure? Supprimer le Chrono. Êtes-vous sûr? From 8a978b5b0761411b9a135767d9f0ce35fd8f5b0d Mon Sep 17 00:00:00 2001 From: Bryan Mayland Date: Mon, 19 Apr 2021 15:24:05 -0400 Subject: [PATCH 02/14] Update ModuleSyncStatus::update signature with proper types Also updates getRefreshString to use the signed types, and display correctly scaled values. --- radio/src/telemetry/telemetry.cpp | 15 +++++++-------- radio/src/telemetry/telemetry.h | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp index 700bf535a..d83765ce8 100644 --- a/radio/src/telemetry/telemetry.cpp +++ b/radio/src/telemetry/telemetry.cpp @@ -398,7 +398,7 @@ ModuleSyncStatus::ModuleSyncStatus() memset(this, 0, sizeof(ModuleSyncStatus)); } -void ModuleSyncStatus::update(uint16_t newRefreshRate, uint16_t newInputLag) +void ModuleSyncStatus::update(uint16_t newRefreshRate, int16_t newInputLag) { if (!newRefreshRate) return; @@ -449,13 +449,12 @@ void ModuleSyncStatus::getRefreshString(char * statusText) char * tmp = statusText; #if defined(DEBUG) *tmp++ = 'L'; - tmp = strAppendUnsigned(tmp, inputLag, 5); - tmp = strAppend(tmp, "us R "); - tmp = strAppendUnsigned(tmp, (uint32_t) (refreshRate / 1000), 5); - tmp = strAppend(tmp, "us"); + tmp = strAppendSigned(tmp, inputLag, 5); + tmp = strAppend(tmp, "R"); + tmp = strAppendUnsigned(tmp, refreshRate, 5); #else - tmp = strAppend(tmp, "Sync at "); - tmp = strAppendUnsigned(tmp, (uint32_t) (refreshRate / 1000000)); - tmp = strAppend(tmp, " ms"); + tmp = strAppend(tmp, "Sync "); + tmp = strAppendUnsigned(tmp, refreshRate); #endif + tmp = strAppend(tmp, "us"); } diff --git a/radio/src/telemetry/telemetry.h b/radio/src/telemetry/telemetry.h index c70cc5fb9..1189443ba 100644 --- a/radio/src/telemetry/telemetry.h +++ b/radio/src/telemetry/telemetry.h @@ -306,7 +306,7 @@ struct ModuleSyncStatus } // Set feedback from RF module - void update(uint16_t newRefreshRate, uint16_t newInputLag); + void update(uint16_t newRefreshRate, int16_t newInputLag); // Get computed settings for scheduler uint16_t getAdjustedRefreshRate(); From 30f72a869577e0f7903ee45fe088416ff417331e Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 20 Apr 2021 09:03:07 +0200 Subject: [PATCH 03/14] Update CREDITS.txt --- CREDITS.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CREDITS.txt b/CREDITS.txt index f4f2c3cb9..88516b482 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -2238,3 +2238,6 @@ Michael Jakob Dean Berg David Hankins Gary Cripps +Devin Crumb +Daniel Naude +James Miller From d67d1aa0c09d2f485c3ef7ca8c4fb1e9214a2ee7 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 20 Apr 2021 11:09:43 +0200 Subject: [PATCH 04/14] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 88516b482..227bb3c99 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -2241,3 +2241,4 @@ Gary Cripps Devin Crumb Daniel Naude James Miller +Pascal Cayol From 5f59bb58d7cc21e7a7c9272f0147736f780a4521 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 21 Apr 2021 12:58:13 +0200 Subject: [PATCH 05/14] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 227bb3c99..2029edbb0 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -2242,3 +2242,4 @@ Devin Crumb Daniel Naude James Miller Pascal Cayol +eDefine From a626d57d79cf485492bd900e6af8a4242e8a0a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Charpentier?= Date: Wed, 21 Apr 2021 13:24:01 +0200 Subject: [PATCH 06/14] Updated French translation. (#8461) --- companion/src/translations/companion_fr.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/companion/src/translations/companion_fr.ts b/companion/src/translations/companion_fr.ts index d94e9785d..0ece144ea 100644 --- a/companion/src/translations/companion_fr.ts +++ b/companion/src/translations/companion_fr.ts @@ -1631,7 +1631,7 @@ Si vous avez un fichier de sauvegarde des paramètres, vous pouvez l'import Trainer Sticks - Manches Écolage + Écolage Manches @@ -1656,7 +1656,7 @@ Si vous avez un fichier de sauvegarde des paramètres, vous pouvez l'import Trainer Channels - Écolage Channels + Écolage Canaux @@ -8982,7 +8982,7 @@ Mixage actif par défaut si non-renseigné. Racing Mode - Mode Course/Racing + Mode Course/Racing From 77f1840af6d709eed975fba24a9648f3ed37ca58 Mon Sep 17 00:00:00 2001 From: Neil Horne Date: Fri, 23 Apr 2021 15:06:27 +1000 Subject: [PATCH 07/14] Fix 8463 (#8464) --- companion/src/firmwares/rawsource.cpp | 2 +- companion/src/firmwares/sensordata.cpp | 10 +++++----- companion/src/firmwares/sensordata.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/companion/src/firmwares/rawsource.cpp b/companion/src/firmwares/rawsource.cpp index 898c0ca4a..dfd8ae4d4 100644 --- a/companion/src/firmwares/rawsource.cpp +++ b/companion/src/firmwares/rawsource.cpp @@ -60,7 +60,7 @@ RawSourceRange RawSource::getRange(const ModelData * model, const GeneralSetting result.min = -30000 * result.step; result.max = +30000 * result.step; result.decimals = sensor.prec; - result.unit = SensorData::unitToString(qr.quot); + result.unit = sensor.unitToString(); break; } diff --git a/companion/src/firmwares/sensordata.cpp b/companion/src/firmwares/sensordata.cpp index ae602bd0d..9a26a6d82 100644 --- a/companion/src/firmwares/sensordata.cpp +++ b/companion/src/firmwares/sensordata.cpp @@ -75,9 +75,9 @@ QString SensorData::cellIndexToString() const return cellIndexToString(index); } -QString SensorData::unitToString() const +QString SensorData::unitToString(bool hideRaw) const { - return unitToString(unit); + return unitToString(unit, hideRaw); } QString SensorData::precToString() const @@ -342,11 +342,11 @@ QString SensorData::sourceToString(const ModelData * model, const int index, con } // static -QString SensorData::unitToString(const int value) +QString SensorData::unitToString(const int value, bool hideRaw) { switch (value) { case UNIT_RAW: - return tr("Raw (-)"); + return hideRaw ? QString() : tr("Raw (-)"); case UNIT_VOLTS: return tr("V"); case UNIT_AMPS: @@ -496,7 +496,7 @@ AbstractStaticItemModel * SensorData::unitItemModel() mdl->setName("sensordata.unit"); for (int i = 0; i <= UNIT_MAX; i++) { - QString str = unitToString(i); + QString str = unitToString(i, false); if (str != CPN_STR_UNKNOWN_ITEM) mdl->appendToItemList(str, i); } diff --git a/companion/src/firmwares/sensordata.h b/companion/src/firmwares/sensordata.h index 8a032cec5..1581b444b 100644 --- a/companion/src/firmwares/sensordata.h +++ b/companion/src/firmwares/sensordata.h @@ -188,7 +188,7 @@ class SensorData { QString typeToString() const; QString formulaToString() const; QString cellIndexToString() const; - QString unitToString() const; + QString unitToString(bool hideRaw = true) const; QString precToString() const; int getMask() const; QString paramsToString(const ModelData * model) const; @@ -203,7 +203,7 @@ class SensorData { static QString typeToString(const int value); static QString formulaToString(const int value); static QString cellIndexToString(const int value); - static QString unitToString(const int value); + static QString unitToString(const int value, bool hideRaw = true); static QString precToString(const int value); static bool isRssiSensorAvailable(const ModelData * model, const int value); static QString rssiSensorToString(const ModelData * model, const int value); From 890888f3e3e87be75ebc1ea65b23232fe57511b9 Mon Sep 17 00:00:00 2001 From: Neil Horne Date: Sat, 24 Apr 2021 19:47:50 +1000 Subject: [PATCH 08/14] Stop Companion crash when conversion switch index out of range (#8469) --- companion/src/firmwares/rawswitch.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/companion/src/firmwares/rawswitch.cpp b/companion/src/firmwares/rawswitch.cpp index 7aef46922..f609e7942 100644 --- a/companion/src/firmwares/rawswitch.cpp +++ b/companion/src/firmwares/rawswitch.cpp @@ -191,7 +191,10 @@ RawSwitch RawSwitch::convert(RadioDataConversionState & cstate) QStringList fromSwitchList(getSwitchList(cstate.fromBoard)); QStringList toSwitchList(getSwitchList(cstate.toBoard)); // set to -1 if no match found - newIdx = toSwitchList.indexOf(fromSwitchList.at(swtch.quot)); + if (swtch.quot < fromSwitchList.count()) + newIdx = toSwitchList.indexOf(fromSwitchList.at(swtch.quot)); + else + newIdx = -1; // perform forced mapping if (newIdx < 0) { if (IS_TARANIS_X7(cstate.toType) && (IS_TARANIS_X9(cstate.fromType) || IS_FAMILY_HORUS_OR_T16(cstate.fromType))) { From ddd033f03409d7ab2c04d3f48d09656d19c2f558 Mon Sep 17 00:00:00 2001 From: Neil Horne Date: Sat, 24 Apr 2021 20:59:21 +1000 Subject: [PATCH 09/14] Stop Companion crash when conversion source index out of range (#8470) --- companion/src/firmwares/rawsource.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/companion/src/firmwares/rawsource.cpp b/companion/src/firmwares/rawsource.cpp index dfd8ae4d4..eaa651b6c 100644 --- a/companion/src/firmwares/rawsource.cpp +++ b/companion/src/firmwares/rawsource.cpp @@ -351,8 +351,11 @@ RawSource RawSource::convert(RadioDataConversionState & cstate) if (type == SOURCE_TYPE_SWITCH) { QStringList fromSwitchList(getSwitchList(cstate.fromBoard)); QStringList toSwitchList(getSwitchList(cstate.toBoard)); - index = toSwitchList.indexOf(fromSwitchList.at(oldData.id)); // index set to -1 if no match found + if (oldData.id < fromSwitchList.count()) + index = toSwitchList.indexOf(fromSwitchList.at(oldData.id)); + else + index = -1; // perform forced mapping if (index < 0) { if (IS_TARANIS_X7(cstate.toType) && (IS_TARANIS_X9(cstate.fromType) || IS_FAMILY_HORUS_OR_T16(cstate.fromType))) { From fe2bb8b07317fd281ca6bc3201ed15247703a953 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 26 Apr 2021 14:24:44 +0200 Subject: [PATCH 10/14] Update CREDITS.txt --- CREDITS.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CREDITS.txt b/CREDITS.txt index 2029edbb0..af5a6c0e7 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -2243,3 +2243,6 @@ Daniel Naude James Miller Pascal Cayol eDefine +Mario Sette +Hans-Georg Böhm +Robert Oats From 25c7392d43dd8aa63972686d1e414f84312b8cd8 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 27 Apr 2021 21:30:21 +0200 Subject: [PATCH 11/14] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index af5a6c0e7..6e1770037 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -2246,3 +2246,4 @@ eDefine Mario Sette Hans-Georg Böhm Robert Oats +Helmut Suhrbier From 22f515580313c3e43cc78467ae3d7b87a1f0cbfc Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 28 Apr 2021 15:19:24 +0200 Subject: [PATCH 12/14] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 6e1770037..b6a2875e0 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -2247,3 +2247,4 @@ Mario Sette Hans-Georg Böhm Robert Oats Helmut Suhrbier +Johannes Vorster From e6fbce0772dd5b8759acf509136c390e77e9cd38 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 28 Apr 2021 15:55:18 +0200 Subject: [PATCH 13/14] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index b6a2875e0..cca0aad20 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -2248,3 +2248,4 @@ Hans-Georg Böhm Robert Oats Helmut Suhrbier Johannes Vorster +Deon du Rand From c8a2d279d53cc52aa34ae0f2bae39e23f13c7b5b Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 30 Apr 2021 19:46:27 +0200 Subject: [PATCH 14/14] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index cca0aad20..592206e07 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -2249,3 +2249,4 @@ Robert Oats Helmut Suhrbier Johannes Vorster Deon du Rand +Stephen Hill-Harriss