From 1cbce29970928e782f10b30bea629b540b27eb25 Mon Sep 17 00:00:00 2001 From: pascallanger Date: Fri, 23 Feb 2024 11:06:48 +0100 Subject: [PATCH] Remove Radiolink/RC4G when MULTI_AIR --- Multiprotocol/RadioLink_cc2500.ino | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Multiprotocol/RadioLink_cc2500.ino b/Multiprotocol/RadioLink_cc2500.ino index 1603afa..8cb6c31 100644 --- a/Multiprotocol/RadioLink_cc2500.ino +++ b/Multiprotocol/RadioLink_cc2500.ino @@ -255,6 +255,7 @@ static void __attribute__((unused)) RLINK_send_packet() #endif } +#ifndef MULTI_AIR static void __attribute__((unused)) RLINK_RC4G_send_packet() { uint32_t val; @@ -296,6 +297,7 @@ static void __attribute__((unused)) RLINK_RC4G_send_packet() debugln(""); #endif } +#endif #define RLINK_TIMING_PROTO 20000-100 // -100 for compatibility with R8EF #define RLINK_TIMING_RFSEND 10500 @@ -305,10 +307,14 @@ uint16_t RLINK_callback() { if(sub_protocol == RLINK_RC4G) { - #ifdef MULTI_SYNC - telemetry_set_input_sync(RLINK_RC4G_TIMING_PROTO); + #ifndef MULTI_AIR + #ifdef MULTI_SYNC + telemetry_set_input_sync(RLINK_RC4G_TIMING_PROTO); + #endif + RLINK_RC4G_send_packet(); + #else + SUB_PROTO_INVALID; #endif - RLINK_RC4G_send_packet(); return RLINK_RC4G_TIMING_PROTO; } switch(phase)