diff options
author | Dimitri Stolnikov <horiz0n@gmx.net> | 2012-04-11 23:40:27 +0200 |
---|---|---|
committer | Dimitri Stolnikov <horiz0n@gmx.net> | 2012-04-11 23:40:27 +0200 |
commit | 3ddcdbd8b83bebfc9c7005b65dc40f71f756cf6f (patch) | |
tree | 3bab18d28b1bb48156cf9285bcfb723885ef1609 /apps | |
parent | 619d7a5a8b7a442f565bf92fa534738f9ac40e97 (diff) |
update GRC integration
Diffstat (limited to 'apps')
-rw-r--r-- | apps/osmosdr_source.grc | 177 | ||||
-rwxr-xr-x | apps/osmosdr_source.py | 21 |
2 files changed, 131 insertions, 67 deletions
diff --git a/apps/osmosdr_source.grc b/apps/osmosdr_source.grc index e661ae1..446f015 100644 --- a/apps/osmosdr_source.grc +++ b/apps/osmosdr_source.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Fri Apr 6 15:57:44 2012</timestamp> + <timestamp>Wed Apr 11 17:53:04 2012</timestamp> <block> <key>options</key> <param> @@ -57,29 +57,6 @@ </param> </block> <block> - <key>variable</key> - <param> - <key>id</key> - <value>samp_rate</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>2048e3</value> - </param> - <param> - <key>_coordinate</key> - <value>(39, 137)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> <key>variable_slider</key> <param> <key>id</key> @@ -135,41 +112,6 @@ </param> </block> <block> - <key>osmosdr_source_c</key> - <param> - <key>id</key> - <value>osmosdr_source_c_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>args</key> - <value></value> - </param> - <param> - <key>freq</key> - <value>freq</value> - </param> - <param> - <key>rate</key> - <value>samp_rate</value> - </param> - <param> - <key>gain</key> - <value>gain</value> - </param> - <param> - <key>_coordinate</key> - <value>(284, 297)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> <key>variable_slider</key> <param> <key>id</key> @@ -311,6 +253,123 @@ <value>0</value> </param> </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>samp_rate</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>samplerate</value> + </param> + <param> + <key>_coordinate</key> + <value>(39, 137)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>osmosdr_source_c</key> + <param> + <key>id</key> + <value>osmosdr_source_c_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>args</key> + <value></value> + </param> + <param> + <key>freq</key> + <value>freq</value> + </param> + <param> + <key>freq_corr</key> + <value>0</value> + </param> + <param> + <key>rate</key> + <value>samplerate</value> + </param> + <param> + <key>gain</key> + <value>gain</value> + </param> + <param> + <key>_coordinate</key> + <value>(278, 276)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_slider</key> + <param> + <key>id</key> + <value>samplerate</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value></value> + </param> + <param> + <key>value</key> + <value>2048e3</value> + </param> + <param> + <key>min</key> + <value>1e6</value> + </param> + <param> + <key>max</key> + <value>3.2e6</value> + </param> + <param> + <key>num_steps</key> + <value>100</value> + </param> + <param> + <key>style</key> + <value>wx.SL_HORIZONTAL</value> + </param> + <param> + <key>converver</key> + <value>float_converter</value> + </param> + <param> + <key>grid_pos</key> + <value></value> + </param> + <param> + <key>notebook</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(40, 237)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <connection> <source_block_id>osmosdr_source_c_0</source_block_id> <sink_block_id>wxgui_fftsink2_0</sink_block_id> diff --git a/apps/osmosdr_source.py b/apps/osmosdr_source.py index f2ed63d..e7c3120 100755 --- a/apps/osmosdr_source.py +++ b/apps/osmosdr_source.py @@ -22,14 +22,15 @@ class osmosdr_source_c(grc_wxgui.top_block_gui): self.src = osmosdr.source_c() - self.src.set_samp_rate(1024000) - self.src.set_center_freq(392.8e6) + self.src.set_sample_rate(1024000) + self.src.set_center_freq(394.5e6) self.src.set_gain(10) ################################################## # Variables ################################################## - self.samp_rate = samp_rate = self.src.get_samp_rate() + self.sample_rate = self.src.get_sample_rate() + self.center_freq = self.src.get_center_freq() ################################################## # Blocks @@ -37,11 +38,12 @@ class osmosdr_source_c(grc_wxgui.top_block_gui): self.sink = fftsink2.fft_sink_c( self.GetWin(), fft_size=1024, - sample_rate=samp_rate, + baseband_freq=self.center_freq, + sample_rate=self.sample_rate, ref_scale=2.0, ref_level=0, y_divs=10, - fft_rate=15, + fft_rate=10, average=False, avg_alpha=0.5 ) @@ -53,10 +55,13 @@ class osmosdr_source_c(grc_wxgui.top_block_gui): ################################################## self.connect((self.src, 0), (self.sink, 0)) + def set_sample_rate(self, sample_rate): + self.sample_rate = sample_rate + self.sink.set_sample_rate(self.sample_rate) - def set_samp_rate(self, samp_rate): - self.samp_rate = samp_rate - self.sink.set_sample_rate(self.samp_rate) + def set_center_freq(self, center_freq): + self.center_freq = center_freq + self.sink.set_center_freq(self.center_freq) if __name__ == '__main__': parser = OptionParser(option_class=eng_option, usage="%prog: [options]") |