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

FrSky X telemetry quick fix

Browse Source
This commit is contained in:
pascallanger 2019-11-01 18:42:45 +01:00
parent 5cf2bf2cf5
commit 815cf4fd99
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Multiprotocol/FrSkyX_cc2500.ino
View File

@ -304,6 +304,9 @@ uint16_t ReadFrSkyX()
break; break;
case FRSKY_DATA5: case FRSKY_DATA5:
telemetry_set_input_sync(9000); telemetry_set_input_sync(9000);
#if defined TELEMETRY
telemetry_link=1; //Send telemetry out anyway
#endif
len = CC2500_ReadReg(CC2500_3B_RXBYTES | CC2500_READ_BURST) & 0x7F; len = CC2500_ReadReg(CC2500_3B_RXBYTES | CC2500_READ_BURST) & 0x7F;
if (len && (len<=(0x0E + 3))) //Telemetry frame is 17 if (len && (len<=(0x0E + 3))) //Telemetry frame is 17
{ {
@ -329,6 +332,7 @@ uint16_t ReadFrSkyX()
packet_count=0; packet_count=0;
#if defined TELEMETRY #if defined TELEMETRY
telemetry_lost=1; telemetry_lost=1;
telemetry_link=0; //Stop sending telemetry
#endif #endif
} }
CC2500_Strobe(CC2500_SFRX); //Flush the RXFIFO CC2500_Strobe(CC2500_SFRX); //Flush the RXFIFO

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 0 #define VERSION_REVISION 0
#define VERSION_PATCH_LEVEL 28 #define VERSION_PATCH_LEVEL 29
//****************** //******************
// Protocols // Protocols

8
Multiprotocol/Telemetry.ino
View File

@ -824,9 +824,13 @@ void TelemetryUpdate()
t -= h ; t -= h ;
if ( t < 32 ) if ( t < 32 )
{ {
// debugln("TEL_BUF_FULL"); //debugln("TEL_BUF_FULL %d",t);
return ; return ;
} }
/* else
if(t!=96)
debugln("TEL_BUF %d",t);
*/
#endif #endif
#if defined(MULTI_TELEMETRY) || defined(MULTI_STATUS) #if defined(MULTI_TELEMETRY) || defined(MULTI_STATUS)
uint32_t now = millis(); uint32_t now = millis();
@ -847,7 +851,7 @@ void TelemetryUpdate()
#endif #endif
#endif #endif
#if defined SPORT_TELEMETRY #if defined SPORT_TELEMETRY
if (protocol==PROTO_FRSKYX if (protocol==PROTO_FRSKYX && telemetry_link
#ifdef TELEMETRY_FRSKYX_TO_FRSKYD #ifdef TELEMETRY_FRSKYX_TO_FRSKYD
&& mode_select==MODE_SERIAL && mode_select==MODE_SERIAL
#endif #endif