diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index bedfc6e..79f0208 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_REVISION 1 -#define VERSION_PATCH_LEVEL 75 +#define VERSION_PATCH_LEVEL 76 //****************** // Protocols diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index cacb9ba..2f05d47 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -116,7 +116,6 @@ uint8_t num_ch; #ifdef CC2500_INSTALLED #ifdef SCANNER_CC2500_INO uint8_t calData[255]; - #define SCAN_CHANS_PER_PACKET 5 #else uint8_t calData[50]; #endif diff --git a/Multiprotocol/Scanner_cc2500.ino b/Multiprotocol/Scanner_cc2500.ino index e1666f2..5c7aaf4 100644 --- a/Multiprotocol/Scanner_cc2500.ino +++ b/Multiprotocol/Scanner_cc2500.ino @@ -20,6 +20,7 @@ #define SCAN_MAX_RADIOCHANNEL 249 // 2483 MHz #define SCAN_CHANNEL_LOCK_TIME 300 // with precalibration, channel requires only 90 usec for synthesizer to settle #define SCAN_AVERAGE_INTVL 30 +#define SCAN_CHANS_PER_PACKET 5 static uint8_t scan_tlm_index; diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h index bd8f26e..29bde84 100644 --- a/Multiprotocol/Validate.h +++ b/Multiprotocol/Validate.h @@ -254,6 +254,9 @@ #if defined MULTI_TELEMETRY && not defined INVERT_TELEMETRY #warning MULTI_TELEMETRY has been defined but not INVERT_TELEMETRY. They should be both enabled for OpenTX telemetry and status to work. #endif + #if not defined(SCANNER_CC2500_INO) + #undef SCANNER_TELEMETRY + #endif #if not defined(BAYANG_NRF24L01_INO) #undef BAYANG_HUB_TELEMETRY #endif