gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-12-25 21:03:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'SPort_Send' of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module into SPort_Send

Browse Source
This commit is contained in:
pascallanger
2019-10-12 19:50:46 +02:00
parent 31ff27b1d3 a234ccbd05
commit 840944ea94
9 changed files with 399 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Multiprotocol/Multiprotocol.ino
View File

@@ -668,7 +668,7 @@ uint8_t Update_All()
update_led_status();
#if defined(TELEMETRY)
#if ( !( defined(MULTI_TELEMETRY) || defined(MULTI_STATUS) ) )
if( (protocol == PROTO_FRSKYX_RX) || (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))
if( (protocol == PROTO_FRSKY_RX) || (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
if(IS_DISABLE_TELEM_off && !(protocol==PROTO_XN297DUMP))
TelemetryUpdate();
@@ -1085,12 +1085,12 @@ static void protocol_init()
remote_callback = Scanner_callback;
break;
#endif
#if defined(FRSKYX_RX_CC2500_INO)
case PROTO_FRSKYX_RX:
#if defined(FRSKY_RX_CC2500_INO)
case PROTO_FRSKY_RX:
PE1_off;
PE2_on; //antenna RF2
next_callback = initFrSkyX_Rx();
remote_callback = FrSkyX_Rx_callback;
next_callback = initFrSky_Rx();
remote_callback = FrSky_Rx_callback;
break;
#endif
#endif