gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-02-04 22:38:14 +00:00
Code Issues Projects Releases Wiki Activity

Protocols order

Browse Source
This commit is contained in:
Pascal Langer 2020-10-31 15:59:04 +01:00
parent 627d47f139
commit 6de4e1e1dd
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Multiprotocol/Multi_Names.ino
View File

@ -38,7 +38,7 @@ const char STR_MT99XX[] ="MT99XX";
const char STR_MJXQ[] ="MJXq"; const char STR_MJXQ[] ="MJXq";
const char STR_SHENQI[] ="Shenqi"; const char STR_SHENQI[] ="Shenqi";
const char STR_FY326[] ="FY326"; const char STR_FY326[] ="FY326";
const char STR_SFHSS[] ="Futaba"; const char STR_FUTABA[] ="Futaba";
const char STR_J6PRO[] ="J6 Pro"; const char STR_J6PRO[] ="J6 Pro";
const char STR_JJRC345[] ="JJRC345"; const char STR_JJRC345[] ="JJRC345";
const char STR_FQ777[] ="FQ777"; const char STR_FQ777[] ="FQ777";
@ -146,7 +146,7 @@ const char STR_SUBTYPE_V761[] = "\x03""3ch""4ch";
const char STR_SUBTYPE_RLINK[] = "\x07""Surface""Air\0 "; const char STR_SUBTYPE_RLINK[] = "\x07""Surface""Air\0 ";
const char STR_SUBTYPE_REALACC[] = "\x03""R11"; const char STR_SUBTYPE_REALACC[] = "\x03""R11";
const char STR_SUBTYPE_KYOSHO[] = "\x04""FHSS""Hype"; const char STR_SUBTYPE_KYOSHO[] = "\x04""FHSS""Hype";
const char STR_SUBTYPE_SFHSS[] = "\x05""SFHSS"; const char STR_SUBTYPE_FUTABA[] = "\x05""SFHSS";
const char STR_SUBTYPE_JJRC345[] = "\x08""JJRC345\0""SkyTmblr"; const char STR_SUBTYPE_JJRC345[] = "\x08""JJRC345\0""SkyTmblr";
enum enum
@ -230,9 +230,6 @@ const mm_protocol_definition multi_protocols[] = {
#if defined(AFHDS2A_RX_A7105_INO) #if defined(AFHDS2A_RX_A7105_INO)
{PROTO_AFHDS2A_RX, STR_AFHDS2A_RX,0, NO_SUBTYPE, OPTION_NONE }, {PROTO_AFHDS2A_RX, STR_AFHDS2A_RX,0, NO_SUBTYPE, OPTION_NONE },
#endif #endif
#if defined(HEIGHT_A7105_INO)
{PROTO_HEIGHT, STR_HEIGHT, 2, STR_SUBTYPE_HEIGHT, OPTION_NONE },
#endif
#if defined(FQ777_NRF24L01_INO) #if defined(FQ777_NRF24L01_INO)
{PROTO_FQ777, STR_FQ777, 0, NO_SUBTYPE, OPTION_NONE }, {PROTO_FQ777, STR_FQ777, 0, NO_SUBTYPE, OPTION_NONE },
#endif #endif
@ -257,6 +254,9 @@ const mm_protocol_definition multi_protocols[] = {
#if defined(FRSKYR9_SX1276_INO) #if defined(FRSKYR9_SX1276_INO)
{PROTO_FRSKY_R9, STR_FRSKYR9, 8, STR_SUBTYPE_FRSKYR9, OPTION_NONE }, {PROTO_FRSKY_R9, STR_FRSKYR9, 8, STR_SUBTYPE_FRSKYR9, OPTION_NONE },
#endif #endif
#if defined(FUTABA_CC2500_INO)
{PROTO_FUTABA, STR_FUTABA, 1, STR_SUBTYPE_FUTABA, OPTION_RFTUNE },
#endif
#if defined(FX816_NRF24L01_INO) #if defined(FX816_NRF24L01_INO)
{PROTO_FX816, STR_FX816, 1, STR_SUBTYPE_FX816, OPTION_NONE }, {PROTO_FX816, STR_FX816, 1, STR_SUBTYPE_FX816, OPTION_NONE },
#endif #endif
@ -272,6 +272,9 @@ const mm_protocol_definition multi_protocols[] = {
#if defined(H8_3D_NRF24L01_INO) #if defined(H8_3D_NRF24L01_INO)
{PROTO_H8_3D, STR_H8_3D, 4, STR_SUBTYPE_H83D, OPTION_NONE }, {PROTO_H8_3D, STR_H8_3D, 4, STR_SUBTYPE_H83D, OPTION_NONE },
#endif #endif
#if defined(HEIGHT_A7105_INO)
{PROTO_HEIGHT, STR_HEIGHT, 2, STR_SUBTYPE_HEIGHT, OPTION_NONE },
#endif
#if defined(HISKY_NRF24L01_INO) #if defined(HISKY_NRF24L01_INO)
{PROTO_HISKY, STR_HISKY, 2, STR_SUBTYPE_HISKY, OPTION_NONE }, {PROTO_HISKY, STR_HISKY, 2, STR_SUBTYPE_HISKY, OPTION_NONE },
#endif #endif
@ -344,9 +347,6 @@ const mm_protocol_definition multi_protocols[] = {
#if defined(SCANNER_CC2500_INO) #if defined(SCANNER_CC2500_INO)
// {PROTO_SCANNER, STR_SCANNER, 0, NO_SUBTYPE, OPTION_NONE }, // {PROTO_SCANNER, STR_SCANNER, 0, NO_SUBTYPE, OPTION_NONE },
#endif #endif
#if defined(FUTABA_CC2500_INO)
{PROTO_FUTABA, STR_SFHSS, 1, STR_SUBTYPE_SFHSS, OPTION_RFTUNE },
#endif
#if defined(SHENQI_NRF24L01_INO) #if defined(SHENQI_NRF24L01_INO)
{PROTO_SHENQI, STR_SHENQI, 0, NO_SUBTYPE, OPTION_NONE }, {PROTO_SHENQI, STR_SHENQI, 0, NO_SUBTYPE, OPTION_NONE },
#endif #endif

4
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 3 #define VERSION_MINOR 3
#define VERSION_REVISION 1 #define VERSION_REVISION 1
#define VERSION_PATCH_LEVEL 76 #define VERSION_PATCH_LEVEL 77
//****************** //******************
// Protocols // Protocols
@ -778,7 +778,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p --
MJXQ 18 MJXQ 18
SHENQI 19 SHENQI 19
FY326 20 FY326 20
SFHSS 21 Futaba 21
J6PRO 22 J6PRO 22
FQ777 23 FQ777 23
ASSAN 24 ASSAN 24

2
Multiprotocol/Validate.h
View File

@ -116,7 +116,7 @@
#endif #endif
#ifdef FORCE_FUTABA_TUNING #ifdef FORCE_FUTABA_TUNING
#if ( FORCE_FUTABA_TUNING < -127 ) || ( FORCE_FUTABA_TUNING > 127 ) #if ( FORCE_FUTABA_TUNING < -127 ) || ( FORCE_FUTABA_TUNING > 127 )
#error "The SFHSS forced frequency tuning value is outside of the range -127..127." #error "The Futaba forced frequency tuning value is outside of the range -127..127."
#endif #endif
#endif #endif
#ifdef FORCE_SKYARTEC_TUNING #ifdef FORCE_SKYARTEC_TUNING