From 6bb421b3a6577ab01e37a7df6062bd2aead864fd Mon Sep 17 00:00:00 2001 From: Rob Hartill Date: Thu, 10 Jan 2019 12:54:33 +1030 Subject: [PATCH 1/2] Fix frament idetification --- demod_flex.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/demod_flex.c b/demod_flex.c index 3bfcc73..12b09fc 100644 --- a/demod_flex.c +++ b/demod_flex.c @@ -22,6 +22,9 @@ * Boston, MA 02110-1301, USA. */ /* + * Version 0.9.1v (10 Jan 2019) + * Modification (to this file) made by Rob0101 + * Fixed marking marking messages with K,F,C - One case had a 'C' marked as a 'K' * Version 0.9.0v (22 May 2018) * Modification (to this file) made by Bruce Quinton (zanoroy@gmail.com) * - Addded Define at top of file to modify the way missed group messages are reported in the debug output (default is 1; report missed capcodes on the same line) @@ -512,14 +515,15 @@ static void parse_alphanumeric(struct Flex * flex, unsigned int * phaseptr, char // char buf[1024], *message; char message[1024]; int currentChar = 0; - char frag_flag = 'K'; + char frag_flag = '?'; int frag = (phaseptr[mw1] >> 11) & 0x03; - int cont = ( phaseptr[mw1] >> 0x0A ) & 0x01; + int cont = (phaseptr[mw1] >> 0x0A) & 0x01; - if (cont == 1) frag_flag = 'F'; - if (cont == 0 && frag == 0) frag_flag = 'C'; - + if (cont == 0 && frag == 3) frag_flag = 'K'; // complete, ready to send + if (cont == 0 && frag != 3) frag_flag = 'C'; // incomplete until appended to 1 or more 'F's + if (cont == 1 ) frag_flag = 'F'; // incomplete until a 'C' fragment is appended + mw1++; for (i = mw1; i <= mw2; i++) { From e8c1db6367261a4d415461c55af87d7ebfe2c614 Mon Sep 17 00:00:00 2001 From: Rob Hartill Date: Thu, 10 Jan 2019 13:04:16 +1030 Subject: [PATCH 2/2] Fix typo --- demod_flex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demod_flex.c b/demod_flex.c index 12b09fc..4174800 100644 --- a/demod_flex.c +++ b/demod_flex.c @@ -24,7 +24,7 @@ /* * Version 0.9.1v (10 Jan 2019) * Modification (to this file) made by Rob0101 - * Fixed marking marking messages with K,F,C - One case had a 'C' marked as a 'K' + * Fixed marking messages with K,F,C - One case had a 'C' marked as a 'K' * Version 0.9.0v (22 May 2018) * Modification (to this file) made by Bruce Quinton (zanoroy@gmail.com) * - Addded Define at top of file to modify the way missed group messages are reported in the debug output (default is 1; report missed capcodes on the same line)