SD error flipping working on streaming version

git-svn-id: https://svn.code.sf.net/p/freetel/code@2447 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/octave/fsk_horus.m b/codec2-dev/octave/fsk_horus.m
index f4c71c6c51a1eb32adb1f52a96f0392f96b9895b..98e491c0b379764885712fe7649a99c702e9fb1f 100644 (file)
--- a/codec2-dev/octave/fsk_horus.m
+++ b/codec2-dev/octave/fsk_horus.m
@@ -349,6 +349,43 @@ function [str crc_ok] = extract_ascii(states, rx_bits_buf, uw_loc1, uw_loc2)
 endfunction
 
 
+% Use soft decision information to find bits most likely in error.  I think
+% this is some form of maximum likelihood decoding.
+% 
+% TODO: ignore rs232 start and stop bits, ie remove from weakest bit list
+%       insert known good bits (copy from prev packet with gd CRC)
+%       use other apriori info, like if a lat or long isn't a digit, use last packet as guess
+
+function [str crc_ok] = sd_bit_flipping(states, rx_bits_log, rx_bits_sd_log, st, uw_loc);
+
+  [dodgy_bits_mag dodgy_bits_index] = sort(abs(rx_bits_sd_log(st+length(states.uw):uw_loc)));
+  dodgy_bits_index += length(states.uw) + st - 1;
+  nbits = 8;
+  ntries = nbits^2;
+  str = "";
+  crc_ok = 0;
+
+  % try various combinations of these bits
+
+  for i=1:ntries-1
+    error_mask = zeros(1, length(rx_bits_log));
+    for b=1:nbits
+      x = bitget(i,b);
+      bit_to_flip = dodgy_bits_index(b);
+      error_mask(bit_to_flip) = x;
+      %printf("st: %d i: %d b: %d x: %d index: %d\n", st, i,b,x,bit_to_flip);
+    end
+    rx_bits_log_flipped = xor(rx_bits_log, error_mask);
+    [str_flipped crc_ok_flipped] = extract_ascii(states, rx_bits_log_flipped, st, uw_loc);
+    if crc_ok_flipped
+      %printf("Yayy we fixed a packet by flipping with pattern %d\n", i);
+      str = str_flipped;
+      crc_ok = crc_ok_flipped;
+    end
+  end 
+endfunction
+
+
 % Extract as many ASCII packets as we can from a great big buffer of bits
 
 function extract_and_print_packets(states, rx_bits_log, rx_bits_sd_log)
@@ -378,49 +415,13 @@ function extract_and_print_packets(states, rx_bits_log, rx_bits_sd_log)
       %save -ascii horus_msg.txt msg
 
       [str crc_ok] = extract_ascii(states, rx_bits_log, st, uw_loc);
+      printf("%s\n", str);
 
       if crc_ok == 0
-
-        % Use soft decision information to find bits most likely in error
-
-        [dodgy_bits_mag dodgy_bits_index] = sort(abs(rx_bits_sd_log(st+length(states.uw):uw_loc)));
-        dodgy_bits_index += length(states.uw) + st - 1;
-        nbits = 8;
-        ntries = nbits^2;
-
-        % try various combinations of these bits
-
-        for i=1:ntries-1
-          error_mask = zeros(1, length(rx_bits_log));
-          for b=1:nbits
-            x = bitget(i,b);
-            bit_to_flip = dodgy_bits_index(b);
-            error_mask(bit_to_flip) = x;
-            %printf("st: %d i: %d b: %d x: %d index: %d\n", st, i,b,x,bit_to_flip);
-          end
-          rx_bits_log_flipped = xor(rx_bits_log, error_mask);
-          [str_flipped crc_ok_flipped] = extract_ascii(states, rx_bits_log_flipped, st, uw_loc);
-          if crc_ok_flipped
-            %printf("Yayy we fixed a packet by flipping with pattern %d\n", i);
-            str = sprintf("%s fixed", str_flipped);
-          end
-       end 
-
-if 0
-        % try flipping bits and see if we can get a checksum match
-        % this will fix single bit errors
-        
-        for i=st + length(states.uw):uw_loc
-          error_mask = zeros(1, length(rx_bits_log));
-          error_mask(i) = 1;
-          rx_bits_log_flipped = xor(rx_bits_log, error_mask);
-          [str_flipped crc_ok_flipped] = extract_ascii(states, rx_bits_log_flipped, st, uw_loc);
-          if crc_ok_flipped
-            printf("Yayy we fixed a packet by flipping bit %d\n", i);
-            str = str_flipped;
-          end
+        [str_flipped crc_flipped_ok] = sd_bit_flipping(states, rx_bits_log, rx_bits_sd_log, st, uw_loc); 
+        if crc_flipped_ok
+          str = sprintf("%s fixed", str_flipped);
         end
-end
       end
 
       printf("%s\n", str);

diff --git a/codec2-dev/octave/fsk_horus_stream.m b/codec2-dev/octave/fsk_horus_stream.m
index f9aa1a2b8386a4a667402bb3ee6cdfd1154931aa..b01d6d82d866bdb8850d588d4e2f95ae2d786f48 100755 (executable)
--- a/codec2-dev/octave/fsk_horus_stream.m
+++ b/codec2-dev/octave/fsk_horus_stream.m
@@ -36,6 +36,7 @@ SNR = 0;
 
 rx = [];
 rx_bits_buf = [];
+rx_bits_sd_buf = [];
 
 [s,c] = fread(stdin, N, "short");
 
@@ -48,6 +49,7 @@ while c
   while length(rx) > nin
     [rx_bits states] = fsk_horus_demod(states, rx(1:nin)');
     rx_bits_buf = [rx_bits_buf rx_bits];
+    rx_bits_sd_buf = [rx_bits_sd_buf states.rx_bits_sd];
     rx = rx(nin+1:length(rx));
     nin = states.nin;
     EbNo = 0.9*EbNo + 0.1*states.EbNodB;
@@ -67,7 +69,19 @@ while c
     uw_loc2 = find_uw(states, uw_loc1+length(uw), rx_bits_buf);
 
     if uw_loc2 != -1
+      % insert a single bit error for testing
+      %rx_bits_buf(uw_loc1+100) = xor(rx_bits_buf(uw_loc1+100),1);
+      %rx_bits_sd_buf(uw_loc1+100) = 0;
+
       [str crc_ok] = extract_ascii(states, rx_bits_buf, uw_loc1, uw_loc2);
+
+      if crc_ok == 0
+        [str_flipped crc_flipped_ok] = sd_bit_flipping(states, rx_bits_buf, rx_bits_sd_buf, uw_loc1, uw_loc2); 
+        if crc_flipped_ok
+          str = sprintf("%s fixed", str_flipped);
+        end
+      end
+
       printf("%s         \n", str);
 
       % throw out used bits in buffer
@@ -91,6 +105,13 @@ while c
 
       system(system_command);
     end
+  else
+    % Truncate buffers if no UW found so they don't grow endlessly with no signal.
+    % Keep very end of it as it may have part of a UW in it
+    if length(rx_bits_buf) > length(uw)
+      rx_bits_buf = rx_bits_buf(length(rx_bits_buf)-length(uw):length(rx_bits_buf));
+      rx_bits_sd_buf = rx_bits_sd_buf(length(rx_bits_sd_buf)-length(uw):length(rx_bits_sd_buf));
+    end
   end
   [s,c] = fread(stdin, N, "short");