diff --git a/Lua_scripts/MultiChan.txt b/Lua_scripts/MultiChan.txt index 68aaf0d..1c28144 100644 --- a/Lua_scripts/MultiChan.txt +++ b/Lua_scripts/MultiChan.txt @@ -193,7 +193,7 @@ 62,0,XK,X450,1,FMode,TakeOf,Emerg,3D_6G,Pict,Video 62,1,XK,X420,1,FMode,TakeOf,Emerg,3D_6G,Pict,Video,Flip,Light 62,2,XK,Cars,0,FMode,TakeOf,Emerg,3D_6G,Pict,Video,Flip,Light -99,0,XK2,X4,0,Rate,Mode,Hover +99,0,XK2,X4,0,Rate,Mode,Hover,Light 8,0,YD717,Std,1,Flip,Light,Pict,Video,HLess 8,1,YD717,SkyWlkr,1,Flip,Light,Pict,Video,HLess 8,2,YD717,Simax4,1,Flip,Light,Pict,Video,HLess diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 8822e1b..936d877 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 18 +#define VERSION_PATCH_LEVEL 19 #define MODE_SERIAL 0 diff --git a/Multiprotocol/XK2_ccnrf.ino b/Multiprotocol/XK2_ccnrf.ino index 429afed..01463d5 100644 --- a/Multiprotocol/XK2_ccnrf.ino +++ b/Multiprotocol/XK2_ccnrf.ino @@ -70,13 +70,14 @@ static void __attribute__((unused)) XK2_send_packet() //Flags packet[5] = GET_FLAG(CH5_SW, 0x01) //Rate | GET_FLAG(CH6_SW, 0x08) //Mode - | GET_FLAG(CH7_SW, 0x20); //Hover + | GET_FLAG(CH7_SW, 0x20) //Hover + | GET_FLAG(CH8_SW, 0x40); //Light //Telemetry not received=00, Telemetry received=01 but sometimes switch to 1 even if telemetry is not there... packet[6] = 0x00; //Unknown packet[7] = crc8; //?? RX_ID checksum ?? => sum RX_ID[0..2] //Checksum seed - packet[8] = 0x7F; //Constant? + packet[8] = num_ch; //Based on TX ID but calculation is unknown } //Checksum for(uint8_t i=0; i temporary 08=6g/3d=short_press_right sequece also switches for a few packets to C1 if 8 C0 if 0 P[6] = 00 telemetry nok 01 telemetry ok but sometimes switch to 1 also when telemetry is nok... diff --git a/Protocols_Details.md b/Protocols_Details.md index 5b0625f..cc5ffd7 100644 --- a/Protocols_Details.md +++ b/Protocols_Details.md @@ -1515,17 +1515,17 @@ Models: WLtoys cars 284131/284161/284010/124016/124017/144010 and Eachine EAT14 ## XK2 - *99* ### Sub_protocol X4 - *0* -Transmitter: XK X4-A160, model: XK A160S +Transmitter: XK X4-A160, X5S, model: XK A160S, XK A280 -**Only 1 ID and might only work with my plane** +**Only 2 IDs** If a CC2500 is installed it will be used for this sub protocol. Option in this case is used for fine frequency tuning like any CC2500 protocols so check the [Frequency Tuning page](/docs/Frequency_Tuning.md). If only a NRF24L01 is installed then this sub protocol might be problematic because it is using the xn297L emulation with a transmission speed of 250kbps which doesn't work very well with every NRF24L01, this is an hardware issue with the authenticity and accuracy of the components. -CH1|CH2|CH3|CH4|CH5|CH6|CH7 ----|---|---|---|---|---|--- -A|E|T|R|Rate|Mode|Hover +CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8 +---|---|---|---|---|---|---|--- +A|E|T|R|Rate|Mode|Hover|Light The plane does not need to be bound each time if it is powered on **after** the radio/protocol is on.