From: drowe67 Date: Sat, 10 Mar 2018 04:04:41 +0000 (+0000) Subject: bringing horus RTTY demod back to life X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=d480bbe71dab92ac4242c2873a0dac154642281e;p=freetel-svn-tracking.git 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 4158104f..0c4fd55d 100755 --- 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 032953ab..9c58c3ea 100644 --- 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 --------------------------------------------------------