diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index e65312a..baee1f4 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 0 -#define VERSION_PATCH_LEVEL 24 +#define VERSION_PATCH_LEVEL 25 //****************** // Protocols diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index 7a16a52..c860f82 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -1463,7 +1463,7 @@ static void protocol_init() void update_serial_data() { static bool prev_ch_mapping=false; - #ifdef TELEMETRY + #if defined(TELEMETRY) && defined(INVERT_TELEMETRY_TX) #ifdef INVERT_TELEMETRY static bool prev_inv_telem=true; #else @@ -1557,16 +1557,15 @@ void update_serial_data() DISABLE_TELEM_on; if(rx_ok_buff[26]&0x01) DISABLE_CH_MAP_on; - #if defined TELEMETRY + #if defined(TELEMETRY) && defined(INVERT_TELEMETRY_TX) if(((rx_ok_buff[26]&0x08)!=0) ^ prev_inv_telem) { //value changed if(rx_ok_buff[26]&0x08) { // Invert telemetry debugln("Invert telem %d,%d",rx_ok_buff[26]&0x01,prev_inv_telem); - #ifdef ORANGE_TX + #if defined (ORANGE_TX) PORTC.PIN3CTRL |= 0x40 ; - #endif - #ifdef STM32_BOARD + #elif defined (STM32_BOARD) TX_INV_on; RX_INV_on; #endif @@ -1574,10 +1573,9 @@ void update_serial_data() else { // Normal telemetry debugln("Normal telem %d,%d",rx_ok_buff[26]&0x01,prev_inv_telem); - #ifdef ORANGE_TX + #if defined (ORANGE_TX) PORTC.PIN3CTRL &= 0xBF ; - #endif - #ifdef STM32_BOARD + #elif defined (STM32_BOARD) TX_INV_off; RX_INV_off; #endif diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index 443a384..334044d 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -225,7 +225,7 @@ //FrSkyX specific setting //----------------------- //EU LBT setting: if commented the TX will not check if a channel is busy before transmitting. -//#define FRSKYX_LBT +#define FRSKYX_LBT //DSM specific settings //---------------------