From 37138f03ae70d61499f55d934d4271996555fdf1 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Fri, 31 Jul 2020 15:58:07 +0200 Subject: [PATCH] Few fixes --- Multiprotocol/Multiprotocol.h | 2 +- Multiprotocol/Multiprotocol.ino | 2 +- Multiprotocol/Pelikan_a7105.ino | 5 +++-- Multiprotocol/Validate.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 381e501..24d17d5 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 1 -#define VERSION_PATCH_LEVEL 48 +#define VERSION_PATCH_LEVEL 49 //****************** // Protocols diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index 0b1e6dd..254ef67 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -1915,7 +1915,7 @@ void update_serial_data() } #endif #ifdef SPORT_SEND - if((protocol==PROTO_FRSKYX || protocol==PROTO_FRSKYX2 || PROTO_FRSKY_R9) && rx_len==35) + if((protocol==PROTO_FRSKYX || protocol==PROTO_FRSKYX2 || protocol==PROTO_FRSKY_R9) && rx_len==35) {//Protocol waiting for 8 bytes #define BYTE_STUFF 0x7D #define STUFF_MASK 0x20 diff --git a/Multiprotocol/Pelikan_a7105.ino b/Multiprotocol/Pelikan_a7105.ino index 708e0b8..59558dc 100644 --- a/Multiprotocol/Pelikan_a7105.ino +++ b/Multiprotocol/Pelikan_a7105.ino @@ -127,7 +127,7 @@ uint16_t ReadPelikan() if(sub_protocol==PELIKAN_PRO) A7105_WriteReg(A7105_03_FIFOI,0x28); else//PELIKAN_LITE - A7105_WriteID((rx_tx_addr[0]<<24)|(rx_tx_addr[1]<<16)|(rx_tx_addr[2]<<8)|(rx_tx_addr[3])); + A7105_WriteID(MProtocol_id); } } #ifdef MULTI_SYNC @@ -281,8 +281,9 @@ uint16_t initPelikan() } #endif + MProtocol_id=((uint32_t)rx_tx_addr[0]<<24)|((uint32_t)rx_tx_addr[1]<<16)|((uint32_t)rx_tx_addr[2]<<8)|(rx_tx_addr[3]); if(sub_protocol==PELIKAN_LITE && IS_BIND_DONE) - A7105_WriteID((rx_tx_addr[0]<<24)|(rx_tx_addr[1]<<16)|(rx_tx_addr[2]<<8)|(rx_tx_addr[3])); + A7105_WriteID(MProtocol_id); hopping_frequency_no=PELIKAN_NUM_RF_CHAN; packet_count=5; diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h index 443bb77..d601884 100644 --- a/Multiprotocol/Validate.h +++ b/Multiprotocol/Validate.h @@ -4,7 +4,7 @@ #endif #if not defined (ORANGE_TX) && not defined (STM32_BOARD) //Atmega328p - #if not defined(ARDUINO_AVR_PRO) && not defined(ARDUINO_MULTI_NO_BOOT) && not defined(ARDUINO_MULTI_FLASH_FROM_TX) && not defined(ARDUINO_AVR_MINI) && not defined(ARDUINO_AVR_NANO) + #if not defined(ARDUINO_AVR_PRO) && not defined(ARDUINO_MULTI_NO_BOOT) && not defined(ARDUINO_MULTI_FLASH_FROM_TX) && not defined(ARDUINO_AVR_MINI) && not defined(ARDUINO_AVR_NANO) && not defined(ARDUINO_AVR_DUEMILANOVE) #error You must select one of these boards: "Multi 4-in-1", "Arduino Pro or Pro Mini" or "Arduino Mini" #endif #if F_CPU != 16000000L || not defined(__AVR_ATmega328P__)