gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-02-13 19:43:44 +00:00
Code Issues Projects Releases Wiki Activity

New protocol CX-10/Q242

Browse Source
This commit is contained in:
pascallanger 2016-01-25 18:14:56 +01:00
parent a41bfabede
commit 9140c426c4
4 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Multiprotocol/CX10_nrf24l01.ino
View File

@ -90,9 +90,15 @@ static void CX10_Write_Packet(uint8_t bind)
if(Servo_AUX4) flags |= 0x08; // Channel 8 - video if(Servo_AUX4) flags |= 0x08; // Channel 8 - video
break; break;
case Q282: case Q282:
case Q242:
memcpy(&packet[15], "\x10\x10\xaa\xaa\x00\x00", 6);
//FLIP|LED|PICTURE|VIDEO|HEADLESS|RTH|XCAL|YCAL //FLIP|LED|PICTURE|VIDEO|HEADLESS|RTH|XCAL|YCAL
if(Servo_AUX1) flags2 =0x80; // Channel 5 - FLIP if(Servo_AUX1) flags2 =0x80; // Channel 5 - FLIP
if(Servo_AUX2) flags2|=0x40; // Channel 6 - LED if(Servo_AUX2) flags2|=0x40; // Channel 6 - LED
if(Servo_AUX5) flags2|=0x08; // Channel 9 - HEADLESS
if(sub_protocol==Q282)
{
if(Servo_AUX3) flags2|=0x10; // Channel 7 - picture if(Servo_AUX3) flags2|=0x10; // Channel 7 - picture
if(Servo_AUX4) // Channel 8 - video if(Servo_AUX4) // Channel 8 - video
{ {
@ -101,13 +107,19 @@ static void CX10_Write_Packet(uint8_t bind)
else else
if (video_state & 0x20) video_state &= 0x01; if (video_state & 0x20) video_state &= 0x01;
flags2 |= video_state; flags2 |= video_state;
if(Servo_AUX5) flags2|=0x08; // Channel 9 - HEADLESS
flags=3; flags=3;
}
else
{
if(Servo_AUX3) flags2|=0x01; // Channel 7 - picture
if(Servo_AUX4) flags2|=0x10; // Channel 8 - video
flags=2;
packet[17]=0x00;
packet[18]=0x00;
}
if(Servo_AUX6) flags |=0x80; // Channel 10 - RTH if(Servo_AUX6) flags |=0x80; // Channel 10 - RTH
if(Servo_AUX7) flags2|=0x04; // Channel 11 - XCAL if(Servo_AUX7) flags2|=0x04; // Channel 11 - XCAL
if(Servo_AUX8) flags2|=0x02; // Channel 12 - YCAL if(Servo_AUX8) flags2|=0x02; // Channel 12 - YCAL
memcpy(&packet[15], "\x10\x10\xaa\xaa\x00\x00", 6);
break; break;
case DM007: case DM007:
//FLIP|MODE|PICTURE|VIDEO|HEADLESS //FLIP|MODE|PICTURE|VIDEO|HEADLESS
@ -224,6 +236,14 @@ static void initialize_txid()
hopping_frequency[2] = 0x4a; hopping_frequency[2] = 0x4a;
hopping_frequency[3] = 0x4c; hopping_frequency[3] = 0x4c;
} }
else
if(sub_protocol==Q242)
{
hopping_frequency[0] = 0x48;
hopping_frequency[1] = 0x4a;
hopping_frequency[2] = 0x4c;
hopping_frequency[3] = 0x4e;
}
else else
{ {
hopping_frequency[0] = 0x03 + (rx_tx_addr[0] & 0x0F); hopping_frequency[0] = 0x03 + (rx_tx_addr[0] & 0x0F);
@ -247,7 +267,7 @@ uint16_t initCX10(void)
} }
else else
{ {
if(sub_protocol==Q282) if(sub_protocol==Q282||sub_protocol==Q242)
packet_length = Q282_PACKET_SIZE; packet_length = Q282_PACKET_SIZE;
else else
packet_length = CX10_PACKET_SIZE; packet_length = CX10_PACKET_SIZE;

1
Multiprotocol/_Config.h
View File

@ -104,6 +104,7 @@ static const PPM_Parameters PPM_prot[15]=
JC3015_1 JC3015_1
JC3015_2 JC3015_2
MK33041 MK33041
Q242
MODE_CG023 MODE_CG023
CG023 CG023
YD829 YD829

4
Multiprotocol/multiprotocol.h
View File

@ -78,7 +78,8 @@ enum CX10
Q282=3, Q282=3,
JC3015_1=4, JC3015_1=4,
JC3015_2=5, JC3015_2=5,
MK33041=6 MK33041=6,
Q242=7
}; };
enum CG023 enum CG023
{ {
@ -428,6 +429,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p --
JC3015_1 4 JC3015_1 4
JC3015_2 5 JC3015_2 5
MK33041 6 MK33041 6
Q242 7
sub_protocol==CG023 sub_protocol==CG023
CG023 0 CG023 0
YD829 1 YD829 1

2
README.md
View File

@ -163,6 +163,7 @@ CX10||NRF24L01
|JC3015_1 |JC3015_1
|JC3015_2 |JC3015_2
|MK33041 |MK33041
|Q242
CG023||NRF24L01 CG023||NRF24L01
|CG023 |CG023
|YD829 |YD829
@ -251,6 +252,7 @@ CH5|CH6|CH7|CH8|CH9
FLIP|MODE|PICTURE|VIDEO|HEADLESS FLIP|MODE|PICTURE|VIDEO|HEADLESS
#####Sub_protocol CX10_Q282 #####Sub_protocol CX10_Q282
#####Sub_protocol CX10_Q242
CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12 CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12
---|---|---|---|---|---|---|--- ---|---|---|---|---|---|---|---