From 3dcf74c2e44ff49615270b3351857d8f82ab50c4 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Tue, 2 Jun 2020 17:17:49 +0200 Subject: [PATCH] Bayang: renamed CX100 to QX100 --- Multiprotocol/Bayang_nrf24l01.ino | 6 +++--- Multiprotocol/Multi.txt | 2 +- Multiprotocol/Multi_Names.ino | 4 ++-- Multiprotocol/Multiprotocol.h | 2 +- Multiprotocol/_Config.h | 2 +- Protocols_Details.md | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Multiprotocol/Bayang_nrf24l01.ino b/Multiprotocol/Bayang_nrf24l01.ino index d2c6cc9..ceeace5 100644 --- a/Multiprotocol/Bayang_nrf24l01.ino +++ b/Multiprotocol/Bayang_nrf24l01.ino @@ -67,7 +67,7 @@ static void __attribute__((unused)) BAYANG_send_packet() else #endif packet[0]= 0xA4; - if(sub_protocol==CX100) + if(sub_protocol==QX100) packet[0] = 0x53; for(i=0;i<5;i++) @@ -76,7 +76,7 @@ static void __attribute__((unused)) BAYANG_send_packet() packet[i+6]=hopping_frequency[i]; switch (sub_protocol) { - case CX100: + case QX100: case X16_AH: packet[10] = 0x00; packet[11] = 0x00; @@ -165,7 +165,7 @@ static void __attribute__((unused)) BAYANG_send_packet() packet[12] = rx_tx_addr[2]; // txid[2] packet[13] = 0x34; break; - case CX100: + case QX100: case X16_AH: packet[12] = 0; packet[13] = 0; diff --git a/Multiprotocol/Multi.txt b/Multiprotocol/Multi.txt index 2b635da..4f53b61 100644 --- a/Multiprotocol/Multi.txt +++ b/Multiprotocol/Multi.txt @@ -11,7 +11,7 @@ 11,SLT,SLT_V1,SLT_V2,Q100,Q200,MR100 12,CX10,GREEN,BLUE,DM007,---,J3015_1,J3015_2,MK33041 13,CG023,CG023,YD829 -14,Bayang,Bayang,H8S3D,X16_AH,IRDRONE,DHD_D4,CX100 +14,Bayang,Bayang,H8S3D,X16_AH,IRDRONE,DHD_D4,QX100 15,FrskyX,CH_16,CH_8,EU_16,EU_8,Cloned 16,ESky,Std,ET4 17,MT99xx,MT,H7,YZ,LS,FY805 diff --git a/Multiprotocol/Multi_Names.ino b/Multiprotocol/Multi_Names.ino index 3cba389..92a8928 100644 --- a/Multiprotocol/Multi_Names.ino +++ b/Multiprotocol/Multi_Names.ino @@ -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_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_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_MJXQ[] = "\x07""WLH08\0 ""X600\0 ""X800\0 ""H26D\0 ""E010\0 ""H26WH\0 ""Phoenix"; 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 }, #endif #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 #if defined(BAYANG_RX_NRF24L01_INO) {PROTO_BAYANG_RX, STR_BAYANG_RX, 0, NO_SUBTYPE, OPTION_NONE }, diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 2c4e9b1..69e8808 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -195,7 +195,7 @@ enum BAYANG X16_AH = 2, IRDRONE = 3, DHD_D4 = 4, - CX100 = 5, + QX100 = 5, }; enum MT99XX { diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index 1ec2097..ac7e8f5 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -510,7 +510,7 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { X16_AH IRDRONE DHD_D4 - CX100 + QX100 PROTO_BAYANG_RX NONE PROTO_BUGS diff --git a/Protocols_Details.md b/Protocols_Details.md index 68fbc73..c65380a 100644 --- a/Protocols_Details.md +++ b/Protocols_Details.md @@ -778,8 +778,8 @@ CH12|CH13 ----|---- TAKE_OFF|EMG_STOP -### Sub_protocol CX100 - *5* -Model: REVELL CX100 +### Sub_protocol QX100 - *5* +Model: REVELL QX100 ## BAYANG RX - *59* The Bayang receiver protocol enables master/slave trainning, separate access from 2 different radios to the same model,...