From 46240751127e8ba02486780f4c028732bef78288 Mon Sep 17 00:00:00 2001 From: hexfet Date: Sat, 22 Jul 2017 22:07:42 -0400 Subject: [PATCH 1/4] Update sequence number logic to send invalid sequence indicator when invalid sequence detected. Works to resync telemetry stream as tested with EU firmware version. --- Multiprotocol/FrSkyX_cc2500.ino | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Multiprotocol/FrSkyX_cc2500.ino b/Multiprotocol/FrSkyX_cc2500.ino index 3d69d08..6af6a34 100644 --- a/Multiprotocol/FrSkyX_cc2500.ino +++ b/Multiprotocol/FrSkyX_cc2500.ino @@ -156,6 +156,8 @@ static void __attribute__((unused)) frskyX_data_frame() seq_last_sent = (seq_last_sent + 1) % 4; else if (seq_last_rcvd == 0x00) seq_last_sent = 1; + else + seq_last_rcvd = 8; if(sub_protocol & 1 )// in X8 mode send only 8ch every 9ms lpass = 0 ; @@ -281,4 +283,4 @@ uint16_t initFrSkyX() seq_last_rcvd = 8; return 10000; } -#endif \ No newline at end of file +#endif From 44a086a27b00d1a08647744d57fc85220d019463 Mon Sep 17 00:00:00 2001 From: hexfet Date: Sat, 22 Jul 2017 22:35:43 -0400 Subject: [PATCH 2/4] Revert terminating newline. --- Multiprotocol/FrSkyX_cc2500.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Multiprotocol/FrSkyX_cc2500.ino b/Multiprotocol/FrSkyX_cc2500.ino index 6af6a34..0085b6a 100644 --- a/Multiprotocol/FrSkyX_cc2500.ino +++ b/Multiprotocol/FrSkyX_cc2500.ino @@ -283,4 +283,4 @@ uint16_t initFrSkyX() seq_last_rcvd = 8; return 10000; } -#endif +#endif \ No newline at end of file From ebf0c4fae6a74898f73e57deb49da784e7a39c0a Mon Sep 17 00:00:00 2001 From: hexfet Date: Sat, 22 Jul 2017 22:39:26 -0400 Subject: [PATCH 3/4] Change spaces to tabs. --- Multiprotocol/FrSkyX_cc2500.ino | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Multiprotocol/FrSkyX_cc2500.ino b/Multiprotocol/FrSkyX_cc2500.ino index 0085b6a..3381e88 100644 --- a/Multiprotocol/FrSkyX_cc2500.ino +++ b/Multiprotocol/FrSkyX_cc2500.ino @@ -156,8 +156,8 @@ static void __attribute__((unused)) frskyX_data_frame() seq_last_sent = (seq_last_sent + 1) % 4; else if (seq_last_rcvd == 0x00) seq_last_sent = 1; - else - seq_last_rcvd = 8; + else + seq_last_rcvd = 8; if(sub_protocol & 1 )// in X8 mode send only 8ch every 9ms lpass = 0 ; @@ -283,4 +283,4 @@ uint16_t initFrSkyX() seq_last_rcvd = 8; return 10000; } -#endif \ No newline at end of file +#endif From a1fb4a0ac5e9009179025c08bef06c882496b2fa Mon Sep 17 00:00:00 2001 From: hexfet Date: Sat, 22 Jul 2017 22:41:34 -0400 Subject: [PATCH 4/4] Revert terminating newline. --- Multiprotocol/FrSkyX_cc2500.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Multiprotocol/FrSkyX_cc2500.ino b/Multiprotocol/FrSkyX_cc2500.ino index 3381e88..84594b4 100644 --- a/Multiprotocol/FrSkyX_cc2500.ino +++ b/Multiprotocol/FrSkyX_cc2500.ino @@ -283,4 +283,4 @@ uint16_t initFrSkyX() seq_last_rcvd = 8; return 10000; } -#endif +#endif \ No newline at end of file