aboutsummaryrefslogtreecommitdiffstats
path: root/apps/grgsm_decode
diff options
context:
space:
mode:
authorPiotr Krysik <ptrkrysik@gmail.com>2016-05-20 12:45:54 +0200
committerPiotr Krysik <ptrkrysik@gmail.com>2016-05-20 12:45:54 +0200
commit773a194c327c89161b3d11e5246dfea04d9b45dc (patch)
treed81ba89769c7a807a4b155b84e8d4bfb3e2bae16 /apps/grgsm_decode
parentbac8284599e137981f178e8998d6426f011d9dab (diff)
Big change of the universal control channels demapper:
-simplification of the universal demapper, -addition of hierarhical blocks for each of the demappers - so they also look well and readable in python, -addition of helper script for compilation of the demappers.
Diffstat (limited to 'apps/grgsm_decode')
-rwxr-xr-xapps/grgsm_decode12
1 files changed, 3 insertions, 9 deletions
diff --git a/apps/grgsm_decode b/apps/grgsm_decode
index 4be199d..8f412bf 100755
--- a/apps/grgsm_decode
+++ b/apps/grgsm_decode
@@ -88,17 +88,11 @@ class grgsm_decoder(gr.top_block):
self.subslot_filter = grgsm.burst_sdcch_subslot_filter(grgsm.SS_FILTER_SDCCH8, self.subslot)
if self.chan_mode == 'BCCH':
- self.bcch_demapper = grgsm.universal_ctrl_chans_demapper(self.timeslot,
- ([2, 6, 12, 16, 22, 26, 32, 36, 42, 46]),
- ([1, 2, 2, 2, 2, 2, 2, 2, 2, 2]))
+ self.bcch_demapper = grgsm.gsm_bcch_ccch_demapper(self.timeslot)
elif self.chan_mode == 'BCCH_SDCCH4':
- self.bcch_sdcch4_demapper = grgsm.universal_ctrl_chans_demapper(self.timeslot,
- ([2, 6, 12, 16, 22, 26, 32, 36, 42, 46]),
- ([1, 2, 2, 2, 7, 7, 7, 7, 135, 135]))
+ self.bcch_sdcch4_demapper = grgsm.gsm_bcch_ccch_sdcch4_demapper(self.timeslot)
elif self.chan_mode == 'SDCCH8':
- self.sdcch8_demapper = grgsm.universal_ctrl_chans_demapper(self.timeslot,
- ([0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44]),
- ([8, 8, 8, 8, 8, 8, 8, 8, 136, 136, 136, 136]))
+ self.sdcch8_demapper = grgsm.gsm_sdcch8_demapper(self.timeslot)
elif self.chan_mode == 'TCHF':
self.tch_f_demapper = grgsm.tch_f_chans_demapper(self.timeslot)
self.tch_f_decoder = grgsm.tch_f_decoder(speech_codec, speech_file)