streaming works with both protocols

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

diff --git a/codec2-dev/octave/fsk_horus_stream.m b/codec2-dev/octave/fsk_horus_stream.m
index 397f66afeca5c1ec46b86f30c735f070550c5fa6..aeaa7b56ce7fdceb02c6df5ff380489b929d1819 100755 (executable)
--- a/codec2-dev/octave/fsk_horus_stream.m
+++ b/codec2-dev/octave/fsk_horus_stream.m
@@ -23,14 +23,15 @@ gps_log = "~/Desktop/gps_log.txt"
 system_command = "echo -n \"/home/david/Desktop/gps_log.txt\" | nc -u -q1 127.0.0.1 21234";
 
 more off;
-states = fsk_horus_init(8000);
+states = fsk_horus_init(8000, 100);
+%states = fsk_horus_init_rtty_uw(states);
 N = states.N;
 Rs = states.Rs;
 nsym = states.nsym;
 nin = states.nin;
-nfield = states.nfield;
-npad = states.npad;
-uw = states.uw;
+nfield = states.rtty.nfield;
+npad = states.rtty.npad;
+uw = states.rtty.uw;
 EbNo = 0;
 SNR = 0;
 
@@ -59,36 +60,40 @@ while c
   f = (states.f1+states.f2)/2; shift = states.f2 - states.f1;
   printf("max: %d f: %d fshift %d ppm: %d Eb/No: %3.1f SNR: %3.1f bits: %d\r", max(s), f, shift, states.ppm, EbNo, SNR, length(rx_bits_buf));
 
-  % look for complete Horus frame, delimited by 2 unique words
+  packet_found = 0;
+
+  % Look for complete Horus RTTY frame -------------------------------------------------------------------
 
-  bit = 1;
   nbits = length(rx_bits_buf);
-  uw_loc1 = find_uw(states, bit, rx_bits_buf);
+  uw_loc = find_uw(states.rtty, 1, rx_bits_buf);
+
+  if uw_loc != -1
+    packet_found = 1;
 
-  if uw_loc1 != -1
-    uw_loc2 = find_uw(states, uw_loc1+length(uw), rx_bits_buf);
+    if (uw_loc + states.rtty.max_packet_len) < nbits
 
-    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);
+      [str crc_ok] = extract_ascii(states.rtty, rx_bits_buf, uw_loc);
 
       if crc_ok == 0
-        [str_flipped crc_flipped_ok] = sd_bit_flipping(states, rx_bits_buf, rx_bits_sd_buf, uw_loc1, uw_loc2); 
+        [str_flipped crc_flipped_ok] = sd_bit_flipping(states.rtty, rx_bits_buf, rx_bits_sd_buf, uw_loc, uw_loc+states.rtty.max_packet_len); 
         if crc_flipped_ok
           str = sprintf("%s fixed", str_flipped);
           crc_ok = 1;
         end
       end
+      
+      printf("\n  %s         \n", str);
 
-      printf("%s         \n", str);
-
-      % throw out used bits in buffer
+      % throw out used bits in buffer.  We're not sure where the next packet starts
+      % so lets remove everything up to just after the UW we just used to force
+      % a search for the next UW.
 
-      rx_bits_buf =  rx_bits_buf(uw_loc2-1:length(rx_bits_buf));
-      rx_bits_sd_buf =  rx_bits_sd_buf(uw_loc2-1:length(rx_bits_sd_buf));
+      rx_bits_buf    = rx_bits_buf(uw_loc+length(uw):length(rx_bits_buf));
+      rx_bits_sd_buf = rx_bits_sd_buf(uw_loc+length(uw):length(rx_bits_sd_buf));
 
       if crc_ok
         % extract GPS coords and save to log file for mapping software
@@ -108,9 +113,51 @@ while c
         system(system_command);
       end
     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
+  end
+
+
+  % Look for complete Horus BINARY frame -------------------------------------------------------------------
+
+  nbits = length(rx_bits_buf);
+  uw_loc = find_uw(states.binary, 1, rx_bits_buf);
+
+  if uw_loc != -1
+    packet_found = 1;
+
+    if (uw_loc + states.binary.max_packet_len) < nbits
+
+      pin = uw_loc;    
+      for i=1:45
+        rx_bytes(i) = rx_bits_buf(pin:pin+7) * (2.^(7:-1:0))';
+        pin += 8;
+        %printf("%d 0x%02x\n", i, rx_bytes(i));
+      end
+
+      printf("\n  ");
+      f=fopen("horus_rx_bits_binary.txt","wt");
+      fwrite(f, rx_bytes, "uchar");
+      fclose(f);
+
+      % horus_l2 can be compiled a bunch of different ways.  You need to
+      % compile with:
+      %   codec2-dev/src$ gcc horus_l2.c -o horus_l2 -Wall -DDEC_RX_BITS -DHORUS_L2_RX
+
+      system("../src/horus_l2"); 
+
+      % throw out used bits in buffer.  We're not sure where the next packet starts
+      % so lets remove everything up to just after the UW we just used to force
+      % a search for the next UW.
+
+      rx_bits_buf    = rx_bits_buf(uw_loc+length(uw):length(rx_bits_buf));
+      rx_bits_sd_buf = rx_bits_sd_buf(uw_loc+length(uw):length(rx_bits_sd_buf));
+    end
+  end
+
+
+  % 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 packet_found == 0
     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));