Changed the BCCH+CCCH+SDCCH4 demapper into BCCH+CCCH demapper
diff --git a/apps/grgsm_livemon b/apps/grgsm_livemon
index e1c273d..1ec5ecb 100755
--- a/apps/grgsm_livemon
+++ b/apps/grgsm_livemon
@@ -25,7 +25,7 @@
# Title: Gr-gsm Livemon
# Author: Piotr Krysik
# Description: Interactive monitor of a single C0 channel with analysis performed by Wireshark (command to run wireshark: sudo wireshark -k -f udp -Y gsmtap -i lo)
-# Generated: Sat Aug 26 13:26:35 2017
+# Generated: Sun Aug 27 08:34:42 2017
##################################################
if __name__ == '__main__':
@@ -184,7 +184,7 @@
self.gsm_control_channels_decoder_0_0 = grgsm.control_channels_decoder()
self.gsm_control_channels_decoder_0 = grgsm.control_channels_decoder()
self.gsm_clock_offset_control_0 = grgsm.clock_offset_control(fc-shiftoff, samp_rate, osr)
- self.gsm_bcch_ccch_sdcch4_demapper_0 = grgsm.gsm_bcch_ccch_sdcch4_demapper(
+ self.gsm_bcch_ccch_demapper_0 = grgsm.gsm_bcch_ccch_demapper(
timeslot_nr=0,
)
self.blocks_socket_pdu_0_1 = blocks.socket_pdu("UDP_CLIENT", collector, collectorport, 1500, False)
@@ -195,12 +195,12 @@
# Connections
##################################################
self.msg_connect((self.blocks_socket_pdu_0_0, 'pdus'), (self.gsm_message_printer_1, 'msgs'))
- self.msg_connect((self.gsm_bcch_ccch_sdcch4_demapper_0, 'bursts'), (self.gsm_control_channels_decoder_0, 'bursts'))
+ self.msg_connect((self.gsm_bcch_ccch_demapper_0, 'bursts'), (self.gsm_control_channels_decoder_0, 'bursts'))
self.msg_connect((self.gsm_clock_offset_control_0, 'ctrl'), (self.gsm_input_0, 'ctrl_in'))
self.msg_connect((self.gsm_control_channels_decoder_0, 'msgs'), (self.blocks_socket_pdu_0_1, 'pdus'))
self.msg_connect((self.gsm_control_channels_decoder_0_0, 'msgs'), (self.blocks_socket_pdu_0_1, 'pdus'))
self.msg_connect((self.gsm_decryption_0, 'bursts'), (self.gsm_control_channels_decoder_0_0, 'bursts'))
- self.msg_connect((self.gsm_receiver_0, 'C0'), (self.gsm_bcch_ccch_sdcch4_demapper_0, 'bursts'))
+ self.msg_connect((self.gsm_receiver_0, 'C0'), (self.gsm_bcch_ccch_demapper_0, 'bursts'))
self.msg_connect((self.gsm_receiver_0, 'measurements'), (self.gsm_clock_offset_control_0, 'measurements'))
self.msg_connect((self.gsm_receiver_0, 'C0'), (self.gsm_sdcch8_demapper_0, 'bursts'))
self.msg_connect((self.gsm_sdcch8_demapper_0, 'bursts'), (self.gsm_decryption_0, 'bursts'))
diff --git a/apps/grgsm_livemon.grc b/apps/grgsm_livemon.grc
index 3342fb6..af6aa6e 100644
--- a/apps/grgsm_livemon.grc
+++ b/apps/grgsm_livemon.grc
@@ -647,7 +647,7 @@
</param>
</block>
<block>
- <key>gsm_bcch_ccch_sdcch4_demapper</key>
+ <key>gsm_bcch_ccch_demapper</key>
<param>
<key>alias</key>
<value></value>
@@ -666,7 +666,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(920, 284)</value>
+ <value>(896, 284)</value>
</param>
<param>
<key>_rotation</key>
@@ -674,7 +674,7 @@
</param>
<param>
<key>id</key>
- <value>gsm_bcch_ccch_sdcch4_demapper_0</value>
+ <value>gsm_bcch_ccch_demapper_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -3024,7 +3024,7 @@
<sink_key>msgs</sink_key>
</connection>
<connection>
- <source_block_id>gsm_bcch_ccch_sdcch4_demapper_0</source_block_id>
+ <source_block_id>gsm_bcch_ccch_demapper_0</source_block_id>
<sink_block_id>gsm_control_channels_decoder_0</sink_block_id>
<source_key>bursts</source_key>
<sink_key>bursts</sink_key>
@@ -3061,7 +3061,7 @@
</connection>
<connection>
<source_block_id>gsm_receiver_0</source_block_id>
- <sink_block_id>gsm_bcch_ccch_sdcch4_demapper_0</sink_block_id>
+ <sink_block_id>gsm_bcch_ccch_demapper_0</sink_block_id>
<source_key>C0</source_key>
<sink_key>bursts</sink_key>
</connection>