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

Fixed frame size

Browse Source
This commit is contained in:
Pascal Langer 2020-08-31 22:21:21 +02:00
parent fe6778635e
commit f168abc2bb
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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 59 #define VERSION_PATCH_LEVEL 60
//****************** //******************
// Protocols // Protocols
@ -1032,6 +1032,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p --
FrSkyX and FrSkyX2: Stream[27] during bind Telem on=0x00,off=0x01 | CH1-8=0x00,CH9-16=0x02 FrSkyX and FrSkyX2: Stream[27] during bind Telem on=0x00,off=0x01 | CH1-8=0x00,CH9-16=0x02
FrSkyX and FrSkyX2: Stream[27..34] during normal operation unstuffed SPort data to be sent FrSkyX and FrSkyX2: Stream[27..34] during normal operation unstuffed SPort data to be sent
HoTT: Stream[27] 1 byte for telemetry type HoTT: Stream[27] 1 byte for telemetry type
DSM: Stream[27..33] Forward Programming
*/ */
/* /*
Multimodule Status Multimodule Status

19
Multiprotocol/Multiprotocol.ino
View File

@ -256,6 +256,10 @@ uint8_t packet_in[TELEMETRY_BUFFER_SIZE];//telemetry receiving packets
uint8_t HoTT_SerialRX_val=0; uint8_t HoTT_SerialRX_val=0;
bool HoTT_SerialRX=false; bool HoTT_SerialRX=false;
#endif #endif
#ifdef DSM_FWD_PGM
uint8_t DSM_SerialRX_val[7];
bool DSM_SerialRX=false;
#endif
#endif // TELEMETRY #endif // TELEMETRY
// Callback // Callback
@ -1927,7 +1931,7 @@ void update_serial_data()
} }
#endif #endif
#ifdef SPORT_SEND #ifdef SPORT_SEND
if((protocol==PROTO_FRSKYX || protocol==PROTO_FRSKYX2 || protocol==PROTO_FRSKY_R9) && rx_len==35) if((protocol==PROTO_FRSKYX || protocol==PROTO_FRSKYX2 || protocol==PROTO_FRSKY_R9) && rx_len==27+8)
{//Protocol waiting for 8 bytes {//Protocol waiting for 8 bytes
#define BYTE_STUFF 0x7D #define BYTE_STUFF 0x7D
#define STUFF_MASK 0x20 #define STUFF_MASK 0x20
@ -1971,12 +1975,19 @@ void update_serial_data()
} }
#endif //SPORT_SEND #endif //SPORT_SEND
#ifdef HOTT_FW_TELEMETRY #ifdef HOTT_FW_TELEMETRY
if(protocol==PROTO_HOTT && rx_len==28) if(protocol==PROTO_HOTT && rx_len==27+1)
{//Protocol waiting for 1 byte {//Protocol waiting for 1 byte
HoTT_SerialRX_val=rx_ok_buff[27]; HoTT_SerialRX_val=rx_ok_buff[27];
HoTT_SerialRX=true; HoTT_SerialRX=true;
} }
#endif #endif
#ifdef DSM_FWD_PGM
if(protocol==PROTO_DSM && rx_len==27+7)
{//Protocol waiting for 7 bytes
memcpy(DSM_SerialRX_val, (const void *)&rx_ok_buff[27],7);
DSM_SerialRX=true;
}
#endif
} }
RX_DONOTUPDATE_off; RX_DONOTUPDATE_off;
@ -2484,7 +2495,7 @@ static void __attribute__((unused)) calc_fh_channels(uint8_t num_ch)
ISR(TIMER1_COMPB_vect) ISR(TIMER1_COMPB_vect)
#endif #endif
{ // Timer1 compare B interrupt { // Timer1 compare B interrupt
if(rx_idx>=26 && rx_idx<RXBUFFER_SIZE) if(rx_idx>=26 && rx_idx<=RXBUFFER_SIZE)
{ {
// A full frame has been received // A full frame has been received
if(!IS_RX_DONOTUPDATE_on) if(!IS_RX_DONOTUPDATE_on)
@ -2503,7 +2514,7 @@ static void __attribute__((unused)) calc_fh_channels(uint8_t num_ch)
} }
#ifdef DEBUG_SERIAL #ifdef DEBUG_SERIAL
else else
debugln("RX frame too short"); debugln("RX frame size incorrect");
#endif #endif
discard_frame=true; discard_frame=true;
#ifdef STM32_BOARD #ifdef STM32_BOARD