Make band user-selectable in gsm_wideband_input
This commit is contained in:
parent
4ea1b92ff5
commit
5707c2b01e
|
@ -9,6 +9,7 @@
|
||||||
fc=$fc,
|
fc=$fc,
|
||||||
samp_rate_in=$samp_rate_in,
|
samp_rate_in=$samp_rate_in,
|
||||||
ca=$cell_allocation,
|
ca=$cell_allocation,
|
||||||
|
band=$band,
|
||||||
)</make>
|
)</make>
|
||||||
<callback>set_ppm($ppm)</callback>
|
<callback>set_ppm($ppm)</callback>
|
||||||
<callback>set_osr($osr)</callback>
|
<callback>set_osr($osr)</callback>
|
||||||
|
@ -35,6 +36,45 @@
|
||||||
<type>float</type>
|
<type>float</type>
|
||||||
<hide>part</hide>
|
<hide>part</hide>
|
||||||
</param>
|
</param>
|
||||||
|
<param>
|
||||||
|
<name>Band</name>
|
||||||
|
<key>band</key>
|
||||||
|
<value>E-GSM</value>
|
||||||
|
<type>string</type>
|
||||||
|
<hide>part</hide>
|
||||||
|
<option>
|
||||||
|
<name>P-GSM (1-124)</name>
|
||||||
|
<key>P-GSM</key>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>DCS1800 (512-885)</name>
|
||||||
|
<key>DCS1900</key>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>PCS1900 (512-810)</name>
|
||||||
|
<key>PCS1900</key>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>E-GSM (975-1023)</name>
|
||||||
|
<key>E-GSM</key>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>R-GSM (955-1023)</name>
|
||||||
|
<key>R-GSM</key>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>GSM450 (259-293)</name>
|
||||||
|
<key>GSM450</key>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>GSM480 (306-340)</name>
|
||||||
|
<key>GSM480</key>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>GSM850 (128-251)</name>
|
||||||
|
<key>GSM850</key>
|
||||||
|
</option>
|
||||||
|
</param>
|
||||||
<param>
|
<param>
|
||||||
<name>Cell allocation</name>
|
<name>Cell allocation</name>
|
||||||
<key>cell_allocation</key>
|
<key>cell_allocation</key>
|
||||||
|
@ -57,6 +97,7 @@
|
||||||
<hide>part</hide>
|
<hide>part</hide>
|
||||||
</param>
|
</param>
|
||||||
<check>$num_streams >= 0</check>
|
<check>$num_streams >= 0</check>
|
||||||
|
<check>$cell_allocation and all(grgsm.arfcn.is_valid_arfcn(c, $band) for c in $cell_allocation)</check>
|
||||||
<sink>
|
<sink>
|
||||||
<name>in</name>
|
<name>in</name>
|
||||||
<type>complex</type>
|
<type>complex</type>
|
||||||
|
|
|
@ -15,7 +15,7 @@ import grgsm.arfcn as arfcn
|
||||||
import grgsm
|
import grgsm
|
||||||
|
|
||||||
class gsm_wideband_input(grgsm.hier_block):
|
class gsm_wideband_input(grgsm.hier_block):
|
||||||
def __init__(self, ppm=0, osr=4, fc=925.2e6, samp_rate_in=20e6, ca=[]):
|
def __init__(self, ppm=0, osr=4, fc=925.2e6, samp_rate_in=20e6, ca=[], band='P-GSM'):
|
||||||
self.num_streams = len(ca)
|
self.num_streams = len(ca)
|
||||||
grgsm.hier_block.__init__(
|
grgsm.hier_block.__init__(
|
||||||
self, "GSM wideband input adaptor",
|
self, "GSM wideband input adaptor",
|
||||||
|
@ -34,7 +34,7 @@ class gsm_wideband_input(grgsm.hier_block):
|
||||||
self.blocks_fir_filters = {}
|
self.blocks_fir_filters = {}
|
||||||
self.blocks_resamplers = {}
|
self.blocks_resamplers = {}
|
||||||
self.blocks_ocs = {}
|
self.blocks_ocs = {}
|
||||||
self.band = band = 'E-GSM' # TODO make selectable
|
self.band = band
|
||||||
|
|
||||||
##################################################
|
##################################################
|
||||||
# Variables
|
# Variables
|
||||||
|
|
Loading…
Reference in New Issue