Merge branch 'packaging' into desktop-menu-entry
This commit is contained in:
commit
440dcea64e
|
@ -18,7 +18,6 @@
|
||||||
# Boston, MA 02110-1301, USA.
|
# Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
include(GrPython)
|
include(GrPython)
|
||||||
include(CreateSymlink)
|
|
||||||
add_subdirectory(helpers)
|
add_subdirectory(helpers)
|
||||||
|
|
||||||
GR_PYTHON_INSTALL(
|
GR_PYTHON_INSTALL(
|
||||||
|
@ -29,18 +28,14 @@ GR_PYTHON_INSTALL(
|
||||||
DESTINATION bin
|
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(
|
install(
|
||||||
PROGRAMS
|
PROGRAMS
|
||||||
${symlinks}
|
|
||||||
DESTINATION bin
|
DESTINATION bin
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set(XDG_DESKTOP_DIR "/usr/share/applications/")
|
||||||
|
install(
|
||||||
|
FILES
|
||||||
|
grgsm_livemon.desktop
|
||||||
|
DESTINATION ${XDG_DESKTOP_DIR}
|
||||||
|
)
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
# Title: Gr-gsm Livemon
|
# Title: Gr-gsm Livemon
|
||||||
# Author: Piotr Krysik
|
# 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)
|
# 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__':
|
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_0 = grgsm.control_channels_decoder()
|
||||||
self.gsm_control_channels_decoder_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_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,
|
timeslot_nr=0,
|
||||||
)
|
)
|
||||||
self.blocks_socket_pdu_0_1 = blocks.socket_pdu("UDP_CLIENT", collector, collectorport, 1500, False)
|
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
|
# Connections
|
||||||
##################################################
|
##################################################
|
||||||
self.msg_connect((self.blocks_socket_pdu_0_0, 'pdus'), (self.gsm_message_printer_1, 'msgs'))
|
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_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, '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_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_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, '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_receiver_0, 'C0'), (self.gsm_sdcch8_demapper_0, 'bursts'))
|
||||||
self.msg_connect((self.gsm_sdcch8_demapper_0, 'bursts'), (self.gsm_decryption_0, 'bursts'))
|
self.msg_connect((self.gsm_sdcch8_demapper_0, 'bursts'), (self.gsm_decryption_0, 'bursts'))
|
||||||
|
|
|
@ -647,7 +647,7 @@
|
||||||
</param>
|
</param>
|
||||||
</block>
|
</block>
|
||||||
<block>
|
<block>
|
||||||
<key>gsm_bcch_ccch_sdcch4_demapper</key>
|
<key>gsm_bcch_ccch_demapper</key>
|
||||||
<param>
|
<param>
|
||||||
<key>alias</key>
|
<key>alias</key>
|
||||||
<value></value>
|
<value></value>
|
||||||
|
@ -666,7 +666,7 @@
|
||||||
</param>
|
</param>
|
||||||
<param>
|
<param>
|
||||||
<key>_coordinate</key>
|
<key>_coordinate</key>
|
||||||
<value>(920, 284)</value>
|
<value>(896, 284)</value>
|
||||||
</param>
|
</param>
|
||||||
<param>
|
<param>
|
||||||
<key>_rotation</key>
|
<key>_rotation</key>
|
||||||
|
@ -674,7 +674,7 @@
|
||||||
</param>
|
</param>
|
||||||
<param>
|
<param>
|
||||||
<key>id</key>
|
<key>id</key>
|
||||||
<value>gsm_bcch_ccch_sdcch4_demapper_0</value>
|
<value>gsm_bcch_ccch_demapper_0</value>
|
||||||
</param>
|
</param>
|
||||||
<param>
|
<param>
|
||||||
<key>maxoutbuf</key>
|
<key>maxoutbuf</key>
|
||||||
|
@ -3024,7 +3024,7 @@
|
||||||
<sink_key>msgs</sink_key>
|
<sink_key>msgs</sink_key>
|
||||||
</connection>
|
</connection>
|
||||||
<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>
|
<sink_block_id>gsm_control_channels_decoder_0</sink_block_id>
|
||||||
<source_key>bursts</source_key>
|
<source_key>bursts</source_key>
|
||||||
<sink_key>bursts</sink_key>
|
<sink_key>bursts</sink_key>
|
||||||
|
@ -3061,7 +3061,7 @@
|
||||||
</connection>
|
</connection>
|
||||||
<connection>
|
<connection>
|
||||||
<source_block_id>gsm_receiver_0</source_block_id>
|
<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>
|
<source_key>C0</source_key>
|
||||||
<sink_key>bursts</sink_key>
|
<sink_key>bursts</sink_key>
|
||||||
</connection>
|
</connection>
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
# Boston, MA 02110-1301, USA.
|
# Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
include(GrPython)
|
include(GrPython)
|
||||||
include(CreateSymlink)
|
|
||||||
|
|
||||||
GR_PYTHON_INSTALL(
|
GR_PYTHON_INSTALL(
|
||||||
PROGRAMS
|
PROGRAMS
|
||||||
|
@ -27,13 +26,8 @@ GR_PYTHON_INSTALL(
|
||||||
DESTINATION bin
|
DESTINATION bin
|
||||||
)
|
)
|
||||||
|
|
||||||
CREATE_SYMLINK(grgsm_capture airprobe_rtlsdr_capture.py)
|
|
||||||
|
|
||||||
add_custom_target(helpers_symlinks ALL DEPENDS ${symlinks})
|
|
||||||
|
|
||||||
install(
|
install(
|
||||||
PROGRAMS
|
PROGRAMS
|
||||||
${symlinks}
|
|
||||||
DESTINATION bin
|
DESTINATION bin
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue