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

Update Multi protocols

Browse Source
This commit is contained in:
Arne Schwabe
2018-08-03 13:21:31 +02:00
parent d6d3bc0159
commit eaae858a38
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/moduledata.h
+2 -1
View File
@@ -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 {
companion/src/firmwares/multiprotocols.cpp
+5 -2
View File
@@ -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)
radio/src/gui/gui_common_arm.cpp
+5 -2
View File
@@ -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)
radio/src/myeeprom.h
+2 -1
View File
@@ -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 {