From 874356694c6de19a1995751467a73aa78a2f1876 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 2 Dec 2018 16:40:35 +0100 Subject: [PATCH 01/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 414023ed6..5135374e4 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1457,3 +1457,4 @@ Stefan Hufnagl Jean Philippe Bonacci Jack Mitchell Santiago Iglesias Garcia +Steve Kurywchak From 45ebb29de4a0e8b73cc4f08f4348163c5d056930 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 7 Dec 2018 08:17:05 +0100 Subject: [PATCH 02/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 5135374e4..a08fc3cc6 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1458,3 +1458,4 @@ Jean Philippe Bonacci Jack Mitchell Santiago Iglesias Garcia Steve Kurywchak +Tore Skjefstad From ac80681b7722a5901ec90482d2b4bbcf5b0dcb3b Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 8 Dec 2018 13:40:35 +0100 Subject: [PATCH 03/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index a08fc3cc6..c3bcfe6a8 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1459,3 +1459,4 @@ Jack Mitchell Santiago Iglesias Garcia Steve Kurywchak Tore Skjefstad +Sergio Digiandco di Molino From 3ecf8448f05ac76568130e89c6aafda384213315 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 11 Dec 2018 22:40:04 +0100 Subject: [PATCH 04/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index c3bcfe6a8..e9de2a747 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1460,3 +1460,4 @@ Santiago Iglesias Garcia Steve Kurywchak Tore Skjefstad Sergio Digiandco di Molino +Xavier Delepine From 19898e3e0adb8d2935e6dab868eaec8033cb4e7d Mon Sep 17 00:00:00 2001 From: Kilrah Date: Thu, 13 Dec 2018 11:24:53 +0100 Subject: [PATCH 05/41] Fix DIY_FIRST_ID --- radio/src/telemetry/frsky.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h index e138dcf62..dc19a5bd7 100644 --- a/radio/src/telemetry/frsky.h +++ b/radio/src/telemetry/frsky.h @@ -181,7 +181,7 @@ enum FrSkyDataState { #define GASSUIT_MAX_FLOW_LAST_ID 0x0d6f #define GASSUIT_AVG_FLOW_FIRST_ID 0x0d70 #define GASSUIT_AVG_FLOW_LAST_ID 0x0d7f -#define DIY_FIRST_ID 0x5000 +#define DIY_FIRST_ID 0x5100 #define DIY_LAST_ID 0x52ff #define DIY_STREAM_FIRST_ID 0x5000 #define DIY_STREAM_LAST_ID 0x50ff From 1d28f319165ad6893824f7501425e3ba26693234 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 13 Dec 2018 19:41:36 +0100 Subject: [PATCH 06/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index e9de2a747..448e728df 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1461,3 +1461,4 @@ Steve Kurywchak Tore Skjefstad Sergio Digiandco di Molino Xavier Delepine +Miles Shearman From 2ed1b6cf7c6cfa4ebb7445668ff07c5a9a3afd64 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 15 Dec 2018 12:08:03 +0100 Subject: [PATCH 07/41] Update CREDITS.txt --- CREDITS.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CREDITS.txt b/CREDITS.txt index 448e728df..3e1504a19 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1462,3 +1462,9 @@ Tore Skjefstad Sergio Digiandco di Molino Xavier Delepine Miles Shearman +Bernard Teyssier +Entel Consulting BVBA +Stuart Olson +Maximilian Wechselberger + + From 03835558fc3b7d3ce6d7b6e0da221962e3c8b588 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 15 Dec 2018 15:24:17 +0100 Subject: [PATCH 08/41] Update CREDITS.txt --- CREDITS.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CREDITS.txt b/CREDITS.txt index 3e1504a19..2feb043db 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1466,5 +1466,4 @@ Bernard Teyssier Entel Consulting BVBA Stuart Olson Maximilian Wechselberger - - +Kenneth Crump From 2f4863241b2c869a9cc9950cd1f95460c37fb05e Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 16 Dec 2018 09:21:50 +0100 Subject: [PATCH 09/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 2feb043db..eae0a4787 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1467,3 +1467,4 @@ Entel Consulting BVBA Stuart Olson Maximilian Wechselberger Kenneth Crump +Ken Elder From edec4149cf1d9afe8ca32f57cd912edfea058e7d Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 16 Dec 2018 14:55:20 +0100 Subject: [PATCH 10/41] Fix alignement --- radio/src/gui/480x272/widgets.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/480x272/widgets.cpp b/radio/src/gui/480x272/widgets.cpp index e8bb01f92..065017c6f 100644 --- a/radio/src/gui/480x272/widgets.cpp +++ b/radio/src/gui/480x272/widgets.cpp @@ -33,12 +33,12 @@ void drawColumnHeader(const char * const * headers, const char * const * descrip } } -const uint8_t __alpha_button_on[] { +static const uint8_t __alpha_button_on[] __ALIGNED(4) = { #include "alpha_button_on.lbm" }; Bitmap ALPHA_BUTTON_ON(BMP_ARGB4444, (const uint16_t*)__alpha_button_on); -const uint8_t __alpha_button_off[] { +static const uint8_t __alpha_button_off[] __ALIGNED(4) = { #include "alpha_button_off.lbm" }; Bitmap ALPHA_BUTTON_OFF(BMP_ARGB4444, (const uint16_t*)__alpha_button_off); From b50a152dd55cf5ceb0c51cb200e8831be1de870d Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 17 Dec 2018 21:31:39 +0100 Subject: [PATCH 11/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index eae0a4787..9eade9979 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1468,3 +1468,4 @@ Stuart Olson Maximilian Wechselberger Kenneth Crump Ken Elder +Darko Perković From c3cb7b78fe0663cc5caa217b0e85dcfaa26d6f74 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 18 Dec 2018 18:59:11 +0100 Subject: [PATCH 12/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 9eade9979..5e3c68174 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1469,3 +1469,4 @@ Maximilian Wechselberger Kenneth Crump Ken Elder Darko Perković +Martin Krueger From 74b9446a301f4502fa27f7d3e5531838fbec7d55 Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 20 Dec 2018 09:22:47 +0100 Subject: [PATCH 13/41] Fix backlight not turning off on radio with physical on/off switch This fixes #6270 --- radio/src/targets/taranis/keys_driver.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/radio/src/targets/taranis/keys_driver.cpp b/radio/src/targets/taranis/keys_driver.cpp index 95c93c658..1f44b824f 100644 --- a/radio/src/targets/taranis/keys_driver.cpp +++ b/radio/src/targets/taranis/keys_driver.cpp @@ -149,7 +149,11 @@ void readKeysAndTrims() keys[index++].input(trims_input & i); } +#if defined(PWR_BUTTON_PRESS) if ((keys_input || trims_input || pwrPressed()) && (g_eeGeneral.backlightMode & e_backlight_mode_keys)) { +#else + if ((keys_input || trims_input) && (g_eeGeneral.backlightMode & e_backlight_mode_keys)) { +#endif // on keypress turn the light on backlightOn(); } From c7896aeecf9ec02d66f512640a894a84bba44a8e Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 20 Dec 2018 19:39:17 +0100 Subject: [PATCH 14/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 5e3c68174..3bb616de6 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1470,3 +1470,4 @@ Kenneth Crump Ken Elder Darko Perković Martin Krueger +Jack Lopes From 32a7b503187a69e27914fc431cf9af84f8ac1819 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 22 Dec 2018 10:11:34 +0100 Subject: [PATCH 15/41] Update CREDITS.txt --- CREDITS.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CREDITS.txt b/CREDITS.txt index 3bb616de6..e30045d76 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1471,3 +1471,5 @@ Ken Elder Darko Perković Martin Krueger Jack Lopes +Huguette Viale +Didier Christien From e1d056486f92bbade2dcc4e45995cbd091919ee9 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 22 Dec 2018 11:08:16 +0100 Subject: [PATCH 16/41] Fix wrong default channels in D8 (thx @Kilrah) --- radio/src/pulses/modules.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/pulses/modules.h b/radio/src/pulses/modules.h index 2ecb78168..f15a9968c 100644 --- a/radio/src/pulses/modules.h +++ b/radio/src/pulses/modules.h @@ -193,7 +193,7 @@ inline int8_t defaultModuleChannels_M8(uint8_t idx) else if (isModuleMultimoduleDSM2(idx)) return -1; // 7 channels else - return 8; // 16 channels + return maxModuleChannels_M8(idx); } inline int8_t sentModuleChannels(uint8_t idx) From fb4160e8e87f8ae86d106b4abdb1d9b2d75427c5 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 23 Dec 2018 11:47:49 +0100 Subject: [PATCH 17/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index e30045d76..0bedf93be 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1473,3 +1473,4 @@ Martin Krueger Jack Lopes Huguette Viale Didier Christien +Pascal Roublot From cad0d484565c89954b443ae3733d13b157819528 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 24 Dec 2018 00:25:23 +0100 Subject: [PATCH 18/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 0bedf93be..54b6e28f4 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1474,3 +1474,4 @@ Jack Lopes Huguette Viale Didier Christien Pascal Roublot +Arnaud Sourisse From 419da20ca48f1e8024cc02ab81f82da0729cb502 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 5 Jan 2019 20:58:01 +0100 Subject: [PATCH 19/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 54b6e28f4..8c9f919d0 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1475,3 +1475,4 @@ Huguette Viale Didier Christien Pascal Roublot Arnaud Sourisse +Aldo Midali From d35a8bdea3000d968ed46ff19a25eb777bb7921f Mon Sep 17 00:00:00 2001 From: Kilrah Date: Sun, 6 Jan 2019 10:19:49 +0100 Subject: [PATCH 20/41] R9M 1W setting is Auto up to 1W --- companion/src/firmwares/moduledata.cpp | 2 +- radio/src/pulses/pulses_arm.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/companion/src/firmwares/moduledata.cpp b/companion/src/firmwares/moduledata.cpp index 9734fd29e..cc1ccd285 100644 --- a/companion/src/firmwares/moduledata.cpp +++ b/companion/src/firmwares/moduledata.cpp @@ -114,7 +114,7 @@ QString ModuleData::protocolToString(unsigned protocol) QStringList ModuleData::powerValueStrings(int subType, Firmware * fw) { static const QStringList strings[] = { - { tr("10mW - 16CH"), tr("100mW - 16CH"), tr("500mW - 16CH"), tr("1W - 16CH") }, // full-size FCC + { tr("10mW - 16CH"), tr("100mW - 16CH"), tr("500mW - 16CH"), tr("Auto <= 1W - 16CH") }, // full-size FCC { tr("25mW - 8CH"), tr("25mW - 16CH"), tr("200mW - 16CH (no telemetry)"), tr("500mW - 16CH (no telemetry)") }, // full-size EU { tr("100mW - 16CH") }, // mini FCC { tr("25mW - 8CH"), tr("25mW - 16CH"), tr("100mW - 16CH (no telemetry)") } // mini EU diff --git a/radio/src/pulses/pulses_arm.h b/radio/src/pulses/pulses_arm.h index 744abb07b..12bd41389 100644 --- a/radio/src/pulses/pulses_arm.h +++ b/radio/src/pulses/pulses_arm.h @@ -188,10 +188,10 @@ enum R9MLBTPowerValues { #define LEN_R9M_REGION "\006" #define TR_R9M_REGION "FCC\0 ""EU\0 ""868MHz""915MHz" -#define LEN_R9M_FCC_POWER_VALUES "\006" +#define LEN_R9M_FCC_POWER_VALUES "\013" #define LEN_R9M_LBT_POWER_VALUES "\013" -#define TR_R9M_FCC_POWER_VALUES "10 mW\0" "100 mW" "500 mW" "1 W\0" -#define TR_R9M_LBT_POWER_VALUES "25 mW 8ch\0 ""25 mW 16ch\0" "200 mW 16ch" "500 mW 16ch" +#define TR_R9M_FCC_POWER_VALUES "10 mW\0 " "100 mW\0 " "500 mW\0 " "Auto <= 1 W" +#define TR_R9M_LBT_POWER_VALUES "25 mW 8ch\0 " "25 mW 16ch\0" "200 mW 16ch" "500 mW 16ch" enum R9MFCCPowerValues { R9M_FCC_POWER_10 = 0, From 1a96655173751252551a22b85fee93c3ffc87157 Mon Sep 17 00:00:00 2001 From: Kilrah Date: Sun, 6 Jan 2019 10:27:59 +0100 Subject: [PATCH 21/41] R9M 1W setting is Auto up to 1W --- radio/src/pulses/pulses_arm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/pulses/pulses_arm.h b/radio/src/pulses/pulses_arm.h index 12bd41389..fb512de85 100644 --- a/radio/src/pulses/pulses_arm.h +++ b/radio/src/pulses/pulses_arm.h @@ -190,7 +190,7 @@ enum R9MLBTPowerValues { #define TR_R9M_REGION "FCC\0 ""EU\0 ""868MHz""915MHz" #define LEN_R9M_FCC_POWER_VALUES "\013" #define LEN_R9M_LBT_POWER_VALUES "\013" -#define TR_R9M_FCC_POWER_VALUES "10 mW\0 " "100 mW\0 " "500 mW\0 " "Auto <= 1 W" +#define TR_R9M_FCC_POWER_VALUES "10 mW\0 " "100 mW\0 " "500 mW\0 " "Auto <= 1 W" #define TR_R9M_LBT_POWER_VALUES "25 mW 8ch\0 " "25 mW 16ch\0" "200 mW 16ch" "500 mW 16ch" enum R9MFCCPowerValues { From 3407f91aa0b2787914b701eae51ad31b6a2bcd9a Mon Sep 17 00:00:00 2001 From: Kilrah Date: Sun, 6 Jan 2019 09:32:28 +0100 Subject: [PATCH 22/41] Use website for release notes --- companion/src/mainwindow.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 6cc2f5ab8..490887c75 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -863,16 +863,8 @@ void MainWindow::sdsync() void MainWindow::changelog() { - Firmware * firmware = getCurrentFirmware(); - QString url = firmware->getReleaseNotesUrl(); - if (url.isEmpty()) { - QMessageBox::information(this, tr("Release notes"), tr("Cannot retrieve release notes from the server.")); - } - else { - ReleaseNotesFirmwareDialog * dialog = new ReleaseNotesFirmwareDialog(this, url); - dialog->exec(); - dialog->deleteLater(); - } + QString link = "http://www.open-tx.org"; + QDesktopServices::openUrl(QUrl(link)); } void MainWindow::customizeSplash() From 350acc3cc331b8cdf4a982129571c3bafb1fcedf Mon Sep 17 00:00:00 2001 From: MRC3742 Date: Sun, 6 Jan 2019 04:59:40 -0500 Subject: [PATCH 23/41] Multi protocol updates to MPM version 1.2.1.16 (#6249) --- companion/src/firmwares/moduledata.h | 8 +++++++- companion/src/firmwares/multiprotocols.cpp | 4 +++- radio/src/gui/gui_common_arm.cpp | 2 ++ radio/src/myeeprom.h | 8 +++++++- radio/src/translations/cz.h.txt | 2 +- radio/src/translations/de.h.txt | 2 +- radio/src/translations/en.h.txt | 2 +- radio/src/translations/es.h.txt | 2 +- radio/src/translations/fi.h.txt | 2 +- radio/src/translations/fr.h.txt | 2 +- radio/src/translations/it.h.txt | 2 +- radio/src/translations/nl.h.txt | 2 +- radio/src/translations/pl.h.txt | 2 +- radio/src/translations/pt.h.txt | 2 +- radio/src/translations/se.h.txt | 2 +- 15 files changed, 30 insertions(+), 14 deletions(-) diff --git a/companion/src/firmwares/moduledata.h b/companion/src/firmwares/moduledata.h index f07975534..e0ea74958 100644 --- a/companion/src/firmwares/moduledata.h +++ b/companion/src/firmwares/moduledata.h @@ -92,7 +92,13 @@ enum MultiModuleRFProtocols { MM_RF_PROTO_HITEC, MM_RF_PROTO_WFLY, MM_RF_PROTO_BUGS, - MM_RF_PROTO_LAST= MM_RF_PROTO_BUGS + MM_RF_PROTO_BUGS_MINI, + MM_RF_PROTO_TRAXXAS, + MM_RF_PROTO_NCC1701, + MM_RF_PROTO_E01X, + MM_RF_PROTO_V911S, + MM_RF_PROTO_GD00X, + MM_RF_PROTO_LAST = MM_RF_PROTO_GD00X }; enum TrainerProtocol { diff --git a/companion/src/firmwares/multiprotocols.cpp b/companion/src/firmwares/multiprotocols.cpp index fc38a133a..3d7923a9a 100644 --- a/companion/src/firmwares/multiprotocols.cpp +++ b/companion/src/firmwares/multiprotocols.cpp @@ -61,6 +61,7 @@ static const QStringList STR_SUBTYPE_CABELL {"Cabell V3", "Cab V3 Telem", "-", static const QStringList STR_SUBTYPE_H83D {"H8 Mini 3D", "H20H", "H20 Mini", "H30 Mini"}; static const QStringList STR_SUBTYPE_CORONA {"V1", "V2", "Flydream V3"}; static const QStringList STR_SUBTYPE_HITEC {"Optima", "Optima Hub Telem", "Minima"}; +static const QStringList STR_SUBTYPE_E01X {"E012", "E015"}; static const QStringList NO_SUBTYPE {STR_MULTI_DEFAULT}; @@ -95,6 +96,7 @@ const Multiprotocols multiProtocols { {MM_RF_PROTO_H83D, 3, false, STR_SUBTYPE_H83D, nullptr}, {MM_RF_PROTO_CORONA, 2, false, STR_SUBTYPE_CORONA, STR_MULTI_RFTUNE}, {MM_RF_PROTO_HITEC, 2, false, STR_SUBTYPE_HITEC, STR_MULTI_RFTUNE}, + {MM_RF_PROTO_E01X, 1, false, STR_SUBTYPE_E01X, nullptr}, {MM_RF_CUSTOM_SELECTED, 7, true, STR_SUBTYPE_CUSTOM, STR_MULTI_OPTION}, // Sentinel and default for protocols not listed above (MM_RF_CUSTOM is 0xff) @@ -136,7 +138,7 @@ QString Multiprotocols::protocolToString(int protocol, bool custom) "FlySky", "Hubsan", "FrSky", "Hisky", "V2x2", "DSM", "Devo", "YD717", "KN", "SymaX", "SLT", "CX10", "CG023", "Bayang", "ESky", "MT99XX", "MJXQ", "Shenqi", "FY326", "SFHSS", "J6 PRO","FQ777","Assan","Hontai","Open LRS", "FlySky AFHDS2A", "Q2x2", "Walkera", "Q303", "GW008", "DM002", "Cabell", "ESky 150", "H8 3D", "Corona", "CFlie", - "Hitec", "Wfly", "Bugs" + "Hitec", "Wfly", "Bugs", "Bugs Mini", "Traxxas", "NCC-1701-A", "E01X", "V911S", "GD00X" }); if (protocol == MM_RF_CUSTOM_SELECTED || custom) diff --git a/radio/src/gui/gui_common_arm.cpp b/radio/src/gui/gui_common_arm.cpp index 2b22783e0..5d6b1fe0a 100644 --- a/radio/src/gui/gui_common_arm.cpp +++ b/radio/src/gui/gui_common_arm.cpp @@ -680,6 +680,7 @@ const char STR_SUBTYPE_CABELL[] = "\007""V3\0 ""V3 Telm""-\0 ""-\0 " const char STR_SUBTYPE_H83D[] = "\007""Std\0 ""H20H\0 ""H20Mini""H30Mini"; const char STR_SUBTYPE_CORONA[] = "\006"" V1\0 "" V2\0 "" FD V3"; const char STR_SUBTYPE_HITEC[] = "\007""Optima\0""Opt Hub""Minima\0"; +const char STR_SUBTYPE_E01X[] = "\004""E012""E015"; const mm_protocol_definition multi_protocols[] = { @@ -710,6 +711,7 @@ const mm_protocol_definition multi_protocols[] = { {MM_RF_PROTO_H83D, 3, false, STR_SUBTYPE_H83D, nullptr}, {MM_RF_PROTO_CORONA, 2, false, STR_SUBTYPE_CORONA, STR_MULTI_RFTUNE}, {MM_RF_PROTO_HITEC, 2, false, STR_SUBTYPE_HITEC, STR_MULTI_RFTUNE}, + {MM_RF_PROTO_E01X, 1, false, STR_SUBTYPE_E01X, nullptr}, {MM_RF_CUSTOM_SELECTED, 7, true, NO_SUBTYPE, STR_MULTI_OPTION}, // Sentinel and default for protocols not listed above (MM_RF_CUSTOM is 0xff) diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 3024536b5..e21595ce0 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -411,7 +411,13 @@ enum MultiModuleRFProtocols { MM_RF_PROTO_HITEC, MM_RF_PROTO_WFLY, MM_RF_PROTO_BUGS, - MM_RF_PROTO_LAST= MM_RF_PROTO_BUGS + MM_RF_PROTO_BUGS_MINI, + MM_RF_PROTO_TRAXXAS, + MM_RF_PROTO_NCC1701, + MM_RF_PROTO_E01X, + MM_RF_PROTO_V911S, + MM_RF_PROTO_GD00X, + MM_RF_PROTO_LAST = MM_RF_PROTO_GD00X }; enum MMDSM2Subtypes { diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 20b40cd90..dad143ba0 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -112,7 +112,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 ""BugMin""Traxas""NC1701""E01X\0 ""V911S\0""GD00X\0" #define TR_MULTI_CUSTOM "Custom" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 94520161b..df6663b80 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -115,7 +115,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" //LP45 =Low Power 4 und 5 Kanal #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 ""BugMin""Traxas""NC1701""E01X\0 ""V911S\0""GD00X\0" #define TR_MULTI_CUSTOM "Custom" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 920dce585..6107e6048 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -114,7 +114,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 ""BugMin""Traxas""NC1701""E01X\0 ""V911S\0""GD00X\0" #define TR_MULTI_CUSTOM "Custom" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 9526692a3..434d932e9 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -114,7 +114,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 ""BugMin""Traxas""NC1701""E01X\0 ""V911S\0""GD00X\0" #define TR_MULTI_CUSTOM "Custom" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 2b29e1140..46e7ad7ea 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -114,7 +114,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 ""BugMin""Traxas""NC1701""E01X\0 ""V911S\0""GD00X\0" #define TR_MULTI_CUSTOM "Custom" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index b6b62a7e5..344e29d4c 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -114,7 +114,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 ""BugMin""Traxas""NC1701""E01X\0 ""V911S\0""GD00X\0" #define TR_MULTI_CUSTOM "Perso" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 4cc640c15..e50eeed7e 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -114,7 +114,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 ""BugMin""Traxas""NC1701""E01X\0 ""V911S\0""GD00X\0" #define TR_MULTI_CUSTOM "Custom" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 1091d3ae1..27f78c492 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -116,7 +116,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 ""BugMin""Traxas""NC1701""E01X\0 ""V911S\0""GD00X\0" #define TR_MULTI_CUSTOM "Custom" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index f24c2846e..a8b8d8f99 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -114,7 +114,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 ""BugMin""Traxas""NC1701""E01X\0 ""V911S\0""GD00X\0" #define TR_MULTI_CUSTOM "Custom" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 61de3d069..bb298b1ea 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -114,7 +114,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 ""BugMin""Traxas""NC1701""E01X\0 ""V911S\0""GD00X\0" #define TR_MULTI_CUSTOM "Custom" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 7bc236511..b4d2d6289 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -114,7 +114,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 ""BugMin""Traxas""NC1701""E01X\0 ""V911S\0""GD00X\0" #define TR_MULTI_CUSTOM "Custom" From 0d7a486630b5f025fe4e90b9ab44078a55766be8 Mon Sep 17 00:00:00 2001 From: Bryan Mayland Date: Sun, 6 Jan 2019 05:01:11 -0500 Subject: [PATCH 24/41] Display FlySky VOLTS values as signed integers (#6252) Standard AFHDS2A protocol transmits all values as 2 raw bytes and a stock FS-i6 transmitter shows voltage type values properly as signed. This change interprets all UNIT_VOLTS FlySky telemetry items as being signed 16-bit values so their display matches the values displayed on stock FS-i6 and FS-i6X receivers. Signed-off-by: Bryan Mayland --- radio/src/telemetry/flysky_ibus.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/radio/src/telemetry/flysky_ibus.cpp b/radio/src/telemetry/flysky_ibus.cpp index 7f54c6594..980b158ce 100644 --- a/radio/src/telemetry/flysky_ibus.cpp +++ b/radio/src/telemetry/flysky_ibus.cpp @@ -103,6 +103,9 @@ static void processFlySkySensor(const uint8_t *packet) else if (id == FS_ID_TEMP) // Temperature sensors have 40 degree offset value -= 400; + else if (sensor->unit == UNIT_VOLTS) + // Voltage types are signed 16bit integers + value = (int16_t)value; setTelemetryValue(TELEM_PROTO_FLYSKY_IBUS, id, 0, instance, value, sensor->unit, sensor->precision); return; } From f858fa2234eca6123dd9d2e1106bb660f022070e Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 6 Jan 2019 11:05:07 +0100 Subject: [PATCH 25/41] Update CREDITS.txt --- CREDITS.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CREDITS.txt b/CREDITS.txt index 8c9f919d0..8a5e05e6b 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1476,3 +1476,5 @@ Didier Christien Pascal Roublot Arnaud Sourisse Aldo Midali +Sidney Gates + From e67cb385bef34f550c3c12e05e657087f3282b34 Mon Sep 17 00:00:00 2001 From: Neil Horne Date: Mon, 7 Jan 2019 19:32:48 +1100 Subject: [PATCH 26/41] Add file name to model edit window title (#6288) --- companion/src/mdichild.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index d0d3e1869..ade0caeb1 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -1260,7 +1260,7 @@ void MdiChild::openModelEditWindow(int row) gStopwatch.report("ModelEdit creation"); ModelEdit * t = new ModelEdit(this, radioData, (row), firmware); gStopwatch.report("ModelEdit created"); - t->setWindowTitle(tr("Editing model %1: ").arg(row+1) + QString(model.name)); + t->setWindowTitle(tr("Editing model %1: ").arg(row+1) + QString(model.name) + QString(" (%1)").arg(userFriendlyCurrentFile())); connect(t, &ModelEdit::modified, this, &MdiChild::setModified); gStopwatch.report("STARTING MODEL EDIT"); t->show(); From 7f7a6947993c2da5f4df66338b6c42d2d960f2b5 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 5 Jan 2019 16:19:08 +0100 Subject: [PATCH 27/41] SBEC telem support --- radio/src/telemetry/frsky.h | 2 ++ radio/src/telemetry/frsky_sport.cpp | 6 ++++++ radio/src/translations/cz.h.txt | 2 ++ radio/src/translations/de.h.txt | 2 ++ radio/src/translations/en.h.txt | 2 ++ radio/src/translations/es.h.txt | 2 ++ radio/src/translations/fi.h.txt | 3 ++- radio/src/translations/fr.h.txt | 2 ++ radio/src/translations/it.h.txt | 2 ++ radio/src/translations/nl.h.txt | 2 ++ radio/src/translations/pl.h.txt | 2 ++ radio/src/translations/pt.h.txt | 2 ++ radio/src/translations/se.h.txt | 2 ++ 13 files changed, 30 insertions(+), 1 deletion(-) diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h index dc19a5bd7..96145e3e7 100644 --- a/radio/src/telemetry/frsky.h +++ b/radio/src/telemetry/frsky.h @@ -181,6 +181,8 @@ enum FrSkyDataState { #define GASSUIT_MAX_FLOW_LAST_ID 0x0d6f #define GASSUIT_AVG_FLOW_FIRST_ID 0x0d70 #define GASSUIT_AVG_FLOW_LAST_ID 0x0d7f +#define SBEC_POWER_FIRST_ID 0x0e50 +#define SBEC_POWER_LAST_ID 0x0e5f #define DIY_FIRST_ID 0x5100 #define DIY_LAST_ID 0x52ff #define DIY_STREAM_FIRST_ID 0x5000 diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp index 9369c3024..dd394de6c 100644 --- a/radio/src/telemetry/frsky_sport.cpp +++ b/radio/src/telemetry/frsky_sport.cpp @@ -77,6 +77,8 @@ const FrSkySportSensor sportSensors[] = { { GASSUIT_FLOW_FIRST_ID, GASSUIT_FLOW_LAST_ID, 0, ZSTR_GASSUIT_FLOW, UNIT_MILLILITERS, 0 }, //TODO this needs to be changed to ml/min, but need eeprom conversion { GASSUIT_MAX_FLOW_FIRST_ID, GASSUIT_MAX_FLOW_LAST_ID, 0, ZSTR_GASSUIT_MAX_FLOW, UNIT_MILLILITERS, 0 }, //TODO this needs to be changed to ml/min, but need eeprom conversion { GASSUIT_AVG_FLOW_FIRST_ID, GASSUIT_AVG_FLOW_LAST_ID, 0, ZSTR_GASSUIT_AVG_FLOW, UNIT_MILLILITERS, 0 }, //TODO this needs to be changed to ml/min, but need eeprom conversion + { SBEC_POWER_FIRST_ID, SBEC_POWER_LAST_ID, 0, ZSTR_SBEC_VOLTAGE, UNIT_VOLTS, 2 }, + { SBEC_POWER_FIRST_ID, SBEC_POWER_LAST_ID, 1, ZSTR_SBEC_CURRENT, UNIT_AMPS, 2 }, { 0, 0, 0, NULL, UNIT_RAW, 0 } // sentinel }; @@ -235,6 +237,10 @@ void sportProcessTelemetryPacket(const uint8_t * packet) else if (id >= ESC_TEMPERATURE_FIRST_ID && id <= ESC_TEMPERATURE_LAST_ID) { sportProcessTelemetryPacket(id, 0, instance, data & 0x00ff); } + else if (id >= SBEC_POWER_FIRST_ID && id <= SBEC_POWER_LAST_ID) { + sportProcessTelemetryPacket(id, 0, instance, data & 0xffff); + sportProcessTelemetryPacket(id, 1, instance, data >> 16); + } else if (id >= DIY_STREAM_FIRST_ID && id <= DIY_STREAM_LAST_ID) { #if defined(LUA) if (luaInputTelemetryFifo && luaInputTelemetryFifo->hasSpace(sizeof(SportTelemetryPacket))) { diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index dad143ba0..4294d322a 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -1274,3 +1274,5 @@ #define ZSTR_GASSUIT_RES_PERC "GRPc" #define ZSTR_GASSUIT_MAX_FLOW "GMFl" #define ZSTR_GASSUIT_AVG_FLOW "GAFl" +#define ZSTR_SBEC_VOLTAGE "BecV" +#define ZSTR_SBEC_CURRENT "BecA" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index df6663b80..ab02c533b 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -1272,3 +1272,5 @@ #define ZSTR_GASSUIT_RES_PERC "GRPc" #define ZSTR_GASSUIT_MAX_FLOW "GMFl" #define ZSTR_GASSUIT_AVG_FLOW "GAFl" +#define ZSTR_SBEC_VOLTAGE "BecV" +#define ZSTR_SBEC_CURRENT "BecA" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 6107e6048..322932530 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -1283,3 +1283,5 @@ #define ZSTR_GASSUIT_RES_PERC "GRPc" #define ZSTR_GASSUIT_MAX_FLOW "GMFl" #define ZSTR_GASSUIT_AVG_FLOW "GAFl" +#define ZSTR_SBEC_VOLTAGE "BecV" +#define ZSTR_SBEC_CURRENT "BecA" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 434d932e9..53da96ac6 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -1278,3 +1278,5 @@ #define ZSTR_GASSUIT_RES_PERC "GRPc" #define ZSTR_GASSUIT_MAX_FLOW "GMFl" #define ZSTR_GASSUIT_AVG_FLOW "GAFl" +#define ZSTR_SBEC_VOLTAGE "BecV" +#define ZSTR_SBEC_CURRENT "BecA" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 46e7ad7ea..b09f22406 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -1263,4 +1263,5 @@ #define ZSTR_GASSUIT_RES_VOL "GRVl" #define ZSTR_GASSUIT_RES_PERC "GRPc" #define ZSTR_GASSUIT_MAX_FLOW "GMFl" -#define ZSTR_GASSUIT_AVG_FLOW "GAFl" +#define ZSTR_SBEC_VOLTAGE "BecV" +#define ZSTR_SBEC_CURRENT "BecA" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 344e29d4c..26a901ffc 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -1290,3 +1290,5 @@ #define ZSTR_GASSUIT_RES_PERC "GRPc" #define ZSTR_GASSUIT_MAX_FLOW "GMFl" #define ZSTR_GASSUIT_AVG_FLOW "GAFl" +#define ZSTR_SBEC_VOLTAGE "BecV" +#define ZSTR_SBEC_CURRENT "BecA" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index e50eeed7e..32d1eebc0 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -1273,3 +1273,5 @@ #define ZSTR_GASSUIT_RES_PERC "GRPc" #define ZSTR_GASSUIT_MAX_FLOW "GMFl" #define ZSTR_GASSUIT_AVG_FLOW "GAFl" +#define ZSTR_SBEC_VOLTAGE "BecV" +#define ZSTR_SBEC_CURRENT "BecA" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 27f78c492..ab9e48e41 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -1280,3 +1280,5 @@ #define ZSTR_GASSUIT_RES_PERC "GRPc" #define ZSTR_GASSUIT_MAX_FLOW "GMFl" #define ZSTR_GASSUIT_AVG_FLOW "GAFl" +#define ZSTR_SBEC_VOLTAGE "BecV" +#define ZSTR_SBEC_CURRENT "BecA" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index a8b8d8f99..8f7af0ef1 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -1274,3 +1274,5 @@ #define ZSTR_GASSUIT_RES_PERC "GRPc" #define ZSTR_GASSUIT_MAX_FLOW "GMFl" #define ZSTR_GASSUIT_AVG_FLOW "GAFl" +#define ZSTR_SBEC_VOLTAGE "BecV" +#define ZSTR_SBEC_CURRENT "BecA" \ No newline at end of file diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index bb298b1ea..255b5f3f6 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -1277,3 +1277,5 @@ #define ZSTR_GASSUIT_RES_PERC "GRPc" #define ZSTR_GASSUIT_MAX_FLOW "GMFl" #define ZSTR_GASSUIT_AVG_FLOW "GAFl" +#define ZSTR_SBEC_VOLTAGE "BecV" +#define ZSTR_SBEC_CURRENT "BecA" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index b4d2d6289..9d2c71498 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -1285,3 +1285,5 @@ #define ZSTR_GASSUIT_RES_PERC "GRPc" #define ZSTR_GASSUIT_MAX_FLOW "GMFl" #define ZSTR_GASSUIT_AVG_FLOW "GAFl" +#define ZSTR_SBEC_VOLTAGE "BecV" +#define ZSTR_SBEC_CURRENT "BecA" From d363f957f517a935ad23e71c7e6ffa92f7d59e1b Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 7 Jan 2019 07:15:32 +0100 Subject: [PATCH 28/41] Fix SBEC sensor scale --- radio/src/telemetry/frsky_sport.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp index dd394de6c..0309ecb2f 100644 --- a/radio/src/telemetry/frsky_sport.cpp +++ b/radio/src/telemetry/frsky_sport.cpp @@ -238,8 +238,8 @@ void sportProcessTelemetryPacket(const uint8_t * packet) sportProcessTelemetryPacket(id, 0, instance, data & 0x00ff); } else if (id >= SBEC_POWER_FIRST_ID && id <= SBEC_POWER_LAST_ID) { - sportProcessTelemetryPacket(id, 0, instance, data & 0xffff); - sportProcessTelemetryPacket(id, 1, instance, data >> 16); + sportProcessTelemetryPacket(id, 0, instance, (data & 0xffff) / 10); + sportProcessTelemetryPacket(id, 1, instance, (data >> 16) / 10); } else if (id >= DIY_STREAM_FIRST_ID && id <= DIY_STREAM_LAST_ID) { #if defined(LUA) From fd7f839342c069858447087bcd6e647aff3b90a1 Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 8 Jan 2019 16:34:52 +0100 Subject: [PATCH 29/41] Fix Horus wiazrd when 'no motor' is choosen --- radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua | 2 +- radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua b/radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua index df21f59c4..2e8c0bf88 100644 --- a/radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua +++ b/radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua @@ -355,7 +355,7 @@ local function runConfigSummary(event) -- motors if(MotorFields[1][5] == 1) then drawNextLine("Motor chan :", MotorFields[2][5]) - elseif (MotorFields[2][5] == 2) then + elseif (MotorFields[1][5] == 2) then drawNextLine("Motor 1 chan :", MotorFields[2][5]) drawNextLine("Motor 2 chan :", MotorFields[3][5]) end diff --git a/radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua b/radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua index 00ceaa6a2..bff885361 100755 --- a/radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua +++ b/radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua @@ -355,7 +355,7 @@ local function runConfigSummary(event) -- motors if(MotorFields[1][5] == 1) then drawNextLine("Motor chan :", MotorFields[2][5]) - elseif (MotorFields[2][5] == 2) then + elseif (MotorFields[1][5] == 2) then drawNextLine("Motor 1 chan :", MotorFields[2][5]) drawNextLine("Motor 2 chan :", MotorFields[3][5]) end From 415544d012eee4882a727ffff13efd6cbe9d6e9b Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 8 Jan 2019 17:03:00 +0100 Subject: [PATCH 30/41] Fix Horus wiazrd when 'no motor' is choosen (continued) --- radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua | 2 +- radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua b/radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua index 2e8c0bf88..05a8bf6e0 100644 --- a/radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua +++ b/radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua @@ -414,7 +414,7 @@ local function createModel(event) -- motor if(MotorFields[1][5] == 1) then addMix(MotorFields[2][5], MIXSRC_FIRST_INPUT+defaultChannel(2), "Motor") - elseif (MotorFields[2][5] == 2) then + elseif (MotorFields[1][5] == 2) then addMix(MotorFields[2][5], MIXSRC_FIRST_INPUT+defaultChannel(2), "Motor1") addMix(MotorFields[3][5], MIXSRC_FIRST_INPUT+defaultChannel(2), "Motor2") end diff --git a/radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua b/radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua index bff885361..b5701e56d 100755 --- a/radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua +++ b/radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua @@ -414,7 +414,7 @@ local function createModel(event) -- motor if(MotorFields[1][5] == 1) then addMix(MotorFields[2][5], MIXSRC_FIRST_INPUT+defaultChannel(2), "Motor") - elseif (MotorFields[2][5] == 2) then + elseif (MotorFields[1][5] == 2) then addMix(MotorFields[2][5], MIXSRC_FIRST_INPUT+defaultChannel(2), "Motor1") addMix(MotorFields[3][5], MIXSRC_FIRST_INPUT+defaultChannel(2), "Motor2") end From 31f1c7761f09637212b40e57e41b8b019ae9231c Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 9 Jan 2019 16:02:57 +0100 Subject: [PATCH 31/41] Update CREDITS.txt --- CREDITS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CREDITS.txt b/CREDITS.txt index 8a5e05e6b..9a57f9f42 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1477,4 +1477,4 @@ Pascal Roublot Arnaud Sourisse Aldo Midali Sidney Gates - +Serhiy Semenenko From 23e2c503005bc44c5c61b0423a6bb953ce0fc982 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 9 Jan 2019 17:44:15 +0100 Subject: [PATCH 32/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 9a57f9f42..255509530 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1478,3 +1478,4 @@ Arnaud Sourisse Aldo Midali Sidney Gates Serhiy Semenenko +Miguel Esquer Ramiro From 25761039f6e87938cac401635f460c4a1145d265 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 13 Jan 2019 21:28:22 +0100 Subject: [PATCH 33/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 255509530..b9a230133 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1479,3 +1479,4 @@ Aldo Midali Sidney Gates Serhiy Semenenko Miguel Esquer Ramiro +Stefan Grunenberg From 677df3c18e37f74ed7a4e1336285c442262cf3d7 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 13 Jan 2019 21:28:51 +0100 Subject: [PATCH 34/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index b9a230133..6e4002ad3 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1480,3 +1480,4 @@ Sidney Gates Serhiy Semenenko Miguel Esquer Ramiro Stefan Grunenberg +Ferenc Kunkli From 75ed73412dc6f8b4f0b84e1cbc687384adcd0ce0 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 16 Jan 2019 12:42:47 +0100 Subject: [PATCH 35/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 6e4002ad3..b4f3a3703 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1481,3 +1481,4 @@ Serhiy Semenenko Miguel Esquer Ramiro Stefan Grunenberg Ferenc Kunkli +Stefano Boggia From cf6f0f6f0b118ca1e4ebc44515a1be6f55ef4387 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 17 Jan 2019 22:00:40 +0100 Subject: [PATCH 36/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index b4f3a3703..185397366 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1482,3 +1482,4 @@ Miguel Esquer Ramiro Stefan Grunenberg Ferenc Kunkli Stefano Boggia +Lee Bennett From 00e28d3c0eb305f0b4de360b83728d21f070337d Mon Sep 17 00:00:00 2001 From: Kilrah Date: Sun, 20 Jan 2019 19:56:15 +0400 Subject: [PATCH 37/41] flexr9m was missing from compile scripts for sky9x (fix #6305) --- radio/util/fwoptions.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/radio/util/fwoptions.py b/radio/util/fwoptions.py index 3e16c3b4f..b990212e1 100755 --- a/radio/util/fwoptions.py +++ b/radio/util/fwoptions.py @@ -40,7 +40,8 @@ options_sky9x = { "faimode": ("FAI", "YES", None), "faichoice": ("FAI", "CHOICE", None), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), - "multimodule": ("MULTIMODULE", "YES", "NO") + "multimodule": ("MULTIMODULE", "YES", "NO"), + "flexr9m": ("MODULE_R9M_FLEX_FW", "YES", None) } options_ar9x = { @@ -61,7 +62,8 @@ options_ar9x = { "faichoice": ("FAI", "CHOICE", None), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), # "rtc": ("RTCLOCK", "YES", "NO"), - "multimodule": ("MULTIMODULE", "YES", "NO") + "multimodule": ("MULTIMODULE", "YES", "NO"), + "flexr9m": ("MODULE_R9M_FLEX_FW", "YES", None) } options_taranis = { From 490243eb1103fa171d1d62e4e629e5f25c970865 Mon Sep 17 00:00:00 2001 From: Massimiliano Zambrini Date: Tue, 22 Jan 2019 10:35:13 +0100 Subject: [PATCH 38/41] enhanced Italian language sounds --- radio/util/tts_it.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/radio/util/tts_it.py b/radio/util/tts_it.py index 81360605e..18105e17e 100755 --- a/radio/util/tts_it.py +++ b/radio/util/tts_it.py @@ -16,12 +16,12 @@ for i, s in enumerate(["virgola", "un", "e", "meno", "ora", "ore", "minuto", "mi systemSounds.append((s, filename(PROMPT_SYSTEM_BASE + 103 + i))) for i, (s, f) in enumerate([("volt", "volt0"), ("ampere", "amp0"), - ("milliampers", "mamp0"), + ("milliampere", "mamp0"), ("nodo", "knot0"), ("nodi", "knot1"), ("metro al secondo", "mps0"), ("metri al secondo", "msp1"), ("piede al secondo", "fps0"), ("piedi al secondo", "fps1"), - ("chilometro ora", "kph0"), ("chilometri orari", "kph1"), - ("miglio per ora", "mph0"), ("miglia per ora", "mph1"), + ("chilometri orari", "kph0"), ("chilometri orari", "kph1"), + ("miglia orarie", "mph0"), ("miglia orarie", "mph1"), ("metro", "meter0"), ("metri", "meter1"), ("piede", "foot0"), ("piedi", "foot1"), ("grado celsius", "celsius0"), ("gradi celsius", "celsius1"), @@ -36,7 +36,7 @@ for i, (s, f) in enumerate([("volt", "volt0"), ("grado", "degree0"), ("gradi", "degree1"), ("radian", "rad0"), ("radians", "rad1"), ("millilitro", "m10"), ("millilitri", "m11"), - ("oncia", "founce0"), ("once", "founce1"), + ("oncia fluida", "founce0"), ("once fluide", "founce1"), ("ora", "hour0"), ("ore", "hour1"), ("minuto", "minute0"), ("minuti", "minute1"), ("secondo", "second0"), ("secondi", "second1"), @@ -70,14 +70,14 @@ for s, f, a in [("radio inattiva controllare", "inactiv", 486), ("Problema all'antenna della radio", "swr_red", NO_ALTERNATE), ("Telemetria assente", "telemko", NO_ALTERNATE), ("Telemetria disponibile", "telemok", NO_ALTERNATE), - ("servo overload", "servoko", NO_ALTERNATE), - ("power overload", "rxko", NO_ALTERNATE), - ("receiver still connected", "modelpwr", NO_ALTERNATE), + ("sovraccarico servo", "servoko", NO_ALTERNATE), + ("sovraccarico di alimentazione", "rxko", NO_ALTERNATE), + ("ricevente ancora connessa", "modelpwr", NO_ALTERNATE), ]: systemSounds.append((s, filename(f, a))) for i, s in enumerate(["timer", "", "tensione", "tensione", "trasmissione", "ricezione", "altitudine", "motore", "carburante", "temperatura", "temperatura", "velocità", "distanza", "altitudine", "cella lipo", - "totale lipo", "tensione", "corrente", "consumo", "potenza", "accellerazione X", "accellerazione Y", "accellerazione Z", + "totale lipo", "tensione", "corrente", "consumo", "potenza", "accelerazione X", "accelerazione Y", "accelerazione Z", "direzione", "variometro", "minimo", "massimo"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE + 135 + i))) for i, (s, f) in enumerate([("carrello chiuso", "gearup"), From a030f215dd04d98ae9a5e27ea43cb25482a70e25 Mon Sep 17 00:00:00 2001 From: Massimiliano Zambrini Date: Thu, 24 Jan 2019 10:48:17 +0100 Subject: [PATCH 39/41] Corrected grammatical errors --- radio/util/tts_it.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/util/tts_it.py b/radio/util/tts_it.py index 18105e17e..050a9fc16 100755 --- a/radio/util/tts_it.py +++ b/radio/util/tts_it.py @@ -18,8 +18,8 @@ for i, (s, f) in enumerate([("volt", "volt0"), ("ampere", "amp0"), ("milliampere", "mamp0"), ("nodo", "knot0"), ("nodi", "knot1"), - ("metro al secondo", "mps0"), ("metri al secondo", "msp1"), - ("piede al secondo", "fps0"), ("piedi al secondo", "fps1"), + ("metri al secondo", "mps0"), ("metri al secondo", "msp1"), + ("piedi al secondo", "fps0"), ("piedi al secondo", "fps1"), ("chilometri orari", "kph0"), ("chilometri orari", "kph1"), ("miglia orarie", "mph0"), ("miglia orarie", "mph1"), ("metro", "meter0"), ("metri", "meter1"), @@ -34,7 +34,7 @@ for i, (s, f) in enumerate([("volt", "volt0"), ("r p m", "rpm0"), ("r p m", "rpm1"), ("g", "g0"), ("g", "g1"), ("grado", "degree0"), ("gradi", "degree1"), - ("radian", "rad0"), ("radians", "rad1"), + ("radiante", "rad0"), ("radianti", "rad1"), ("millilitro", "m10"), ("millilitri", "m11"), ("oncia fluida", "founce0"), ("once fluide", "founce1"), ("ora", "hour0"), ("ore", "hour1"), @@ -47,7 +47,7 @@ for s, f, a in [("radio inattiva controllare", "inactiv", 486), ("controllo motore non in posizione, verificare", "thralert", 481), ("interruttori non in posizione, verificare", "swalert", 482), ("eeprom corrotta", "eebad", NO_ALTERNATE), - ("formattazzione eeprom in corso", "eeformat", NO_ALTERNATE), + ("formattazione eeprom in corso", "eeformat", NO_ALTERNATE), ("errore", "error", NO_ALTERNATE), ("trim centrato", "midtrim", 495), ("potenziometro centrato", "midpot", 496), From d3e839c8d0a88f8a2814997b260560104cf7477e Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 25 Jan 2019 11:37:33 +0100 Subject: [PATCH 40/41] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 185397366..09c2a0d58 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1483,3 +1483,4 @@ Stefan Grunenberg Ferenc Kunkli Stefano Boggia Lee Bennett +Morgantech From f813b9923d5bed1b0b1f8329ce034e15b5a51f2f Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 25 Jan 2019 13:03:12 +0100 Subject: [PATCH 41/41] Update CREDITS.txt --- CREDITS.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CREDITS.txt b/CREDITS.txt index 09c2a0d58..673a08dc7 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1484,3 +1484,5 @@ Ferenc Kunkli Stefano Boggia Lee Bennett Morgantech +Marek Přikryl +Peter Scott