diff --git a/Lua_scripts/MultiChan.txt b/Lua_scripts/MultiChan.txt index ae88981..e09ff6f 100644 --- a/Lua_scripts/MultiChan.txt +++ b/Lua_scripts/MultiChan.txt @@ -176,8 +176,8 @@ 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 -48,1,V761,4CH,0,Gyro,Calib,Flip,RtnAct,Rtn +48,0,V761,3CH,0,Gyro,Calib,Flip,RtnAct,Rtn,Beep +48,1,V761,4CH,0,Gyro,Calib,Flip,RtnAct,Rtn,Beep 48,2,V761,TOPRC,0,Gyro,Calib,Flip,RtnAct,Rtn 46,0,V911s,V911s,1,Calib,Rate 46,1,V911s,E119,1,Calib,Rate,6G_3D diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 943b107..03d72a4 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 4 -#define VERSION_PATCH_LEVEL 12 +#define VERSION_PATCH_LEVEL 13 #define MODE_SERIAL 0 diff --git a/Multiprotocol/V761_nrf24l01.ino b/Multiprotocol/V761_nrf24l01.ino index 2bb837e..5519ed8 100644 --- a/Multiprotocol/V761_nrf24l01.ino +++ b/Multiprotocol/V761_nrf24l01.ino @@ -118,9 +118,10 @@ static void __attribute__((unused)) V761_send_packet() packet[5] |= flags; - packet[6] = GET_FLAG(CH7_SW, 0x20) // Flip - |GET_FLAG(CH8_SW, 0x08) // RTH activation - |GET_FLAG(CH9_SW, 0x10); // RTH on/off + packet[6] = GET_FLAG(CH7_SW, 0x20) // Flip + |GET_FLAG(CH8_SW, 0x08) // RTH activation + |GET_FLAG(CH9_SW, 0x10) // RTH on/off + |GET_FLAG(CH10_SW, 0x40); // Beeper on/off if(sub_protocol == V761_3CH) packet[6] |= 0x80; // Unknown, set on original V761-1 dump but not on eachine dumps, keeping for compatibility } diff --git a/Protocols_Details.md b/Protocols_Details.md index bfa7dbc..c27cfb8 100644 --- a/Protocols_Details.md +++ b/Protocols_Details.md @@ -143,7 +143,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|V1_4CH|||NRF24L01|CC2500 [SymaX](Protocols_Details.md#Symax---10)|10|SYMAX|SYMAX5C|||||||NRF24L01| -[Traxxas](Protocols_Details.md#Traxxas---43)|43|TQ||||||||CYRF6936| +[Traxxas](Protocols_Details.md#Traxxas---43)|43|TQ1|TQ2|||||||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 @@ -696,6 +696,13 @@ CH1|CH2|CH3|CH4 A|E|T|R ## Traxxas - *43* + +### Sub_protocol TQ1 - *0* +Transmitter 2228 TX and a 2217 RX + +Under dev + +### Sub_protocol TQ2 - *1* Transmitter TQ, Receivers: 6519, 2218(X), ECM-2.5 Extended limits supported @@ -2123,18 +2130,18 @@ RTN_ACT and RTN: -100% disable, +100% enable ### Sub_protocol 3CH - *0* Models: Volantex V761-1, V761-3 and may be others -CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9 ----|---|---|---|---|---|---|---|--- --|E|T|R|GYRO|CALIB|FLIP|RTN_ACT|RTN +CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10 +---|---|---|---|---|---|---|---|---|--- +-|E|T|R|GYRO|CALIB|FLIP|RTN_ACT|RTN|BEEP ### Sub_protocol 4CH - *1* Models: Volantex V761-4+ and Eachine P51-D, F4U, F22 and may be others If the model (761-11 and above) sends telemetry then the battery status ok/empty is in A1 (4.4V -> 2.2V) and RSSI gets a dummy value of 100. -CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9 ----|---|---|---|---|---|---|---|--- -A|E|T|R|GYRO|CALIB|FLIP|RTN_ACT|RTN +CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10 +---|---|---|---|---|---|---|---|---|--- +A|E|T|R|GYRO|CALIB|FLIP|RTN_ACT|RTN|BEEP ### Sub_protocol TOPRC - *2* Models: Top RC Hobby Spitfire, P51D, BF-109