Commit Graph

187 Commits

Author SHA1 Message Date
Vadim Yanitskiy 180a037a41 python/trx: introduce and use Transceiver class
Change-Id: I6dc88edbb69a68746cc8e01206dc86f7ea2fa80f
2019-01-19 11:29:35 +07:00
Vadim Yanitskiy 7da82f458f python/trx: get rid of FakePM class
Change-Id: Ie96eb9735ecaa3329135c7be976ffd277a2f64f4
2019-01-19 09:32:36 +07:00
Vadim Yanitskiy 435d7557e8 apps/grgsm_trx: move init code from run() to __init__()
Change-Id: I1bcc9c8a2d37d156bbec93be3838200f6c4a80c2
2019-01-19 09:02:12 +07:00
Vadim Yanitskiy f237f1a978 python/trx: use CamelCase naming for basic classes
Change-Id: Ica9c56d01191dda38e63b51caba2ec8c63b671c9
2019-01-16 17:11:55 +07:00
Vasil Velichkov 7f259fdb68 Add TCH/H decoder block with AMR multirate support
Add new TCHH channel mode
Add two new optional arguments

    -m CHAN_MODE, --mode=CHAN_MODE
                        Channel mode. Valid options are 'BCCH' (Non-combined
                        C0), 'BCCH_SDCCH4'(Combined C0), 'SDCCH8' (Stand-alone
                        control channel) 'TCHF' (Traffic Channel, Full rate),
                        'TCHH' (Traffic Channel, Half rate)

    --sub-channel=TCH_H_CHANNEL
                        TCH/H sub-channel. [default=0]
    --multi-rate=MULTI_RATE
                        The MultiRrate configuration element from the
                        Assigment Command message. Example: 28111a40. See 3GPP
                        TS 44.018 - 10.5.2.21aa MultiRate configuration

Example:
    grgsm_decode -m TCHH --sub-channel 0 --multi-rate 2811 -o voice.amr ...
2018-12-29 00:52:05 +01:00
Vadim Yanitskiy ed03e41494 apps/grgsm_trx: (re)structurize help message
Change-Id: I612d8ae7d3ff99fee809e10d95919989bfbe0f59
2018-09-21 14:52:53 +07:00
Piotr Krysik b8632ffdac apps/grgsm_trx: remove redundant unit from freq_offset variable name
Frequency is always in Hz so there is no need to add that
information in the variable name.

Change-Id: I509771c3fe072069a680f66b0763ae6825f6d529
2018-09-13 16:34:35 +00:00
Vasil Velichkov fa2f784f4f grgsm_channelize: Add ichar data type
This is the output format of rtl_sdr and hackrf_transfer and this would
allow direct channelization without an additional post processing.

Change-Id: Ia489eca9ec7defc3a83946c42f1ae3f136efe4e8
2018-09-13 13:05:35 +00:00
Piotr Krysik 0f3bceb13d apps/grgsm_trx: remove unnecessary checks of freq_offset
Checking if freq_offset is None doesn't make sense currently
as it's always set to a float value by argparse (to 0 by default).

Change-Id: Ie8bae1ccde60d07fc25e0b874afa5aaaac04d8a7
2018-09-13 14:53:26 +02:00
Piotr Krysik 0631767b24 trx/radio_if: add freq_offset parameter to constructor
Change-Id: Ie1db02b719a0fec478b8a8b8a95643fb10fdfce5
2018-09-13 14:41:06 +02:00
Piotr Krysik 7379e341b0 apps/grgsm_trx: migrate from getopt to argparse
Change-Id: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d
2018-09-12 00:37:40 +07:00
Vadim Yanitskiy 38baac9678 apps/grgsm_trx: fix inaccurate sample rate calculation
Change-Id: I0c309588fa0f7822abfb3919327639735db07679
2018-09-12 00:36:13 +07:00
Vasil Velichkov fb1f65c572 grgsm_scanner: Add --debug option
When set the stdout and stderr won't be redirected to /dev/null which
will facilitate resolving issues

Change-Id: I11e99facb5a1ab9c9bfee3c314a91a74f98a2523
2018-09-11 08:13:23 +00:00
Piotr Krysik 1cc264fb0c Revert "grgsm_trx: Migrated argument parsing to argparse" that shouldn't be pushed
This reverts commit c62a3d9f55.
2018-09-06 19:57:57 +02:00
Piotr Krysik c62a3d9f55 grgsm_trx: Migrated argument parsing to argparse
Argparse makes adding new parameters easier and
adds consistent way of handling default values of
parameters and printing of their help info.

Change-Id: Idf99fd7a581464aa2f77fe01e721dbd162686811
2018-09-05 21:36:34 +02:00
Vadim Yanitskiy 97dc84e9f3 apps/grgsm_trx: add baseband frequency shift feature
An ability to shift the baseband frequency would allow one to
run both base stations and (OsmocomBB-based) mobile stations on
any frequency (e.g. in 2.4 GHz WiFi band)!

This is achieved by adding a given frequency offset to the
result of "ARFCN -> RX/TX frequency" calculation.

Usage example:

  grgsm_trx --freq-offset -500M

Both RX (Downlink) and TX (Uplink) frequencies will be shifted
by 500 MHz back, e.g. tuning request to ARFCN 105 would result
in tuning the radio to 456.0 MHz (instead of 956.0 MHz).

