Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #857 FM emphasis filters #777

Merged
merged 4 commits into from Mar 31, 2016
Merged

Issue #857 FM emphasis filters #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
137ae34
gr-analog: Fix FM preemphasis filter and rework deemphasis filter
awalls-cx18 Mar 30, 2016
2ae7809
gr-analog: FM emphasis filters use "newstyle" taps
awalls-cx18 Mar 30, 2016
515e400
gr-analog: Add safety and default for FM preemphasis filter
awalls-cx18 Mar 30, 2016
dd625eb
gr-analog: Set FM blocks to use implicit default for preemphasis corner
awalls-cx18 Mar 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/exploring-gnuradio/fm_tx.grc
View file
Open in desktop
Expand Up @@ -791,6 +791,10 @@
<key>max_dev</key>
<value>75e3</value>
</param>
<param>
<key>fh</key>
<value>0.925 * tx_rate/2.0</value>
</param>
<param>
<key>affinity</key>
<value></value>
Expand Down
3 changes: 2 additions & 1 deletion gr-analog/examples/fmtest.py
View file
Open in desktop
Expand Up @@ -48,7 +48,8 @@ def __init__(self, lo_freq, audio_rate, if_rate):
gr.io_signature(1, 1, gr.sizeof_float),
gr.io_signature(1, 1, gr.sizeof_gr_complex))

fmtx = analog.nbfm_tx(audio_rate, if_rate, max_dev=5e3, tau=75e-6)
fmtx = analog.nbfm_tx(audio_rate, if_rate, max_dev=5e3,
tau=75e-6, fh=0.925*if_rate/2.0)

# Local oscillator
lo = analog.sig_source_c(if_rate, # sample rate
Expand Down
8 changes: 7 additions & 1 deletion gr-analog/grc/analog_fm_preemph.xml
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
<name>FM Preemphasis</name>
<key>analog_fm_preemph</key>
<import>from gnuradio import analog</import>
<make>analog.fm_preemph(fs=$samp_rate, tau=$tau)</make>
<make>analog.fm_preemph(fs=$samp_rate, tau=$tau, fh=$fh)</make>
<param>
<name>Sample Rate</name>
<key>samp_rate</key>
Expand All @@ -20,6 +20,12 @@
<value>75e-6</value>
<type>real</type>
</param>
<param>
<name>High Corner Freq</name>
<key>fh</key>
<value>-1.0</value>
<type>real</type>
</param>
<sink>
<name>in</name>
<type>float</type>
Expand Down
8 changes: 8 additions & 0 deletions gr-analog/grc/analog_nbfm_tx.xml
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@
quad_rate=$quad_rate,
tau=$tau,
max_dev=$max_dev,
fh=$fh,
)</make>
<callback>set_max_deviation($max_dev)</callback>

Expand Down Expand Up @@ -42,6 +43,13 @@
<type>real</type>
</param>

<param>
<name>Preemphasis High Corner Freq</name>
<key>fh</key>
<value>-1.0</value>
<type>real</type>
</param>

<check>($quad_rate)%($audio_rate) == 0</check>

<sink>
Expand Down
7 changes: 7 additions & 0 deletions gr-analog/grc/analog_wfm_tx.xml
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@
quad_rate=$quad_rate,
tau=$tau,
max_dev=$max_dev,
fh=$fh,
)</make>
<param>
<name>Audio Rate</name>
Expand All @@ -36,6 +37,12 @@
<value>75e3</value>
<type>real</type>
</param>
<param>
<name>Preemphasis High Corner Freq</name>
<key>fh</key>
<value>-1.0</value>
<type>real</type>
</param>
<check>($quad_rate)%($audio_rate) == 0</check>
<sink>
<name>in</name>
Expand Down