From eaae858a386975ca8626030561babcdfb03c2932 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Fri, 3 Aug 2018 13:20:29 +0200 Subject: [PATCH] Update Multi protocols --- companion/src/firmwares/moduledata.h | 3 ++- companion/src/firmwares/multiprotocols.cpp | 7 +++++-- radio/src/gui/gui_common_arm.cpp | 7 +++++-- radio/src/myeeprom.h | 3 ++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/companion/src/firmwares/moduledata.h b/companion/src/firmwares/moduledata.h index b02fd6093..4cdeb6e99 100644 --- a/companion/src/firmwares/moduledata.h +++ b/companion/src/firmwares/moduledata.h @@ -88,7 +88,8 @@ enum MultiModuleRFProtocols { MM_RF_PROTO_H83D, MM_RF_PROTO_CORONA, MM_RF_PROTO_CFLIE, - MM_RF_PROTO_LAST= MM_RF_PROTO_CFLIE + MM_RF_PROTO_HITEC, + MM_RF_PROTO_LAST= MM_RF_PROTO_HITEC }; enum TrainerProtocol { diff --git a/companion/src/firmwares/multiprotocols.cpp b/companion/src/firmwares/multiprotocols.cpp index fe05b4d5a..6a8d17b3c 100644 --- a/companion/src/firmwares/multiprotocols.cpp +++ b/companion/src/firmwares/multiprotocols.cpp @@ -58,7 +58,9 @@ static const QStringList STR_SUBTYPE_WK2x01 {"WK2801", "WK2401", "W6_5_1", "W6_ static const QStringList STR_SUBTYPE_Q303 {"Q303", "CX35", "CX10D", "CX10WD"}; static const QStringList STR_SUBTYPE_CABELL {"CABELL V3", "C TELEM", "-", "-", "-", "-", "F_SAFE", "UNBIND"}; static const QStringList STR_SUBTYPE_H83D {"H8_3D", "H20H", "H20Mini", "H30Mini"}; -static const QStringList STR_SUBTYPE_CORONA {"V1", "V2"}; +static const QStringList STR_SUBTYPE_CORONA {"V1", "V2", "Flydream V3"}; +static const QStringList STR_SUBTYPE_HITEC {"Optima", "Minima"}; + static const QStringList NO_SUBTYPE {STR_MULTI_DEFAULT}; @@ -90,7 +92,8 @@ const Multiprotocols multiProtocols { {MM_RF_PROTO_Q303, 3, false, STR_SUBTYPE_Q303, nullptr}, {MM_RF_PROTO_CABELL, 7, false, STR_SUBTYPE_CABELL, STR_MULTI_OPTION}, {MM_RF_PROTO_H83D, 3, false, STR_SUBTYPE_H83D, nullptr}, - {MM_RF_PROTO_CORONA, 1, false, STR_SUBTYPE_CORONA, nullptr}, + {MM_RF_PROTO_CORONA, 2, false, STR_SUBTYPE_CORONA, nullptr}, + {MM_RF_PROTO_HITEC, 1, false, STR_SUBTYPE_HITEC, STR_MULTI_RFTUNE}, {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) diff --git a/radio/src/gui/gui_common_arm.cpp b/radio/src/gui/gui_common_arm.cpp index 61edddebe..0d2c594ed 100644 --- a/radio/src/gui/gui_common_arm.cpp +++ b/radio/src/gui/gui_common_arm.cpp @@ -691,7 +691,9 @@ const pm_char STR_SUBTYPE_CABELL[] PROGMEM = "\006""CAB_V3""C_TELM""-\0 " const pm_char STR_SUBTYPE_H83D[] PROGMEM = "\006""H8_3D\0""H20H\0 ""H20Mini""H30Mini"; -const pm_char STR_SUBTYPE_CORONA[] PROGMEM = "\002""V1""V2"; +const pm_char STR_SUBTYPE_CORONA[] PROGMEM = "\005""V1\0 ""V2\0 ""FD V3"; + +const pm_char STR_SUBTYPE_HITEC[] PROGMEM = "\006""Optima\0""Minima"; const mm_protocol_definition multi_protocols[] = { @@ -720,7 +722,8 @@ const mm_protocol_definition multi_protocols[] = { {MM_RF_PROTO_Q303, 3, false, STR_SUBTYPE_Q303, nullptr}, {MM_RF_PROTO_CABELL, 7, false, STR_SUBTYPE_CABELL, STR_MULTI_OPTION}, {MM_RF_PROTO_H83D, 3, false, STR_SUBTYPE_H83D, nullptr}, - {MM_RF_PROTO_CORONA, 1, false, STR_SUBTYPE_CORONA, nullptr}, + {MM_RF_PROTO_CORONA, 2, false, STR_SUBTYPE_CORONA, nullptr}, + {MM_RF_PROTO_HITEC, 1, false, STR_SUBTYPE_HITEC, STR_MULTI_RFTUNE}, {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 6b78f5368..387317836 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -403,7 +403,8 @@ enum MultiModuleRFProtocols { MM_RF_PROTO_H83D, MM_RF_PROTO_CORONA, MM_RF_PROTO_CFLIE, - MM_RF_PROTO_LAST= MM_RF_PROTO_CFLIE + MM_RF_PROTO_HITEC, + MM_RF_PROTO_LAST= MM_RF_PROTO_HITEC }; enum MMDSM2Subtypes {