Related: OS#3520 (https://osmocom.org/versions/136)
Change-Id: I42e397e47402a87f4141ef31b25eff4c8c1267e2
2018-09-05 02:36:08 +07:00
Vadim Yanitskiy 473b35be86 apps/grgsm_trx: introduce bind address option
The new option (-b --bind-addr) allows one to specify the bind
address for both DATA and CTRL interfaces. By default, '0.0.0.0'
is used, so there are no restrictions for the L1 source address.

Change-Id: I3339f686b53db07cfd1bff9a516f4bdc28058cd9
2018-08-10 16:38:59 +07:00
Vadim Yanitskiy bf6f6ec0de trx/udp_link.py: close socket in destructor
Previously it was required to call the UDPLink.shutdown() method
manually in order to close a socket. Let's do it automatically
using the destructor of UDPLink.

Cherry-picked from: I59c3dc61ec58cd9effeb789947d28fd602ca91f4
Change-Id: Ief7aa21d1e50682a90616833b679741957193aae
2018-08-10 16:38:59 +07:00
Vadim Yanitskiy 8e1fa8bdd7 apps/grgsm_trx: use format string for help message
Instead of using the hard-coded default values in help message,
it makes sense to use a format string, and pass the actual
values when printing help.

Change-Id: Ib1bf0ef3ded86aa92faeb9b63eb286283f5c8c3d
2018-08-10 16:38:59 +07:00
Vadim Yanitskiy cae78211a6 grgsm_trx: change default TRX port number to 6700
In order to avoid clashes with OsmoTRX, which may be also
running on the same host, let's use a different port range
starting from 6700 by default.

This idea was introduced as a result of OS#2984.

Change-Id: Iaf0c78733bfefcb0b0938abf6d316e27d03ecab4
2018-08-10 15:11:23 +07:00
Vadim Yanitskiy 3674f48df5 apps/grgsm_trx: also print Piotr as a copyright holder
Despite the most part of Python code was written by Vadim, it's
heavily based on huge and impressive work done by Piotr. Let's
also print his credentials in the license header.

Change-Id: Icca7c679d84f99440ff502219f624e0f73112744
2018-08-10 15:11:23 +07:00
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
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 69434963d9 Added short description of grgsm_trx 2018-05-05 13:06:22 +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 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 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 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 f0c83d84e0 Fixing missing callback to set_fc in clock_offset_control block 2018-01-23 15:07:08 +01:00
Vadim Yanitskiy 14b8e854c2 apps/grgsm_trx: use 4 * GSM_SYM_RATE as default sample rate
With this sample rate it's easier to synchronize
training sequence with the signal.
2017-12-04 00:22:39 +07:00
Piotr Krysik 66c56e7803 trx: Changed default gain to 40 2017-12-01 11:58:53 +01:00
Piotr Krysik be1da4a233 trc: Changed sample rate to 4 times GSM symbol rate 2017-11-30 13:44:54 +01:00
Vadim Yanitskiy 0e7c9a80ad apps/grgsm_trx: fix antenna selection options
Both '--rx-antenna' and '--tx-antenna' require an argument.
2017-11-29 23:11:14 +01:00
Piotr Krysik ab8cde9b7a Making headless livemon executable 2017-11-05 17:44:26 +01:00
Vadim Yanitskiy 790b6f0cc1 apps/grgsm_trx: add cmd line arguments for TX chain 2017-11-05 17:33:26 +01:00
Vadim Yanitskiy 5d68aa5620 apps/grgsm_trx: get rid of unused subdev_spec
This could be specified via the device_args,
for example: "subdev=B:0".
2017-11-05 17:33:26 +01:00
Vadim Yanitskiy ba7ad29638 apps/grgsm_trx: import helper classes from grgsm.trx 2017-11-05 17:33:26 +01:00
Petter Reinholdtsen 615fc86d53 Making arfcn<->freq conversions more robust for grgsm_livemon too (closes issue #337). 2017-09-25 23:41:52 +02:00
Piotr Krysik 902f4ebaf0 Moved trx utilities from apps subdirectory - the grgsm_trx app need to be updated 2017-09-19 08:04:33 +02:00
Piotr Krysik e6e787959f Merge branch 'fixeria/trx' into development
# Conflicts:
#	swig/grgsm_swig.i
2017-09-12 11:45:20 +02:00
Piotr Krysik 45b8700072 Removed all references to 'band' 2017-09-11 10:38:40 +02:00
Piotr Krysik fcb45b021a Remove 'band' option from grgsm_decode altogether 2017-09-11 10:38:40 +02:00
Piotr Krysik a80567f013 Bring back parameter checking, correct creation of grgsm_capture object 2017-09-11 10:38:40 +02:00
Piotr Krysik df0adf3d86 Remove band from grgsm_capture altogether 2017-09-11 10:38:40 +02:00
leommxj caa7741d09 delete some useless code after the change of is_valid_arfcn(...) and arfcn2downlink(...) 2017-09-11 10:38:40 +02:00
leommxj ece9fd7f39 fix bug after commit 3dfa11b89e .change arfcn2downlink(a,b) to one argument in grgsm_decode and grgsm_capture and grgsm_channelize 2017-09-11 10:38:40 +02:00