gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-07-12 09:47:54 +00:00
Code Issues Projects Releases Wiki Activity

Renamed CX100 to QX100 and fixed the sub selection

Browse Source
This commit is contained in:
Herman 2020-06-02 16:18:12 +02:00
parent 50f1eca4be
commit 16585467f0
4 changed files with 375 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Multiprotocol/Bayang_nrf24l01.ino
View File

@ -67,7 +67,7 @@ static void __attribute__((unused)) BAYANG_send_packet()
else else
#endif #endif
packet[0]= 0xA4; packet[0]= 0xA4;
if(sub_protocol==CX100) if(sub_protocol==QX100)
packet[0] = 0x53; packet[0] = 0x53;
for(i=0;i<5;i++) for(i=0;i<5;i++)
@ -76,7 +76,7 @@ static void __attribute__((unused)) BAYANG_send_packet()
packet[i+6]=hopping_frequency[i]; packet[i+6]=hopping_frequency[i];
switch (sub_protocol) switch (sub_protocol)
{ {
case CX100: case QX100:
case X16_AH: case X16_AH:
packet[10] = 0x00; packet[10] = 0x00;
packet[11] = 0x00; packet[11] = 0x00;
@ -165,7 +165,7 @@ static void __attribute__((unused)) BAYANG_send_packet()
packet[12] = rx_tx_addr[2]; // txid[2] packet[12] = rx_tx_addr[2]; // txid[2]
packet[13] = 0x34; packet[13] = 0x34;
break; break;
case CX100: case QX100:
case X16_AH: case X16_AH:
packet[12] = 0; packet[12] = 0;
packet[13] = 0; packet[13] = 0;

4
Multiprotocol/Multi_Names.ino
View File

@ -101,7 +101,7 @@ const char STR_SUBTYPE_SYMAX[] = "\x03""Std""X5C";
const char STR_SUBTYPE_SLT[] = "\x06""V1_6ch""V2_8ch""Q100\0 ""Q200\0 ""MR100\0"; const char STR_SUBTYPE_SLT[] = "\x06""V1_6ch""V2_8ch""Q100\0 ""Q200\0 ""MR100\0";
const char STR_SUBTYPE_CX10[] = "\x07""Green\0 ""Blue\0 ""DM007\0 ""-\0 ""JC3015a""JC3015b""MK33041"; const char STR_SUBTYPE_CX10[] = "\x07""Green\0 ""Blue\0 ""DM007\0 ""-\0 ""JC3015a""JC3015b""MK33041";
const char STR_SUBTYPE_CG023[] = "\x05""Std\0 ""YD829"; const char STR_SUBTYPE_CG023[] = "\x05""Std\0 ""YD829";
const char STR_SUBTYPE_BAYANG[] = "\x07""Std\0 ""H8S3D\0 ""X16 AH\0""IRDrone""DHD D4\0""CX100\0 "; const char STR_SUBTYPE_BAYANG[] = "\x07""Std\0 ""H8S3D\0 ""X16 AH\0""IRDrone""DHD D4\0""QX100\0 ";
const char STR_SUBTYPE_MT99[] = "\x06""MT99\0 ""H7\0 ""YZ\0 ""LS\0 ""FY805"; const char STR_SUBTYPE_MT99[] = "\x06""MT99\0 ""H7\0 ""YZ\0 ""LS\0 ""FY805";
const char STR_SUBTYPE_MJXQ[] = "\x07""WLH08\0 ""X600\0 ""X800\0 ""H26D\0 ""E010\0 ""H26WH\0 ""Phoenix"; const char STR_SUBTYPE_MJXQ[] = "\x07""WLH08\0 ""X600\0 ""X800\0 ""H26D\0 ""E010\0 ""H26WH\0 ""Phoenix";
const char STR_SUBTYPE_FY326[] = "\x05""Std\0 ""FY319"; const char STR_SUBTYPE_FY326[] = "\x05""Std\0 ""FY319";
@ -157,7 +157,7 @@ const mm_protocol_definition multi_protocols[] = {
{PROTO_ASSAN, STR_ASSAN, 0, NO_SUBTYPE, OPTION_NONE }, {PROTO_ASSAN, STR_ASSAN, 0, NO_SUBTYPE, OPTION_NONE },
#endif #endif
#if defined(BAYANG_NRF24L01_INO) #if defined(BAYANG_NRF24L01_INO)
{PROTO_BAYANG, STR_BAYANG, 5, STR_SUBTYPE_BAYANG, OPTION_TELEM }, {PROTO_BAYANG, STR_BAYANG, 6, STR_SUBTYPE_BAYANG, OPTION_TELEM },
#endif #endif
#if defined(BAYANG_RX_NRF24L01_INO) #if defined(BAYANG_RX_NRF24L01_INO)
{PROTO_BAYANG_RX, STR_BAYANG_RX, 0, NO_SUBTYPE, OPTION_NONE }, {PROTO_BAYANG_RX, STR_BAYANG_RX, 0, NO_SUBTYPE, OPTION_NONE },

3
Multiprotocol/Multiprotocol.h
View File

@ -195,7 +195,7 @@ enum BAYANG
X16_AH = 2, X16_AH = 2,
IRDRONE = 3, IRDRONE = 3,
DHD_D4 = 4, DHD_D4 = 4,
CX100 = 5, QX100 = 5,
}; };
enum MT99XX enum MT99XX
{ {
@ -834,6 +834,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p --
X16_AH 2 X16_AH 2
IRDRONE 3 IRDRONE 3
DHD_D4 4 DHD_D4 4
QX100 5
sub_protocol==MT99XX sub_protocol==MT99XX
MT99 0 MT99 0
H7 1 H7 1

2
Multiprotocol/_Config.h
View File

@ -510,7 +510,7 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= {
X16_AH X16_AH
IRDRONE IRDRONE
DHD_D4 DHD_D4
CX100 QX100
PROTO_BAYANG_RX PROTO_BAYANG_RX
NONE NONE
PROTO_BUGS PROTO_BUGS