From ae0136229a1f557201cc93544ac8c8d3cd8cc6e8 Mon Sep 17 00:00:00 2001
From: Sergey Musikhin <musihin_sergei@mail.ru>
Date: Wed, 16 Jun 2021 18:13:39 +0000
Subject: [PATCH] common frequency/bandwidth
---
apps/fm_receiver.grc | 19 +++++++---------
grc/gen_bladerf_blocks.py | 46 +++++++++++++++------------------------
2 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/apps/fm_receiver.grc b/apps/fm_receiver.grc
index 397b024..ceaa53e 100644
--- a/apps/fm_receiver.grc
+++ b/apps/fm_receiver.grc
@@ -212,25 +212,21 @@ blocks:
parameters:
affinity: ''
alias: ''
- bias_tee0: 'False'
+ bias_tee0: 'True'
bias_tee1: 'False'
- bw0: samp_rate
- bw1: '200000'
+ bw: '2000000'
comment: ''
- corr0: '0'
- corr1: '0'
- dac: '8000'
+ dac: '6000'
dc_calibration: RX_LPF
dc_offset_mode0: '0'
dc_offset_mode1: '0'
device_id: '0'
fpga_image: test123
fpga_reload: 'False'
- freq0: freq
- freq1: 1e8
+ freq: freq
gain0: rf_gain
gain1: '10'
- gain_mode0: 'False'
+ gain_mode0: 'True'
gain_mode1: 'False'
if_gain0: if_gain
if_gain1: '20'
@@ -248,13 +244,14 @@ blocks:
sampling: external
smb: 10e6
tamer: internal
- trigger0: 'True'
+ trigger0: 'False'
trigger1: 'False'
trigger_role0: master
trigger_role1: master
trigger_signal0: J71_4
trigger_signal1: J51_1
- verbosity: warning
+ use_dac: 'True'
+ verbosity: info
xb200: none
states:
bus_sink: false
diff --git a/grc/gen_bladerf_blocks.py b/grc/gen_bladerf_blocks.py
index 548bf7f..34d8d5d 100644
--- a/grc/gen_bladerf_blocks.py
+++ b/grc/gen_bladerf_blocks.py
@@ -68,6 +68,16 @@ parameters:
label: 'Sample Rate (sps)'
dtype: real
default: samp_rate
+
+- id: freq
+ label: 'Frequency (Hz)'
+ dtype: real
+ default: 1e8
+
+- id: bw
+ label: 'Bandwidth (Hz)'
+ dtype: real
+ default: 200000
- id: ref_clk
label: 'Reference clock'
@@ -208,10 +218,10 @@ templates:
)
self.${'$'}{id}.set_sample_rate(${'$'}{sample_rate})
+ self.${'$'}{id}.set_center_freq(${'$'}{freq},0)
+ self.${'$'}{id}.set_bandwidth(${'$'}{bw},0)
% for n in range(max_nchan):
- ${'%'} if context.get('nchan')() > ${n}:
- self.${'$'}{id}.set_center_freq(${'$'}{${'freq' + str(n)}}, ${n})
- self.${'$'}{id}.set_freq_corr(${'$'}{${'corr' + str(n)}}, ${n})
+ ${'%'} if context.get('nchan')() > ${n}:
% if sourk == 'source':
self.${'$'}{id}.set_dc_offset_mode(${'$'}{${'dc_offset_mode' + str(n)}}, ${n})
self.${'$'}{id}.set_iq_balance_mode(${'$'}{${'iq_balance_mode' + str(n)}}, ${n})
@@ -219,14 +229,14 @@ templates:
% endif
self.${'$'}{id}.set_gain(${'$'}{${'gain' + str(n)}}, ${n})
self.${'$'}{id}.set_if_gain(${'$'}{${'if_gain' + str(n)}}, ${n})
- self.${'$'}{id}.set_bandwidth(${'$'}{${'bw' + str(n)}}, ${n})
+
${'%'} endif
% endfor
callbacks:
- set_sample_rate(${'$'}{sample_rate})
- % for n in range(max_nchan):
- - set_center_freq(${'$'}{${'freq' + str(n)}}, ${n})
- - set_freq_corr(${'$'}{${'corr' + str(n)}}, ${n})
+ - set_center_freq(${'$'}{freq}, 0)
+ - set_bandwidth(${'$'}{bw}, 0)
+ % for n in range(max_nchan):
% if sourk == 'source':
- set_dc_offset_mode(${'$'}{${'dc_offset_mode' + str(n)}}, ${n})
- set_iq_balance_mode(${'$'}{${'iq_balance_mode' + str(n)}}, ${n})
@@ -234,7 +244,6 @@ templates:
% endif
- set_gain(${'$'}{${'gain' + str(n)}}, ${n})
- set_if_gain(${'$'}{${'if_gain' + str(n)}}, ${n})
- - set_bandwidth(${'$'}{${'bw' + str(n)}}, ${n})
% endfor
documentation: |-
@@ -351,27 +360,6 @@ file_format: 1
# """
PARAMS_TMPL = """
-- id: freq${n}
- category: 'Channel ${n}'
- label: 'Frequency (Hz)'
- dtype: real
- default: 1e8
- hide: ${'$'}{'none' if (nchan > ${n}) else 'all'}
-
-- id: corr${n}
- category: 'Channel ${n}'
- label: 'Freq. Corr. (ppm)'
- dtype: real
- default: 0
- hide: ${'$'}{'none' if (nchan > ${n}) else 'all'}
-
-- id: bw${n}
- category: 'Channel ${n}'
- label: 'Bandwidth (Hz)'
- dtype: real
- default: 200000
- hide: ${'$'}{'none' if (nchan > ${n}) else 'all'}
-
- id: bias_tee${n}
category: 'Channel ${n}'
label: 'Bias tee'
--
GitLab