Skip to content

Commit

Permalink
Merge branch 'marathon' of https://github.com/maiconkist/gr-hydra int…
Browse files Browse the repository at this point in the history 
…o marathon
  • Loading branch information
@maiconkist
maiconkist committed Mar 12, 2019
2 parents cf0b3cb + a444c24 commit 4243a94
Show file tree
Hide file tree
Showing 4 changed files with 236 additions and 7 deletions.
233 changes: 231 additions & 2 deletions grc_blocks/app/ansible_hydra_vr1_rx.grc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
</param>
<param>
<key>value</key>
<value>0.85</value>
<value>0.7</value>
</param>
<param>
<key>_enabled</key>
Expand Down Expand Up @@ -734,7 +734,7 @@
</param>
<param>
<key>_enabled</key>
<value>True</value>
<value>1</value>
</param>
<param>
<key>_coordinate</key>
Expand Down Expand Up @@ -808,6 +808,229 @@
<value>0.04</value>
</param>
</block>
<block>
<key>qtgui_waterfall_sink_x</key>
<param>
<key>axislabels</key>
<value>True</value>
</param>
<param>
<key>bw</key>
<value>samp_rate</value>
</param>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>fc</key>
<value>0</value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>0</value>
</param>
<param>
<key>fftsize</key>
<value>1024</value>
</param>
<param>
<key>_coordinate</key>
<value>(680, 592)</value>
</param>
<param>
<key>gui_hint</key>
<value></value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
<param>
<key>grid</key>
<value>False</value>
</param>
<param>
<key>id</key>
<value>qtgui_waterfall_sink_x_0</value>
</param>
<param>
<key>int_max</key>
<value>10</value>
</param>
<param>
<key>int_min</key>
<value>-140</value>
</param>
<param>
<key>legend</key>
<value>True</value>
</param>
<param>
<key>alpha1</key>
<value>1.0</value>
</param>
<param>
<key>color1</key>
<value>0</value>
</param>
<param>
<key>label1</key>
<value></value>
</param>
<param>
<key>alpha10</key>
<value>1.0</value>
</param>
<param>
<key>color10</key>
<value>0</value>
</param>
<param>
<key>label10</key>
<value></value>
</param>
<param>
<key>alpha2</key>
<value>1.0</value>
</param>
<param>
<key>color2</key>
<value>0</value>
</param>
<param>
<key>label2</key>
<value></value>
</param>
<param>
<key>alpha3</key>
<value>1.0</value>
</param>
<param>
<key>color3</key>
<value>0</value>
</param>
<param>
<key>label3</key>
<value></value>
</param>
<param>
<key>alpha4</key>
<value>1.0</value>
</param>
<param>
<key>color4</key>
<value>0</value>
</param>
<param>
<key>label4</key>
<value></value>
</param>
<param>
<key>alpha5</key>
<value>1.0</value>
</param>
<param>
<key>color5</key>
<value>0</value>
</param>
<param>
<key>label5</key>
<value></value>
</param>
<param>
<key>alpha6</key>
<value>1.0</value>
</param>
<param>
<key>color6</key>
<value>0</value>
</param>
<param>
<key>label6</key>
<value></value>
</param>
<param>
<key>alpha7</key>
<value>1.0</value>
</param>
<param>
<key>color7</key>
<value>0</value>
</param>
<param>
<key>label7</key>
<value></value>
</param>
<param>
<key>alpha8</key>
<value>1.0</value>
</param>
<param>
<key>color8</key>
<value>0</value>
</param>
<param>
<key>label8</key>
<value></value>
</param>
<param>
<key>alpha9</key>
<value>1.0</value>
</param>
<param>
<key>color9</key>
<value>0</value>
</param>
<param>
<key>label9</key>
<value></value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>name</key>
<value>""</value>
</param>
<param>
<key>nconnections</key>
<value>1</value>
</param>
<param>
<key>showports</key>
<value>True</value>
</param>
<param>
<key>freqhalf</key>
<value>True</value>
</param>
<param>
<key>type</key>
<value>complex</value>
</param>
<param>
<key>update_time</key>
<value>0.10</value>
</param>
<param>
<key>wintype</key>
<value>firdes.WIN_BLACKMAN_hARRIS</value>
</param>
</block>
<block>
<key>parameter</key>
<param>
Expand Down Expand Up @@ -3147,4 +3370,10 @@
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>uhd_usrp_source_0</source_block_id>
<sink_block_id>qtgui_waterfall_sink_x_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
</flow_graph>
2 changes: 1 addition & 1 deletion grc_blocks/app/ansible_hydra_vr1_rx.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
##################################################
# GNU Radio Python Flow Graph
# Title: Ansible Hydra Vr1 Rx
# Generated: Tue Mar 12 17:00:19 2019
# Generated: Tue Mar 12 17:39:50 2019
##################################################


Expand Down
2 changes: 1 addition & 1 deletion grc_blocks/app/usrp_vr1_pdu_gen.grc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
</param>
<param>
<key>value</key>
<value>0.1</value>
<value>0.04</value>
</param>
<param>
<key>_enabled</key>
Expand Down
6 changes: 3 additions & 3 deletions grc_blocks/app/usrp_vr1_pdu_gen.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
##################################################
# GNU Radio Python Flow Graph
# Title: Usrp Vr1 Pdu Gen
# Generated: Tue Mar 12 13:41:08 2019
# Generated: Tue Mar 12 17:19:49 2019
##################################################

from distutils.version import StrictVersion
Expand Down Expand Up @@ -84,12 +84,12 @@ def __init__(self, freqrx=2.22e9, freqtx=2.22e9+3e6 , samp_rate=200e3, vr1offset
self.pilot_symbols = pilot_symbols = ((1, 1, 1, -1,),)
self.pilot_carriers = pilot_carriers = ((-21, -7, 7, 21,),)
self.occupied_carriers = occupied_carriers = (range(-26, -21) + range(-20, -7) + range(-6, 0) + range(1, 7) + range(8, 21) + range(22, 27),)
self.mul1 = mul1 = 0.1
self.mul1 = mul1 = 0.04

##################################################
# Blocks
##################################################
self._mul1_range = Range(0, 1, 0.01, 0.1, 200)
self._mul1_range = Range(0, 1, 0.01, 0.04, 200)
self._mul1_win = RangeWidget(self._mul1_range, self.set_mul1, 'mul1', "counter_slider", float)
self.top_layout.addWidget(self._mul1_win)
self.uhd_usrp_source_0 = uhd.usrp_source(
Expand Down

0 comments on commit 4243a94

Please sign in to comment.