From ac78ddcc8240970b153ad0fddad54e8800187656 Mon Sep 17 00:00:00 2001 From: pascallanger Date: Thu, 28 Jan 2016 18:43:46 +0100 Subject: [PATCH] Fix: Hubsan telemetry packet check function & Change: Telemetry variables to static --- Multiprotocol/Hubsan_a7105.ino | 3 +-- Multiprotocol/Telemetry.ino | 12 ++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Multiprotocol/Hubsan_a7105.ino b/Multiprotocol/Hubsan_a7105.ino index f126b34..760cb4e 100644 --- a/Multiprotocol/Hubsan_a7105.ino +++ b/Multiprotocol/Hubsan_a7105.ino @@ -181,11 +181,10 @@ static void __attribute__((unused)) hubsan_build_packet() } #if defined(TELEMETRY) -static __attribute__((unused)) uint8_t hubsan_check_integrity() +static uint8_t __attribute__((unused)) hubsan_check_integrity() { if( (packet[0]&0xFE) != 0xE0 ) return 0; - return 1; uint8_t sum = 0; for(uint8_t i = 0; i < 15; i++) sum += packet[i]; diff --git a/Multiprotocol/Telemetry.ino b/Multiprotocol/Telemetry.ino index 48f8f2c..e7ff62f 100644 --- a/Multiprotocol/Telemetry.ino +++ b/Multiprotocol/Telemetry.ino @@ -8,10 +8,6 @@ #define USER_MAX_BYTES 6 #define MAX_PKTX 10 uint8_t frame[18]; -uint8_t pass = 0; -uint8_t index; -uint8_t prev_index; -uint8_t pktx[MAX_PKTX]; void frskySendStuffed() { @@ -63,7 +59,8 @@ void frsky_link_frame() #if defined HUB_TELEMETRY void frsky_user_frame() { - uint8_t indexx = 0, c=0, j=8, n=0, i; + static uint8_t indexx = 0, pass=0, index, pktx[MAX_PKTX]; + uint8_t c=0, j=8, n=0, i; if(pktt[6]>0 && pktt[6]<=MAX_PKTX) {//only valid hub frames @@ -93,7 +90,6 @@ void frsky_user_frame() case 1: index=indexx; - prev_index = indexx; if(index