From b5bc7c04fb0ebfd4b7731aa4e59224538e17ede8 Mon Sep 17 00:00:00 2001 From: pascallanger Date: Fri, 23 Feb 2024 17:19:09 +0100 Subject: [PATCH] Rename Traxxas/6519 to Traxxas/TQ --- Lua_scripts/MultiChan.txt | 3 ++- Multiprotocol/Multi.txt | 3 ++- Multiprotocol/Multi_Protos.ino | 6 +++++- Multiprotocol/Multiprotocol.h | 6 +++--- Multiprotocol/Validate.h | 2 ++ Multiprotocol/_Config.h | 5 ++++- Protocols_Details.md | 4 ++-- 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Lua_scripts/MultiChan.txt b/Lua_scripts/MultiChan.txt index fc33678..0cd3c6c 100644 --- a/Lua_scripts/MultiChan.txt +++ b/Lua_scripts/MultiChan.txt @@ -170,7 +170,7 @@ 11,4,SLT,MR100,0,Rates,n-a,CH7,CH8,Mode,Flip,Video,Pict 10,0,Symax,Std,1,Flip,Rates,Pict,Video,HLess 10,1,Symax,X5C,1,Flip,Rates,Pict,Video,HLess -43,0,Traxxas,6519,0 +43,0,Traxxas,TQ,0 5,0,V2x2,Std,1,Flip,Light,Pict,Video,HLess,CalX,CalY 5,1,V2x2,JXD506,1,Flip,Light,Pict,Video,HLess,StaSto,Emerg,Cam_UD 48,0,V761,3CH,0,Gyro,Calib,Flip,RtnAct,Rtn @@ -214,3 +214,4 @@ 95,0,Bluefly,HP100,0,CH5,CH6,CH7,CH8 96,0,BumbleB 97,0,SGF22,Std,1,Mode,Flip,LED,Pict,Video +61,1,EazyRC diff --git a/Multiprotocol/Multi.txt b/Multiprotocol/Multi.txt index a49f205..36b2341 100644 --- a/Multiprotocol/Multi.txt +++ b/Multiprotocol/Multi.txt @@ -40,7 +40,7 @@ 40,WFLY,WFR0x 41,BUGS 42,BUGSMINI,BUGSMINI,BUGS3H -43,Traxxas,RX6519 +43,Traxxas,TQ 44,NCC1701 45,E01X,E012,E015 46,V911S,V911S,E119 @@ -58,6 +58,7 @@ 58,FX,816,620,9630 59,Bayang_RX,Multi,CPPM 60,Pelikan,Pro,Lite,SCX24 +61,EazyRC 62,XK,X450,X420,Cars 63,XN_DUMP,250K,1M,2M,AUTO 64,FrskyX2,CH_16,CH_8,EU_16,EU_8,Cloned diff --git a/Multiprotocol/Multi_Protos.ino b/Multiprotocol/Multi_Protos.ino index fecf1b9..b918a4d 100644 --- a/Multiprotocol/Multi_Protos.ino +++ b/Multiprotocol/Multi_Protos.ino @@ -108,6 +108,7 @@ const char STR_SCORPIO[] ="Scorpio"; const char STR_BLUEFLY[] ="BlueFly"; const char STR_BUMBLEB[] ="BumbleB"; const char STR_SGF22[] ="SGF22"; +const char STR_EAZYRC[] ="EazyRC"; const char STR_SUBTYPE_FLYSKY[] = "\x04""Std\0""V9x9""V6x6""V912""CX20"; const char STR_SUBTYPE_HUBSAN[] = "\x04""H107""H301""H501"; @@ -146,7 +147,7 @@ const char STR_SUBTYPE_H83D[] = "\x07""Std\0 ""H20H\0 ""H20Mini""H30Min const char STR_SUBTYPE_CORONA[] = "\x05""V1\0 ""V2\0 ""FD V3"; const char STR_SUBTYPE_HITEC[] = "\x07""Optima\0""Opt Hub""Minima\0"; const char STR_SUBTYPE_BUGS_MINI[] = "\x06""Std\0 ""Bugs3H"; -const char STR_SUBTYPE_TRAXXAS[] = "\x04""6519"; +const char STR_SUBTYPE_TRAXXAS[] = "\x02""TQ"; const char STR_SUBTYPE_E01X[] = "\x05""E012\0""E015\0"; const char STR_SUBTYPE_GD00X[] = "\x05""GD_V1""GD_V2"; const char STR_SUBTYPE_REDPINE[] = "\x04""Fast""Slow"; @@ -278,6 +279,9 @@ const mm_protocol_definition multi_protocols[] = { #if defined(E129_CYRF6936_INO) {PROTO_E129, STR_E129, STR_SUBTYPE_E129, 2, OPTION_NONE, 0, 0, SW_CYRF, E129_init, E129_callback }, #endif + #if defined(EAZYRC_NRF24L01_INO) + {PROTO_EAZYRC, STR_EAZYRC, NO_SUBTYPE, 0, OPTION_NONE, 0, 0, SW_NRF, EAZYRC_init, EAZYRC_callback }, + #endif #if defined(ESKY_NRF24L01_INO) {PROTO_ESKY, STR_ESKY, STR_SUBTYPE_ESKY, 2, OPTION_NONE, 0, 1, SW_NRF, ESKY_init, ESKY_callback }, #endif diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 9e91f91..416323f 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -89,7 +89,7 @@ enum PROTOCOLS PROTO_FX = 58, // =>NRF24L01 PROTO_BAYANG_RX = 59, // =>NRF24L01 PROTO_PELIKAN = 60, // =>A7105 - + PROTO_EAZYRC = 61, // =>NRF24L01 PROTO_XK = 62, // =>NRF24L01 PROTO_XN297DUMP = 63, // =>NRF24L01 PROTO_FRSKYX2 = 64, // =>CC2500 @@ -360,7 +360,7 @@ enum REDPINE }; enum TRAXXAS { - RX6519 = 0, + TRAXXAS_TQ = 0, }; enum ESKY150 { @@ -1106,7 +1106,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p -- RED_FAST 0 RED_SLOW 1 sub_protocol==TRAXXAS - RX6519 0 + TQ 0 sub_protocol==ESKY150 ESKY150_4CH 0 ESKY150_7CH 1 diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h index 48b5725..a3b90b6 100644 --- a/Multiprotocol/Validate.h +++ b/Multiprotocol/Validate.h @@ -312,6 +312,7 @@ #undef CX10_NRF24L01_INO #undef DM002_NRF24L01_INO #undef E016H_NRF24L01_INO + #undef EAZYRC_NRF24L01_INO #undef ESKY_NRF24L01_INO #undef ESKY150_NRF24L01_INO #undef FQ777_NRF24L01_INO @@ -374,6 +375,7 @@ //#undef PELIKAN_A7105_INO #undef LOSI_CYRF6936_INO //Need DSM to be enabled #undef TRAXXAS_CYRF6936_INO + #undef EAZYRC_NRF24L01_INO #undef KYOSHO2_NRF24L01_INO #undef MOULDKG_NRF24L01_INO #undef SHENQI_NRF24L01_INO diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index 4280888..0962ca2 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -227,6 +227,7 @@ #define CX10_NRF24L01_INO //Include Q2X2 protocol #define DM002_NRF24L01_INO #define E016H_NRF24L01_INO +#define EAZYRC_NRF24L01_INO #define ESKY_NRF24L01_INO #define ESKY150_NRF24L01_INO #define FQ777_NRF24L01_INO @@ -621,6 +622,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { PROTO_E129 E129_E129 E129_C186 + PROTO_EAZYRC + NONE PROTO_ESKY ESKY_STD ESKY_ET4 @@ -816,7 +819,7 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { SYMAX SYMAX5C PROTO_TRAXXAS - RX6519 + NONE PROTO_V2X2 V2X2 JXD506 diff --git a/Protocols_Details.md b/Protocols_Details.md index 1aa1ef5..86106e7 100644 --- a/Protocols_Details.md +++ b/Protocols_Details.md @@ -141,7 +141,7 @@ CFlie|38|CFlie||||||||NRF24L01| [Skyartec](Protocols_Details.md#Skyartec---68)|68|||||||||CC2500|CC2500 [SLT](Protocols_Details.md#SLT---11)|11|SLT_V1|SLT_V2|Q100|Q200|MR100||||NRF24L01|CC2500 [SymaX](Protocols_Details.md#Symax---10)|10|SYMAX|SYMAX5C|||||||NRF24L01| -[Traxxas](Protocols_Details.md#Traxxas---43)|43|6519 RX||||||||CYRF6936| +[Traxxas](Protocols_Details.md#Traxxas---43)|43|TQ||||||||CYRF6936| [V2x2](Protocols_Details.md#V2X2---5)|5|V2x2|JXD506|MR101||||||NRF24L01| [V761](Protocols_Details.md#V761---48)|48|3CH|4CH|TOPRC||||||NRF24L01|XN297 [V911S](Protocols_Details.md#V911S---46)|46|V911S*|E119*|||||||NRF24L01|XN297 @@ -671,7 +671,7 @@ CH1|CH2|CH3|CH4 A|E|T|R ## Traxxas - *43* -Receiver 6519 +Transmitter TQ, Receivers: 6519, ECM-2.5 Extended limits supported