diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 1edb138..96d563c 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 16 +#define VERSION_PATCH_LEVEL 17 //****************** // Protocols diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index 8939704..f821950 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -236,7 +236,6 @@ uint8_t packet_in[TELEMETRY_BUFFER_SIZE];//telemetry receiving packets }; extern const mm_protocol_definition multi_protocols[]; uint8_t multi_protocols_index=0xFF; - uint8_t multi_protocols_send; #endif #endif // TELEMETRY @@ -957,7 +956,6 @@ static void protocol_init() inputRefreshRate = 7000; // Default value #endif #ifdef MULTI_NAMES - multi_protocols_send = 0; multi_protocols_index = 0xFF; #endif tx_pause(); @@ -1412,7 +1410,6 @@ static void protocol_init() if(multi_protocols[index].protocol==protocol) { multi_protocols_index=index; - multi_protocols_send = 0; SEND_MULTI_STATUS_on; #ifdef DEBUG_SERIAL debug("Proto=%s",multi_protocols[multi_protocols_index].ProtoString); diff --git a/Multiprotocol/Telemetry.ino b/Multiprotocol/Telemetry.ino index 0e8a299..dd2cd3a 100644 --- a/Multiprotocol/Telemetry.ino +++ b/Multiprotocol/Telemetry.ino @@ -128,7 +128,7 @@ inline void telemetry_set_input_sync(uint16_t refreshRate) static void multi_send_status() { #ifdef MULTI_NAMES - if(multi_protocols_send && multi_protocols_index != 0xFF) + if(multi_protocols_index != 0xFF) multi_send_header(MULTI_TELEMETRY_STATUS, 25); else #endif @@ -188,9 +188,8 @@ static void multi_send_status() Serial_write(RUDDER<<6|THROTTLE<<4|ELEVATOR<<2|AILERON); #ifdef MULTI_NAMES - if(multi_protocols_send && multi_protocols_index != 0xFF) + if(multi_protocols_index != 0xFF) { - multi_protocols_send--; // Protocol next/prev if(multi_protocols[multi_protocols_index+1].protocol != 0) Serial_write(multi_protocols[multi_protocols_index+1].protocol); // next protocol number