bringing horus RTTY demod back to life

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

diff --git a/codec2-dev/octave/fsk_horus_stream.m b/codec2-dev/octave/fsk_horus_stream.m
index 4158104f06aeec6926f97eb3a6a59905c40792ea..0c4fd55d691c80abc7440a6fdd40457b79b70263 100755 (executable)
--- a/codec2-dev/octave/fsk_horus_stream.m
+++ b/codec2-dev/octave/fsk_horus_stream.m
@@ -84,7 +84,7 @@ while c
 
   while length(rx) > nin
     states = est_freq(states, rx(1:nin)', states.M);
-    [rx_bits states] = fsk_horus_demod(states, rx(1:nin)');
+    [rx_bits states] = fsk_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));

diff --git a/codec2-dev/octave/fsk_lib.m b/codec2-dev/octave/fsk_lib.m
index 032953ab200ee277d3b526b72b70639782dc00d0..9c58c3ea25352ad225e7bdc30f5e13aba1f74b28 100644 (file)
--- a/codec2-dev/octave/fsk_lib.m
+++ b/codec2-dev/octave/fsk_lib.m
@@ -122,7 +122,7 @@ function states = fsk_init_hbr(Fs,P,Rs,M=2,nsym=48)
   states.prev_pkt = [];
  
   #{ 
-  TODO: fix me to ressuect fks_horus RTTY stuff, maybe call from 
+  TODO: fix me to resurect fsk_horus RTTY stuff, maybe call from 
   % protocol specific states
 
   states.rtty = fsk_horus_init_rtty_uw(states);
@@ -212,9 +212,9 @@ function states = est_freq(states, sf, ntones)
   f = []; a = [];
   Sf = states.Sf;
 
-  figure(8)
-  clf
-  plot(Sf(1:Ndft/2));
+  %figure(8)
+  %clf
+  %plot(Sf(1:Ndft/2));
 
   % Search for each tone --------------------------------------------------------