Fix some compilation issues

This commit is contained in:
Pascal Langer 2018-11-07 15:52:39 +01:00
parent 3f0d6cfcf1
commit c658a892f2
3 changed files with 4 additions and 4 deletions

View File

@ -154,7 +154,7 @@ static void __attribute__((unused)) E01X_send_packet(uint8_t bind)
}
// Power on, TX mode, CRC enabled
HS6200_Configure(BV(NRF24L01_00_EN_CRC) | BV(NRF24L01_00_CRCO) | BV(NRF24L01_00_PWR_UP));
HS6200_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP));
NRF24L01_WriteReg(NRF24L01_05_RF_CH, rf_ch_num);
NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);

View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 2
#define VERSION_REVISION 1
#define VERSION_PATCH_LEVEL 9
#define VERSION_PATCH_LEVEL 10
//******************
// Protocols
@ -371,7 +371,7 @@ enum MultiPacketTypes
uint16_t debug_time=0;
#define debug(msg, ...) {char buf[64]; sprintf(buf, msg, ##__VA_ARGS__); Serial.write(buf);}
#define debugln(msg, ...) {char buf[64]; sprintf(buf, msg "\r\n", ##__VA_ARGS__); Serial.write(buf);}
#define debug_time(msg) { uint16_t debug_time_TCNT1=TCNT1; debug_time=debug_time_TCNT1-debug_time; debugln(msg "%u", debug_time>>1); debug_time=debug_time_TCNT1; }
#define debug_time(msg) { uint16_t debug_time_TCNT1=TCNT1; debug_time=debug_time_TCNT1-debug_time; debug(msg "%u", debug_time>>1); debug_time=debug_time_TCNT1; }
#else
#define debug(...) { }
#define debugln(...) { }

View File

@ -112,7 +112,7 @@ uint16_t state;
uint8_t len;
uint8_t armed, arm_flags, arm_channel_previous;
#if defined(FRSKYX_CC2500_INO) || defined(SFHSS_CC2500_INO)
#if defined(FRSKYX_CC2500_INO) || defined(SFHSS_CC2500_INO) || defined(HITEC_CC2500_INO)
uint8_t calData[48];
#endif