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:28:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix compilation when telemetry is disabled

Browse Source
This commit is contained in:
Pascal Langer 2020-06-09 20:08:00 +02:00
parent b2e312b41e
commit 32dbdfc6e3
6 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Multiprotocol/Devo_cyrf6936.ino
View File

@ -162,6 +162,7 @@ static void __attribute__((unused)) DEVO_build_data_pkt()
DEVO_add_pkt_suffix(); DEVO_add_pkt_suffix();
} }
#if defined DEVO_HUB_TELEMETRY
static void __attribute__((unused)) DEVO_parse_telemetry_packet() static void __attribute__((unused)) DEVO_parse_telemetry_packet()
{ {
DEVO_scramble_pkt(); //This will unscramble the packet DEVO_scramble_pkt(); //This will unscramble the packet
@ -186,6 +187,7 @@ static void __attribute__((unused)) DEVO_parse_telemetry_packet()
v_lipo2 = packet[3] << 1; v_lipo2 = packet[3] << 1;
} }
} }
#endif
static void __attribute__((unused)) DEVO_cyrf_set_bound_sop_code() static void __attribute__((unused)) DEVO_cyrf_set_bound_sop_code()
{ {
@ -296,7 +298,7 @@ uint16_t devo_callback()
{ {
static uint8_t txState=0; static uint8_t txState=0;
#if defined DEVO_HUB_TELEMETRY #if defined DEVO_HUB_TELEMETRY
int delay; int delay;
if (txState == 0) if (txState == 0)

2
Multiprotocol/Multi_Names.ino
View File

@ -244,7 +244,7 @@ const mm_protocol_definition multi_protocols[] = {
{PROTO_FRSKYL, STR_FRSKYL, 2, STR_SUBTYPE_FRSKYL, OPTION_RFTUNE }, {PROTO_FRSKYL, STR_FRSKYL, 2, STR_SUBTYPE_FRSKYL, OPTION_RFTUNE },
#endif #endif
#if defined(FRSKYR9_SX1276_INO) #if defined(FRSKYR9_SX1276_INO)
{PROTO_FRSKY_R9, STR_FRSKYR9, 4, STR_SUBTYPE_FRSKYR9, OPTION_RFPOWER }, {PROTO_FRSKY_R9, STR_FRSKYR9, 4, STR_SUBTYPE_FRSKYR9, OPTION_NONE },
#endif #endif
#if defined(FX816_NRF24L01_INO) #if defined(FX816_NRF24L01_INO)
{PROTO_FX816, STR_FX816, 1, STR_SUBTYPE_FX816, OPTION_NONE }, {PROTO_FX816, STR_FX816, 1, STR_SUBTYPE_FX816, OPTION_NONE },

2
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 3 #define VERSION_MINOR 3
#define VERSION_REVISION 1 #define VERSION_REVISION 1
#define VERSION_PATCH_LEVEL 14 #define VERSION_PATCH_LEVEL 15
//****************** //******************
// Protocols // Protocols

42
Multiprotocol/Propel_nrf24l01.ino
View File

@ -252,28 +252,30 @@ uint16_t PROPEL_callback()
break; break;
case PROPEL_DATA1: case PROPEL_DATA1:
if (_BV(NRF24L01_07_RX_DR) & NRF24L01_ReadReg(NRF24L01_07_STATUS)) #ifdef PROPEL_HUB_TELEMETRY
{// data received from the model if (_BV(NRF24L01_07_RX_DR) & NRF24L01_ReadReg(NRF24L01_07_STATUS))
NRF24L01_ReadPayload(packet_in, PROPEL_PACKET_SIZE); {// data received from the model
if (packet_in[0] == 0xa3 && memcmp(&packet_in[1],rx_id,3)==0) NRF24L01_ReadPayload(packet_in, PROPEL_PACKET_SIZE);
{ if (packet_in[0] == 0xa3 && memcmp(&packet_in[1],rx_id,3)==0)
telemetry_counter++; //LQI {
v_lipo1=packet[5]; //number of life left? telemetry_counter++; //LQI
v_lipo2=packet[4]; //bit mask: 0x80=flying, 0x08=taking off, 0x04=landing, 0x00=landed/crashed v_lipo1=packet[5]; //number of life left?
if(telemetry_lost==0) v_lipo2=packet[4]; //bit mask: 0x80=flying, 0x08=taking off, 0x04=landing, 0x00=landed/crashed
telemetry_link=1; if(telemetry_lost==0)
telemetry_link=1;
}
} }
} packet_count++;
if(packet_count>=100)
{//LQI calculation
packet_count=0;
TX_LQI=telemetry_counter;
RX_RSSI=telemetry_counter;
telemetry_counter = 0;
telemetry_lost=0;
}
#endif
PROPEL_data_packet(); PROPEL_data_packet();
packet_count++;
if(packet_count>=100)
{//LQI calculation
packet_count=0;
TX_LQI=telemetry_counter;
RX_RSSI=telemetry_counter;
telemetry_counter = 0;
telemetry_lost=0;
}
break; break;
} }
return PROPEL_PACKET_PERIOD; return PROPEL_PACKET_PERIOD;

6
Multiprotocol/Validate.h
View File

@ -321,6 +321,7 @@
#undef BAYANG_RX_TELEMETRY #undef BAYANG_RX_TELEMETRY
#undef BAYANG_RX_NRF24L01_INO #undef BAYANG_RX_NRF24L01_INO
#undef DEVO_HUB_TELEMETRY #undef DEVO_HUB_TELEMETRY
#undef PROPEL_HUB_TELEMETRY
#undef DSM_RX_CYRF6936_INO #undef DSM_RX_CYRF6936_INO
#else #else
#if defined(MULTI_TELEMETRY) && defined(MULTI_STATUS) #if defined(MULTI_TELEMETRY) && defined(MULTI_STATUS)
@ -348,6 +349,9 @@
#if not defined(DEVO_CYRF6936_INO) #if not defined(DEVO_CYRF6936_INO)
#undef DEVO_HUB_TELEMETRY #undef DEVO_HUB_TELEMETRY
#endif #endif
#if not defined(PROPEL_NRF24L01_INO)
#undef PROPEL_HUB_TELEMETRY
#endif
#if not defined(NCC1701_NRF24L01_INO) #if not defined(NCC1701_NRF24L01_INO)
#undef NCC1701_HUB_TELEMETRY #undef NCC1701_HUB_TELEMETRY
#endif #endif
@ -384,7 +388,7 @@
#if not defined(HOTT_CC2500_INO) #if not defined(HOTT_CC2500_INO)
#undef HOTT_FW_TELEMETRY #undef HOTT_FW_TELEMETRY
#endif #endif
#if not defined(HOTT_FW_TELEMETRY) && not defined(DSM_TELEMETRY) && not defined(SPORT_TELEMETRY) && not defined(HUB_TELEMETRY) && not defined(HUBSAN_HUB_TELEMETRY) && not defined(BUGS_HUB_TELEMETRY) && not defined(NCC1701_HUB_TELEMETRY) && not defined(BAYANG_HUB_TELEMETRY) && not defined(CABELL_HUB_TELEMETRY) && not defined(AFHDS2A_HUB_TELEMETRY) && not defined(AFHDS2A_FW_TELEMETRY) && not defined(MULTI_TELEMETRY) && not defined(MULTI_STATUS) && not defined(HITEC_HUB_TELEMETRY) && not defined(HITEC_FW_TELEMETRY) && not defined(SCANNER_TELEMETRY) && not defined(FRSKY_RX_TELEMETRY) && not defined(AFHDS2A_RX_TELEMETRY) && not defined(BAYANG_RX_TELEMETRY) && not defined(DEVO_HUB_TELEMETRY) #if not defined(HOTT_FW_TELEMETRY) && not defined(DSM_TELEMETRY) && not defined(SPORT_TELEMETRY) && not defined(HUB_TELEMETRY) && not defined(HUBSAN_HUB_TELEMETRY) && not defined(BUGS_HUB_TELEMETRY) && not defined(NCC1701_HUB_TELEMETRY) && not defined(BAYANG_HUB_TELEMETRY) && not defined(CABELL_HUB_TELEMETRY) && not defined(AFHDS2A_HUB_TELEMETRY) && not defined(AFHDS2A_FW_TELEMETRY) && not defined(MULTI_TELEMETRY) && not defined(MULTI_STATUS) && not defined(HITEC_HUB_TELEMETRY) && not defined(HITEC_FW_TELEMETRY) && not defined(SCANNER_TELEMETRY) && not defined(FRSKY_RX_TELEMETRY) && not defined(AFHDS2A_RX_TELEMETRY) && not defined(BAYANG_RX_TELEMETRY) && not defined(DEVO_HUB_TELEMETRY) && not defined(PROPEL_HUB_TELEMETRY)
#undef TELEMETRY #undef TELEMETRY
#undef INVERT_TELEMETRY #undef INVERT_TELEMETRY
#undef MULTI_TELEMETRY #undef MULTI_TELEMETRY

1
Multiprotocol/_Config.h
View File

@ -310,6 +310,7 @@
#define DEVO_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX #define DEVO_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX
#define HUBSAN_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX #define HUBSAN_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX
#define NCC1701_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX #define NCC1701_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX
#define PROPEL_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX
#define CABELL_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX #define CABELL_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX
#define HITEC_HUB_TELEMETRY // Use FrSkyD Hub format to send basic telemetry to the radios which can decode it like er9x, erskyTX and OpenTX #define HITEC_HUB_TELEMETRY // Use FrSkyD Hub format to send basic telemetry to the radios which can decode it like er9x, erskyTX and OpenTX
#define HITEC_FW_TELEMETRY // Forward received telemetry packets to be decoded by erskyTX and OpenTX #define HITEC_FW_TELEMETRY // Forward received telemetry packets to be decoded by erskyTX and OpenTX