argilo
/
gr-osmosdr
forked from sdr/gr-osmosdr
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

made siggen cooperate with sinks without bw range

This commit is contained in:
Marcus Müller 2015-12-29 19:08:40 +01:00 committed by Dimitri Stolnikov
parent 84249efbea
commit 20a5986ca0
2 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/osmocom_siggen
View File

@ -164,16 +164,19 @@ class app_gui(pubsub):
) )
freq_hbox.AddSpacer(5) freq_hbox.AddSpacer(5)
forms.slider( try:
parent=self.panel, sizer=freq_hbox, forms.slider(
proportion=2, parent=self.panel, sizer=freq_hbox,
ps=self.tb, proportion=2,
key=osmocom_siggen.TX_FREQ_KEY, ps=self.tb,
minimum=self.tb[osmocom_siggen.FREQ_RANGE_KEY].start(), key=osmocom_siggen.TX_FREQ_KEY,
maximum=self.tb[osmocom_siggen.FREQ_RANGE_KEY].stop(), minimum=self.tb[osmocom_siggen.FREQ_RANGE_KEY].start(),
num_steps=101, maximum=self.tb[osmocom_siggen.FREQ_RANGE_KEY].stop(),
) num_steps=101,
freq_hbox.AddSpacer(3) )
freq_hbox.AddSpacer(3)
except:
pass
corr_hbox.AddSpacer(3) corr_hbox.AddSpacer(3)
forms.text_box( forms.text_box(

44
apps/osmocom_siggen_base.py
View File

@ -218,22 +218,40 @@ class top_block(gr.top_block, pubsub):
print 'Supported sample rates %d-%d step %d.' % (rates.start(), rates.stop(), rates.step()) print 'Supported sample rates %d-%d step %d.' % (rates.start(), rates.stop(), rates.step())
# Set the antenna # Set the antenna
if self._verbose:
print "setting antenna..."
if(options.antenna): if(options.antenna):
ant = self._sink.set_antenna(options.antenna, 0) ant = self._sink.set_antenna(options.antenna, 0)
if self._verbose: if self._verbose:
print "Set antenna to:", ant print "Set antenna to:", ant
try:
self.publish(FREQ_RANGE_KEY, self._sink.get_freq_range)
except:
print "Couldn't publish %s" % FREQ_RANGE_KEY
self.publish(FREQ_RANGE_KEY, self._sink.get_freq_range) try:
for name in self.get_gain_names():
self.publish(GAIN_RANGE_KEY(name), (lambda self=self,name=name: self._sink.get_gain_range(name)))
except:
print "Couldn't publish %s" % FREQ_RANGE_KEY
for name in self.get_gain_names(): try:
self.publish(GAIN_RANGE_KEY(name), (lambda self=self,name=name: self._sink.get_gain_range(name))) self.publish(BWIDTH_RANGE_KEY, self._sink.get_bandwidth_range)
except:
if self._verbose:
print "Couldn't publish %s" % BWIDTH_RANGE_KEY
self.publish(BWIDTH_RANGE_KEY, self._sink.get_bandwidth_range) try:
for name in self.get_gain_names():
for name in self.get_gain_names(): self.publish(GAIN_KEY(name), (lambda self=self,name=name: self._sink.get_gain(name)))
self.publish(GAIN_KEY(name), (lambda self=self,name=name: self._sink.get_gain(name))) except:
if self._verbose:
self.publish(BWIDTH_KEY, self._sink.get_bandwidth) print "Couldn't publish GAIN_KEYs"
try:
self.publish(BWIDTH_KEY, self._sink.get_bandwidth)
except:
if self._verbose:
print "Couldn't publish %s" % BWIDTH_KEY
def get_gain_names(self): def get_gain_names(self):
return self._sink.get_gain_names() return self._sink.get_gain_names()
@ -273,7 +291,13 @@ class top_block(gr.top_block, pubsub):
print "Set " + name + " gain to:", gain print "Set " + name + " gain to:", gain
def set_bandwidth(self, bw): def set_bandwidth(self, bw):
clipped_bw = self[BWIDTH_RANGE_KEY].clip(bw) try:
clipped_bw = self[BWIDTH_RANGE_KEY].clip(bw)
except:
if self._verbose:
print "couldn't clip bandwidth"
return
if self._sink.get_bandwidth() != clipped_bw: if self._sink.get_bandwidth() != clipped_bw:
bw = self._sink.set_bandwidth(clipped_bw) bw = self._sink.set_bandwidth(clipped_bw)