From b40e7d6e970275e1c2309d665340e8effaac1a82 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Thu, 11 Oct 2018 17:58:07 +0200 Subject: [PATCH] Bugs: fixed telemetry disable compilation error --- Multiprotocol/Bugs_a7105.ino | 18 ++++++++++-------- Multiprotocol/CX10_nrf24l01.ino | 2 +- Multiprotocol/Multiprotocol.h | 3 ++- Multiprotocol/Multiprotocol.ino | 6 ++++++ 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Multiprotocol/Bugs_a7105.ino b/Multiprotocol/Bugs_a7105.ino index a7d1d30..60098fe 100644 --- a/Multiprotocol/Bugs_a7105.ino +++ b/Multiprotocol/Bugs_a7105.ino @@ -427,14 +427,16 @@ uint16_t ReadBUGS(void) if (!(mode & 0x01)) { A7105_ReadData(16); - v_lipo1=packet[10] == 0xff ? 0xff : 0x00; // Voltage in this case is only an alert on level good or bad. - RX_RSSI=packet[3]; - // Read TX RSSI - int16_t temp=256-(A7105_ReadReg(A7105_1D_RSSI_THOLD)*8)/5; // Value from A7105 is between 8 for maximum signal strength to 160 or less - if(temp<0) temp=0; - else if(temp>255) temp=255; - TX_RSSI=temp; - telemetry_link=1; + #if defined(BUGS_HUB_TELEMETRY) + v_lipo1=packet[10] == 0xff ? 0xff : 0x00; // Voltage in this case is only an alert on level good or bad. + RX_RSSI=packet[3]; + // Read TX RSSI + int16_t temp=256-(A7105_ReadReg(A7105_1D_RSSI_THOLD)*8)/5; // Value from A7105 is between 8 for maximum signal strength to 160 or less + if(temp<0) temp=0; + else if(temp>255) temp=255; + TX_RSSI=temp; + telemetry_link=1; + #endif } phase = BUGS_DATA_1; packet_period = BUGS_DELAY_POST_RX; diff --git a/Multiprotocol/CX10_nrf24l01.ino b/Multiprotocol/CX10_nrf24l01.ino index 328d04b..4f98d44 100644 --- a/Multiprotocol/CX10_nrf24l01.ino +++ b/Multiprotocol/CX10_nrf24l01.ino @@ -259,6 +259,7 @@ static void __attribute__((unused)) CX10_initialize_txid() uint16_t initCX10(void) { + BIND_IN_PROGRESS; // autobind protocol if(sub_protocol==CX10_BLUE) { packet_length = CX10A_PACKET_SIZE; @@ -282,7 +283,6 @@ uint16_t initCX10(void) } CX10_initialize_txid(); CX10_init(); - BIND_IN_PROGRESS; // autobind protocol return CX10_INITIAL_WAIT+packet_period; } diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index e96fc13..727abc2 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_REVISION 1 -#define VERSION_PATCH_LEVEL 1 +#define VERSION_PATCH_LEVEL 2 //****************** // Protocols @@ -68,6 +68,7 @@ enum PROTOCOLS PROTO_HITEC = 39, // =>CC2500 PROTO_WFLY = 40, // =>CYRF6936 PROTO_BUGS = 41, // =>A7105 + PROTO_TEST = 63, // =>NRF24L01 }; enum Flysky diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index 4b1cc2d..1234f5a 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -1187,6 +1187,12 @@ static void protocol_init() remote_callback = cflie_callback; break; #endif + #if defined(TEST_NRF24L01_INO) + case PROTO_TEST: + next_callback=initTest(); + remote_callback = Test_callback; + break; + #endif #endif } }