sdr
/
gr-gsm
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'packaging' into desktop-menu-entry

This commit is contained in:
Piotr Krysik 2017-08-28 17:56:21 +02:00 committed by GitHub
parent ccab28dffe 56825a7ae8
commit 440dcea64e
4 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/CMakeLists.txt
View File

@ -18,7 +18,6 @@
# Boston, MA 02110-1301, USA.
include(GrPython)
include(CreateSymlink)
add_subdirectory(helpers)
GR_PYTHON_INSTALL(
@ -29,18 +28,14 @@ GR_PYTHON_INSTALL(
DESTINATION bin
)
SET(XDG_DESKTOP_DIR "/usr/share/applications/")
INSTALL (FILES grgsm_livemon.desktop DESTINATION ${XDG_DESKTOP_DIR})
#CREATE_SYMLINK(grgsm_livemon airprobe_rtlsdr.py)
#CREATE_SYMLINK(grgsm_decode airprobe_decode.py)
#CREATE_SYMLINK(grgsm_scanner airprobe_rtlsdr_scanner.py)
add_custom_target(apps_symlinks ALL DEPENDS ${symlinks})
install(
PROGRAMS
${symlinks}
DESTINATION bin
)
set(XDG_DESKTOP_DIR "/usr/share/applications/")
install(
FILES
grgsm_livemon.desktop
DESTINATION ${XDG_DESKTOP_DIR}
)

8
apps/grgsm_livemon
View File

@ -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 @@ class grgsm_livemon(gr.top_block, Qt.QWidget):
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 @@ class grgsm_livemon(gr.top_block, Qt.QWidget):
# 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'))

10
apps/grgsm_livemon.grc
View File

@ -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>

6
apps/helpers/CMakeLists.txt
View File

@ -18,7 +18,6 @@
# Boston, MA 02110-1301, USA.
include(GrPython)
include(CreateSymlink)
GR_PYTHON_INSTALL(
PROGRAMS
@ -27,13 +26,8 @@ GR_PYTHON_INSTALL(
DESTINATION bin
)
CREATE_SYMLINK(grgsm_capture airprobe_rtlsdr_capture.py)
add_custom_target(helpers_symlinks ALL DEPENDS ${symlinks})
install(
PROGRAMS
${symlinks}
DESTINATION bin
)