Commit Graph

1046 Commits

Author SHA1 Message Date
Piotr Krysik f00936d60d Placing grcc compilation utils in separate files
Avoiding increasing required cmake version with use of wrapper shell script.
2018-06-18 15:13:25 +02:00
Piotr Krysik c711e97af1 Separating libosmogsm from the rest 2018-06-18 15:13:13 +02:00
Vasil Velichkov 9b5519db84 Check that pkg-config is available
It is needed to properly detect the grcc full path
See also 3f6ab15a7a
2018-06-18 15:11:17 +02:00
Vasil Velichkov 8c4eefb205 Add DEBIAN_FRONTEND=noninteractive 2018-06-18 15:11:17 +02:00
Vasil Velichkov 487bf4764e Fix the parallel build with cmake 3.11
Copy UseSWIG.cmake from the gnuradio repository from commit
4433a7703fe3f5713c2200a0f7c11b13510f34cc

This macro is distributed in the Debian's gnuradio-dev package but it's
not available in Fedora/Centos gnuradio-devel package. The gnuradio's
version contains a fix for the parallel build 99a09af05fda6d0bab0cf3724a1c6bf453c71bc7
and some other improvements as well.
2018-06-18 15:11:17 +02:00
Vasil Velichkov 8f4b5ba372 Add CentOS7 docker container 2018-06-18 15:11:17 +02:00
Vasil Velichkov 014ed2be5c Add cmake options that enable/disable grcc compilation
To disable compilation of both grgsm_livemon and grgsm_livemon_headless
execute

  cmake -DENABLE_GRCC=OFF ..

To disable only one execute

  cmake -DENABLE_GRGSM_LIVEMON=OFF ..
  cmake -DENABLE_GRGSM_LIVEMON_HEADLESS=OFF ..
2018-06-18 15:11:17 +02:00
Piotr Krysik 47c3e9bf43 Changing tabs to spaces 2018-06-04 09:11:59 +02:00
Piotr Krysik 1e7241464a Disabling installation of desktop files
Installation of dekstop files is causing problems with packaging - github issue #335.
Disabling it then.
2018-06-04 09:11:47 +02:00
Piotr Krysik ea44d98558 Commenting out a line causeing crash on HackRF 2018-06-02 12:27:58 +02:00
Piotr Krysik 2779e62094 Fix includes after moving trx_burst_if 2018-05-06 22:23:06 +02:00
Piotr Krysik 69434963d9 Added short description of grgsm_trx 2018-05-05 13:06:22 +02:00
Piotr Krysik ea7a66cb86 Updated e-mail addresses of Vadim and Vasil 2018-05-05 13:06:02 +02:00
Piotr Krysik 650a436a8d Fix burst_to_fn_time name in gsm_burst_to_fn_time.xml 2018-05-05 12:40:14 +02:00
Piotr Krysik 993055342d Moving trx burst interface to trx directory
and to new 'Transceiver' cathegory in gnuradio-companion
2018-05-05 12:38:11 +02:00
Piotr Krysik 3c1452f94f Fix gsm_msg_to_tag block record in grc/gsm_block_tree.xml
so it appear in gnuradio-companion
2018-05-05 12:24:33 +02:00
Piotr Krysik 2471052cfe Merge branch 'fixeria/trx' of https://github.com/axilirator/gr-gsm into fixeria_trx
# Resolved conflicts:
#	apps/grgsm_trx
#	python/trx/radio_if.py
#	swig/grgsm_swig.i
2018-04-17 09:10:33 +02:00
Piotr Krysik 2ece45f516 Adding Vadim and Vasil to the credits section 2018-04-17 08:48:40 +02:00
Piotr Krysik d77414b827 GRCC: Adding new directories to python path to make grc files compile after merger 2018-04-17 08:22:11 +02:00
Piotr Krysik 8a8d41a583 Merge branch 'ptrkrysik/trx' into development 2018-04-16 22:21:29 +02:00
Vasil Velichkov 8b9b88d788 Disable the parallel build on Fedora 26
There is a problem with cmake 3.11.0 and the parallel build fails with
See https://github.com/ptrkrysik/gr-gsm/pull/378#issuecomment-379583050

make[2]: *** No rule to make target 'swig/grgsm_swig.py', needed by 'swig/grgsm_swig.pyc'.  Stop.
make[1]: *** [CMakeFiles/Makefile2:601: swig/CMakeFiles/pygen_swig_43235.dir/all] Error 2
2018-04-16 21:08:50 +02:00
Vasil Velichkov 084b14ea17 Workaround for the grcc failure
See https://github.com/ptrkrysik/gr-gsm/pull/378#issuecomment-379587145

Traceback (most recent call last):
  File "/usr/bin/grcc", line 29, in <module>
    from gnuradio import gr
  File "/usr/lib/python2.7/dist-packages/gnuradio/gr/__init__.py", line 41, in <module>
    from runtime_swig import *
  File "/usr/lib/python2.7/dist-packages/gnuradio/gr/runtime_swig.py", line 17, in <module>
    _runtime_swig = swig_import_helper()
  File "/usr/lib/python2.7/dist-packages/gnuradio/gr/runtime_swig.py", line 16, in swig_import_helper
    return importlib.import_module('_runtime_swig')
  File "/usr/lib/python2.7/importlib/__init__.py", line 37, in import_module
    __import__(name)
ImportError: No module named _runtime_swig
2018-04-16 21:08:50 +02:00
Piotr Krysik e24860f9c0 Reformatting control_channels_decoder 2018-04-06 15:22:51 +02:00
Vasil Velichkov bb7d94a712 Add tch_f_decoder tests 2018-04-06 15:18:26 +02:00
Vasil Velichkov 924d1873da Fix an assert in ViterbiR2O4::decode
The table length was wrong becuase matchCostTable is a float pointer and
not an array since 792330777d

