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

Fix: Hubsan telemetry packet check function & Change: Telemetry variables to static

Browse Source
This commit is contained in:
pascallanger 2016-01-28 18:43:46 +01:00
parent f912d84ab6
commit ac78ddcc82
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Multiprotocol/Hubsan_a7105.ino
View File

@ -181,11 +181,10 @@ static void __attribute__((unused)) hubsan_build_packet()
} }
#if defined(TELEMETRY) #if defined(TELEMETRY)
static __attribute__((unused)) uint8_t hubsan_check_integrity() static uint8_t __attribute__((unused)) hubsan_check_integrity()
{ {
if( (packet[0]&0xFE) != 0xE0 ) if( (packet[0]&0xFE) != 0xE0 )
return 0; return 0;
return 1;
uint8_t sum = 0; uint8_t sum = 0;
for(uint8_t i = 0; i < 15; i++) for(uint8_t i = 0; i < 15; i++)
sum += packet[i]; sum += packet[i];

12
Multiprotocol/Telemetry.ino
View File

@ -8,10 +8,6 @@
#define USER_MAX_BYTES 6 #define USER_MAX_BYTES 6
#define MAX_PKTX 10 #define MAX_PKTX 10
uint8_t frame[18]; uint8_t frame[18];
uint8_t pass = 0;
uint8_t index;
uint8_t prev_index;
uint8_t pktx[MAX_PKTX];
void frskySendStuffed() void frskySendStuffed()
{ {
@ -63,7 +59,8 @@ void frsky_link_frame()
#if defined HUB_TELEMETRY #if defined HUB_TELEMETRY
void frsky_user_frame() void frsky_user_frame()
{ {
uint8_t indexx = 0, c=0, j=8, n=0, i; static uint8_t indexx = 0, pass=0, index, pktx[MAX_PKTX];
uint8_t c=0, j=8, n=0, i;
if(pktt[6]>0 && pktt[6]<=MAX_PKTX) if(pktt[6]>0 && pktt[6]<=MAX_PKTX)
{//only valid hub frames {//only valid hub frames
@ -93,7 +90,6 @@ void frsky_user_frame()
case 1: case 1:
index=indexx; index=indexx;
prev_index = indexx;
if(index<USER_MAX_BYTES) if(index<USER_MAX_BYTES)
{ {
for(i=0;i<index;i++) for(i=0;i<index;i++)
@ -110,8 +106,8 @@ void frsky_user_frame()
} }
break; break;
case 2: case 2:
index = prev_index - index; index = indexx - index;
prev_index=0; indexx=0;
if(index<MAX_PKTX-USER_MAX_BYTES) //10-6=4 if(index<MAX_PKTX-USER_MAX_BYTES) //10-6=4
for(i=0;i<index;i++) for(i=0;i<index;i++)
frame[i+3]=pktx[USER_MAX_BYTES+i]; frame[i+3]=pktx[USER_MAX_BYTES+i];