Change in gr-gsm[master]: Fix compilation error: '_1' was not declared in this scope
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24105 ) Change subject: Fix compilation error: '_1' was not declared in this scope .. Fix compilation error: '_1' was not declared in this scope Change-Id: I0f1f2df817a65f7d5b72c5280451346a0a011d47 --- M include/grgsm/misc_utils/udp_socket.h M lib/decoding/control_channels_decoder_impl.cc M lib/decoding/tch_f_decoder_impl.cc M lib/decoding/tch_h_decoder_impl.cc M lib/decryption/decryption_impl.cc M lib/demapping/tch_f_chans_demapper_impl.cc M lib/demapping/tch_h_chans_demapper_impl.cc M lib/demapping/universal_ctrl_chans_demapper_impl.cc M lib/flow_control/burst_fnr_filter_impl.cc M lib/flow_control/burst_sdcch_subslot_filter_impl.cc M lib/flow_control/burst_sdcch_subslot_splitter_impl.cc M lib/flow_control/burst_timeslot_filter_impl.cc M lib/flow_control/burst_timeslot_splitter_impl.cc M lib/flow_control/burst_type_filter_impl.cc M lib/flow_control/dummy_burst_filter_impl.cc M lib/flow_control/uplink_downlink_splitter_impl.cc M lib/misc_utils/burst_file_sink_impl.cc M lib/misc_utils/burst_to_fn_time_impl.cc M lib/misc_utils/bursts_printer_impl.cc M lib/misc_utils/collect_system_info_impl.cc M lib/misc_utils/extract_assignment_cmd_impl.cc M lib/misc_utils/extract_cmc_impl.cc M lib/misc_utils/extract_immediate_assignment_impl.cc M lib/misc_utils/extract_system_info_impl.cc M lib/misc_utils/message_file_sink_impl.cc M lib/misc_utils/message_printer_impl.cc M lib/misc_utils/msg_to_tag_impl.cc M lib/misc_utils/tmsi_dumper_impl.cc M lib/qa_utils/burst_sink_impl.cc M lib/qa_utils/message_sink_impl.cc M lib/receiver/clock_offset_control_impl.cc M lib/receiver/cx_channel_hopper_impl.cc M lib/transmitter/gen_test_ab_impl.cc M lib/transmitter/preprocess_tx_burst_impl.cc M lib/transmitter/txtime_setter_impl.cc M lib/trx/trx_burst_if_impl.cc 36 files changed, 38 insertions(+), 39 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/include/grgsm/misc_utils/udp_socket.h b/include/grgsm/misc_utils/udp_socket.h index d1ceb9f..d048f00 100644 --- a/include/grgsm/misc_utils/udp_socket.h +++ b/include/grgsm/misc_utils/udp_socket.h @@ -28,7 +28,6 @@ #include #include #include -#include #include namespace gr { diff --git a/lib/decoding/control_channels_decoder_impl.cc b/lib/decoding/control_channels_decoder_impl.cc index 81ce161..b49582f 100644 --- a/lib/decoding/control_channels_decoder_impl.cc +++ b/lib/decoding/control_channels_decoder_impl.cc @@ -70,7 +70,7 @@ { //setup input/output ports message_port_register_in(pmt::mp("bursts")); - set_msg_handler(pmt::mp("bursts"), boost::bind(_channels_decoder_impl::decode, this, _1)); + set_msg_handler(pmt::mp("bursts"), boost::bind(_channels_decoder_impl::decode, this, boost::placeholders::_1)); message_port_register_out(pmt::mp("msgs")); } diff --git a/lib/decoding/tch_f_decoder_impl.cc b/lib/decoding/tch_f_decoder_impl.cc index 02dc45a..03e8fc8 100644 --- a/lib/decoding/tch_f_decoder_impl.cc +++ b/lib/decoding/tch_f_decoder_impl.cc @@ -92,7 +92,7 @@ { //setup input/output ports message_port_register_in(pmt::mp("bursts")); -set_msg_handler(pmt::mp("bursts"), boost::bind(_f_decoder_impl::decode, this, _1)); +set_msg_handler(pmt::mp("bursts"), boost::bind(_f_decoder_impl::decode, this, boost::placeholders::_1)); message_port_register_out(pmt::mp("msgs")); message_port_register_out(pmt::mp("voice")); diff --git a/lib/decoding/tch_h_decoder_impl.cc b/lib/decoding/tch_h_decoder_impl.cc index b6827f7..f1ba5ba 100644 --- a/lib/decoding/tch_h_decoder_impl.cc +++ b/lib/decoding/tch_h_decoder_impl.cc @@ -81,7 +81,7 @@ { //setup input/output ports message_port_register_in(pmt::mp("bursts")); -set_msg_handler(pmt::mp("bursts"), boost::bind(_h_decoder_impl::decode, this, _1)); +set_msg_handler(pmt::mp("bursts"), boost::bind(_h_decoder_impl::decode, this, boost::placeholders::_1)); message_port_register_out(pmt::mp("msgs")); message_port_register_out(pmt::mp("voice")); diff --git a/lib/decryption/decryption_impl.cc b/lib/decryption/decryption_impl.cc index 551afa4..d189596 100644 --- a/lib/decryption/decryption_impl.cc +++ b/lib/decryption/decryption_impl.cc @@ -61,7 +61,7 @@ validate_k_c(); message_port_register_in(pmt::mp("bursts")); -set_msg_handler(pmt::mp("bursts"), boost::bind(_impl::decrypt, this, _1)); +set_msg_handler(pmt::mp("bursts"), boost::bind(_impl::decrypt, this, boost::placeholders::_1)); message_port_register_out(pmt::mp("bursts")); } diff --git a/lib/dem
Change in gr-gsm[master]: Fix compilation error: '_1' was not declared in this scope
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24105 ) Change subject: Fix compilation error: '_1' was not declared in this scope .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I0f1f2df817a65f7d5b72c5280451346a0a011d47 Gerrit-Change-Number: 24105 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Wed, 05 May 2021 03:09:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: tests: Add test for Ubuntu 20.04
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24101 ) Change subject: tests: Add test for Ubuntu 20.04 .. tests: Add test for Ubuntu 20.04 Change-Id: I38bbde4fad7bdc72ad99a1957678539ea813013e --- M .travis.yml A tests/dockerfiles/Ubuntu_20_04.docker 2 files changed, 34 insertions(+), 1 deletion(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/.travis.yml b/.travis.yml index 5dcec4d..8ef60ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ language: ruby env: + - DOCKERFILE=tests/dockerfiles/Ubuntu_20_04.docker IMGNAME=ubuntu_20_04 - DOCKERFILE=tests/dockerfiles/Debian_testing.docker IMGNAME=debian_testing services: @@ -13,6 +14,6 @@ - cat $DOCKERFILE > Dockerfile ; docker build -t $IMGNAME . script: -# - docker run -it --rm $IMGNAME sh -c 'cd /src/build;make test' + - docker run -it --rm $IMGNAME sh -c 'cd /src/build;make test' - docker run -it --rm $IMGNAME /src/tests/scripts/decode.sh - docker run -it --rm $IMGNAME /src/tests/scripts/decrypt.sh diff --git a/tests/dockerfiles/Ubuntu_20_04.docker b/tests/dockerfiles/Ubuntu_20_04.docker new file mode 100644 index 000..f972d9e --- /dev/null +++ b/tests/dockerfiles/Ubuntu_20_04.docker @@ -0,0 +1,32 @@ +FROM ubuntu:20.04 +MAINTAINER Piotr Krysik + +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ +cmake \ +autoconf \ +libtool \ +pkg-config \ +build-essential \ +libcppunit-dev \ +swig \ +doxygen \ +liblog4cpp5-dev \ +python3-docutils \ +python3-scipy \ +gnuradio-dev \ +liborc-dev \ +libosmocore-dev \ +gr-osmosdr + +COPY ./ /src/ +RUN mkdir /src/build +WORKDIR /src/build + +RUN cmake .. && \ +# The parallel build sometimes fails when the .grc_gnuradio +# and .gnuradio directories do not exist +mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \ +make -j $(nproc) && \ +make install && \ +ldconfig && \ +make CTEST_OUTPUT_ON_FAILURE=1 test -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I38bbde4fad7bdc72ad99a1957678539ea813013e Gerrit-Change-Number: 24101 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-MessageType: merged
Change in gr-gsm[master]: tests: Remove test that don't work
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24100 ) Change subject: tests: Remove test that don't work .. tests: Remove test that don't work Change-Id: I9f37131c565e6d87ae94f583d36a2de3d9500b38 --- M .travis.yml D tests/dockerfiles/CentOS_7.Dockerfile D tests/dockerfiles/CentOS_7_pygtk2.patch M tests/dockerfiles/Debian_testing.docker D tests/dockerfiles/Debian_testing_package.docker D tests/dockerfiles/Fedora_26.Dockerfile D tests/dockerfiles/Kali.docker D tests/dockerfiles/Ubuntu_16_04.docker D tests/dockerfiles/Ubuntu_16_04_nolibosmo.docker D tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker 10 files changed, 5 insertions(+), 257 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/.travis.yml b/.travis.yml index 437e66e..5dcec4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,7 @@ language: ruby env: - - DOCKERFILE=tests/dockerfiles/Debian_testing.docker IMGNAME=debtest-grgsm -# - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04.docker IMGNAME=ubu16.04-grgsm -# - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04_nolibosmo.docker IMGNAME=ubu16.04-grgsm-nolibosmo - - DOCKERFILE=tests/dockerfiles/Kali.docker IMGNAME=kali-grgsm -# - DOCKERFILE=tests/dockerfiles/Fedora_26.Dockerfile IMGNAME=fedora26-grgsm - - DOCKERFILE=tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker IMGNAME=ubuntu_18_04_gnuradio_ppa - + - DOCKERFILE=tests/dockerfiles/Debian_testing.docker IMGNAME=debian_testing services: - docker diff --git a/tests/dockerfiles/CentOS_7.Dockerfile b/tests/dockerfiles/CentOS_7.Dockerfile deleted file mode 100644 index b5c235d..000 --- a/tests/dockerfiles/CentOS_7.Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM centos:7 - -RUN yum install -y \ -https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ -yum install -y \ -gcc-c++ \ -make \ -cmake3 \ -pkgconfig \ -boost-devel \ -gnuradio-devel \ -libosmocore-devel \ -gr-osmosdr \ -swig \ -doxygen \ -python2-docutils \ -cppunit-devel - -COPY ./ /src/ - -RUN yum install -y patch && \ -patch -p0 < /src/tests/dockerfiles/CentOS_7_pygtk2.patch - -WORKDIR /src/build -RUN cmake3 -DENABLE_GRGSM_LIVEMON=OFF .. && \ -# The parallel build sometimes fails when the .grc_gnuradio -# and .gnuradio directories do not exist -mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \ -make -j $(nproc) && \ -make install && \ -ldconfig && \ -make test diff --git a/tests/dockerfiles/CentOS_7_pygtk2.patch b/tests/dockerfiles/CentOS_7_pygtk2.patch deleted file mode 100644 index a5ed29c..000 --- a/tests/dockerfiles/CentOS_7_pygtk2.patch +++ /dev/null @@ -1,30 +0,0 @@ /usr/lib64/python2.7/site-packages/gtk-2.0/gtk/__init__.py 2018-04-23 17:29:19.555209060 + -+++ /usr/lib64/python2.7/site-packages/gtk-2.0/gtk/__init__.py 2018-04-23 17:32:53.448304174 + -@@ -47,14 +47,19 @@ - def _init(): - import sys - --sys_path = sys.path[:] -+try: -+sys_path = sys.path[:] - --_gtk.init_check() -- --# init_check calls PySys_SetArgv which calls sys.path.insert(0, ''), --# which causes problems for pychecker, restore it if modified. --if sys.path != sys_path: --sys.path[:] = sys_path -+try: -+_gtk.init_check() -+except RuntimeError, e: -+import warnings -+warnings.warn(str(e), _gtk.Warning) -+finally: -+# init_check calls PySys_SetArgv which calls sys.path.insert(0, ''), -+# which causes problems for pychecker, restore it if modified. -+if sys.path != sys_path: -+sys.path[:] = sys_path - - # install the default log handlers - _gtk.add_log_handlers() - diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker index c4c3057..8a9f84b 100644 --- a/tests/dockerfiles/Debian_testing.docker +++ b/tests/dockerfiles/Debian_testing.docker @@ -13,16 +13,16 @@ liblog4cpp5-dev \ python3-docutils \ python3-scipy \ -gnuradio-dev gnuradio libgmp-dev libboost-regex-dev liborc-dev \ +gnuradio-dev \ +liborc-dev \ libosmocore-dev \ gr-osmosdr COPY ./ /src/ - -RUN mkdir -p /src/build +RUN mkdir /src/build WORKDIR /src/build -RUN PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH cmake .. && \ +RUN cmake .. && \ # The parallel build sometimes fails when the .grc_gnuradio # and .gnuradio directories do not exist mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \ diff --git a/tests/dockerfiles/Debian_testing_package.docker b/tests/dockerfiles/Debian_testing_package.docker deleted file mode 100644 index 35d31cd..000 --- a/tests/dockerfiles/Debian_tes
Change in gr-gsm[master]: Remove local copy of associated osmo libraries
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24097 ) Change subject: Remove local copy of associated osmo libraries .. Remove local copy of associated osmo libraries Change-Id: I2b4afedd9f2d568b5287d791891b2c2893fc6843 --- M CMakeLists.txt M lib/CMakeLists.txt M lib/decoding/CMakeLists.txt D lib/decoding/osmocom/codec/CMakeLists.txt D lib/decoding/osmocom/codec/codec.h D lib/decoding/osmocom/codec/gsm610.c D lib/decoding/osmocom/codec/gsm610_bits.h D lib/decoding/osmocom/codec/gsm620.c D lib/decoding/osmocom/codec/gsm660.c D lib/decoding/osmocom/codec/gsm690.c D lib/decoding/osmocom/coding/CMakeLists.txt D lib/decoding/osmocom/coding/gsm0503_coding.c D lib/decoding/osmocom/coding/gsm0503_coding.h D lib/decoding/osmocom/coding/gsm0503_conv.c D lib/decoding/osmocom/coding/gsm0503_interleaving.c D lib/decoding/osmocom/coding/gsm0503_interleaving.h D lib/decoding/osmocom/coding/gsm0503_mapping.c D lib/decoding/osmocom/coding/gsm0503_mapping.h D lib/decoding/osmocom/coding/gsm0503_parity.c D lib/decoding/osmocom/coding/gsm0503_parity.h D lib/decoding/osmocom/coding/gsm0503_tables.c D lib/decoding/osmocom/coding/gsm0503_tables.h D lib/decoding/osmocom/core/CMakeLists.txt D lib/decoding/osmocom/core/bit16gen.h D lib/decoding/osmocom/core/bit32gen.h D lib/decoding/osmocom/core/bit64gen.h D lib/decoding/osmocom/core/bits.c D lib/decoding/osmocom/core/bits.h D lib/decoding/osmocom/core/bitvec.c D lib/decoding/osmocom/core/bitvec.h D lib/decoding/osmocom/core/conv.c D lib/decoding/osmocom/core/conv.h D lib/decoding/osmocom/core/conv_acc.c D lib/decoding/osmocom/core/conv_acc_generic.c D lib/decoding/osmocom/core/crc16gen.c D lib/decoding/osmocom/core/crc16gen.h D lib/decoding/osmocom/core/crc32gen.h D lib/decoding/osmocom/core/crc64gen.c D lib/decoding/osmocom/core/crc64gen.h D lib/decoding/osmocom/core/crc8gen.c D lib/decoding/osmocom/core/crc8gen.h D lib/decoding/osmocom/core/crcgen.h D lib/decoding/osmocom/core/defs.h D lib/decoding/osmocom/core/endian.h D lib/decoding/osmocom/core/linuxlist.h D lib/decoding/osmocom/core/panic.c D lib/decoding/osmocom/core/panic.h D lib/decoding/osmocom/core/utils.h D lib/decoding/osmocom/crypt/auth.h D lib/decoding/osmocom/gsm/CMakeLists.txt D lib/decoding/osmocom/gsm/a5.c D lib/decoding/osmocom/gsm/a5.h D lib/decoding/osmocom/gsm/auth_core.c D lib/decoding/osmocom/gsm/gsm0503.h D lib/decoding/osmocom/gsm/gsm48_ie.c D lib/decoding/osmocom/gsm/gsm48_ie.h D lib/decoding/osmocom/gsm/kasumi.c D lib/decoding/osmocom/gsm/kasumi.h D lib/decoding/osmocom/gsm/protocol/gsm_04_08.h 59 files changed, 2 insertions(+), 17,859 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I2b4afedd9f2d568b5287d791891b2c2893fc6843 Gerrit-Change-Number: 24097 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-MessageType: merged
Change in gr-gsm[master]: Execute python apps with use of python3
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24098 ) Change subject: Execute python apps with use of python3 .. Execute python apps with use of python3 Change-Id: Ib9ab805cc5a3878d168787736463dc495b96ddcf --- M apps/helpers/grgsm_capture M apps/helpers/grgsm_channelize 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/apps/helpers/grgsm_capture b/apps/helpers/grgsm_capture index f3886ba..43dce33 100755 --- a/apps/helpers/grgsm_capture +++ b/apps/helpers/grgsm_capture @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @file # @author (C) 2015 by Roman Khassraf diff --git a/apps/helpers/grgsm_channelize b/apps/helpers/grgsm_channelize index 5eaeb3b..92b252e 100755 --- a/apps/helpers/grgsm_channelize +++ b/apps/helpers/grgsm_channelize @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @file # @author (C) 2015 by Pieter Robyns -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ib9ab805cc5a3878d168787736463dc495b96ddcf Gerrit-Change-Number: 24098 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-MessageType: merged
Change in gr-gsm[master]: Port compile_demappers helper script to gr3.8
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24099 ) Change subject: Port compile_demappers helper script to gr3.8 .. Port compile_demappers helper script to gr3.8 Change-Id: Iadcc19288496558fc65a46b72d36dcf047489ac3 --- M hier_blocks/compile_demappers 1 file changed, 9 insertions(+), 7 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/hier_blocks/compile_demappers b/hier_blocks/compile_demappers index 96d652b..d492620 100755 --- a/hier_blocks/compile_demappers +++ b/hier_blocks/compile_demappers @@ -8,23 +8,25 @@ for p in *.grc do echo $p -grcc $p -d `pwd` +grcc $p -o `pwd` done cd .. mv ~/.grc_gnuradio/gsm_* . -for file in *.py.xml +for file in *.py.block.yml do -cat $file | sed 's/.*\.*/ import grgsm<\/import>/' \ - | sed 's//grgsm./' \ +echo $file +cat $file | sed "s/imports: .*\(#.*\)/imports: \\'import grgsm\\' \1/" \ + | sed 's/make: "/make: "grgsm./' \ | sed "s/.*.py//" \ - | sed 's/.*hier_blocks/gr-gsm\/hier_blocks/' \ + | sed 's/grc_source:.*hier_blocks/grc_source: gr-gsm\/hier_blocks/' \ > ${file}2 + mv ${file}2 $file -mv "$file" "`basename $file .py.xml`.xml" +mv "$file" "`basename $file .py.block.yml`.block.yml" done for py in *.py @@ -34,4 +36,4 @@ done mv *.py ../python/demapping -mv *.xml ../grc/demapping \ No newline at end of file +mv *.yml ../grc/demapping -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Iadcc19288496558fc65a46b72d36dcf047489ac3 Gerrit-Change-Number: 24099 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-MessageType: merged
Change in gr-gsm[master]: cmake: make formatting of install statements follow one pattern
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24096 ) Change subject: cmake: make formatting of install statements follow one pattern .. cmake: make formatting of install statements follow one pattern Change-Id: Ib7d571af629b0af78397a411b0cca409a6d218d8 --- M CMakeLists.txt M apps/apps_data/CMakeLists.txt M docs/CMakeLists.txt M docs/doxygen/CMakeLists.txt M grc/CMakeLists.txt M grc/decoding/CMakeLists.txt M grc/decryption/CMakeLists.txt M grc/demapping/CMakeLists.txt M grc/flow_control/CMakeLists.txt M grc/misc_utils/CMakeLists.txt M grc/qa_utils/CMakeLists.txt M grc/receiver/CMakeLists.txt M grc/transmitter/CMakeLists.txt M grc/trx/CMakeLists.txt M include/grgsm/CMakeLists.txt M include/grgsm/decoding/CMakeLists.txt M include/grgsm/decryption/CMakeLists.txt M include/grgsm/demapping/CMakeLists.txt M include/grgsm/flow_control/CMakeLists.txt M include/grgsm/misc_utils/CMakeLists.txt M include/grgsm/qa_utils/CMakeLists.txt M include/grgsm/receiver/CMakeLists.txt M include/grgsm/transmitter/CMakeLists.txt M include/grgsm/trx/CMakeLists.txt M python/demapping/CMakeLists.txt M python/receiver/CMakeLists.txt M python/transmitter/CMakeLists.txt 27 files changed, 79 insertions(+), 38 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/CMakeLists.txt b/CMakeLists.txt index e8d7ef0..2231bc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -175,6 +175,8 @@ # Install cmake search helper for this library -install(FILES cmake/Modules/gr-gsmConfig.cmake +install( +FILES +cmake/Modules/gr-gsmConfig.cmake DESTINATION ${CMAKE_MODULES_DIR}/grgsm ) diff --git a/apps/apps_data/CMakeLists.txt b/apps/apps_data/CMakeLists.txt index db8a843..24ed3f0 100644 --- a/apps/apps_data/CMakeLists.txt +++ b/apps/apps_data/CMakeLists.txt @@ -35,7 +35,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/grgsm_setup_freedesktop @ONLY) install( -PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/grgsm_setup_freedesktop -DESTINATION ${GR_PKG_LIBEXEC_DIR} COMPONENT "gr-gsm" +PROGRAMS +${CMAKE_CURRENT_BINARY_DIR}/grgsm_setup_freedesktop +DESTINATION ${GR_PKG_LIBEXEC_DIR} +COMPONENT "gr-gsm" ) endif(UNIX AND HAVE_XDG_UTILS) diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index ed0fe3d..d2f9b1c 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -54,7 +54,11 @@ message(WARNING "rst2man from python-docutils is required to build man pages") else() build_man_page(MAN1_OUTPUT grgsm_livemon.rst grgsm_livemon.1) -install(FILES ${MAN1_OUTPUT} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) +install( +FILES +${MAN1_OUTPUT} +DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 +) endif() diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt index 6ade92c..ce64cec 100644 --- a/docs/doxygen/CMakeLists.txt +++ b/docs/doxygen/CMakeLists.txt @@ -50,4 +50,8 @@ add_custom_target(doxygen_target ALL DEPENDS ${BUILT_DIRS}) -install(DIRECTORY ${BUILT_DIRS} DESTINATION ${GR_PKG_DOC_DIR}) +install( +DIRECTORY +${BUILT_DIRS} +DESTINATION ${GR_PKG_DOC_DIR} +) diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index deee6e0..173b642 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -25,6 +25,8 @@ add_subdirectory(misc_utils) add_subdirectory(transmitter) add_subdirectory(trx) -install(FILES -gsm.tree.yml DESTINATION share/gnuradio/grc/blocks +install( +FILES +gsm.tree.yml +DESTINATION share/gnuradio/grc/blocks ) diff --git a/grc/decoding/CMakeLists.txt b/grc/decoding/CMakeLists.txt index 63a2ee6..71953f0 100644 --- a/grc/decoding/CMakeLists.txt +++ b/grc/decoding/CMakeLists.txt @@ -17,7 +17,8 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -install(FILES +install( +FILES gsm_control_channels_decoder.block.yml gsm_tch_f_decoder.block.yml gsm_tch_h_decoder.block.yml diff --git a/grc/decryption/CMakeLists.txt b/grc/decryption/CMakeLists.txt index e71e466..455ee0b 100644 --- a/grc/decryption/CMakeLists.txt +++ b/grc/decryption/CMakeLists.txt @@ -17,7 +17,8 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -install(FILES +install( +FILES gsm_decryption.block.yml DESTINATION share/gnuradio/grc/blocks ) diff --git a/grc/demapping/CMakeLists.txt b/grc/demapping/CMakeLists.txt index 2572235..2bc5750 100644 --- a/grc/demapping/CMakeLists.txt +++ b/grc/demapping/CMakeLists.txt @@ -17,7 +17,8 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -install(FILES +install( +FILES gsm_universal_ctrl_chans_demapper.block.yml gsm_bcch_ccch_demapper.block.yml gsm_bcch_ccch_
Change in gr-gsm[master]: cmake: change 'gsm' to 'grgsm'
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24095 ) Change subject: cmake: change 'gsm' to 'grgsm' .. cmake: change 'gsm' to 'grgsm' Change-Id: I130a7912e179b1f04e68eb131e06800becca5a00 --- M CMakeLists.txt M lib/CMakeLists.txt 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/CMakeLists.txt b/CMakeLists.txt index f73bfbe..e8d7ef0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,5 +176,5 @@ install(FILES cmake/Modules/gr-gsmConfig.cmake -DESTINATION ${CMAKE_MODULES_DIR}/gsm +DESTINATION ${CMAKE_MODULES_DIR}/grgsm ) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index bc1baeb..88aa635 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -136,18 +136,18 @@ # If your unit tests require special include paths, add them here #include_directories() # List all files that contain Boost.UTF unit tests here -list(APPEND test_gsm_sources +list(APPEND test_grgsm_sources ) # Anything we need to link to for the unit tests go here list(APPEND GR_TEST_TARGET_DEPS grgsm) -if(NOT test_gsm_sources) +if(NOT test_grgsm_sources) MESSAGE(STATUS "No C++ unit tests... skipping") return() -endif(NOT test_gsm_sources) +endif(NOT test_grgsm_sources) -foreach(qa_file ${test_gsm_sources}) -GR_ADD_CPP_TEST("gsm_${qa_file}" +foreach(qa_file ${test_grgsm_sources}) +GR_ADD_CPP_TEST("grgsm_${qa_file}" ${CMAKE_CURRENT_SOURCE_DIR}/${qa_file} ) endforeach(qa_file) -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I130a7912e179b1f04e68eb131e06800becca5a00 Gerrit-Change-Number: 24095 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-MessageType: merged
Change in gr-gsm[master]: trx: Removing old and unused grc based radio_if
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24094 ) Change subject: trx: Removing old and unused grc based radio_if .. trx: Removing old and unused grc based radio_if Change-Id: I7d43e6f2962b21ff03601cf1b1aafc222f2c4661 --- M python/trx/CMakeLists.txt D python/trx/radio_if_grc.py 2 files changed, 0 insertions(+), 269 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/python/trx/CMakeLists.txt b/python/trx/CMakeLists.txt index 697687b..1069db8 100644 --- a/python/trx/CMakeLists.txt +++ b/python/trx/CMakeLists.txt @@ -26,7 +26,6 @@ radio_if.py radio_if_uhd.py radio_if_lms.py -radio_if_grc.py transceiver.py dict_toggle_sign.py DESTINATION ${GR_PYTHON_DIR}/grgsm/trx diff --git a/python/trx/radio_if_grc.py b/python/trx/radio_if_grc.py deleted file mode 100755 index fb9b100..000 --- a/python/trx/radio_if_grc.py +++ /dev/null @@ -1,268 +0,0 @@ -#!/usr/bin/env python2 -# -*- coding: utf-8 -*- -## -# GNU Radio Python Flow Graph -# Title: Trx radio interface -# Author: (C) Piotr Krysik 2017 -# Description: Alpha version of trx radio interface -# Generated: Fri Dec 1 10:49:25 2017 -## - -from dict_toggle_sign import dict_toggle_sign -from gnuradio import blocks -from gnuradio import digital -from gnuradio import eng_notation -from gnuradio import filter -from gnuradio import gr -from gnuradio import uhd -from gnuradio.eng_option import eng_option -from gnuradio.filter import firdes -from grgsm import gsm_gmsk_mod -from optparse import OptionParser -import grgsm -import math -import time - - -class RadioInterfaceGRC(gr.top_block): - -def __init__(self, delay_correction=285.616e-6, osr=4, ppm=-0.799427, rx_freq=935e6+36*0.2e6, rx_gain=40, samp_rate=13e6/12.0, timing_advance=0, trx_base_port="5710", trx_remote_addr="127.0.0.1", tx_freq=935e6+36*0.2e6-45e6, tx_gain=40, uplink_shift=-(6.0/1625000*(156.25)*3)): -gr.top_block.__init__(self, "Trx radio interface") - -## -# Parameters -## -self.delay_correction = delay_correction -self.osr = osr -self.ppm = ppm -self.rx_freq = rx_freq -self.rx_gain = rx_gain -self.samp_rate = samp_rate -self.timing_advance = timing_advance -self.trx_base_port = trx_base_port -self.trx_remote_addr = trx_remote_addr -self.tx_freq = tx_freq -self.tx_gain = tx_gain -self.uplink_shift = uplink_shift - -## -# Blocks -## -self.uhd_usrp_source_0 = uhd.usrp_source( - ",".join(("", "")), - uhd.stream_args( - cpu_format="fc32", - channels=range(1), - ), -) -self.uhd_usrp_source_0.set_clock_rate(26e6, uhd.ALL_MBOARDS) -self.uhd_usrp_source_0.set_samp_rate(samp_rate) -self.uhd_usrp_source_0.set_center_freq(rx_freq, 0) -self.uhd_usrp_source_0.set_gain(rx_gain, 0) -self.uhd_usrp_source_0.set_antenna("RX2", 0) -self.uhd_usrp_sink_0 = uhd.usrp_sink( - ",".join(("", "")), - uhd.stream_args( - cpu_format="fc32", - channels=range(1), - ), - "packet_len", -) -self.uhd_usrp_sink_0.set_clock_rate(26e6, uhd.ALL_MBOARDS) -self.uhd_usrp_sink_0.set_subdev_spec("A:B", 0) -self.uhd_usrp_sink_0.set_samp_rate(samp_rate) -self.uhd_usrp_sink_0.set_center_freq(tx_freq, 0) -self.uhd_usrp_sink_0.set_gain(tx_gain, 0) -self.uhd_usrp_sink_0.set_antenna("TX/RX", 0) -self.ts_filter = grgsm.burst_timeslot_filter(0) -self.low_pass_filter_0_0 = filter.fir_filter_ccf(1, firdes.low_pass( - 1, samp_rate, 125e3, 5e3, firdes.WIN_HAMMING, 6.76)) -self.gsm_txtime_setter_0 = grgsm.txtime_setter(None if (None is not None) else 0x, 0, 0, 0, 0, timing_advance, delay_correction+uplink_shift) -self.gsm_trx_burst_if_0 = grgsm.trx_burst_if(trx_remote_addr, trx_base_port) -self.gsm_receiver_0 = grgsm.receiver(4, ([0]), ([4]), False) -self.gsm_preprocess_tx_burst_0 = grgsm.preprocess_tx_burst() -self.gsm_msg_to_tag_0_0 = grgsm.msg_to_tag() -self.gsm_msg_to_tag_0 = grgsm.msg_to_tag() -self.gsm_gmsk_mod_0 = gsm_gmsk_mod( -BT=0.3, -pulse_duration
Change in gr-gsm[master]: Fix compiling with the local libosmocore copy
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24093 ) Change subject: Fix compiling with the local libosmocore copy .. Fix compiling with the local libosmocore copy Change-Id: Ic72e6ca7f9cc40bc2d78b931e54e66cd71444835 --- M lib/CMakeLists.txt 1 file changed, 16 insertions(+), 6 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index e7dae14..bc1baeb 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -77,22 +77,32 @@ add_subdirectory(trx) if(NOT LOCAL_OSMOCOM) -list (APPEND grgsm_link_libraries ${LIBOSMOCORE_LIBRARIES} ${LIBOSMOCODEC_LIBRARIES} ${LIBOSMOGSM_LIBRARY}) +list (APPEND grgsm_link_libraries ${LIBOSMOCORE_LIBRARY} ${LIBOSMOCODEC_LIBRARY} ${LIBOSMOGSM_LIBRARY}) if(LIBOSMOCODING_FOUND) list (APPEND grgsm_link_libraries - ${LIBOSMOCODING_LIBRARIES} - ) + ${LIBOSMOCODING_LIBRARY} +) list (APPEND grgsm_include_directories - ${LIBOSMOCORE_INCLUDE_DIR} + PUBLIC $ +) +else() +list (APPEND grgsm_include_directories +PUBLIC $ ) endif() -endif() +else(NOT LOCAL_OSMOCOM) +list (APPEND grgsm_include_directories +PUBLIC $ +) +endif(NOT LOCAL_OSMOCOM) + add_library(grgsm SHARED ${grgsm_sources}) -target_link_libraries(grgsm gnuradio::gnuradio-runtime gnuradio::gnuradio-filter volk osmocoding) +target_link_libraries(grgsm gnuradio::gnuradio-runtime gnuradio::gnuradio-filter volk ${grgsm_link_libraries}) target_include_directories(grgsm PUBLIC $ PUBLIC $ +${grgsm_include_directories} PUBLIC $ PUBLIC $ ) -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ic72e6ca7f9cc40bc2d78b931e54e66cd71444835 Gerrit-Change-Number: 24093 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: Log import errors as currently GRC 3.8 suppress them
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24092 ) Change subject: Log import errors as currently GRC 3.8 suppress them .. Log import errors as currently GRC 3.8 suppress them See gnuradio/grc/core/FlowGraph.py:194 Change-Id: Ie6213428c218720692a544c98dc32c16bd50cbe1 --- M python/__init__.py 1 file changed, 20 insertions(+), 16 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/python/__init__.py b/python/__init__.py index 87a62d6..b68df4a 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -43,21 +43,25 @@ os.path.join(dirname, "transmitter"), os.path.join(dirname, "trx")] -# import swig generated symbols into the gsm namespace -from .grgsm_swig import * +try: +# import swig generated symbols into the gsm namespace +from .grgsm_swig import * -# import any pure python here +# import any pure python here -#from fcch_burst_tagger import fcch_burst_tagger -#from sch_detector import sch_detector -#from fcch_detector import fcch_detector -from .clock_offset_corrector_tagged import clock_offset_corrector_tagged -from .gsm_input import gsm_input -from .gsm_bcch_ccch_demapper import gsm_bcch_ccch_demapper -from .gsm_bcch_ccch_sdcch4_demapper import gsm_bcch_ccch_sdcch4_demapper -from .gsm_sdcch8_demapper import gsm_sdcch8_demapper -from .gsm_gmsk_mod import gsm_gmsk_mod -from .fn_time import * -from .txtime_bursts_tagger import * -from .arfcn import * -from .device import * +#from fcch_burst_tagger import fcch_burst_tagger +#from sch_detector import sch_detector +#from fcch_detector import fcch_detector +from .clock_offset_corrector_tagged import clock_offset_corrector_tagged +from .gsm_input import gsm_input +from .gsm_bcch_ccch_demapper import gsm_bcch_ccch_demapper +from .gsm_bcch_ccch_sdcch4_demapper import gsm_bcch_ccch_sdcch4_demapper +from .gsm_sdcch8_demapper import gsm_sdcch8_demapper +from .gsm_gmsk_mod import gsm_gmsk_mod +from .fn_time import * +from .txtime_bursts_tagger import * +from .arfcn import * +from .device import * +except ImportError as e: +import traceback; traceback.print_exc() +raise -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ie6213428c218720692a544c98dc32c16bd50cbe1 Gerrit-Change-Number: 24092 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: travis: Test in Ubuntu 18.04 container
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24091 ) Change subject: travis: Test in Ubuntu 18.04 container .. travis: Test in Ubuntu 18.04 container - Install gnuradio from the new official PPA repository https://launchpad.net/~gnuradio/+archive/ubuntu/gnuradio-releases Change-Id: Iaa8813ab0ae91b667285ab3ef42ffaa279e3a885 --- M .dockerignore M .travis.yml A tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker 3 files changed, 53 insertions(+), 0 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/.dockerignore b/.dockerignore index 1b2211d..ef67c26 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,2 @@ build* +.git diff --git a/.travis.yml b/.travis.yml index 182e006..437e66e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ # - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04_nolibosmo.docker IMGNAME=ubu16.04-grgsm-nolibosmo - DOCKERFILE=tests/dockerfiles/Kali.docker IMGNAME=kali-grgsm # - DOCKERFILE=tests/dockerfiles/Fedora_26.Dockerfile IMGNAME=fedora26-grgsm + - DOCKERFILE=tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker IMGNAME=ubuntu_18_04_gnuradio_ppa services: diff --git a/tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker b/tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker new file mode 100644 index 000..e0f45a5 --- /dev/null +++ b/tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker @@ -0,0 +1,51 @@ +FROM ubuntu:18.04 +MAINTAINER Vasil Velichkov + +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ +software-properties-common && \ +add-apt-repository --yes ppa:gnuradio/gnuradio-releases && \ +DEBIAN_FRONTEND=noninteractive apt-get install -y \ +git \ +cmake \ +autoconf \ +libtool \ +pkg-config \ +build-essential \ +python-docutils \ +libcppunit-dev \ +swig \ +doxygen \ +liblog4cpp5-dev \ +python-scipy \ +gnuradio-dev gnuradio libgmp-dev libboost-regex-dev liborc-dev libuhd-dev \ +libosmocore-dev + +RUN git clone --branch maint-3.8 --recurse-submodules https://github.com/velichkov/gr-iqbal && \ +cd gr-iqbal && \ +mkdir build && \ +cd build && \ +cmake -DENABLE_DOXYGEN=OFF .. && \ +make -j $(nproc) install + +RUN git clone --branch maint-3.8 https://github.com/velichkov/gr-osmosdr && \ +cd gr-osmosdr && \ +mkdir build && \ +cd build && \ +cmake -DENABLE_DOXYGEN=OFF .. && \ +make -j $(nproc) install + +COPY ./ /src/ +RUN mkdir /src/build +WORKDIR /src/build + +#PYTHONPATH is needed as gr-osmosdr gets installed in /usr/local/lib/python3/... +ENV PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH + +RUN cmake .. && \ +# The parallel build sometimes fails when the .grc_gnuradio +# and .gnuradio directories do not exist +mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \ +make -j $(nproc) && \ +make install && \ +ldconfig && \ +make CTEST_OUTPUT_ON_FAILURE=1 test -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Iaa8813ab0ae91b667285ab3ef42ffaa279e3a885 Gerrit-Change-Number: 24091 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: tests: export VOLK_GENERIC=1 to workaround VOLK's bug 278
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24089 ) Change subject: tests: export VOLK_GENERIC=1 to workaround VOLK's bug 278 .. tests: export VOLK_GENERIC=1 to workaround VOLK's bug 278 Change-Id: Ib9ad4384388e480b8fa2f91e02359c85c749e802 --- M tests/scripts/decode.sh M tests/scripts/decrypt.sh 2 files changed, 11 insertions(+), 0 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/tests/scripts/decode.sh b/tests/scripts/decode.sh index 1ec7bf8..402e818 100755 --- a/tests/scripts/decode.sh +++ b/tests/scripts/decode.sh @@ -25,7 +25,13 @@ cd "$TEST_DIR" || exit 1 head -c 600 $CAPFILE > $SHORTENED_CAPFILE +# VOLK_GENERIC=1 is a temporary workaround for the following VOLK's bug +# https://github.com/gnuradio/volk/pull/278 +# https://github.com/gnuradio/gnuradio/issues/2748 +export VOLK_GENERIC=1 + $RUNLINE | grep -A 99 "860933 1329237: 59 06 1a 8f 6d 18 10 80 00 00 00 00 00 00 00 00 00 00 00 78 b9 00 00" | tee $RESULT_OBTAINED + diff $RESULT_EXPECTED $RESULT_OBTAINED TEST_RESULT=$? diff --git a/tests/scripts/decrypt.sh b/tests/scripts/decrypt.sh index 5c33537..335528a 100755 --- a/tests/scripts/decrypt.sh +++ b/tests/scripts/decrypt.sh @@ -25,6 +25,11 @@ cd "$TEST_DIR" || exit 1 head -c -3700 $CAPFILE | head -c 3580 > $SHORTENED_CAPFILE +# VOLK_GENERIC=1 is a temporary workaround for the following VOLK's bug +# https://github.com/gnuradio/volk/pull/278 +# https://github.com/gnuradio/gnuradio/issues/2748 +export VOLK_GENERIC=1 + $RUNLINE | grep -A 99 "862210 1331352: 03 03 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b" | tee $RESULT_OBTAINED diff -u $RESULT_EXPECTED $RESULT_OBTAINED TEST_RESULT=$? -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ib9ad4384388e480b8fa2f91e02359c85c749e802 Gerrit-Change-Number: 24089 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: Print the error message on stderr in a python2 compatible way
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24090 ) Change subject: Print the error message on stderr in a python2 compatible way .. Print the error message on stderr in a python2 compatible way Change-Id: Iaea1510b02a2df924ef9777d107d22c45cb37d12 --- M apps/grgsm_decode 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_decode b/apps/grgsm_decode index d754fc7..000440f 100755 --- a/apps/grgsm_decode +++ b/apps/grgsm_decode @@ -369,7 +369,7 @@ parser.error("Invalid A5 version\n") if options.cfile and (options.fc is None and options.arfcn is None): -print("You haven't provided a frequency or an ARFCN - working without automatic frequency offset correction.\n", file=sys.stderr) +sys.stderr.write("You haven't provided a frequency or an ARFCN - working without automatic frequency offset correction.\n") # handle frequency / arfcn input arfcn = None -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Iaea1510b02a2df924ef9777d107d22c45cb37d12 Gerrit-Change-Number: 24090 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: tests: Get more information about CPU and user limits
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24088 ) Change subject: tests: Get more information about CPU and user limits .. tests: Get more information about CPU and user limits Change-Id: I0bd3c206f422e11a59070a1c9aace38201ff7c85 --- M tests/scripts/decode.sh M tests/scripts/decrypt.sh 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/tests/scripts/decode.sh b/tests/scripts/decode.sh index 98aa165..1ec7bf8 100755 --- a/tests/scripts/decode.sh +++ b/tests/scripts/decode.sh @@ -19,6 +19,8 @@ echo "Testing with:" echo " $RUNLINE" gnuradio-config-info --version +cat /proc/cpuinfo +ulimit -a cd "$TEST_DIR" || exit 1 head -c 600 $CAPFILE > $SHORTENED_CAPFILE diff --git a/tests/scripts/decrypt.sh b/tests/scripts/decrypt.sh index 824955f..5c33537 100755 --- a/tests/scripts/decrypt.sh +++ b/tests/scripts/decrypt.sh @@ -19,6 +19,8 @@ echo "Testing with:" echo " $RUNLINE" gnuradio-config-info --version +cat /proc/cpuinfo +ulimit -a cd "$TEST_DIR" || exit 1 head -c -3700 $CAPFILE | head -c 3580 > $SHORTENED_CAPFILE -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I0bd3c206f422e11a59070a1c9aace38201ff7c85 Gerrit-Change-Number: 24088 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: tests: fix some shellcheck errors.
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24087 ) Change subject: tests: fix some shellcheck errors. .. tests: fix some shellcheck errors. Execute "gnuradio-config-info --version" instead of "gnuradio-companion --version" Change-Id: Ia399324ae7a39e120e338c86d449d7c4d54bd866 --- M tests/scripts/decode.sh M tests/scripts/decrypt.sh 2 files changed, 8 insertions(+), 10 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/tests/scripts/decode.sh b/tests/scripts/decode.sh index b982709..98aa165 100755 --- a/tests/scripts/decode.sh +++ b/tests/scripts/decode.sh @@ -1,6 +1,6 @@ #!/bin/bash -TEST_DIR=`dirname "$0"` +TEST_DIR=$(dirname "$0") # PYTHONPATH and LD_LIBRARY_PATH are needed on Fedora 26 # @@ -18,11 +18,10 @@ export RUNLINE="$AP_DECODE -c $SHORTENED_CAPFILE -s $((1/174)) -m BCCH -t 0 -v --ppm -10" echo "Testing with:" echo " $RUNLINE" -#gnuradio 3.8 does not have --version parameter -#gnuradio-companion --version +gnuradio-config-info --version -cd $TEST_DIR -cat $CAPFILE | head -c 600 > $SHORTENED_CAPFILE +cd "$TEST_DIR" || exit 1 +head -c 600 $CAPFILE > $SHORTENED_CAPFILE $RUNLINE | grep -A 99 "860933 1329237: 59 06 1a 8f 6d 18 10 80 00 00 00 00 00 00 00 00 00 00 00 78 b9 00 00" | tee $RESULT_OBTAINED diff $RESULT_EXPECTED $RESULT_OBTAINED diff --git a/tests/scripts/decrypt.sh b/tests/scripts/decrypt.sh index 7f9bc60..824955f 100755 --- a/tests/scripts/decrypt.sh +++ b/tests/scripts/decrypt.sh @@ -1,6 +1,6 @@ #!/bin/bash -TEST_DIR=`dirname "$0"` +TEST_DIR=$(dirname "$0") # PYTHONPATH and LD_LIBRARY_PATH are needed on Fedora 26 # @@ -18,11 +18,10 @@ export RUNLINE="$AP_DECODE -c $SHORTENED_CAPFILE -s $((1/174)) -m SDCCH8 -t 1 -k 0x1E,0xF0,0x0B,0xAB,0x3B,0xAC,0x70,0x02 -v --ppm -10" echo "Testing with:" echo " $RUNLINE" -#gnuradio 3.8 does not have --version parameter -#gnuradio-companion --version +gnuradio-config-info --version -cd $TEST_DIR -cat $CAPFILE | head -c -3700 | head -c 3580 > $SHORTENED_CAPFILE +cd "$TEST_DIR" || exit 1 +head -c -3700 $CAPFILE | head -c 3580 > $SHORTENED_CAPFILE $RUNLINE | grep -A 99 "862210 1331352: 03 03 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b" | tee $RESULT_OBTAINED diff -u $RESULT_EXPECTED $RESULT_OBTAINED -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ia399324ae7a39e120e338c86d449d7c4d54bd866 Gerrit-Change-Number: 24087 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: travis: Use bionic build environment
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24086 ) Change subject: travis: Use bionic build environment .. travis: Use bionic build environment https: //docs.travis-ci.com/user/reference/bionic/ Change-Id: I8f622506329ee97ff3555c2a43a2165303d9ae82 --- M .travis.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/.travis.yml b/.travis.yml index 5230b46..182e006 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ sudo: required +dist: bionic language: ruby -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I8f622506329ee97ff3555c2a43a2165303d9ae82 Gerrit-Change-Number: 24086 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: travis: Install gr-osmosdr from the apt repository
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24085 ) Change subject: travis: Install gr-osmosdr from the apt repository .. travis: Install gr-osmosdr from the apt repository Also install liborc-dev as gnuradio depends on it Change-Id: I0bbc33a39ef1e4edc1636c338e429639e0b15066 --- M tests/dockerfiles/Debian_testing.docker M tests/dockerfiles/Kali.docker 2 files changed, 9 insertions(+), 44 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker index c482c52..c4c3057 100644 --- a/tests/dockerfiles/Debian_testing.docker +++ b/tests/dockerfiles/Debian_testing.docker @@ -13,31 +13,13 @@ liblog4cpp5-dev \ python3-docutils \ python3-scipy \ -gnuradio-dev gnuradio libgmp-dev libboost-regex-dev \ -libosmocore-dev - -# packages needed for gr-iqbal and gr-osmosdr -RUN apt-get install -y git libuhd-dev liborc-0.4-dev +gnuradio-dev gnuradio libgmp-dev libboost-regex-dev liborc-dev \ +libosmocore-dev \ +gr-osmosdr COPY ./ /src/ -RUN git clone --branch maint-3.8 --recurse-submodules https://github.com/velichkov/gr-iqbal && \ -cd gr-iqbal && \ -mkdir build && \ -cd build && \ -cmake .. && \ -make -j $(nproc) install && \ -ldconfig - -RUN git clone --branch maint-3.8 https://github.com/velichkov/gr-osmosdr && \ -cd gr-osmosdr && \ -mkdir build && \ -cd build && \ -cmake .. && \ -make -j $(nproc) install && \ -ldconfig - -RUN mkdir /src/build +RUN mkdir -p /src/build WORKDIR /src/build RUN PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH cmake .. && \ diff --git a/tests/dockerfiles/Kali.docker b/tests/dockerfiles/Kali.docker index 8949bb5..a953ece 100644 --- a/tests/dockerfiles/Kali.docker +++ b/tests/dockerfiles/Kali.docker @@ -13,32 +13,15 @@ liblog4cpp5-dev \ python3-docutils \ python3-scipy \ -gnuradio-dev gnuradio libgmp-dev libboost-regex-dev \ -libosmocore-dev - -# packages needed for gr-iqbal and gr-osmosdr -RUN apt-get install -y git libuhd-dev liborc-0.4-dev +gnuradio-dev gnuradio libgmp-dev libboost-regex-dev liborc-dev \ +libosmocore-dev \ +gr-osmosdr COPY ./ /src/ -RUN git clone --branch maint-3.8 --recurse-submodules https://github.com/velichkov/gr-iqbal && \ -cd gr-iqbal && \ -mkdir build && \ -cd build && \ -cmake .. && \ -make -j $(nproc) install && \ -ldconfig - -RUN git clone --branch maint-3.8 https://github.com/velichkov/gr-osmosdr && \ -cd gr-osmosdr && \ -mkdir build && \ -cd build && \ -cmake .. && \ -make -j $(nproc) install && \ -ldconfig - -RUN mkdir /src/build +RUN mkdir -p /src/build WORKDIR /src/build + RUN PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH cmake .. && \ # The parallel build sometimes fails when the .grc_gnuradio # and .gnuradio directories do not exist -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I0bbc33a39ef1e4edc1636c338e429639e0b15066 Gerrit-Change-Number: 24085 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: tests: Close the temp file handle in qa_burst_file_source
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24083 ) Change subject: tests: Close the temp file handle in qa_burst_file_source .. tests: Close the temp file handle in qa_burst_file_source This fixes the following warning ./usr/lib64/python3.7/unittest/case.py:645: ResourceWarning: unclosed file <_io.BufferedWriter name='/tmp/tmpkkz_akd6'> testMethod() ResourceWarning: Enable tracemalloc to get the object allocation traceback Change-Id: I66c2be2e5bf6915e3df253b3a69f5516534e3750 --- M python/qa_burst_file_source.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/python/qa_burst_file_source.py b/python/qa_burst_file_source.py index c83c9c4..bfdcc73 100644 --- a/python/qa_burst_file_source.py +++ b/python/qa_burst_file_source.py @@ -51,6 +51,7 @@ 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01 ])) handle.flush(); +handle.close(); src = grgsm.burst_file_source(temp.name); dst = grgsm.burst_sink(); @@ -88,6 +89,7 @@ 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01 ])) handle.flush(); +handle.close(); src = grgsm.burst_file_source(temp.name); dst = grgsm.burst_sink(); -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I66c2be2e5bf6915e3df253b3a69f5516534e3750 Gerrit-Change-Number: 24083 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: Add .dockerignore file
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24084 ) Change subject: Add .dockerignore file .. Add .dockerignore file Change-Id: I8d4b527a2e5c7b69e5c7338cafba3fbdac381ae1 --- A .dockerignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000..1b2211d --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +build* -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I8d4b527a2e5c7b69e5c7338cafba3fbdac381ae1 Gerrit-Change-Number: 24084 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: Python 3 compatibility changes in fn_time.py
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24082 ) Change subject: Python 3 compatibility changes in fn_time.py .. Python 3 compatibility changes in fn_time.py - Use range instead of xrange as it has been removed - Use integer division operator (//) - Import uniform and fn_time_delta_cpp only when started as a script - Remove the unused imports Change-Id: I268e0aec8fb8e6d490bfb8b0e9e6d169a9f6c352 --- M python/misc_utils/fn_time.py 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/python/misc_utils/fn_time.py b/python/misc_utils/fn_time.py index 17c6295..93342bd 100644 --- a/python/misc_utils/fn_time.py +++ b/python/misc_utils/fn_time.py @@ -20,9 +20,6 @@ # Boston, MA 02110-1301, USA. # # -from math import floor, ceil -from random import uniform -from grgsm import fn_time_delta_cpp __hyper_frame = 26*51*2048 __symb_rate = 13.0e6/48.0 @@ -72,10 +69,13 @@ if __name__ == "__main__": +from random import uniform +from grgsm import fn_time_delta_cpp + fn1 = 1 ts_ref = 4 time1 = 10.5 -for fn2 in xrange(__hyper_frame/2+fn1-10,__hyper_frame/2*10+fn1+100,10): +for fn2 in range(__hyper_frame//2+fn1-10,__hyper_frame//2*10+fn1+100,10): ts_x = int(uniform(0,8)) time2 = time1 + (fn2-fn1)*__frame_period + (ts_x-ts_ref)*__ts_period error = uniform(-6200,6200) -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I268e0aec8fb8e6d490bfb8b0e9e6d169a9f6c352 Gerrit-Change-Number: 24082 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: Build the grgsm_livemon man page
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24081 ) Change subject: Build the grgsm_livemon man page .. Build the grgsm_livemon man page Change-Id: Ie128d68965b5cb2c919afa408b4c8aa7ca87ea8c --- M docs/CMakeLists.txt 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index f9b8b40..ed0fe3d 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -53,7 +53,7 @@ if(NOT RST2MAN_EXECUTABLE) message(WARNING "rst2man from python-docutils is required to build man pages") else() -#build_man_page(MAN1_OUTPUT grgsm_livemon.rst grgsm_livemon.1) +build_man_page(MAN1_OUTPUT grgsm_livemon.rst grgsm_livemon.1) install(FILES ${MAN1_OUTPUT} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) endif() -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ie128d68965b5cb2c919afa408b4c8aa7ca87ea8c Gerrit-Change-Number: 24081 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: tests: Do not specify filename when runing gr_unittest
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24080 ) Change subject: tests: Do not specify filename when runing gr_unittest .. tests: Do not specify filename when runing gr_unittest This fixes the following warning DEPRECATED: Using filename with gr_unittest does no longer have any effect. Change-Id: I7d6dbc32ff794ebf2bc116fa7437062e6780b85f --- M python/qa_arfcn.py M python/qa_burst_file_source.py M python/qa_burst_fnr_filter.py M python/qa_burst_printer.py M python/qa_burst_sdcch_subslot_filter.py M python/qa_burst_sdcch_subslot_splitter.py M python/qa_burst_timeslot_filter.py M python/qa_burst_timeslot_splitter.py M python/qa_controlled_fractional_resampler_cc.py M python/qa_decryption.py M python/qa_dummy_burst_filter.py M python/qa_message_printer.py M python/qa_message_source_sink.py M python/qa_msg_to_tag.py M python/qa_tch_f_chans_demapper.py M python/qa_tch_f_decoder.py M python/qa_tch_h_chans_demapper.py M python/qa_tch_h_decoder.py M python/qa_txtime_bursts_tagger.py M python/qa_txtime_setter.py M python/qa_uplink_downlink_splitter.py 21 files changed, 21 insertions(+), 22 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/python/qa_arfcn.py b/python/qa_arfcn.py index 53c8fff..0a3cc4e 100755 --- a/python/qa_arfcn.py +++ b/python/qa_arfcn.py @@ -267,4 +267,4 @@ if __name__ == '__main__': -gr_unittest.run(qa_arfcn, "qa_arfcn.xml") +gr_unittest.run(qa_arfcn) diff --git a/python/qa_burst_file_source.py b/python/qa_burst_file_source.py index cf8835e..c83c9c4 100644 --- a/python/qa_burst_file_source.py +++ b/python/qa_burst_file_source.py @@ -101,4 +101,4 @@ list(dst.get_burst_data())) if __name__ == '__main__': -gr_unittest.run(qa_burst_file_sink, "qa_burst_file_sink.xml") +gr_unittest.run(qa_burst_file_sink) diff --git a/python/qa_burst_fnr_filter.py b/python/qa_burst_fnr_filter.py index 4602ec7..945cd0b 100755 --- a/python/qa_burst_fnr_filter.py +++ b/python/qa_burst_fnr_filter.py @@ -165,4 +165,4 @@ self.assertEqual(bursts_expected, bursts_result) if __name__ == '__main__': -gr_unittest.run(qa_burst_fnr_filter, "qa_burst_fnr_filter.xml") +gr_unittest.run(qa_burst_fnr_filter) diff --git a/python/qa_burst_printer.py b/python/qa_burst_printer.py index c1fdfaf..15a7fc8 100755 --- a/python/qa_burst_printer.py +++ b/python/qa_burst_printer.py @@ -294,4 +294,4 @@ if __name__ == '__main__': -gr_unittest.run(qa_burst_printer, "qa_burst_printer.xml") +gr_unittest.run(qa_burst_printer) diff --git a/python/qa_burst_sdcch_subslot_filter.py b/python/qa_burst_sdcch_subslot_filter.py index 4940286..bce74fd 100755 --- a/python/qa_burst_sdcch_subslot_filter.py +++ b/python/qa_burst_sdcch_subslot_filter.py @@ -208,4 +208,4 @@ if __name__ == '__main__': -gr_unittest.run(qa_burst_sdcch_subslot_filter, "qa_burst_sdcch_subslot_filter.xml") +gr_unittest.run(qa_burst_sdcch_subslot_filter) diff --git a/python/qa_burst_sdcch_subslot_splitter.py b/python/qa_burst_sdcch_subslot_splitter.py index 7d8b8e0..a72ec01 100755 --- a/python/qa_burst_sdcch_subslot_splitter.py +++ b/python/qa_burst_sdcch_subslot_splitter.py @@ -398,4 +398,4 @@ if __name__ == '__main__': -gr_unittest.run(qa_burst_sdcch_subslot_splitter, "qa_burst_sdcch_subslot_splitter.xml") +gr_unittest.run(qa_burst_sdcch_subslot_splitter) diff --git a/python/qa_burst_timeslot_filter.py b/python/qa_burst_timeslot_filter.py index 16001f0..041c95a 100755 --- a/python/qa_burst_timeslot_filter.py +++ b/python/qa_burst_timeslot_filter.py @@ -89,4 +89,4 @@ if __name__ == '__main__': -gr_unittest.run(qa_burst_timeslot_filter, "qa_burst_timeslot_filter.xml") +gr_unittest.run(qa_burst_timeslot_filter) diff --git a/python/qa_burst_timeslot_splitter.py b/python/qa_burst_timeslot_splitter.py index 2f8738b..e99b44d 100755 --- a/python/qa_burst_timeslot_splitter.py +++ b/python/qa_burst_timeslot_splitter.py @@ -158,4 +158,4 @@ if __name__ == '__main__': -gr_unittest.run(qa_burst_timeslot_splitter, "qa_burst_timeslot_splitter.xml") +gr_unittest.run(qa_burst_timeslot_splitter) diff --git a/python/qa_controlled_fractional_resampler_cc.py b/python/qa_controlled_fractional_resampler_cc.py index e00f6bc..57939de 100755 --- a/python/qa_controlled_fractional_resampler_cc.py +++ b/python/qa_controlled_fractional_resampler_cc.py @@ -40,4 +40,4 @@ if __name__ == '__main__': -gr_unittest.run(qa_controlled_fractional_resampler_cc, "qa_controlled_fractional_resampler_cc.xml") +gr_unittest.run(qa_controlled_fractional_resampler_cc) diff --git a/python/qa_decryption.py b/python/qa_decryption.py index 663471c..995a530 100755 --- a/python/qa_decryption.py +++ b/python/qa_decryption.py @@ -199,4 +199,4 @@ if __name__ == '__main__': -gr
Change in gr-gsm[master]: Remove build_utils.py and build_utils_codes.py
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24079 ) Change subject: Remove build_utils.py and build_utils_codes.py .. Remove build_utils.py and build_utils_codes.py These two files are no longer used Change-Id: I80a364c729e75681a0afd926ea3ecd0eb2d65381 --- D python/build_utils.py D python/build_utils_codes.py 2 files changed, 0 insertions(+), 278 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/python/build_utils.py b/python/build_utils.py deleted file mode 100644 index cf58a97..000 --- a/python/build_utils.py +++ /dev/null @@ -1,226 +0,0 @@ -# -# Copyright 2004,2009,2012 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -"""Misc utilities used at build time -""" - -import re, os, os.path -from build_utils_codes import * - - -# set srcdir to the directory that contains Makefile.am -try: -srcdir = os.environ['srcdir'] -except KeyError, e: -srcdir = "." -srcdir = srcdir + '/' - -# set do_makefile to either true or false dependeing on the environment -try: -if os.environ['do_makefile'] == '0': -do_makefile = False -else: -do_makefile = True -except KeyError, e: -do_makefile = False - -# set do_sources to either true or false dependeing on the environment -try: -if os.environ['do_sources'] == '0': -do_sources = False -else: -do_sources = True -except KeyError, e: -do_sources = True - -name_dict = {} - -def log_output_name (name): -(base, ext) = os.path.splitext (name) -ext = ext[1:] # drop the leading '.' - -entry = name_dict.setdefault (ext, []) -entry.append (name) - -def open_and_log_name (name, dir): -global do_sources -if do_sources: -f = open (name, dir) -else: -f = None -log_output_name (name) -return f - -def expand_template (d, template_filename, extra = ""): -'''Given a dictionary D and a TEMPLATE_FILENAME, expand template into output file -''' -global do_sources -output_extension = extract_extension (template_filename) -template = open_src (template_filename, 'r') -output_name = d['NAME'] + extra + '.' + output_extension -log_output_name (output_name) -if do_sources: -output = open (output_name, 'w') -do_substitution (d, template, output) -output.close () -template.close () - -def output_glue (dirname): -output_makefile_fragment () -output_ifile_include (dirname) - -def output_makefile_fragment (): -global do_makefile -if not do_makefile: -return -# overwrite the source, which must be writable; this should have been -# checked for beforehand in the top-level Makefile.gen.gen . -f = open (os.path.join (os.environ.get('gendir', os.environ.get('srcdir', '.')), 'Makefile.gen'), 'w') -f.write ('#\n# This file is machine generated. All edits will be overwritten\n#\n') -output_subfrag (f, 'h') -output_subfrag (f, 'i') -output_subfrag (f, 'cc') -f.close () - -def output_ifile_include (dirname): -global do_sources -if do_sources: -f = open ('%s_generated.i' % (dirname,), 'w') -f.write ('//\n// This file is machine generated. All edits will be overwritten\n//\n') -files = name_dict.setdefault ('i', []) -files.sort () -f.write ('%{\n') -for file in files: -f.write ('#include <%s>\n' % (file[0:-1] + 'h',)) -f.write ('%}\n\n') -for file in files: -f.write ('%%include <%s>\n' % (file,)) - -def output_subfrag (f, ext): -files = name_dict.setdefault (ext, []) -files.sort () -f.write ("GENERATED_%s =" % (ext.upper ())) -for file in files: -f.write (" \\\n\t%s" % (file,)) -f.write ("\n\n") - -def extract_extension (template_name): -# template name is something like: GrFIRfilterXXX.h.t -# we return everything between the penultimate . and .t -mo = re.search (r'\.([a-z]+)\.t$', template_name) -if not mo: -raise ValueError, "Incorrectly formed template_name '%
Change in gr-gsm[master]: travis: Add /usr/local/lib/python3/dist-packages/ to PYTHONPATH
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24078 ) Change subject: travis: Add /usr/local/lib/python3/dist-packages/ to PYTHONPATH .. travis: Add /usr/local/lib/python3/dist-packages/ to PYTHONPATH and run ldconfig after installing gr-iqbal and gr-osmosdr. Due to debian-python-install patch [1] the OOT packages are installed in /usr/local/lib/python3/dist-packages but this path is not in the python3 default search paths (sys.path) and because of this importing OOT modules fails. [1] https://salsa.debian.org/bottoms/pkg-gnuradio/blob/25e1de07/debian/patches/debian-python-install Change-Id: I260c82d1a53dab85f7aac86f23e61309d8841255 --- M tests/dockerfiles/Debian_testing.docker M tests/dockerfiles/Kali.docker 2 files changed, 10 insertions(+), 6 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker index 7fb7760..c482c52 100644 --- a/tests/dockerfiles/Debian_testing.docker +++ b/tests/dockerfiles/Debian_testing.docker @@ -26,19 +26,21 @@ mkdir build && \ cd build && \ cmake .. && \ -make -j $(nproc) install +make -j $(nproc) install && \ +ldconfig RUN git clone --branch maint-3.8 https://github.com/velichkov/gr-osmosdr && \ cd gr-osmosdr && \ mkdir build && \ cd build && \ cmake .. && \ -make -j $(nproc) install +make -j $(nproc) install && \ +ldconfig RUN mkdir /src/build WORKDIR /src/build -RUN cmake .. && \ +RUN PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH cmake .. && \ # The parallel build sometimes fails when the .grc_gnuradio # and .gnuradio directories do not exist mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \ diff --git a/tests/dockerfiles/Kali.docker b/tests/dockerfiles/Kali.docker index 8b03930..8949bb5 100644 --- a/tests/dockerfiles/Kali.docker +++ b/tests/dockerfiles/Kali.docker @@ -26,18 +26,20 @@ mkdir build && \ cd build && \ cmake .. && \ -make -j $(nproc) install +make -j $(nproc) install && \ +ldconfig RUN git clone --branch maint-3.8 https://github.com/velichkov/gr-osmosdr && \ cd gr-osmosdr && \ mkdir build && \ cd build && \ cmake .. && \ -make -j $(nproc) install +make -j $(nproc) install && \ +ldconfig RUN mkdir /src/build WORKDIR /src/build -RUN cmake .. && \ +RUN PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH cmake .. && \ # The parallel build sometimes fails when the .grc_gnuradio # and .gnuradio directories do not exist mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \ -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I260c82d1a53dab85f7aac86f23e61309d8841255 Gerrit-Change-Number: 24078 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: travis: Install liborc-0.4-dev needed for gr-iqbal
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24077 ) Change subject: travis: Install liborc-0.4-dev needed for gr-iqbal .. travis: Install liborc-0.4-dev needed for gr-iqbal on Debian Testing and Kali with gnuradio (3.8.0.0-5) Change-Id: I4512bb734691f553d63cac59fd2c7ba3ccf3f881 --- M tests/dockerfiles/Debian_testing.docker M tests/dockerfiles/Kali.docker 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker index e81d299..7fb7760 100644 --- a/tests/dockerfiles/Debian_testing.docker +++ b/tests/dockerfiles/Debian_testing.docker @@ -17,7 +17,7 @@ libosmocore-dev # packages needed for gr-iqbal and gr-osmosdr -RUN apt-get install -y git libuhd-dev +RUN apt-get install -y git libuhd-dev liborc-0.4-dev COPY ./ /src/ diff --git a/tests/dockerfiles/Kali.docker b/tests/dockerfiles/Kali.docker index 32548ca..8b03930 100644 --- a/tests/dockerfiles/Kali.docker +++ b/tests/dockerfiles/Kali.docker @@ -17,7 +17,7 @@ libosmocore-dev # packages needed for gr-iqbal and gr-osmosdr -RUN apt-get install -y git libuhd-dev +RUN apt-get install -y git libuhd-dev liborc-0.4-dev COPY ./ /src/ -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I4512bb734691f553d63cac59fd2c7ba3ccf3f881 Gerrit-Change-Number: 24077 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: Fix grcc compilation with python3 by adding local subdirs to __path__
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24075 ) Change subject: Fix grcc compilation with python3 by adding local subdirs to __path__ .. Fix grcc compilation with python3 by adding local subdirs to __path__ As the directory structure in the repository is different then the one after the package gets installed we need to add those subdirectories to the __path__ otherwise python3 is not able to load the modules using the relative import syntax and grcc compilation and some unit tests fail. Mofiy __path__ only when the CMAKE_BINARY_DIR environment variable is present. Revert "grgsm_livemon: Set cell_allocation to [0]" This reverts commit 013d4c258c6ad31c2581f0caa4eee3aa609fd9de. Change-Id: I223fd6181e8e36027039301186b671712a597ff8 --- M apps/grgsm_livemon.grc M apps/grgsm_livemon_headless.grc M cmake/Modules/GrccCompile.cmake M python/CMakeLists.txt M python/__init__.py 5 files changed, 24 insertions(+), 3 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_livemon.grc b/apps/grgsm_livemon.grc index 941f816..e8bf4a5 100644 --- a/apps/grgsm_livemon.grc +++ b/apps/grgsm_livemon.grc @@ -360,7 +360,7 @@ parameters: affinity: '' alias: '' -cell_allocation: '[0]' +cell_allocation: '[arfcn.downlink2arfcn(fc)]' comment: '' maxoutbuf: '0' minoutbuf: '0' diff --git a/apps/grgsm_livemon_headless.grc b/apps/grgsm_livemon_headless.grc index f4d5945..8e2e3fa 100644 --- a/apps/grgsm_livemon_headless.grc +++ b/apps/grgsm_livemon_headless.grc @@ -315,7 +315,7 @@ parameters: affinity: '' alias: '' -cell_allocation: '[0]' +cell_allocation: '[arfcn.downlink2arfcn(fc)]' comment: '' maxoutbuf: '0' minoutbuf: '0' diff --git a/cmake/Modules/GrccCompile.cmake b/cmake/Modules/GrccCompile.cmake index 4589fd4..d2bc2d8 100644 --- a/cmake/Modules/GrccCompile.cmake +++ b/cmake/Modules/GrccCompile.cmake @@ -39,6 +39,7 @@ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file_name} COMMAND "${CMAKE_COMMAND}" -E env PYTHONPATH="${PYTHONPATH}" GRC_BLOCKS_PATH=${CMAKE_SOURCE_DIR}/grc +CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} ${GRCC} -o ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${file_name}.grc COMMAND "${CMAKE_COMMAND}" -E rename ${CMAKE_CURRENT_BINARY_DIR}/${file_name}.py ${CMAKE_CURRENT_BINARY_DIR}/${file_name} diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index f0c984d..9cd7045 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -47,7 +47,8 @@ include(GrTest) set(GR_TEST_TARGET_DEPS gr-gsm) -set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/swig:${CMAKE_BINARY_DIR}/python/misc_utils:${CMAKE_BINARY_DIR}/python/receiver:${CMAKE_BINARY_DIR}/python/demapping:${CMAKE_BINARY_DIR}/python/transmitter) +set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/swig:${CMAKE_BINARY_DIR}/python/misc_utils) +set(GR_TEST_ENVIRONS "CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}") GR_ADD_TEST(qa_arfcn ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_arfcn.py) GR_ADD_TEST(qa_decryption ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_decryption.py) GR_ADD_TEST(qa_burst_printer ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_burst_printer.py) diff --git a/python/__init__.py b/python/__init__.py index ba5fc00..87a62d6 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -23,6 +23,25 @@ description here (python/__init__.py). ''' +import os + +if "CMAKE_BINARY_DIR" in os.environ: +dirname, filename = os.path.split(os.path.abspath(__file__)) + +# As the directory structure in the repository is different then the one after the package +# gets installed we need to add those subdirectories to the __path__ otherwise python3 is +# not able to load the modules using the relative import syntax and grcc compilation and +# some unit tests fail. +__path__ += [ +# Load the local (not yet installed) grgsm_swig from the ../swig subdirectory. +os.path.join(os.environ.get("CMAKE_BINARY_DIR"), "swig"), + +# Load the local (not yet installed) python modules from the local subdirectories +os.path.join(dirname, "misc_utils"), +os.path.join(dirname, "receiver"), +os.path.join(dirname, "demapping"), +os.path.join(dirname, "transmitter"), +os.path.join(dirname, "trx")] # import swig generated symbols into the gsm namespace from .grgsm_swig import * -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I223fd6181e8e36027039301186b671712a597ff8 Gerrit-Change-Number: 24075 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: Do not add python/misc_utils to PYTHONPATH when executing tests
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24076 ) Change subject: Do not add python/misc_utils to PYTHONPATH when executing tests .. Do not add python/misc_utils to PYTHONPATH when executing tests Change-Id: Ib19a181a3fd9bb78c1d3989bad0e55433f060950 --- M python/CMakeLists.txt M python/qa_arfcn.py 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 9cd7045..31efedb 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -47,7 +47,7 @@ include(GrTest) set(GR_TEST_TARGET_DEPS gr-gsm) -set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/swig:${CMAKE_BINARY_DIR}/python/misc_utils) +set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/swig) set(GR_TEST_ENVIRONS "CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}") GR_ADD_TEST(qa_arfcn ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_arfcn.py) GR_ADD_TEST(qa_decryption ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_decryption.py) diff --git a/python/qa_arfcn.py b/python/qa_arfcn.py index 8fc4695..53c8fff 100755 --- a/python/qa_arfcn.py +++ b/python/qa_arfcn.py @@ -23,7 +23,7 @@ from gnuradio import gr, gr_unittest, blocks import grgsm_swig as grgsm -import arfcn +from misc_utils import arfcn import os import sys -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ib19a181a3fd9bb78c1d3989bad0e55433f060950 Gerrit-Change-Number: 24076 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: Remove the RTLD_GLOBAL hack
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24074 ) Change subject: Remove the RTLD_GLOBAL hack .. Remove the RTLD_GLOBAL hack It was removed from gnuradio back in 2014 https://github.com/gnuradio/gnuradio/commit/39f14138ac9158eb0610e89a2ae1f8290f184c44 Change-Id: I1604ad5b9eefe3d4a2228b2a09e2069962844c97 --- M python/__init__.py 1 file changed, 0 insertions(+), 26 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/python/__init__.py b/python/__init__.py index 557a8d6..ba5fc00 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -23,23 +23,6 @@ description here (python/__init__.py). ''' -# -# Temporary workaround for ticket:181 (swig+python problem) -import sys -_RTLD_GLOBAL = 0 -try: -from dl import RTLD_GLOBAL as _RTLD_GLOBAL -except ImportError: -try: -from DLFCN import RTLD_GLOBAL as _RTLD_GLOBAL -except ImportError: -pass - -if _RTLD_GLOBAL != 0: -_dlopenflags = sys.getdlopenflags() -sys.setdlopenflags(_dlopenflags|_RTLD_GLOBAL) -# - # import swig generated symbols into the gsm namespace from .grgsm_swig import * @@ -59,12 +42,3 @@ from .txtime_bursts_tagger import * from .arfcn import * from .device import * - - -# - -# -# Tail of workaround -if _RTLD_GLOBAL != 0: -sys.setdlopenflags(_dlopenflags) # Restore original flags -# -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I1604ad5b9eefe3d4a2228b2a09e2069962844c97 Gerrit-Change-Number: 24074 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: grgsm_decode: Print frequency or ARFCN message on stderr
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24072 ) Change subject: grgsm_decode: Print frequency or ARFCN message on stderr .. grgsm_decode: Print frequency or ARFCN message on stderr For some yet unknown reasons in travis on Debian testing and Kali rolling the message gets printed after the burst and decode.sh and decrypt.sh tests fails because of this. Instead of filtering this messages in the tests I think it is better such messages to be printed on the standard error output Change-Id: Ib18be898cac74769cabf1b748e40e21d23f08e98 --- M apps/grgsm_decode 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_decode b/apps/grgsm_decode index 034014e..d754fc7 100755 --- a/apps/grgsm_decode +++ b/apps/grgsm_decode @@ -30,6 +30,7 @@ import grgsm import pmt import socket +import sys class grgsm_decoder(gr.top_block): @@ -368,7 +369,7 @@ parser.error("Invalid A5 version\n") if options.cfile and (options.fc is None and options.arfcn is None): -print("You haven't provided a frequency or an ARFCN - working without automatic frequency offset correction.\n") +print("You haven't provided a frequency or an ARFCN - working without automatic frequency offset correction.\n", file=sys.stderr) # handle frequency / arfcn input arfcn = None -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ib18be898cac74769cabf1b748e40e21d23f08e98 Gerrit-Change-Number: 24072 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: travis: gnuradio-companion 3.8 does not have --version parameter
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24073 ) Change subject: travis: gnuradio-companion 3.8 does not have --version parameter .. travis: gnuradio-companion 3.8 does not have --version parameter And currently grgsm, gr-osmosdr and gr-iqbal are installed in /usr/local/lib/python3/dist-packages/ which is not in the default python search path. Change-Id: I7e00c84a4b72e9fa1dcf5ac453882f1733724ac0 --- M tests/scripts/decode.sh M tests/scripts/decrypt.sh 2 files changed, 14 insertions(+), 4 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/tests/scripts/decode.sh b/tests/scripts/decode.sh index c71b26e..b982709 100755 --- a/tests/scripts/decode.sh +++ b/tests/scripts/decode.sh @@ -3,7 +3,11 @@ TEST_DIR=`dirname "$0"` # PYTHONPATH and LD_LIBRARY_PATH are needed on Fedora 26 -export PYTHONPATH=/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/grgsm/:$PYTHONPATH +# +# /usr/local/lib/python3/dist-packages/ is currently needed on Debian Testing and Kali Rolling +# https://salsa.debian.org/bottoms/pkg-gnuradio/blob/unstable/debian/patches/debian-python-install#L8 +# +export PYTHONPATH=/usr/local/lib/python3/dist-packages/:/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/grgsm/:$PYTHONPATH export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH export AP_DECODE="grgsm_decode" @@ -14,7 +18,8 @@ export RUNLINE="$AP_DECODE -c $SHORTENED_CAPFILE -s $((1/174)) -m BCCH -t 0 -v --ppm -10" echo "Testing with:" echo " $RUNLINE" -gnuradio-companion --version +#gnuradio 3.8 does not have --version parameter +#gnuradio-companion --version cd $TEST_DIR cat $CAPFILE | head -c 600 > $SHORTENED_CAPFILE diff --git a/tests/scripts/decrypt.sh b/tests/scripts/decrypt.sh index afd12cc..7f9bc60 100755 --- a/tests/scripts/decrypt.sh +++ b/tests/scripts/decrypt.sh @@ -3,7 +3,11 @@ TEST_DIR=`dirname "$0"` # PYTHONPATH and LD_LIBRARY_PATH are needed on Fedora 26 -export PYTHONPATH=/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/grgsm/:$PYTHONPATH +# +# /usr/local/lib/python3/dist-packages/ is currently needed on Debian Testing and Kali Rolling +# https://salsa.debian.org/bottoms/pkg-gnuradio/blob/unstable/debian/patches/debian-python-install#L8 +# +export PYTHONPATH=/usr/local/lib/python3/dist-packages/:/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/grgsm/:$PYTHONPATH export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH export AP_DECODE="grgsm_decode" @@ -14,7 +18,8 @@ export RUNLINE="$AP_DECODE -c $SHORTENED_CAPFILE -s $((1/174)) -m SDCCH8 -t 1 -k 0x1E,0xF0,0x0B,0xAB,0x3B,0xAC,0x70,0x02 -v --ppm -10" echo "Testing with:" echo " $RUNLINE" -gnuradio-companion --version +#gnuradio 3.8 does not have --version parameter +#gnuradio-companion --version cd $TEST_DIR cat $CAPFILE | head -c -3700 | head -c 3580 > $SHORTENED_CAPFILE -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I7e00c84a4b72e9fa1dcf5ac453882f1733724ac0 Gerrit-Change-Number: 24073 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: grgsm_livemon: Specify localhost as string
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24071 ) Change subject: grgsm_livemon: Specify localhost as string .. grgsm_livemon: Specify localhost as string Traceback (most recent call last): File "/home/vasko/gr38/lib/python3.7/dist-packages/gnuradio/grc/core/FlowGraph.py", line 216, in renew_namespace value = eval(parameter_block.params['value'].to_code(), namespace) File "", line 1, in NameError: name 'localhost' is not defined Change-Id: I6bae2fb1f09038cb0cd3410533d3b3fdc79ed354 --- M apps/grgsm_livemon.grc M apps/grgsm_livemon_headless.grc 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_livemon.grc b/apps/grgsm_livemon.grc index a11b243..941f816 100644 --- a/apps/grgsm_livemon.grc +++ b/apps/grgsm_livemon.grc @@ -179,7 +179,7 @@ label: IP or DNS name of collector point short_id: '' type: str -value: 'localhost' +value: '"localhost"' states: bus_sink: false bus_source: false diff --git a/apps/grgsm_livemon_headless.grc b/apps/grgsm_livemon_headless.grc index 27d43b8..f4d5945 100644 --- a/apps/grgsm_livemon_headless.grc +++ b/apps/grgsm_livemon_headless.grc @@ -134,7 +134,7 @@ label: IP or DNS name of collector point short_id: '' type: str -value: 'localhost' +value: '"localhost"' states: bus_sink: false bus_source: false -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I6bae2fb1f09038cb0cd3410533d3b3fdc79ed354 Gerrit-Change-Number: 24071 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: grgsm_livemon: Set cell_allocation to [0]
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24070 ) Change subject: grgsm_livemon: Set cell_allocation to [0] .. grgsm_livemon: Set cell_allocation to [0] Gnuradio 3.8 does not like cell_allocation: '[arfcn.downlink2arfcn(fc)]' and the Receiver block does not work with an empty cell allocation array gnuradio.grc.core.platform:["Param - Cell allocation(cell_allocation):\n\tExpression None is invalid for type'float_vector'."] Change-Id: Iae6de844509b13bdf834c9c7443382b1ab3b0a28 --- M apps/grgsm_livemon.grc M apps/grgsm_livemon_headless.grc 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_livemon.grc b/apps/grgsm_livemon.grc index fa96cfb..a11b243 100644 --- a/apps/grgsm_livemon.grc +++ b/apps/grgsm_livemon.grc @@ -360,7 +360,7 @@ parameters: affinity: '' alias: '' -cell_allocation: '[arfcn.downlink2arfcn(fc)]' +cell_allocation: '[0]' comment: '' maxoutbuf: '0' minoutbuf: '0' diff --git a/apps/grgsm_livemon_headless.grc b/apps/grgsm_livemon_headless.grc index 47db941..27d43b8 100644 --- a/apps/grgsm_livemon_headless.grc +++ b/apps/grgsm_livemon_headless.grc @@ -315,7 +315,7 @@ parameters: affinity: '' alias: '' -cell_allocation: '[arfcn.downlink2arfcn(fc)]' +cell_allocation: '[0]' comment: '' maxoutbuf: '0' minoutbuf: '0' -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Iae6de844509b13bdf834c9c7443382b1ab3b0a28 Gerrit-Change-Number: 24070 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: grgsm_livemon: Fix UDP client and server blocks
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24069 ) Change subject: grgsm_livemon: Fix UDP client and server blocks .. grgsm_livemon: Fix UDP client and server blocks During the convertion to YAML the block types was changed from TCP to UDP Change-Id: I542d7c36c30dc8179fa0ee84fc87e134cd2ba9f5 --- M apps/grgsm_livemon.grc M apps/grgsm_livemon_headless.grc 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_livemon.grc b/apps/grgsm_livemon.grc index 4e07e88..fa96cfb 100644 --- a/apps/grgsm_livemon.grc +++ b/apps/grgsm_livemon.grc @@ -142,7 +142,7 @@ mtu: '1' port: serverport tcp_no_delay: 'False' -type: TCP_SERVER +type: UDP_SERVER states: bus_sink: false bus_source: false @@ -162,7 +162,7 @@ mtu: '1500' port: collectorport tcp_no_delay: 'False' -type: TCP_SERVER +type: UDP_CLIENT states: bus_sink: false bus_source: false diff --git a/apps/grgsm_livemon_headless.grc b/apps/grgsm_livemon_headless.grc index 1bea77c..47db941 100644 --- a/apps/grgsm_livemon_headless.grc +++ b/apps/grgsm_livemon_headless.grc @@ -97,7 +97,7 @@ mtu: '1' port: serverport tcp_no_delay: 'False' -type: TCP_SERVER +type: UDP_SERVER states: bus_sink: false bus_source: false @@ -117,7 +117,7 @@ mtu: '1500' port: collectorport tcp_no_delay: 'False' -type: TCP_SERVER +type: UDP_CLIENT states: bus_sink: false bus_source: false -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I542d7c36c30dc8179fa0ee84fc87e134cd2ba9f5 Gerrit-Change-Number: 24069 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: grgsm_livemon: Change the type of several parameters to string
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24068 ) Change subject: grgsm_livemon: Change the type of several parameters to string .. grgsm_livemon: Change the type of several parameters to string It seems gnuradio 3.8 does not like parameters with type None and does not put them as command line arguments Change-Id: Id67e37e826aa1cc14640d57207a92def682f11e3 --- M apps/grgsm_livemon.grc M apps/grgsm_livemon_headless.grc 2 files changed, 8 insertions(+), 8 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_livemon.grc b/apps/grgsm_livemon.grc index 2f6d29c..4e07e88 100644 --- a/apps/grgsm_livemon.grc +++ b/apps/grgsm_livemon.grc @@ -105,7 +105,7 @@ hide: none label: Device Arguments short_id: '' -type: '' +type: str value: '""' states: bus_sink: false @@ -178,7 +178,7 @@ hide: none label: IP or DNS name of collector point short_id: '' -type: '' +type: str value: 'localhost' states: bus_sink: false @@ -195,7 +195,7 @@ hide: none label: UDP port number of collector short_id: '' -type: '' +type: str value: '4729' states: bus_sink: false @@ -912,7 +912,7 @@ hide: none label: UDP server listening port short_id: '' -type: '' +type: str value: '4729' states: bus_sink: false diff --git a/apps/grgsm_livemon_headless.grc b/apps/grgsm_livemon_headless.grc index 4d0c83e..1bea77c 100644 --- a/apps/grgsm_livemon_headless.grc +++ b/apps/grgsm_livemon_headless.grc @@ -42,7 +42,7 @@ hide: none label: Device Arguments short_id: '' -type: '' +type: str value: '""' states: bus_sink: false @@ -133,7 +133,7 @@ hide: none label: IP or DNS name of collector point short_id: '' -type: '' +type: str value: 'localhost' states: bus_sink: false @@ -150,7 +150,7 @@ hide: none label: UDP port number of collector short_id: '' -type: '' +type: str value: '4729' states: bus_sink: false @@ -804,7 +804,7 @@ hide: none label: UDP server listening port short_id: '' -type: '' +type: str value: '4729' states: bus_sink: false -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Id67e37e826aa1cc14640d57207a92def682f11e3 Gerrit-Change-Number: 24068 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: grgsm_livemon: Disable PPS sync
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24067 ) Change subject: grgsm_livemon: Disable PPS sync .. grgsm_livemon: Disable PPS sync Because of the following error when used with USRP B100 [INFO] [MULTI_USRP] 1) catch time transition at pps edge Traceback (most recent call last): File "./grgsm_livemon.py", line 365, in main() File "./grgsm_livemon.py", line 343, in main tb = top_block_cls(fc=options.fc, gain=options.gain, osr=options.osr, ppm=options.ppm, samp_rate=options.samp_rate, shiftoff=options.shiftoff) File "./grgsm_livemon.py", line 114, in __init__ self.rtlsdr_source_0.set_time_unknown_pps(osmosdr.time_spec_t()) File "/home/vasko/gr38/lib/python3.7/dist-packages/osmosdr/osmosdr_swig.py", line 2543, in set_time_unknown_pps return _osmosdr_swig.source_sptr_set_time_unknown_pps(self, time_spec) RuntimeError: RuntimeError: Board 0 may not be getting a PPS signal! No PPS detected within the time interval. See the application notes for your device. Change-Id: Iee6124bdb2441666a53ac9ee5239894aea61dfde --- M apps/grgsm_livemon.grc M apps/grgsm_livemon_headless.grc 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_livemon.grc b/apps/grgsm_livemon.grc index 3d80268..2f6d29c 100644 --- a/apps/grgsm_livemon.grc +++ b/apps/grgsm_livemon.grc @@ -870,7 +870,7 @@ nchan: '1' num_mboards: '1' sample_rate: samp_rate -sync: sync +sync: none time_source0: '' time_source1: '' time_source2: '' diff --git a/apps/grgsm_livemon_headless.grc b/apps/grgsm_livemon_headless.grc index e6728b7..4d0c83e 100644 --- a/apps/grgsm_livemon_headless.grc +++ b/apps/grgsm_livemon_headless.grc @@ -762,7 +762,7 @@ nchan: '1' num_mboards: '1' sample_rate: samp_rate -sync: sync +sync: none time_source0: '' time_source1: '' time_source2: '' -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Iee6124bdb2441666a53ac9ee5239894aea61dfde Gerrit-Change-Number: 24067 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: travis: Manually install gr-iqbal and gr-osmosdr
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24066 ) Change subject: travis: Manually install gr-iqbal and gr-osmosdr .. travis: Manually install gr-iqbal and gr-osmosdr Currently these two packages still depends on gnuradio 3.8 in debian testing and kali rolling. Change-Id: I4f956577293c48d803b8b45d06ba508792501274 --- M tests/dockerfiles/Debian_testing.docker M tests/dockerfiles/Kali.docker 2 files changed, 35 insertions(+), 2 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker index b95d958..e81d299 100644 --- a/tests/dockerfiles/Debian_testing.docker +++ b/tests/dockerfiles/Debian_testing.docker @@ -16,11 +16,28 @@ gnuradio-dev gnuradio libgmp-dev libboost-regex-dev \ libosmocore-dev +# packages needed for gr-iqbal and gr-osmosdr +RUN apt-get install -y git libuhd-dev + COPY ./ /src/ -RUN ls /src + +RUN git clone --branch maint-3.8 --recurse-submodules https://github.com/velichkov/gr-iqbal && \ +cd gr-iqbal && \ +mkdir build && \ +cd build && \ +cmake .. && \ +make -j $(nproc) install + +RUN git clone --branch maint-3.8 https://github.com/velichkov/gr-osmosdr && \ +cd gr-osmosdr && \ +mkdir build && \ +cd build && \ +cmake .. && \ +make -j $(nproc) install RUN mkdir /src/build WORKDIR /src/build + RUN cmake .. && \ # The parallel build sometimes fails when the .grc_gnuradio # and .gnuradio directories do not exist diff --git a/tests/dockerfiles/Kali.docker b/tests/dockerfiles/Kali.docker index f386049..32548ca 100644 --- a/tests/dockerfiles/Kali.docker +++ b/tests/dockerfiles/Kali.docker @@ -16,8 +16,24 @@ gnuradio-dev gnuradio libgmp-dev libboost-regex-dev \ libosmocore-dev +# packages needed for gr-iqbal and gr-osmosdr +RUN apt-get install -y git libuhd-dev + COPY ./ /src/ -RUN ls /src + +RUN git clone --branch maint-3.8 --recurse-submodules https://github.com/velichkov/gr-iqbal && \ +cd gr-iqbal && \ +mkdir build && \ +cd build && \ +cmake .. && \ +make -j $(nproc) install + +RUN git clone --branch maint-3.8 https://github.com/velichkov/gr-osmosdr && \ +cd gr-osmosdr && \ +mkdir build && \ +cd build && \ +cmake .. && \ +make -j $(nproc) install RUN mkdir /src/build WORKDIR /src/build -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I4f956577293c48d803b8b45d06ba508792501274 Gerrit-Change-Number: 24066 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: travis: Install only python3 packages
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24065 ) Change subject: travis: Install only python3 packages .. travis: Install only python3 packages Change-Id: I3548fa7340afc63557cc65a7a396ecf96c607806 --- M tests/dockerfiles/Debian_testing.docker M tests/dockerfiles/Kali.docker 2 files changed, 4 insertions(+), 6 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker index 6cc4949..b95d958 100644 --- a/tests/dockerfiles/Debian_testing.docker +++ b/tests/dockerfiles/Debian_testing.docker @@ -7,13 +7,12 @@ libtool \ pkg-config \ build-essential \ -python-docutils \ libcppunit-dev \ swig \ doxygen \ liblog4cpp5-dev \ -python-gtk2 \ -python-scipy \ +python3-docutils \ +python3-scipy \ gnuradio-dev gnuradio libgmp-dev libboost-regex-dev \ libosmocore-dev diff --git a/tests/dockerfiles/Kali.docker b/tests/dockerfiles/Kali.docker index b4a9719..f386049 100644 --- a/tests/dockerfiles/Kali.docker +++ b/tests/dockerfiles/Kali.docker @@ -7,13 +7,12 @@ libtool \ pkg-config \ build-essential \ -python-docutils \ libcppunit-dev \ swig \ doxygen \ liblog4cpp5-dev \ -python-gtk2 \ -python-scipy \ +python3-docutils \ +python3-scipy \ gnuradio-dev gnuradio libgmp-dev libboost-regex-dev \ libosmocore-dev -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I3548fa7340afc63557cc65a7a396ecf96c607806 Gerrit-Change-Number: 24065 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: Various python3 related changes
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24063 ) Change subject: Various python3 related changes .. Various python3 related changes - Use relative import for grgsm's modules - Convert map to list - Remove the hier_block.py workaround as as gnuradio 3.7 is no longer supported in this branch Change-Id: I5ca8fd340823996e8c444aaf18ddacd85c92ab1c --- M apps/grgsm_decode M apps/grgsm_scanner M python/__init__.py M python/demapping/gsm_bcch_ccch_demapper.py M python/demapping/gsm_bcch_ccch_sdcch4_demapper.py M python/demapping/gsm_sdcch8_demapper.py M python/misc_utils/CMakeLists.txt M python/misc_utils/clock_offset_corrector_tagged.py M python/misc_utils/device.py D python/misc_utils/hier_block.py M python/qa_txtime_bursts_tagger.py M python/receiver/fcch_detector.py M python/receiver/gsm_input.py M python/transmitter/gsm_gmsk_mod.py M python/transmitter/txtime_bursts_tagger.py M python/trx/__init__.py M python/trx/ctrl_if.py M python/trx/ctrl_if_bb.py M python/trx/radio_if.py M python/trx/radio_if_uhd.py M python/trx/transceiver.py 21 files changed, 53 insertions(+), 92 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_decode b/apps/grgsm_decode index 4bd1d95..034014e 100755 --- a/apps/grgsm_decode +++ b/apps/grgsm_decode @@ -336,7 +336,7 @@ parser, 'TCH Options', 'Options for setting Traffic channel decoding parameters.', ) tch_options.add_option("-d", "--speech-codec", dest="speech_codec", default='FR', - type='choice', choices=tch_codecs.keys(), + type='choice', choices=list(tch_codecs.keys()), help="TCH-F speech codec [default=%default]. " "Valid options are " + ", ".join(tch_codecs.keys())) tch_options.add_option("-o", "--output-tch", dest="speech_output_file", default="/tmp/speech.au.gsm", diff --git a/apps/grgsm_scanner b/apps/grgsm_scanner index ce33a60..e3d7a61 100755 --- a/apps/grgsm_scanner +++ b/apps/grgsm_scanner @@ -40,9 +40,9 @@ # from wideband_receiver import * -class receiver_with_decoder(grgsm.hier_block): +class receiver_with_decoder(gr.hier_block2): def __init__(self, OSR=4, chan_num=0, fc=939.4e6, ppm=0, samp_rate=0.2e6): -grgsm.hier_block.__init__( +gr.hier_block2.__init__( self, "Receiver With Decoder", gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), gr.io_signature(0, 0, 0), @@ -132,9 +132,9 @@ self.samp_rate_out = samp_rate_out -class wideband_receiver(grgsm.hier_block): +class wideband_receiver(gr.hier_block2): def __init__(self, OSR=4, fc=939.4e6, samp_rate=0.4e6): -grgsm.hier_block.__init__( +gr.hier_block2.__init__( self, "Wideband receiver", gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), gr.io_signature(0, 0, 0), @@ -168,14 +168,14 @@ # Connections ## self.connect((self, 0), (self.pfb_channelizer_ccf_0, 0)) -for chan in xrange(0, self.channels_num): +for chan in range(0, self.channels_num): self.connect((self.pfb_channelizer_ccf_0, chan), (self.receivers_with_decoders[chan], 0)) self.msg_connect(self.receivers_with_decoders[chan], 'bursts', self, 'bursts') self.msg_connect(self.receivers_with_decoders[chan], 'msgs', self, 'msgs') def create_receivers(self): self.receivers_with_decoders = {} -for chan in xrange(0, self.channels_num): +for chan in range(0, self.channels_num): self.receivers_with_decoders[chan] = receiver_with_decoder(fc=self.fc, OSR=self.OSR, chan_num=chan, samp_rate=self.OSR_PFB * 0.2e6) @@ -207,7 +207,7 @@ self.ppm = ppm # if no file name is given process data from rtl_sdr source -print "Args=", args +print("Args=", args) self.rtlsdr_source = osmosdr.source(args="numchan=" + str(1) + " " + str(grgsm.device.get_default_args(args))) #self.rtlsdr_source.set_min_output_buffer(int(sample_rate*rec_len)) #this line causes segfaults on HackRF @@ -261,6 +261,10 @@ self.neighbours = neighbours self.cell_arfcns = cell_arfcns +def __lt__(self, other): +return self.arfcn < other.arfcn + + def get_verbose_info(self): i = " | Configuration: %s\n" % self.get_ccch_conf() i += " | Cell ARFCNs: " + ", ".join(map(str, self.cell_arfcns)) + "\n" @@ -315,7 +319,7 @@
Change in gr-gsm[master]: travis: Test only on distributions with gnuradio 3.8
ptrkrysik has submitted this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24062 ) Change subject: travis: Test only on distributions with gnuradio 3.8 .. travis: Test only on distributions with gnuradio 3.8 Change-Id: I05706496687bff2dc4e9a111d8ecd4f878b53c12 --- M .travis.yml M tests/dockerfiles/Debian_testing.docker M tests/dockerfiles/Kali.docker 3 files changed, 5 insertions(+), 7 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified diff --git a/.travis.yml b/.travis.yml index f61ff6e..5230b46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,10 @@ env: - DOCKERFILE=tests/dockerfiles/Debian_testing.docker IMGNAME=debtest-grgsm - - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04.docker IMGNAME=ubu16.04-grgsm - - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04_nolibosmo.docker IMGNAME=ubu16.04-grgsm-nolibosmo +# - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04.docker IMGNAME=ubu16.04-grgsm +# - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04_nolibosmo.docker IMGNAME=ubu16.04-grgsm-nolibosmo - DOCKERFILE=tests/dockerfiles/Kali.docker IMGNAME=kali-grgsm - - DOCKERFILE=tests/dockerfiles/Fedora_26.Dockerfile IMGNAME=fedora26-grgsm +# - DOCKERFILE=tests/dockerfiles/Fedora_26.Dockerfile IMGNAME=fedora26-grgsm services: diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker index a3d16ba..6cc4949 100644 --- a/tests/dockerfiles/Debian_testing.docker +++ b/tests/dockerfiles/Debian_testing.docker @@ -14,8 +14,7 @@ liblog4cpp5-dev \ python-gtk2 \ python-scipy \ -gnuradio-dev \ -gr-osmosdr \ +gnuradio-dev gnuradio libgmp-dev libboost-regex-dev \ libosmocore-dev COPY ./ /src/ diff --git a/tests/dockerfiles/Kali.docker b/tests/dockerfiles/Kali.docker index 52cc110..b4a9719 100644 --- a/tests/dockerfiles/Kali.docker +++ b/tests/dockerfiles/Kali.docker @@ -14,8 +14,7 @@ liblog4cpp5-dev \ python-gtk2 \ python-scipy \ -gnuradio-dev \ -gr-osmosdr \ +gnuradio-dev gnuradio libgmp-dev libboost-regex-dev \ libosmocore-dev COPY ./ /src/ -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I05706496687bff2dc4e9a111d8ecd4f878b53c12 Gerrit-Change-Number: 24062 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: merged
Change in gr-gsm[master]: travis: Install only python3 packages
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24065 ) Change subject: travis: Install only python3 packages .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I3548fa7340afc63557cc65a7a396ecf96c607806 Gerrit-Change-Number: 24065 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:31:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: tests: Add test for Ubuntu 20.04
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24101 ) Change subject: tests: Add test for Ubuntu 20.04 .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I38bbde4fad7bdc72ad99a1957678539ea813013e Gerrit-Change-Number: 24101 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Comment-Date: Mon, 03 May 2021 10:30:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: tests: Remove test that don't work
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24100 ) Change subject: tests: Remove test that don't work .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I9f37131c565e6d87ae94f583d36a2de3d9500b38 Gerrit-Change-Number: 24100 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Comment-Date: Mon, 03 May 2021 10:30:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Port compile_demappers helper script to gr3.8
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24099 ) Change subject: Port compile_demappers helper script to gr3.8 .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Iadcc19288496558fc65a46b72d36dcf047489ac3 Gerrit-Change-Number: 24099 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Comment-Date: Mon, 03 May 2021 10:30:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Execute python apps with use of python3
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24098 ) Change subject: Execute python apps with use of python3 .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ib9ab805cc5a3878d168787736463dc495b96ddcf Gerrit-Change-Number: 24098 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Comment-Date: Mon, 03 May 2021 10:30:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Remove local copy of associated osmo libraries
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24097 ) Change subject: Remove local copy of associated osmo libraries .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I2b4afedd9f2d568b5287d791891b2c2893fc6843 Gerrit-Change-Number: 24097 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Comment-Date: Mon, 03 May 2021 10:30:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: cmake: make formatting of install statements follow one pattern
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24096 ) Change subject: cmake: make formatting of install statements follow one pattern .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ib7d571af629b0af78397a411b0cca409a6d218d8 Gerrit-Change-Number: 24096 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Comment-Date: Mon, 03 May 2021 10:30:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: cmake: change 'gsm' to 'grgsm'
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24095 ) Change subject: cmake: change 'gsm' to 'grgsm' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I130a7912e179b1f04e68eb131e06800becca5a00 Gerrit-Change-Number: 24095 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Comment-Date: Mon, 03 May 2021 10:30:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: trx: Removing old and unused grc based radio_if
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24094 ) Change subject: trx: Removing old and unused grc based radio_if .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I7d43e6f2962b21ff03601cf1b1aafc222f2c4661 Gerrit-Change-Number: 24094 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Comment-Date: Mon, 03 May 2021 10:30:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Fix compiling with the local libosmocore copy
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24093 ) Change subject: Fix compiling with the local libosmocore copy .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ic72e6ca7f9cc40bc2d78b931e54e66cd71444835 Gerrit-Change-Number: 24093 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:30:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Log import errors as currently GRC 3.8 suppress them
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24092 ) Change subject: Log import errors as currently GRC 3.8 suppress them .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ie6213428c218720692a544c98dc32c16bd50cbe1 Gerrit-Change-Number: 24092 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:30:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: travis: Test in Ubuntu 18.04 container
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24091 ) Change subject: travis: Test in Ubuntu 18.04 container .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Iaa8813ab0ae91b667285ab3ef42ffaa279e3a885 Gerrit-Change-Number: 24091 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:30:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Print the error message on stderr in a python2 compatible way
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24090 ) Change subject: Print the error message on stderr in a python2 compatible way .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Iaea1510b02a2df924ef9777d107d22c45cb37d12 Gerrit-Change-Number: 24090 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:30:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: tests: export VOLK_GENERIC=1 to workaround VOLK's bug 278
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24089 ) Change subject: tests: export VOLK_GENERIC=1 to workaround VOLK's bug 278 .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ib9ad4384388e480b8fa2f91e02359c85c749e802 Gerrit-Change-Number: 24089 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:29:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: tests: Get more information about CPU and user limits
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24088 ) Change subject: tests: Get more information about CPU and user limits .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I0bd3c206f422e11a59070a1c9aace38201ff7c85 Gerrit-Change-Number: 24088 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:29:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: tests: fix some shellcheck errors.
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24087 ) Change subject: tests: fix some shellcheck errors. .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ia399324ae7a39e120e338c86d449d7c4d54bd866 Gerrit-Change-Number: 24087 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:29:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: travis: Use bionic build environment
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24086 ) Change subject: travis: Use bionic build environment .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I8f622506329ee97ff3555c2a43a2165303d9ae82 Gerrit-Change-Number: 24086 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:29:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: travis: Install gr-osmosdr from the apt repository
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24085 ) Change subject: travis: Install gr-osmosdr from the apt repository .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I0bbc33a39ef1e4edc1636c338e429639e0b15066 Gerrit-Change-Number: 24085 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:29:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Add .dockerignore file
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24084 ) Change subject: Add .dockerignore file .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I8d4b527a2e5c7b69e5c7338cafba3fbdac381ae1 Gerrit-Change-Number: 24084 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:29:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: tests: Close the temp file handle in qa_burst_file_source
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24083 ) Change subject: tests: Close the temp file handle in qa_burst_file_source .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I66c2be2e5bf6915e3df253b3a69f5516534e3750 Gerrit-Change-Number: 24083 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:28:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Python 3 compatibility changes in fn_time.py
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24082 ) Change subject: Python 3 compatibility changes in fn_time.py .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I268e0aec8fb8e6d490bfb8b0e9e6d169a9f6c352 Gerrit-Change-Number: 24082 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:28:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Build the grgsm_livemon man page
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24081 ) Change subject: Build the grgsm_livemon man page .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ie128d68965b5cb2c919afa408b4c8aa7ca87ea8c Gerrit-Change-Number: 24081 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:28:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: tests: Do not specify filename when runing gr_unittest
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24080 ) Change subject: tests: Do not specify filename when runing gr_unittest .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I7d6dbc32ff794ebf2bc116fa7437062e6780b85f Gerrit-Change-Number: 24080 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:28:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Remove build_utils.py and build_utils_codes.py
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24079 ) Change subject: Remove build_utils.py and build_utils_codes.py .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I80a364c729e75681a0afd926ea3ecd0eb2d65381 Gerrit-Change-Number: 24079 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:28:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: travis: Add /usr/local/lib/python3/dist-packages/ to PYTHONPATH
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24078 ) Change subject: travis: Add /usr/local/lib/python3/dist-packages/ to PYTHONPATH .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I260c82d1a53dab85f7aac86f23e61309d8841255 Gerrit-Change-Number: 24078 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:28:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: travis: Install liborc-0.4-dev needed for gr-iqbal
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24077 ) Change subject: travis: Install liborc-0.4-dev needed for gr-iqbal .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I4512bb734691f553d63cac59fd2c7ba3ccf3f881 Gerrit-Change-Number: 24077 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:28:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Do not add python/misc_utils to PYTHONPATH when executing tests
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24076 ) Change subject: Do not add python/misc_utils to PYTHONPATH when executing tests .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ib19a181a3fd9bb78c1d3989bad0e55433f060950 Gerrit-Change-Number: 24076 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:28:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Fix grcc compilation with python3 by adding local subdirs to __path__
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24075 ) Change subject: Fix grcc compilation with python3 by adding local subdirs to __path__ .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I223fd6181e8e36027039301186b671712a597ff8 Gerrit-Change-Number: 24075 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:28:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Remove the RTLD_GLOBAL hack
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24074 ) Change subject: Remove the RTLD_GLOBAL hack .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I1604ad5b9eefe3d4a2228b2a09e2069962844c97 Gerrit-Change-Number: 24074 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:28:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: travis: gnuradio-companion 3.8 does not have --version parameter
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24073 ) Change subject: travis: gnuradio-companion 3.8 does not have --version parameter .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I7e00c84a4b72e9fa1dcf5ac453882f1733724ac0 Gerrit-Change-Number: 24073 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:28:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: grgsm_livemon: Set cell_allocation to [0]
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24070 ) Change subject: grgsm_livemon: Set cell_allocation to [0] .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Iae6de844509b13bdf834c9c7443382b1ab3b0a28 Gerrit-Change-Number: 24070 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:27:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: grgsm_decode: Print frequency or ARFCN message on stderr
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24072 ) Change subject: grgsm_decode: Print frequency or ARFCN message on stderr .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ib18be898cac74769cabf1b748e40e21d23f08e98 Gerrit-Change-Number: 24072 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:27:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: grgsm_livemon: Specify localhost as string
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24071 ) Change subject: grgsm_livemon: Specify localhost as string .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I6bae2fb1f09038cb0cd3410533d3b3fdc79ed354 Gerrit-Change-Number: 24071 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:27:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: grgsm_livemon: Fix UDP client and server blocks
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24069 ) Change subject: grgsm_livemon: Fix UDP client and server blocks .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I542d7c36c30dc8179fa0ee84fc87e134cd2ba9f5 Gerrit-Change-Number: 24069 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:27:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: grgsm_livemon: Change the type of several parameters to string
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24068 ) Change subject: grgsm_livemon: Change the type of several parameters to string .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Id67e37e826aa1cc14640d57207a92def682f11e3 Gerrit-Change-Number: 24068 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:27:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: grgsm_livemon: Disable PPS sync
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24067 ) Change subject: grgsm_livemon: Disable PPS sync .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Iee6124bdb2441666a53ac9ee5239894aea61dfde Gerrit-Change-Number: 24067 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:27:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: travis: Manually install gr-iqbal and gr-osmosdr
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24066 ) Change subject: travis: Manually install gr-iqbal and gr-osmosdr .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I4f956577293c48d803b8b45d06ba508792501274 Gerrit-Change-Number: 24066 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:27:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: travis: Install only python3 packages
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24065 ) Change subject: travis: Install only python3 packages .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I3548fa7340afc63557cc65a7a396ecf96c607806 Gerrit-Change-Number: 24065 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:27:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Convert grgsm_livemon and grgsm_livemon_headless to YAML
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24064 ) Change subject: Convert grgsm_livemon and grgsm_livemon_headless to YAML .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I73023fc66d1ffd6c714a0610962c005395dc126b Gerrit-Change-Number: 24064 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:27:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Various python3 related changes
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24063 ) Change subject: Various python3 related changes .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I5ca8fd340823996e8c444aaf18ddacd85c92ab1c Gerrit-Change-Number: 24063 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:26:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: travis: Test only on distributions with gnuradio 3.8
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24062 ) Change subject: travis: Test only on distributions with gnuradio 3.8 .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I05706496687bff2dc4e9a111d8ecd4f878b53c12 Gerrit-Change-Number: 24062 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:26:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: Migrate grc blocks from xml to yaml
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24061 ) Change subject: Migrate grc blocks from xml to yaml .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Iee5c611a2e100bd2fdf487611a867dc937d8c292 Gerrit-Change-Number: 24061 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:26:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: GNU Radio 3.8 support
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/24060 ) Change subject: GNU Radio 3.8 support .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I23dd638c8c48ed0a4b50559ce33fbd5e60b7dcbc Gerrit-Change-Number: 24060 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Mon, 03 May 2021 10:26:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in gr-gsm[master]: tests: Remove test that don't work
ptrkrysik has uploaded this change for review. ( https://gerrit.osmocom.org/c/gr-gsm/+/24100 ) Change subject: tests: Remove test that don't work .. tests: Remove test that don't work Change-Id: I9f37131c565e6d87ae94f583d36a2de3d9500b38 --- M .travis.yml D tests/dockerfiles/CentOS_7.Dockerfile D tests/dockerfiles/CentOS_7_pygtk2.patch M tests/dockerfiles/Debian_testing.docker D tests/dockerfiles/Debian_testing_package.docker D tests/dockerfiles/Fedora_26.Dockerfile D tests/dockerfiles/Kali.docker D tests/dockerfiles/Ubuntu_16_04.docker D tests/dockerfiles/Ubuntu_16_04_nolibosmo.docker D tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker 10 files changed, 5 insertions(+), 257 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/00/24100/1 diff --git a/.travis.yml b/.travis.yml index 437e66e..5dcec4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,7 @@ language: ruby env: - - DOCKERFILE=tests/dockerfiles/Debian_testing.docker IMGNAME=debtest-grgsm -# - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04.docker IMGNAME=ubu16.04-grgsm -# - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04_nolibosmo.docker IMGNAME=ubu16.04-grgsm-nolibosmo - - DOCKERFILE=tests/dockerfiles/Kali.docker IMGNAME=kali-grgsm -# - DOCKERFILE=tests/dockerfiles/Fedora_26.Dockerfile IMGNAME=fedora26-grgsm - - DOCKERFILE=tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker IMGNAME=ubuntu_18_04_gnuradio_ppa - + - DOCKERFILE=tests/dockerfiles/Debian_testing.docker IMGNAME=debian_testing services: - docker diff --git a/tests/dockerfiles/CentOS_7.Dockerfile b/tests/dockerfiles/CentOS_7.Dockerfile deleted file mode 100644 index b5c235d..000 --- a/tests/dockerfiles/CentOS_7.Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM centos:7 - -RUN yum install -y \ -https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ -yum install -y \ -gcc-c++ \ -make \ -cmake3 \ -pkgconfig \ -boost-devel \ -gnuradio-devel \ -libosmocore-devel \ -gr-osmosdr \ -swig \ -doxygen \ -python2-docutils \ -cppunit-devel - -COPY ./ /src/ - -RUN yum install -y patch && \ -patch -p0 < /src/tests/dockerfiles/CentOS_7_pygtk2.patch - -WORKDIR /src/build -RUN cmake3 -DENABLE_GRGSM_LIVEMON=OFF .. && \ -# The parallel build sometimes fails when the .grc_gnuradio -# and .gnuradio directories do not exist -mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \ -make -j $(nproc) && \ -make install && \ -ldconfig && \ -make test diff --git a/tests/dockerfiles/CentOS_7_pygtk2.patch b/tests/dockerfiles/CentOS_7_pygtk2.patch deleted file mode 100644 index a5ed29c..000 --- a/tests/dockerfiles/CentOS_7_pygtk2.patch +++ /dev/null @@ -1,30 +0,0 @@ /usr/lib64/python2.7/site-packages/gtk-2.0/gtk/__init__.py 2018-04-23 17:29:19.555209060 + -+++ /usr/lib64/python2.7/site-packages/gtk-2.0/gtk/__init__.py 2018-04-23 17:32:53.448304174 + -@@ -47,14 +47,19 @@ - def _init(): - import sys - --sys_path = sys.path[:] -+try: -+sys_path = sys.path[:] - --_gtk.init_check() -- --# init_check calls PySys_SetArgv which calls sys.path.insert(0, ''), --# which causes problems for pychecker, restore it if modified. --if sys.path != sys_path: --sys.path[:] = sys_path -+try: -+_gtk.init_check() -+except RuntimeError, e: -+import warnings -+warnings.warn(str(e), _gtk.Warning) -+finally: -+# init_check calls PySys_SetArgv which calls sys.path.insert(0, ''), -+# which causes problems for pychecker, restore it if modified. -+if sys.path != sys_path: -+sys.path[:] = sys_path - - # install the default log handlers - _gtk.add_log_handlers() - diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker index c4c3057..8a9f84b 100644 --- a/tests/dockerfiles/Debian_testing.docker +++ b/tests/dockerfiles/Debian_testing.docker @@ -13,16 +13,16 @@ liblog4cpp5-dev \ python3-docutils \ python3-scipy \ -gnuradio-dev gnuradio libgmp-dev libboost-regex-dev liborc-dev \ +gnuradio-dev \ +liborc-dev \ libosmocore-dev \ gr-osmosdr COPY ./ /src/ - -RUN mkdir -p /src/build +RUN mkdir /src/build WORKDIR /src/build -RUN PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH cmake .. && \ +RUN cmake .. && \ # The parallel build sometimes fails when the .grc_gnuradio # and .gnuradio directories do not exist mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \ diff --git a/tests/dockerfiles/Debian_testing_package.docker b/tests/dockerfiles/Debian_testing_package.docker deleted file mode 100644 index 35d31cd..000 --- a/t
Change in gr-gsm[master]: tests: Add test for Ubuntu 20.04
ptrkrysik has uploaded this change for review. ( https://gerrit.osmocom.org/c/gr-gsm/+/24101 ) Change subject: tests: Add test for Ubuntu 20.04 .. tests: Add test for Ubuntu 20.04 Change-Id: I38bbde4fad7bdc72ad99a1957678539ea813013e --- M .travis.yml A tests/dockerfiles/Ubuntu_20_04.docker 2 files changed, 34 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/01/24101/1 diff --git a/.travis.yml b/.travis.yml index 5dcec4d..8ef60ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ language: ruby env: + - DOCKERFILE=tests/dockerfiles/Ubuntu_20_04.docker IMGNAME=ubuntu_20_04 - DOCKERFILE=tests/dockerfiles/Debian_testing.docker IMGNAME=debian_testing services: @@ -13,6 +14,6 @@ - cat $DOCKERFILE > Dockerfile ; docker build -t $IMGNAME . script: -# - docker run -it --rm $IMGNAME sh -c 'cd /src/build;make test' + - docker run -it --rm $IMGNAME sh -c 'cd /src/build;make test' - docker run -it --rm $IMGNAME /src/tests/scripts/decode.sh - docker run -it --rm $IMGNAME /src/tests/scripts/decrypt.sh diff --git a/tests/dockerfiles/Ubuntu_20_04.docker b/tests/dockerfiles/Ubuntu_20_04.docker new file mode 100644 index 000..f972d9e --- /dev/null +++ b/tests/dockerfiles/Ubuntu_20_04.docker @@ -0,0 +1,32 @@ +FROM ubuntu:20.04 +MAINTAINER Piotr Krysik + +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ +cmake \ +autoconf \ +libtool \ +pkg-config \ +build-essential \ +libcppunit-dev \ +swig \ +doxygen \ +liblog4cpp5-dev \ +python3-docutils \ +python3-scipy \ +gnuradio-dev \ +liborc-dev \ +libosmocore-dev \ +gr-osmosdr + +COPY ./ /src/ +RUN mkdir /src/build +WORKDIR /src/build + +RUN cmake .. && \ +# The parallel build sometimes fails when the .grc_gnuradio +# and .gnuradio directories do not exist +mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \ +make -j $(nproc) && \ +make install && \ +ldconfig && \ +make CTEST_OUTPUT_ON_FAILURE=1 test -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I38bbde4fad7bdc72ad99a1957678539ea813013e Gerrit-Change-Number: 24101 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-MessageType: newchange
Change in gr-gsm[master]: Port compile_demappers helper script to gr3.8
ptrkrysik has uploaded this change for review. ( https://gerrit.osmocom.org/c/gr-gsm/+/24099 ) Change subject: Port compile_demappers helper script to gr3.8 .. Port compile_demappers helper script to gr3.8 Change-Id: Iadcc19288496558fc65a46b72d36dcf047489ac3 --- M hier_blocks/compile_demappers 1 file changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/99/24099/1 diff --git a/hier_blocks/compile_demappers b/hier_blocks/compile_demappers index 96d652b..d492620 100755 --- a/hier_blocks/compile_demappers +++ b/hier_blocks/compile_demappers @@ -8,23 +8,25 @@ for p in *.grc do echo $p -grcc $p -d `pwd` +grcc $p -o `pwd` done cd .. mv ~/.grc_gnuradio/gsm_* . -for file in *.py.xml +for file in *.py.block.yml do -cat $file | sed 's/.*\.*/ import grgsm<\/import>/' \ - | sed 's//grgsm./' \ +echo $file +cat $file | sed "s/imports: .*\(#.*\)/imports: \\'import grgsm\\' \1/" \ + | sed 's/make: "/make: "grgsm./' \ | sed "s/.*.py//" \ - | sed 's/.*hier_blocks/gr-gsm\/hier_blocks/' \ + | sed 's/grc_source:.*hier_blocks/grc_source: gr-gsm\/hier_blocks/' \ > ${file}2 + mv ${file}2 $file -mv "$file" "`basename $file .py.xml`.xml" +mv "$file" "`basename $file .py.block.yml`.block.yml" done for py in *.py @@ -34,4 +36,4 @@ done mv *.py ../python/demapping -mv *.xml ../grc/demapping \ No newline at end of file +mv *.yml ../grc/demapping -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Iadcc19288496558fc65a46b72d36dcf047489ac3 Gerrit-Change-Number: 24099 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-MessageType: newchange
Change in gr-gsm[master]: tests: export VOLK_GENERIC=1 to workaround VOLK's bug 278
Hello vvvelichkov, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/gr-gsm/+/24089 to review the following change. Change subject: tests: export VOLK_GENERIC=1 to workaround VOLK's bug 278 .. tests: export VOLK_GENERIC=1 to workaround VOLK's bug 278 Change-Id: Ib9ad4384388e480b8fa2f91e02359c85c749e802 --- M tests/scripts/decode.sh M tests/scripts/decrypt.sh 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/89/24089/1 diff --git a/tests/scripts/decode.sh b/tests/scripts/decode.sh index 1ec7bf8..402e818 100755 --- a/tests/scripts/decode.sh +++ b/tests/scripts/decode.sh @@ -25,7 +25,13 @@ cd "$TEST_DIR" || exit 1 head -c 600 $CAPFILE > $SHORTENED_CAPFILE +# VOLK_GENERIC=1 is a temporary workaround for the following VOLK's bug +# https://github.com/gnuradio/volk/pull/278 +# https://github.com/gnuradio/gnuradio/issues/2748 +export VOLK_GENERIC=1 + $RUNLINE | grep -A 99 "860933 1329237: 59 06 1a 8f 6d 18 10 80 00 00 00 00 00 00 00 00 00 00 00 78 b9 00 00" | tee $RESULT_OBTAINED + diff $RESULT_EXPECTED $RESULT_OBTAINED TEST_RESULT=$? diff --git a/tests/scripts/decrypt.sh b/tests/scripts/decrypt.sh index 5c33537..335528a 100755 --- a/tests/scripts/decrypt.sh +++ b/tests/scripts/decrypt.sh @@ -25,6 +25,11 @@ cd "$TEST_DIR" || exit 1 head -c -3700 $CAPFILE | head -c 3580 > $SHORTENED_CAPFILE +# VOLK_GENERIC=1 is a temporary workaround for the following VOLK's bug +# https://github.com/gnuradio/volk/pull/278 +# https://github.com/gnuradio/gnuradio/issues/2748 +export VOLK_GENERIC=1 + $RUNLINE | grep -A 99 "862210 1331352: 03 03 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b" | tee $RESULT_OBTAINED diff -u $RESULT_EXPECTED $RESULT_OBTAINED TEST_RESULT=$? -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ib9ad4384388e480b8fa2f91e02359c85c749e802 Gerrit-Change-Number: 24089 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: newchange
Change in gr-gsm[master]: cmake: make formatting of install statements follow one pattern
ptrkrysik has uploaded this change for review. ( https://gerrit.osmocom.org/c/gr-gsm/+/24096 ) Change subject: cmake: make formatting of install statements follow one pattern .. cmake: make formatting of install statements follow one pattern Change-Id: Ib7d571af629b0af78397a411b0cca409a6d218d8 --- M CMakeLists.txt M apps/apps_data/CMakeLists.txt M docs/CMakeLists.txt M docs/doxygen/CMakeLists.txt M grc/CMakeLists.txt M grc/decoding/CMakeLists.txt M grc/decryption/CMakeLists.txt M grc/demapping/CMakeLists.txt M grc/flow_control/CMakeLists.txt M grc/misc_utils/CMakeLists.txt M grc/qa_utils/CMakeLists.txt M grc/receiver/CMakeLists.txt M grc/transmitter/CMakeLists.txt M grc/trx/CMakeLists.txt M include/grgsm/CMakeLists.txt M include/grgsm/decoding/CMakeLists.txt M include/grgsm/decryption/CMakeLists.txt M include/grgsm/demapping/CMakeLists.txt M include/grgsm/flow_control/CMakeLists.txt M include/grgsm/misc_utils/CMakeLists.txt M include/grgsm/qa_utils/CMakeLists.txt M include/grgsm/receiver/CMakeLists.txt M include/grgsm/transmitter/CMakeLists.txt M include/grgsm/trx/CMakeLists.txt M python/demapping/CMakeLists.txt M python/receiver/CMakeLists.txt M python/transmitter/CMakeLists.txt 27 files changed, 79 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/96/24096/1 diff --git a/CMakeLists.txt b/CMakeLists.txt index e8d7ef0..2231bc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -175,6 +175,8 @@ # Install cmake search helper for this library -install(FILES cmake/Modules/gr-gsmConfig.cmake +install( +FILES +cmake/Modules/gr-gsmConfig.cmake DESTINATION ${CMAKE_MODULES_DIR}/grgsm ) diff --git a/apps/apps_data/CMakeLists.txt b/apps/apps_data/CMakeLists.txt index db8a843..24ed3f0 100644 --- a/apps/apps_data/CMakeLists.txt +++ b/apps/apps_data/CMakeLists.txt @@ -35,7 +35,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/grgsm_setup_freedesktop @ONLY) install( -PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/grgsm_setup_freedesktop -DESTINATION ${GR_PKG_LIBEXEC_DIR} COMPONENT "gr-gsm" +PROGRAMS +${CMAKE_CURRENT_BINARY_DIR}/grgsm_setup_freedesktop +DESTINATION ${GR_PKG_LIBEXEC_DIR} +COMPONENT "gr-gsm" ) endif(UNIX AND HAVE_XDG_UTILS) diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index ed0fe3d..d2f9b1c 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -54,7 +54,11 @@ message(WARNING "rst2man from python-docutils is required to build man pages") else() build_man_page(MAN1_OUTPUT grgsm_livemon.rst grgsm_livemon.1) -install(FILES ${MAN1_OUTPUT} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) +install( +FILES +${MAN1_OUTPUT} +DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 +) endif() diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt index 6ade92c..ce64cec 100644 --- a/docs/doxygen/CMakeLists.txt +++ b/docs/doxygen/CMakeLists.txt @@ -50,4 +50,8 @@ add_custom_target(doxygen_target ALL DEPENDS ${BUILT_DIRS}) -install(DIRECTORY ${BUILT_DIRS} DESTINATION ${GR_PKG_DOC_DIR}) +install( +DIRECTORY +${BUILT_DIRS} +DESTINATION ${GR_PKG_DOC_DIR} +) diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index deee6e0..173b642 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -25,6 +25,8 @@ add_subdirectory(misc_utils) add_subdirectory(transmitter) add_subdirectory(trx) -install(FILES -gsm.tree.yml DESTINATION share/gnuradio/grc/blocks +install( +FILES +gsm.tree.yml +DESTINATION share/gnuradio/grc/blocks ) diff --git a/grc/decoding/CMakeLists.txt b/grc/decoding/CMakeLists.txt index 63a2ee6..71953f0 100644 --- a/grc/decoding/CMakeLists.txt +++ b/grc/decoding/CMakeLists.txt @@ -17,7 +17,8 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -install(FILES +install( +FILES gsm_control_channels_decoder.block.yml gsm_tch_f_decoder.block.yml gsm_tch_h_decoder.block.yml diff --git a/grc/decryption/CMakeLists.txt b/grc/decryption/CMakeLists.txt index e71e466..455ee0b 100644 --- a/grc/decryption/CMakeLists.txt +++ b/grc/decryption/CMakeLists.txt @@ -17,7 +17,8 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -install(FILES +install( +FILES gsm_decryption.block.yml DESTINATION share/gnuradio/grc/blocks ) diff --git a/grc/demapping/CMakeLists.txt b/grc/demapping/CMakeLists.txt index 2572235..2bc5750 100644 --- a/grc/demapping/CMakeLists.txt +++ b/grc/demapping/CMakeLists.txt @@ -17,7 +17,8 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -install(FILES +install( +FILES gsm_universal_ctrl_chans_demapper.block.yml gs
Change in gr-gsm[master]: Execute python apps with use of python3
ptrkrysik has uploaded this change for review. ( https://gerrit.osmocom.org/c/gr-gsm/+/24098 ) Change subject: Execute python apps with use of python3 .. Execute python apps with use of python3 Change-Id: Ib9ab805cc5a3878d168787736463dc495b96ddcf --- M apps/helpers/grgsm_capture M apps/helpers/grgsm_channelize 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/98/24098/1 diff --git a/apps/helpers/grgsm_capture b/apps/helpers/grgsm_capture index f3886ba..43dce33 100755 --- a/apps/helpers/grgsm_capture +++ b/apps/helpers/grgsm_capture @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @file # @author (C) 2015 by Roman Khassraf diff --git a/apps/helpers/grgsm_channelize b/apps/helpers/grgsm_channelize index 5eaeb3b..92b252e 100755 --- a/apps/helpers/grgsm_channelize +++ b/apps/helpers/grgsm_channelize @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @file # @author (C) 2015 by Pieter Robyns -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ib9ab805cc5a3878d168787736463dc495b96ddcf Gerrit-Change-Number: 24098 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-MessageType: newchange
Change in gr-gsm[master]: Fix compiling with the local libosmocore copy
Hello vvvelichkov, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/gr-gsm/+/24093 to review the following change. Change subject: Fix compiling with the local libosmocore copy .. Fix compiling with the local libosmocore copy Change-Id: Ic72e6ca7f9cc40bc2d78b931e54e66cd71444835 --- M lib/CMakeLists.txt 1 file changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/93/24093/1 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index e7dae14..bc1baeb 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -77,22 +77,32 @@ add_subdirectory(trx) if(NOT LOCAL_OSMOCOM) -list (APPEND grgsm_link_libraries ${LIBOSMOCORE_LIBRARIES} ${LIBOSMOCODEC_LIBRARIES} ${LIBOSMOGSM_LIBRARY}) +list (APPEND grgsm_link_libraries ${LIBOSMOCORE_LIBRARY} ${LIBOSMOCODEC_LIBRARY} ${LIBOSMOGSM_LIBRARY}) if(LIBOSMOCODING_FOUND) list (APPEND grgsm_link_libraries - ${LIBOSMOCODING_LIBRARIES} - ) + ${LIBOSMOCODING_LIBRARY} +) list (APPEND grgsm_include_directories - ${LIBOSMOCORE_INCLUDE_DIR} + PUBLIC $ +) +else() +list (APPEND grgsm_include_directories +PUBLIC $ ) endif() -endif() +else(NOT LOCAL_OSMOCOM) +list (APPEND grgsm_include_directories +PUBLIC $ +) +endif(NOT LOCAL_OSMOCOM) + add_library(grgsm SHARED ${grgsm_sources}) -target_link_libraries(grgsm gnuradio::gnuradio-runtime gnuradio::gnuradio-filter volk osmocoding) +target_link_libraries(grgsm gnuradio::gnuradio-runtime gnuradio::gnuradio-filter volk ${grgsm_link_libraries}) target_include_directories(grgsm PUBLIC $ PUBLIC $ +${grgsm_include_directories} PUBLIC $ PUBLIC $ ) -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ic72e6ca7f9cc40bc2d78b931e54e66cd71444835 Gerrit-Change-Number: 24093 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: newchange
Change in gr-gsm[master]: trx: Removing old and unused grc based radio_if
ptrkrysik has uploaded this change for review. ( https://gerrit.osmocom.org/c/gr-gsm/+/24094 ) Change subject: trx: Removing old and unused grc based radio_if .. trx: Removing old and unused grc based radio_if Change-Id: I7d43e6f2962b21ff03601cf1b1aafc222f2c4661 --- M python/trx/CMakeLists.txt D python/trx/radio_if_grc.py 2 files changed, 0 insertions(+), 269 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/94/24094/1 diff --git a/python/trx/CMakeLists.txt b/python/trx/CMakeLists.txt index 697687b..1069db8 100644 --- a/python/trx/CMakeLists.txt +++ b/python/trx/CMakeLists.txt @@ -26,7 +26,6 @@ radio_if.py radio_if_uhd.py radio_if_lms.py -radio_if_grc.py transceiver.py dict_toggle_sign.py DESTINATION ${GR_PYTHON_DIR}/grgsm/trx diff --git a/python/trx/radio_if_grc.py b/python/trx/radio_if_grc.py deleted file mode 100755 index fb9b100..000 --- a/python/trx/radio_if_grc.py +++ /dev/null @@ -1,268 +0,0 @@ -#!/usr/bin/env python2 -# -*- coding: utf-8 -*- -## -# GNU Radio Python Flow Graph -# Title: Trx radio interface -# Author: (C) Piotr Krysik 2017 -# Description: Alpha version of trx radio interface -# Generated: Fri Dec 1 10:49:25 2017 -## - -from dict_toggle_sign import dict_toggle_sign -from gnuradio import blocks -from gnuradio import digital -from gnuradio import eng_notation -from gnuradio import filter -from gnuradio import gr -from gnuradio import uhd -from gnuradio.eng_option import eng_option -from gnuradio.filter import firdes -from grgsm import gsm_gmsk_mod -from optparse import OptionParser -import grgsm -import math -import time - - -class RadioInterfaceGRC(gr.top_block): - -def __init__(self, delay_correction=285.616e-6, osr=4, ppm=-0.799427, rx_freq=935e6+36*0.2e6, rx_gain=40, samp_rate=13e6/12.0, timing_advance=0, trx_base_port="5710", trx_remote_addr="127.0.0.1", tx_freq=935e6+36*0.2e6-45e6, tx_gain=40, uplink_shift=-(6.0/1625000*(156.25)*3)): -gr.top_block.__init__(self, "Trx radio interface") - -## -# Parameters -## -self.delay_correction = delay_correction -self.osr = osr -self.ppm = ppm -self.rx_freq = rx_freq -self.rx_gain = rx_gain -self.samp_rate = samp_rate -self.timing_advance = timing_advance -self.trx_base_port = trx_base_port -self.trx_remote_addr = trx_remote_addr -self.tx_freq = tx_freq -self.tx_gain = tx_gain -self.uplink_shift = uplink_shift - -## -# Blocks -## -self.uhd_usrp_source_0 = uhd.usrp_source( - ",".join(("", "")), - uhd.stream_args( - cpu_format="fc32", - channels=range(1), - ), -) -self.uhd_usrp_source_0.set_clock_rate(26e6, uhd.ALL_MBOARDS) -self.uhd_usrp_source_0.set_samp_rate(samp_rate) -self.uhd_usrp_source_0.set_center_freq(rx_freq, 0) -self.uhd_usrp_source_0.set_gain(rx_gain, 0) -self.uhd_usrp_source_0.set_antenna("RX2", 0) -self.uhd_usrp_sink_0 = uhd.usrp_sink( - ",".join(("", "")), - uhd.stream_args( - cpu_format="fc32", - channels=range(1), - ), - "packet_len", -) -self.uhd_usrp_sink_0.set_clock_rate(26e6, uhd.ALL_MBOARDS) -self.uhd_usrp_sink_0.set_subdev_spec("A:B", 0) -self.uhd_usrp_sink_0.set_samp_rate(samp_rate) -self.uhd_usrp_sink_0.set_center_freq(tx_freq, 0) -self.uhd_usrp_sink_0.set_gain(tx_gain, 0) -self.uhd_usrp_sink_0.set_antenna("TX/RX", 0) -self.ts_filter = grgsm.burst_timeslot_filter(0) -self.low_pass_filter_0_0 = filter.fir_filter_ccf(1, firdes.low_pass( - 1, samp_rate, 125e3, 5e3, firdes.WIN_HAMMING, 6.76)) -self.gsm_txtime_setter_0 = grgsm.txtime_setter(None if (None is not None) else 0x, 0, 0, 0, 0, timing_advance, delay_correction+uplink_shift) -self.gsm_trx_burst_if_0 = grgsm.trx_burst_if(trx_remote_addr, trx_base_port) -self.gsm_receiver_0 = grgsm.receiver(4, ([0]), ([4]), False) -self.gsm_preprocess_tx_burst_0 = grgsm.preprocess_tx_burst() -self.gsm_msg_to_tag_0_0 = grgsm.msg_to_tag() -self.gsm_msg_to_tag_0 = grgsm.msg_to_tag() -self.gsm_gmsk_mod_0 = gsm_gmsk_mod( -BT=0.3, -pulse_duration
Change in gr-gsm[master]: Remove local copy of associated osmo libraries
ptrkrysik has uploaded this change for review. ( https://gerrit.osmocom.org/c/gr-gsm/+/24097 ) Change subject: Remove local copy of associated osmo libraries .. Remove local copy of associated osmo libraries Change-Id: I2b4afedd9f2d568b5287d791891b2c2893fc6843 --- M CMakeLists.txt M lib/CMakeLists.txt M lib/decoding/CMakeLists.txt D lib/decoding/osmocom/codec/CMakeLists.txt D lib/decoding/osmocom/codec/codec.h D lib/decoding/osmocom/codec/gsm610.c D lib/decoding/osmocom/codec/gsm610_bits.h D lib/decoding/osmocom/codec/gsm620.c D lib/decoding/osmocom/codec/gsm660.c D lib/decoding/osmocom/codec/gsm690.c D lib/decoding/osmocom/coding/CMakeLists.txt D lib/decoding/osmocom/coding/gsm0503_coding.c D lib/decoding/osmocom/coding/gsm0503_coding.h D lib/decoding/osmocom/coding/gsm0503_conv.c D lib/decoding/osmocom/coding/gsm0503_interleaving.c D lib/decoding/osmocom/coding/gsm0503_interleaving.h D lib/decoding/osmocom/coding/gsm0503_mapping.c D lib/decoding/osmocom/coding/gsm0503_mapping.h D lib/decoding/osmocom/coding/gsm0503_parity.c D lib/decoding/osmocom/coding/gsm0503_parity.h D lib/decoding/osmocom/coding/gsm0503_tables.c D lib/decoding/osmocom/coding/gsm0503_tables.h D lib/decoding/osmocom/core/CMakeLists.txt D lib/decoding/osmocom/core/bit16gen.h D lib/decoding/osmocom/core/bit32gen.h D lib/decoding/osmocom/core/bit64gen.h D lib/decoding/osmocom/core/bits.c D lib/decoding/osmocom/core/bits.h D lib/decoding/osmocom/core/bitvec.c D lib/decoding/osmocom/core/bitvec.h D lib/decoding/osmocom/core/conv.c D lib/decoding/osmocom/core/conv.h D lib/decoding/osmocom/core/conv_acc.c D lib/decoding/osmocom/core/conv_acc_generic.c D lib/decoding/osmocom/core/crc16gen.c D lib/decoding/osmocom/core/crc16gen.h D lib/decoding/osmocom/core/crc32gen.h D lib/decoding/osmocom/core/crc64gen.c D lib/decoding/osmocom/core/crc64gen.h D lib/decoding/osmocom/core/crc8gen.c D lib/decoding/osmocom/core/crc8gen.h D lib/decoding/osmocom/core/crcgen.h D lib/decoding/osmocom/core/defs.h D lib/decoding/osmocom/core/endian.h D lib/decoding/osmocom/core/linuxlist.h D lib/decoding/osmocom/core/panic.c D lib/decoding/osmocom/core/panic.h D lib/decoding/osmocom/core/utils.h D lib/decoding/osmocom/crypt/auth.h D lib/decoding/osmocom/gsm/CMakeLists.txt D lib/decoding/osmocom/gsm/a5.c D lib/decoding/osmocom/gsm/a5.h D lib/decoding/osmocom/gsm/auth_core.c D lib/decoding/osmocom/gsm/gsm0503.h D lib/decoding/osmocom/gsm/gsm48_ie.c D lib/decoding/osmocom/gsm/gsm48_ie.h D lib/decoding/osmocom/gsm/kasumi.c D lib/decoding/osmocom/gsm/kasumi.h D lib/decoding/osmocom/gsm/protocol/gsm_04_08.h 59 files changed, 2 insertions(+), 17,859 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/97/24097/1 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I2b4afedd9f2d568b5287d791891b2c2893fc6843 Gerrit-Change-Number: 24097 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-MessageType: newchange
Change in gr-gsm[master]: cmake: change 'gsm' to 'grgsm'
ptrkrysik has uploaded this change for review. ( https://gerrit.osmocom.org/c/gr-gsm/+/24095 ) Change subject: cmake: change 'gsm' to 'grgsm' .. cmake: change 'gsm' to 'grgsm' Change-Id: I130a7912e179b1f04e68eb131e06800becca5a00 --- M CMakeLists.txt M lib/CMakeLists.txt 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/95/24095/1 diff --git a/CMakeLists.txt b/CMakeLists.txt index f73bfbe..e8d7ef0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,5 +176,5 @@ install(FILES cmake/Modules/gr-gsmConfig.cmake -DESTINATION ${CMAKE_MODULES_DIR}/gsm +DESTINATION ${CMAKE_MODULES_DIR}/grgsm ) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index bc1baeb..88aa635 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -136,18 +136,18 @@ # If your unit tests require special include paths, add them here #include_directories() # List all files that contain Boost.UTF unit tests here -list(APPEND test_gsm_sources +list(APPEND test_grgsm_sources ) # Anything we need to link to for the unit tests go here list(APPEND GR_TEST_TARGET_DEPS grgsm) -if(NOT test_gsm_sources) +if(NOT test_grgsm_sources) MESSAGE(STATUS "No C++ unit tests... skipping") return() -endif(NOT test_gsm_sources) +endif(NOT test_grgsm_sources) -foreach(qa_file ${test_gsm_sources}) -GR_ADD_CPP_TEST("gsm_${qa_file}" +foreach(qa_file ${test_grgsm_sources}) +GR_ADD_CPP_TEST("grgsm_${qa_file}" ${CMAKE_CURRENT_SOURCE_DIR}/${qa_file} ) endforeach(qa_file) -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I130a7912e179b1f04e68eb131e06800becca5a00 Gerrit-Change-Number: 24095 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-MessageType: newchange
Change in gr-gsm[master]: Log import errors as currently GRC 3.8 suppress them
Hello vvvelichkov, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/gr-gsm/+/24092 to review the following change. Change subject: Log import errors as currently GRC 3.8 suppress them .. Log import errors as currently GRC 3.8 suppress them See gnuradio/grc/core/FlowGraph.py:194 Change-Id: Ie6213428c218720692a544c98dc32c16bd50cbe1 --- M python/__init__.py 1 file changed, 20 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/92/24092/1 diff --git a/python/__init__.py b/python/__init__.py index 87a62d6..b68df4a 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -43,21 +43,25 @@ os.path.join(dirname, "transmitter"), os.path.join(dirname, "trx")] -# import swig generated symbols into the gsm namespace -from .grgsm_swig import * +try: +# import swig generated symbols into the gsm namespace +from .grgsm_swig import * -# import any pure python here +# import any pure python here -#from fcch_burst_tagger import fcch_burst_tagger -#from sch_detector import sch_detector -#from fcch_detector import fcch_detector -from .clock_offset_corrector_tagged import clock_offset_corrector_tagged -from .gsm_input import gsm_input -from .gsm_bcch_ccch_demapper import gsm_bcch_ccch_demapper -from .gsm_bcch_ccch_sdcch4_demapper import gsm_bcch_ccch_sdcch4_demapper -from .gsm_sdcch8_demapper import gsm_sdcch8_demapper -from .gsm_gmsk_mod import gsm_gmsk_mod -from .fn_time import * -from .txtime_bursts_tagger import * -from .arfcn import * -from .device import * +#from fcch_burst_tagger import fcch_burst_tagger +#from sch_detector import sch_detector +#from fcch_detector import fcch_detector +from .clock_offset_corrector_tagged import clock_offset_corrector_tagged +from .gsm_input import gsm_input +from .gsm_bcch_ccch_demapper import gsm_bcch_ccch_demapper +from .gsm_bcch_ccch_sdcch4_demapper import gsm_bcch_ccch_sdcch4_demapper +from .gsm_sdcch8_demapper import gsm_sdcch8_demapper +from .gsm_gmsk_mod import gsm_gmsk_mod +from .fn_time import * +from .txtime_bursts_tagger import * +from .arfcn import * +from .device import * +except ImportError as e: +import traceback; traceback.print_exc() +raise -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ie6213428c218720692a544c98dc32c16bd50cbe1 Gerrit-Change-Number: 24092 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: newchange
Change in gr-gsm[master]: travis: Test in Ubuntu 18.04 container
Hello vvvelichkov, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/gr-gsm/+/24091 to review the following change. Change subject: travis: Test in Ubuntu 18.04 container .. travis: Test in Ubuntu 18.04 container - Install gnuradio from the new official PPA repository https://launchpad.net/~gnuradio/+archive/ubuntu/gnuradio-releases Change-Id: Iaa8813ab0ae91b667285ab3ef42ffaa279e3a885 --- M .dockerignore M .travis.yml A tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker 3 files changed, 53 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/91/24091/1 diff --git a/.dockerignore b/.dockerignore index 1b2211d..ef67c26 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,2 @@ build* +.git diff --git a/.travis.yml b/.travis.yml index 182e006..437e66e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ # - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04_nolibosmo.docker IMGNAME=ubu16.04-grgsm-nolibosmo - DOCKERFILE=tests/dockerfiles/Kali.docker IMGNAME=kali-grgsm # - DOCKERFILE=tests/dockerfiles/Fedora_26.Dockerfile IMGNAME=fedora26-grgsm + - DOCKERFILE=tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker IMGNAME=ubuntu_18_04_gnuradio_ppa services: diff --git a/tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker b/tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker new file mode 100644 index 000..e0f45a5 --- /dev/null +++ b/tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker @@ -0,0 +1,51 @@ +FROM ubuntu:18.04 +MAINTAINER Vasil Velichkov + +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ +software-properties-common && \ +add-apt-repository --yes ppa:gnuradio/gnuradio-releases && \ +DEBIAN_FRONTEND=noninteractive apt-get install -y \ +git \ +cmake \ +autoconf \ +libtool \ +pkg-config \ +build-essential \ +python-docutils \ +libcppunit-dev \ +swig \ +doxygen \ +liblog4cpp5-dev \ +python-scipy \ +gnuradio-dev gnuradio libgmp-dev libboost-regex-dev liborc-dev libuhd-dev \ +libosmocore-dev + +RUN git clone --branch maint-3.8 --recurse-submodules https://github.com/velichkov/gr-iqbal && \ +cd gr-iqbal && \ +mkdir build && \ +cd build && \ +cmake -DENABLE_DOXYGEN=OFF .. && \ +make -j $(nproc) install + +RUN git clone --branch maint-3.8 https://github.com/velichkov/gr-osmosdr && \ +cd gr-osmosdr && \ +mkdir build && \ +cd build && \ +cmake -DENABLE_DOXYGEN=OFF .. && \ +make -j $(nproc) install + +COPY ./ /src/ +RUN mkdir /src/build +WORKDIR /src/build + +#PYTHONPATH is needed as gr-osmosdr gets installed in /usr/local/lib/python3/... +ENV PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH + +RUN cmake .. && \ +# The parallel build sometimes fails when the .grc_gnuradio +# and .gnuradio directories do not exist +mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \ +make -j $(nproc) && \ +make install && \ +ldconfig && \ +make CTEST_OUTPUT_ON_FAILURE=1 test -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Iaa8813ab0ae91b667285ab3ef42ffaa279e3a885 Gerrit-Change-Number: 24091 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: newchange
Change in gr-gsm[master]: Print the error message on stderr in a python2 compatible way
Hello vvvelichkov, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/gr-gsm/+/24090 to review the following change. Change subject: Print the error message on stderr in a python2 compatible way .. Print the error message on stderr in a python2 compatible way Change-Id: Iaea1510b02a2df924ef9777d107d22c45cb37d12 --- M apps/grgsm_decode 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/90/24090/1 diff --git a/apps/grgsm_decode b/apps/grgsm_decode index d754fc7..000440f 100755 --- a/apps/grgsm_decode +++ b/apps/grgsm_decode @@ -369,7 +369,7 @@ parser.error("Invalid A5 version\n") if options.cfile and (options.fc is None and options.arfcn is None): -print("You haven't provided a frequency or an ARFCN - working without automatic frequency offset correction.\n", file=sys.stderr) +sys.stderr.write("You haven't provided a frequency or an ARFCN - working without automatic frequency offset correction.\n") # handle frequency / arfcn input arfcn = None -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Iaea1510b02a2df924ef9777d107d22c45cb37d12 Gerrit-Change-Number: 24090 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: newchange
Change in gr-gsm[master]: tests: Get more information about CPU and user limits
Hello vvvelichkov, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/gr-gsm/+/24088 to review the following change. Change subject: tests: Get more information about CPU and user limits .. tests: Get more information about CPU and user limits Change-Id: I0bd3c206f422e11a59070a1c9aace38201ff7c85 --- M tests/scripts/decode.sh M tests/scripts/decrypt.sh 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/88/24088/1 diff --git a/tests/scripts/decode.sh b/tests/scripts/decode.sh index 98aa165..1ec7bf8 100755 --- a/tests/scripts/decode.sh +++ b/tests/scripts/decode.sh @@ -19,6 +19,8 @@ echo "Testing with:" echo " $RUNLINE" gnuradio-config-info --version +cat /proc/cpuinfo +ulimit -a cd "$TEST_DIR" || exit 1 head -c 600 $CAPFILE > $SHORTENED_CAPFILE diff --git a/tests/scripts/decrypt.sh b/tests/scripts/decrypt.sh index 824955f..5c33537 100755 --- a/tests/scripts/decrypt.sh +++ b/tests/scripts/decrypt.sh @@ -19,6 +19,8 @@ echo "Testing with:" echo " $RUNLINE" gnuradio-config-info --version +cat /proc/cpuinfo +ulimit -a cd "$TEST_DIR" || exit 1 head -c -3700 $CAPFILE | head -c 3580 > $SHORTENED_CAPFILE -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I0bd3c206f422e11a59070a1c9aace38201ff7c85 Gerrit-Change-Number: 24088 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: newchange
Change in gr-gsm[master]: tests: fix some shellcheck errors.
Hello vvvelichkov, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/gr-gsm/+/24087 to review the following change. Change subject: tests: fix some shellcheck errors. .. tests: fix some shellcheck errors. Execute "gnuradio-config-info --version" instead of "gnuradio-companion --version" Change-Id: Ia399324ae7a39e120e338c86d449d7c4d54bd866 --- M tests/scripts/decode.sh M tests/scripts/decrypt.sh 2 files changed, 8 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/87/24087/1 diff --git a/tests/scripts/decode.sh b/tests/scripts/decode.sh index b982709..98aa165 100755 --- a/tests/scripts/decode.sh +++ b/tests/scripts/decode.sh @@ -1,6 +1,6 @@ #!/bin/bash -TEST_DIR=`dirname "$0"` +TEST_DIR=$(dirname "$0") # PYTHONPATH and LD_LIBRARY_PATH are needed on Fedora 26 # @@ -18,11 +18,10 @@ export RUNLINE="$AP_DECODE -c $SHORTENED_CAPFILE -s $((1/174)) -m BCCH -t 0 -v --ppm -10" echo "Testing with:" echo " $RUNLINE" -#gnuradio 3.8 does not have --version parameter -#gnuradio-companion --version +gnuradio-config-info --version -cd $TEST_DIR -cat $CAPFILE | head -c 600 > $SHORTENED_CAPFILE +cd "$TEST_DIR" || exit 1 +head -c 600 $CAPFILE > $SHORTENED_CAPFILE $RUNLINE | grep -A 99 "860933 1329237: 59 06 1a 8f 6d 18 10 80 00 00 00 00 00 00 00 00 00 00 00 78 b9 00 00" | tee $RESULT_OBTAINED diff $RESULT_EXPECTED $RESULT_OBTAINED diff --git a/tests/scripts/decrypt.sh b/tests/scripts/decrypt.sh index 7f9bc60..824955f 100755 --- a/tests/scripts/decrypt.sh +++ b/tests/scripts/decrypt.sh @@ -1,6 +1,6 @@ #!/bin/bash -TEST_DIR=`dirname "$0"` +TEST_DIR=$(dirname "$0") # PYTHONPATH and LD_LIBRARY_PATH are needed on Fedora 26 # @@ -18,11 +18,10 @@ export RUNLINE="$AP_DECODE -c $SHORTENED_CAPFILE -s $((1/174)) -m SDCCH8 -t 1 -k 0x1E,0xF0,0x0B,0xAB,0x3B,0xAC,0x70,0x02 -v --ppm -10" echo "Testing with:" echo " $RUNLINE" -#gnuradio 3.8 does not have --version parameter -#gnuradio-companion --version +gnuradio-config-info --version -cd $TEST_DIR -cat $CAPFILE | head -c -3700 | head -c 3580 > $SHORTENED_CAPFILE +cd "$TEST_DIR" || exit 1 +head -c -3700 $CAPFILE | head -c 3580 > $SHORTENED_CAPFILE $RUNLINE | grep -A 99 "862210 1331352: 03 03 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b" | tee $RESULT_OBTAINED diff -u $RESULT_EXPECTED $RESULT_OBTAINED -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ia399324ae7a39e120e338c86d449d7c4d54bd866 Gerrit-Change-Number: 24087 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: newchange
Change in gr-gsm[master]: travis: Use bionic build environment
Hello vvvelichkov, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/gr-gsm/+/24086 to review the following change. Change subject: travis: Use bionic build environment .. travis: Use bionic build environment https: //docs.travis-ci.com/user/reference/bionic/ Change-Id: I8f622506329ee97ff3555c2a43a2165303d9ae82 --- M .travis.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/86/24086/1 diff --git a/.travis.yml b/.travis.yml index 5230b46..182e006 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ sudo: required +dist: bionic language: ruby -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I8f622506329ee97ff3555c2a43a2165303d9ae82 Gerrit-Change-Number: 24086 Gerrit-PatchSet: 1 Gerrit-Owner: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-MessageType: newchange