python2.7: /home/user/gr-gsm/lib/decoding/openbts/ViterbiR204.cpp:288: virtual void ViterbiR2O4::decode(const SoftVector&, BitVector&): Assertion `match-matchCostTable<(float)sizeof(matchCostTable)/sizeof(matchCostTable[0])-1' failed.

 (gdb) f 4
 #4  0x00007fffdff820c3 in ViterbiR2O4::decode (this=0x5555563bbdf0, in=..., target=...)
     at /home/vasko/sources/gr-gsm/gr-gsm/lib/decoding/openbts/ViterbiR204.cpp:288
 288				assert(match-matchCostTable<(float)sizeof(matchCostTable)/sizeof(matchCostTable[0])-1);
 (gdb) p match-matchCostTable
 $1 = 2
 (gdb) p (float)sizeof(matchCostTable)/sizeof(matchCostTable[0])-1
 $2 = 1
 (gdb) p (float)sizeof(matchCostTable)/sizeof(matchCostTable[0])
 $3 = 2
 (gdb) p sizeof(matchCostTable)
 $4 = 8
2018-04-06 15:18:26 +02:00
Vasil Velichkov a396100294 Do not test with debtest-grgsm-package container 2018-03-30 22:34:52 +02:00
Vasil Velichkov bc2a23e0e7 Check the gsm0503_xcch_decode return value
- Discard the message when gsm0503_xcch_decode returns -1
- Add automated decrypt test

See https://groups.google.com/d/msg/gr-gsm/9nOkIdrGOck/qTZh47McCQAJ
2018-03-30 22:34:52 +02:00
Piotr Krysik 7476868d8e Added more copyright holders
Added my contributors as copyright holders.
2018-03-22 16:12:03 +01:00
Marc L cbac58cd15 added MANIFEST.md for CGRAN parsing sake
We are currently working on revitalizing CGRAN, the current version is here https://gnuradio.org/cgran/  and just like the old CGRAN it parses OOT's manifest files to get its information.  Feel free to modify stuff, I just copied whatever info I could find.
2018-03-22 16:12:03 +01:00
Piotr Krysik c62f21e44c Fixing Ubuntu 16.04 no libosmocore test 2018-03-22 08:46:25 +01:00
Vasil Velichkov 753afeb5c8 Fix Fedora 26 test failure
On Fedora 26 when gr-gsm is installed in /usr/local/lib in order to work
some paths have to be added to PYTHONPATH and LD_LIBRARY_PATH enviroment
variables

This fixes the following errors
    ImportError: No module named grgsm
    ImportError: No module named _grgsm_swig
    ImportError: libgrgsm-0.41.3.so.0.0.0: cannot open shared object file: No such file or directory
2018-03-22 06:07:24 +01:00
Vasil Velichkov a59de98f24 Add Fedora 26 docker file 2018-03-22 06:07:24 +01:00
Vasil Velichkov 0feb4ab51f Fix the parallel build.
- Override the GR_UNIQUE_TARGET function to not append a hash to the
  target name.
- Add explicit dependency between pygen_apps and _grgsm_swig
  The _grgs_swig needs to be built first because grcc evaluates and
  verify all imports
- Test the parallel build in the docker containers as well
2018-03-22 06:07:24 +01:00
Vasil Velichkov 3f6ab15a7a Install pkg-config in Debian/Ubuntu containers
It is needed to proper detect the grcc full path
2018-03-22 06:07:24 +01:00
Vasil Velichkov b479fb4457 Compile the .grc files with cmake and grcc
And remove the pre-built scripts from the repository

Fixes #13
2018-03-22 06:07:24 +01:00
Piotr Krysik c097ce73c5 Added block for extracting assignment commands 2018-03-05 13:16:32 +01:00
Piotr Krysik 8ef9dad5a7 Creating a new development version 2018-03-05 12:39:06 +01:00
Piotr Krysik 6a66fa83b1 Fixed line ending in 'apt install' command in dockerfile 2018-03-04 23:34:32 +01:00
Piotr Krysik 63492bd93c Fix missing list name error in the main CMakeLists.txt file 2018-03-04 23:01:43 +01:00
Piotr Krysik b1e67fe527 Define __attribute__ and __deprecated__ on MSWin 2018-03-04 22:09:23 +01:00
Piotr Krysik 86c9164000 Change buildsystem message on libosmocore not being found 2018-03-04 22:08:52 +01:00
Piotr Krysik 3e7841211c Additional test for gr-gsm building without libosmocore installed 2018-03-04 19:37:28 +01:00
Piotr Krysik 1a5e87ea1a Conditional compilation of local libosmocore depending if there is or is not libosmocore installation present on the system 2018-03-04 19:36:24 +01:00
Piotr Krysik d8a576618d Fixing warning caused by local libosmocore version 2018-03-04 19:35:00 +01:00
Piotr Krysik daa26e80be Fixing 'free' position 2018-03-03 20:04:13 +01:00
Piotr Krysik 1fd7cfb47e Removing part that causes problems with 'make test' 2018-02-28 14:58:10 +01:00
Piotr Krysik b24beebaf9 Adding include to have 'bool' type 2018-02-28 10:11:08 +01:00
Piotr Krysik 4cd494bbf8 Slight changes to CMake file and libosmocoding file (include change) 2018-02-28 10:08:38 +01:00
Piotr Krysik f9f2596f99 Merge branch 'grgsm_on_win' of https://github.com/ptrkrysik/gr-gsm into grgsm_on_win 2018-02-27 14:47:21 +01:00
Piotr Krysik 70f549abae Merge remote-tracking branch 'origin/quick-hack' into grgsm_on_win 2018-02-27 14:46:18 +01:00