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

FrSkyD telemetry

Browse Source
This commit is contained in:
pascallanger 2017-02-01 12:47:28 +01:00
parent 41d75da33f
commit 021c463d80
2 changed files with 8 additions and 6 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 1 #define VERSION_MINOR 1
#define VERSION_REVISION 6 #define VERSION_REVISION 6
#define VERSION_PATCH_LEVEL 9 #define VERSION_PATCH_LEVEL 10
//****************** //******************
// Protocols // Protocols
//****************** //******************

12
Multiprotocol/Telemetry.ino
View File

@ -162,7 +162,7 @@ void frsky_check_telemetry(uint8_t *pkt,uint8_t len)
{ {
if(pkt[1] == rx_tx_addr[3] && pkt[2] == rx_tx_addr[2] && len ==(pkt[0] + 3)) if(pkt[1] == rx_tx_addr[3] && pkt[2] == rx_tx_addr[2] && len ==(pkt[0] + 3))
{ {
telemetry_link=1; // telemetry data is available telemetry_link=1; // Telemetry data is available
/*preious version /*preious version
RSSI_dBm = (((uint16_t)(pktt[len-2])*18)>>4); RSSI_dBm = (((uint16_t)(pktt[len-2])*18)>>4);
if(pktt[len-2] >=128) RSSI_dBm -= 164; if(pktt[len-2] >=128) RSSI_dBm -= 164;
@ -173,10 +173,12 @@ void frsky_check_telemetry(uint8_t *pkt,uint8_t len)
else else
TX_RSSI += 128; TX_RSSI += 128;
TX_LQI = pkt[len-1]&0x7F; TX_LQI = pkt[len-1]&0x7F;
if(pkt[6]>0 && pkt[6]<=10) // increment only for valid size hub frames
telemetry_counter=(telemetry_counter+1)%32;
for (uint8_t i=3;i<len-2;i++) for (uint8_t i=3;i<len-2;i++)
pktt[i]=pkt[i]; // buffer telemetry values to be sent pktt[i]=pkt[i]; // Buffer telemetry values to be sent
if(pktt[6]>0 && pktt[6]<=10)// && pktt[7] == telemetry_counter )
telemetry_counter=(telemetry_counter+1)%32; // Request next telemetry frame
else
pktt[6]=0; // Discard packet
// //
#if defined SPORT_TELEMETRY && defined FRSKYX_CC2500_INO #if defined SPORT_TELEMETRY && defined FRSKYX_CC2500_INO
telemetry_lost=0; telemetry_lost=0;
@ -244,7 +246,7 @@ void frsky_link_frame()
#if defined HUB_TELEMETRY #if defined HUB_TELEMETRY
void frsky_user_frame() void frsky_user_frame()
{ {
if(pktt[6]>0 && pktt[6]<=10) if(pktt[6])
{//only send valid hub frames {//only send valid hub frames
frame[0] = 0xFD; // user frame frame[0] = 0xFD; // user frame
if(pktt[6]>USER_MAX_BYTES) if(pktt[6]>USER_MAX_BYTES)