From 3fa40b230342a60e169b2afd7dc8092dfa6c5ff4 Mon Sep 17 00:00:00 2001 From: pascallanger Date: Fri, 2 Dec 2016 10:19:35 +0100 Subject: [PATCH] Bayang: add sub_protocol H8S3D Protocol: 14 Sub_protocol: 1 --- Multiprotocol/Bayang_nrf24l01.ino | 2 +- Multiprotocol/Multiprotocol.h | 8 ++++++++ Multiprotocol/_Config.h | 5 +++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Multiprotocol/Bayang_nrf24l01.ino b/Multiprotocol/Bayang_nrf24l01.ino index 7d010d4..3a5bbe4 100644 --- a/Multiprotocol/Bayang_nrf24l01.ino +++ b/Multiprotocol/Bayang_nrf24l01.ino @@ -92,7 +92,7 @@ static void __attribute__((unused)) BAYANG_send_packet(uint8_t bind) packet[11] = val & 0xFF; } packet[12] = rx_tx_addr[2]; // txid[2] - packet[13] = 0x0A; + packet[13] = sub_protocol==H8S3D?0x34:0x0A; packet[14] = 0; for (uint8_t i=0; i < BAYANG_PACKET_SIZE-1; i++) packet[14] += packet[i]; diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 3c0ff9a..5123b07 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -122,6 +122,11 @@ enum CG023 YD829 = 1, H8_3D = 2 }; +enum BAYANG +{ + BAYANG = 0, + H8S3D = 1 +}; enum MT99XX { MT99 = 0, @@ -457,6 +462,9 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p -- CG023 0 YD829 1 H8_3D 2 + sub_protocol==BAYANG + BAYANG 0 + H8S3D 1 sub_protocol==MT99XX MT99 0 H7 1 diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index e3fb6e8..9fd5a02 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -175,7 +175,7 @@ const PPM_Parameters PPM_prot[15]= { /* 11 */ {MODE_SLT , 0 , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 12 */ {MODE_CX10 , CX10_BLUE , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 13 */ {MODE_CG023 , CG023 , 0 , P_HIGH , NO_AUTOBIND , 0 }, -/* 14 */ {MODE_BAYANG, 0 , 0 , P_HIGH , NO_AUTOBIND , 0 }, +/* 14 */ {MODE_BAYANG, BAYANG , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 15 */ {MODE_SYMAX , SYMAX5C , 0 , P_HIGH , NO_AUTOBIND , 0 } }; /* Available protocols and associated sub protocols to pick and choose from @@ -234,7 +234,8 @@ const PPM_Parameters PPM_prot[15]= { YD829 H8_3D MODE_BAYANG - NONE + BAYANG + H8S3D MODE_FRSKYX CH_16 CH_8