gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-02-09 22:58:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix scanner compilation issue

Browse Source
This commit is contained in:
Pascal Langer 2019-09-11 12:23:36 +02:00
parent 7d327c1622
commit 303c4615e9
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 2 #define VERSION_MINOR 2
#define VERSION_REVISION 1 #define VERSION_REVISION 1
#define VERSION_PATCH_LEVEL 75 #define VERSION_PATCH_LEVEL 76
//****************** //******************
// Protocols // Protocols

1
Multiprotocol/Multiprotocol.ino
View File

@ -116,7 +116,6 @@ uint8_t num_ch;
#ifdef CC2500_INSTALLED #ifdef CC2500_INSTALLED
#ifdef SCANNER_CC2500_INO #ifdef SCANNER_CC2500_INO
uint8_t calData[255]; uint8_t calData[255];
#define SCAN_CHANS_PER_PACKET 5
#else #else
uint8_t calData[50]; uint8_t calData[50];
#endif #endif

1
Multiprotocol/Scanner_cc2500.ino
View File

@ -20,6 +20,7 @@
#define SCAN_MAX_RADIOCHANNEL 249 // 2483 MHz #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_CHANNEL_LOCK_TIME 300 // with precalibration, channel requires only 90 usec for synthesizer to settle
#define SCAN_AVERAGE_INTVL 30 #define SCAN_AVERAGE_INTVL 30
#define SCAN_CHANS_PER_PACKET 5
static uint8_t scan_tlm_index; static uint8_t scan_tlm_index;

3
Multiprotocol/Validate.h
View File

@ -254,6 +254,9 @@
#if defined MULTI_TELEMETRY && not defined INVERT_TELEMETRY #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. #warning MULTI_TELEMETRY has been defined but not INVERT_TELEMETRY. They should be both enabled for OpenTX telemetry and status to work.
#endif #endif
#if not defined(SCANNER_CC2500_INO)
#undef SCANNER_TELEMETRY
#endif
#if not defined(BAYANG_NRF24L01_INO) #if not defined(BAYANG_NRF24L01_INO)
#undef BAYANG_HUB_TELEMETRY #undef BAYANG_HUB_TELEMETRY
#endif #endif