aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorleommxj <leommxj@gmail.com>2017-09-10 01:02:53 +0800
committerPiotr Krysik <ptrkrysik@users.noreply.github.com>2017-09-11 10:38:40 +0200
commitece9fd7f39a96484aee027eda3bc38b17fb2fa17 (patch)
treeca203d495511c125d9d3ff0548b769ae36d0c5d7
parent1a35cb973fba5c770f7c14a769c0b1b9d329e764 (diff)
fix bug after commit 3dfa11b89e6a74e6857c11e3029b372c746d535f .change arfcn2downlink(a,b) to one argument in grgsm_decode and grgsm_capture and grgsm_channelize
-rwxr-xr-xapps/grgsm_decode4
-rwxr-xr-xapps/helpers/grgsm_capture8
-rwxr-xr-xapps/helpers/grgsm_channelize2
3 files changed, 7 insertions, 7 deletions
diff --git a/apps/grgsm_decode b/apps/grgsm_decode
index 66ecae2..70cd284 100755
--- a/apps/grgsm_decode
+++ b/apps/grgsm_decode
@@ -354,12 +354,12 @@ if __name__ == '__main__':
parser.error("ARFCN is not valid in the specified band\n")
else:
arfcn = options.arfcn
- fc = grgsm.arfcn.arfcn2downlink(arfcn, options.band)
+ fc = grgsm.arfcn.arfcn2downlink(arfcn)
else:
arfcn = options.arfcn
for band in grgsm.arfcn.get_bands():
if grgsm.arfcn.is_valid_arfcn(arfcn):
- fc = grgsm.arfcn.arfcn2downlink(arfcn, band)
+ fc = grgsm.arfcn.arfcn2downlink(arfcn)
break
elif options.fc:
fc = options.fc
diff --git a/apps/helpers/grgsm_capture b/apps/helpers/grgsm_capture
index d14d1e8..8b10c61 100755
--- a/apps/helpers/grgsm_capture
+++ b/apps/helpers/grgsm_capture
@@ -139,11 +139,11 @@ class grgsm_capture(gr.top_block):
if self.verbose or self.burst_file:
self.gsm_receiver.set_cell_allocation([self.arfcn])
if options.band:
- new_freq = grgsm.arfcn.arfcn2downlink(self.arfcn, self.band)
+ new_freq = grgsm.arfcn.arfcn2downlink(self.arfcn)
else:
for band in grgsm.arfcn.get_bands():
if grgsm.arfcn.is_valid_arfcn(arfcn):
- new_freq = grgsm.arfcn.arfcn2downlink(arfcn, band)
+ new_freq = grgsm.arfcn.arfcn2downlink(arfcn)
break
self.set_fc(new_freq)
@@ -236,12 +236,12 @@ if __name__ == '__main__':
parser.error("ARFCN is not valid in the specified band\n")
else:
arfcn = options.arfcn
- fc = grgsm.arfcn.arfcn2downlink(arfcn, options.band)
+ fc = grgsm.arfcn.arfcn2downlink(arfcn)
else:
arfcn = options.arfcn
for band in grgsm.arfcn.get_bands():
if grgsm.arfcn.is_valid_arfcn(arfcn):
- fc = grgsm.arfcn.arfcn2downlink(arfcn, band)
+ fc = grgsm.arfcn.arfcn2downlink(arfcn)
break
elif options.fc:
fc = options.fc
diff --git a/apps/helpers/grgsm_channelize b/apps/helpers/grgsm_channelize
index fb30334..5735a1a 100755
--- a/apps/helpers/grgsm_channelize
+++ b/apps/helpers/grgsm_channelize
@@ -94,7 +94,7 @@ class grgsm_channelize(gr.top_block):
print("Extracting channels %s, given that the center frequency is at %s" % (str(channels), eng_notation.num_to_str(fc)))
for channel in channels:
- channel_freq = arfcn.arfcn2downlink(channel, band)
+ channel_freq = arfcn.arfcn2downlink(channel)
if channel_freq is None:
print("Warning: invalid ARFCN %d for band %s" % (channel, band))
continue