diff options
Diffstat (limited to 'gr-noaa')
| -rw-r--r-- | gr-noaa/apps/demod_hrpt_file.grc | 154 | ||||
| -rwxr-xr-x | gr-noaa/apps/demod_hrpt_file.py | 6 | ||||
| -rw-r--r-- | gr-noaa/lib/noaa_hrpt_sync_fb.cc | 15 |
3 files changed, 91 insertions, 84 deletions
diff --git a/gr-noaa/apps/demod_hrpt_file.grc b/gr-noaa/apps/demod_hrpt_file.grc index 16f83f780..7a0bbe892 100644 --- a/gr-noaa/apps/demod_hrpt_file.grc +++ b/gr-noaa/apps/demod_hrpt_file.grc @@ -1,57 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sun Sep 27 09:51:42 2009</timestamp> - <block> - <key>options</key> - <param> - <key>id</key> - <value>demod_hrpt_file</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>title</key> - <value>USRP HRPT Receiver</value> - </param> - <param> - <key>author</key> - <value></value> - </param> - <param> - <key>description</key> - <value></value> - </param> - <param> - <key>window_size</key> - <value>4096,4096</value> - </param> - <param> - <key>generate_options</key> - <value>no_gui</value> - </param> - <param> - <key>category</key> - <value>Custom</value> - </param> - <param> - <key>run</key> - <value>True</value> - </param> - <param> - <key>realtime_scheduling</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(10, 10)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> + <timestamp>Sun Oct 4 08:40:03 2009</timestamp> <block> <key>variable</key> <param> @@ -191,29 +140,6 @@ </param> </block> <block> - <key>import</key> - <param> - <key>id</key> - <value>import_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>import</key> - <value>import math</value> - </param> - <param> - <key>_coordinate</key> - <value>(9, 92)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> <key>parameter</key> <param> <key>id</key> @@ -731,6 +657,84 @@ <value>0</value> </param> </block> + <block> + <key>import</key> + <param> + <key>id</key> + <value>import_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>import</key> + <value>import math</value> + </param> + <param> + <key>_coordinate</key> + <value>(11, 111)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>options</key> + <param> + <key>id</key> + <value>demod_hrpt_file</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>title</key> + <value>USRP HRPT Receiver</value> + </param> + <param> + <key>author</key> + <value></value> + </param> + <param> + <key>description</key> + <value></value> + </param> + <param> + <key>window_size</key> + <value>4096,4096</value> + </param> + <param> + <key>generate_options</key> + <value>no_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> + </param> + <param> + <key>run_options</key> + <value>run</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(10, 10)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <connection> <source_block_id>deframer</source_block_id> <sink_block_id>file_sink</sink_block_id> diff --git a/gr-noaa/apps/demod_hrpt_file.py b/gr-noaa/apps/demod_hrpt_file.py index 309a79209..d55351868 100755 --- a/gr-noaa/apps/demod_hrpt_file.py +++ b/gr-noaa/apps/demod_hrpt_file.py @@ -2,7 +2,7 @@ ################################################## # Gnuradio Python Flow Graph # Title: USRP HRPT Receiver -# Generated: Sun Sep 27 09:34:15 2009 +# Generated: Sun Oct 4 08:40:03 2009 ################################################## from gnuradio import eng_notation @@ -129,7 +129,5 @@ if __name__ == '__main__': help="Set sync_alpha [default=%default]") (options, args) = parser.parse_args() tb = demod_hrpt_file(filename=options.filename, output=options.output, decim=options.decim, pll_alpha=options.pll_alpha, sync_alpha=options.sync_alpha) - tb.start() - raw_input('Press Enter to quit: ') - tb.stop() + tb.run() diff --git a/gr-noaa/lib/noaa_hrpt_sync_fb.cc b/gr-noaa/lib/noaa_hrpt_sync_fb.cc index f99947f82..9c655b0d9 100644 --- a/gr-noaa/lib/noaa_hrpt_sync_fb.cc +++ b/gr-noaa/lib/noaa_hrpt_sync_fb.cc @@ -67,11 +67,16 @@ noaa_hrpt_sync_fb::general_work(int noutput_items, // Train on zero crossings in center region of symbol if (sign != d_last_sign) { - if (d_phase > 0.25 && d_phase < 0.75) { - float phase_err = d_phase-0.5; - d_phase -= phase_err*d_alpha; // 1st order phase adjustment - d_freq -= phase_err*d_beta; // 2nd order frequency adjustment - } + float phase_err = 0.0; + if (d_phase > 0.25 && d_phase < 0.75) + phase_err = d_phase-0.5; + else if (d_phase >= 0.75) + phase_err = d_phase - 1.0; + else + phase_err = d_phase; + + d_phase -= phase_err*d_alpha; // 1st order phase adjustment + d_freq -= phase_err*d_beta; // 2nd order frequency adjustment d_last_sign = sign; } |