diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index 6e4ac06..1f0b843 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -625,7 +625,7 @@ uint8_t Update_All() update_led_status(); #if defined(TELEMETRY) #if ( !( defined(MULTI_TELEMETRY) || defined(MULTI_STATUS) ) ) - if( (protocol==PROTO_FRSKYD) || (protocol==PROTO_BAYANG) || (protocol==PROTO_NCC1701) || (protocol==PROTO_BUGS) || (protocol==PROTO_BUGSMINI) || (protocol==PROTO_HUBSAN) || (protocol==PROTO_AFHDS2A) || (protocol==PROTO_FRSKYX) || (protocol==PROTO_DSM) || (protocol==PROTO_CABELL) || (protocol==PROTO_HITEC)) + if( (protocol == PROTO_SCANNER) || (protocol==PROTO_FRSKYD) || (protocol==PROTO_BAYANG) || (protocol==PROTO_NCC1701) || (protocol==PROTO_BUGS) || (protocol==PROTO_BUGSMINI) || (protocol==PROTO_HUBSAN) || (protocol==PROTO_AFHDS2A) || (protocol==PROTO_FRSKYX) || (protocol==PROTO_DSM) || (protocol==PROTO_CABELL) || (protocol==PROTO_HITEC)) #endif TelemetryUpdate(); #endif diff --git a/Multiprotocol/Telemetry.ino b/Multiprotocol/Telemetry.ino index 9a87fdc..6c7def2 100644 --- a/Multiprotocol/Telemetry.ino +++ b/Multiprotocol/Telemetry.ino @@ -1009,6 +1009,15 @@ void TelemetryUpdate() } #endif + #if defined SCANNER_TELEMETRY + if (telemetry_link && protocol == PROTO_SCANNER) + { + spectrum_scanner_frame(); + telemetry_link = 0; + return; + } + #endif + if((telemetry_link & 1 )&& protocol != PROTO_FRSKYX) { // FrSkyD + Hubsan + AFHDS2A + Bayang + Cabell + Hitec + Bugs + BugsMini + NCC1701 frsky_link_frame(); @@ -1021,15 +1030,6 @@ void TelemetryUpdate() return; } #endif - - #if defined SCANNER_TELEMETRY - if (telemetry_link && protocol == PROTO_SCANNER) - { - spectrum_scanner_frame(); - telemetry_link = 0; - return; - } - #endif } diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index a7d4695..af5dff1 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -613,8 +613,6 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { PROTO_REDPINE RED_FAST RED_SLOW - PROTO_SCANNER - NONE PROTO_SFHSS NONE PROTO_SHENQI @@ -654,4 +652,6 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { NIHUI PROTO_ZSX NONE + PROTO_SCANNER + NONE */