Change in gr-gsm[master]: Improve the TCH/H decoder logs
Piotr Krysik has uploaded a new patch set (#2) to the change originally created by Vasil Velichkov. ( https://gerrit.osmocom.org/13671 ) Change subject: Improve the TCH/H decoder logs .. Improve the TCH/H decoder logs - Change "6,90 kbit/s" to "5.9 kbit/s" A typo reported in github ptrkrysik/gr-gsm#456 - Comment out the "Error! frame_nr:" message as it turns out to confuse users more then it actually helps debugging. - When voice-boundary detection is enabled write the name of decoded control channel messages Change-Id: I697ef944f30c4cabb62c888317dd3a7f8dcd5611 --- M lib/decoding/tch_h_decoder_impl.cc 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/71/13671/2 -- To view, visit https://gerrit.osmocom.org/13671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I697ef944f30c4cabb62c888317dd3a7f8dcd5611 Gerrit-Change-Number: 13671 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy
Change in gr-gsm[master]: Improve the TCH/H decoder logs
Piotr Krysik has uploaded a new patch set (#3) to the change originally created by Vasil Velichkov. ( https://gerrit.osmocom.org/13671 ) Change subject: Improve the TCH/H decoder logs .. Improve the TCH/H decoder logs - Change "6,90 kbit/s" to "5.9 kbit/s" A typo reported in github ptrkrysik/gr-gsm#456 - Comment out the "Error! frame_nr:" message as it turns out to confuse users more then it actually helps debugging. - When voice-boundary detection is enabled write the name of decoded control channel messages Change-Id: I697ef944f30c4cabb62c888317dd3a7f8dcd5611 --- M lib/decoding/tch_h_decoder_impl.cc 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/71/13671/3 -- To view, visit https://gerrit.osmocom.org/13671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I697ef944f30c4cabb62c888317dd3a7f8dcd5611 Gerrit-Change-Number: 13671 Gerrit-PatchSet: 3 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy
Change in gr-gsm[master]: Improve the TCH/H decoder logs
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/13671 ) Change subject: Improve the TCH/H decoder logs .. Patch Set 3: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I697ef944f30c4cabb62c888317dd3a7f8dcd5611 Gerrit-Change-Number: 13671 Gerrit-PatchSet: 3 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 02 May 2019 11:00:11 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: grgsm_capture: Fix device arguments
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/13672 ) Change subject: grgsm_capture: Fix device arguments .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2d1bcee835b695c91a5c44ec78a40b2d969f611c Gerrit-Change-Number: 13672 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 02 May 2019 11:01:03 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: Filter out SoapyAudio devices
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/13812 ) Change subject: Filter out SoapyAudio devices .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib84081041ca6c2bc18b9da0c32bac9d3ecef65ca Gerrit-Change-Number: 13812 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 02 May 2019 11:52:13 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: Improve the TCH/H decoder logs
Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/13671 ) Change subject: Improve the TCH/H decoder logs .. Improve the TCH/H decoder logs - Change "6,90 kbit/s" to "5.9 kbit/s" A typo reported in github ptrkrysik/gr-gsm#456 - Comment out the "Error! frame_nr:" message as it turns out to confuse users more then it actually helps debugging. - When voice-boundary detection is enabled write the name of decoded control channel messages Change-Id: I697ef944f30c4cabb62c888317dd3a7f8dcd5611 --- M lib/decoding/tch_h_decoder_impl.cc 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/lib/decoding/tch_h_decoder_impl.cc b/lib/decoding/tch_h_decoder_impl.cc index 11da907..b6827f7 100644 --- a/lib/decoding/tch_h_decoder_impl.cc +++ b/lib/decoding/tch_h_decoder_impl.cc @@ -178,7 +178,7 @@ std::cout<<"5,15 kbit/s codec rate: is part of the subset"<https://gerrit.osmocom.org/13671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I697ef944f30c4cabb62c888317dd3a7f8dcd5611 Gerrit-Change-Number: 13671 Gerrit-PatchSet: 3 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy
Change in gr-gsm[master]: grgsm_capture: Fix device arguments
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/13672 ) Change subject: grgsm_capture: Fix device arguments .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/13672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2d1bcee835b695c91a5c44ec78a40b2d969f611c Gerrit-Change-Number: 13672 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 02 May 2019 11:56:55 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: Filter out SoapyAudio devices
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/13812 ) Change subject: Filter out SoapyAudio devices .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/13812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib84081041ca6c2bc18b9da0c32bac9d3ecef65ca Gerrit-Change-Number: 13812 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 02 May 2019 11:57:07 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
gr-gsm[master]: README.md: Change mailing list address to osmocom.org
Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/5634 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7b474138444f0ceea160f74df4b693030ea07a8 Gerrit-PatchSet: 2 Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No
[PATCH] gr-gsm[master]: Just a change to be discarded in gerrit
Review at https://gerrit.osmocom.org/5690 Just a change to be discarded in gerrit Change-Id: Ice89f3757e9ef672e7b8910f19d5e9512f94ba04 --- M TESTING.md 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/90/5690/1 diff --git a/TESTING.md b/TESTING.md index b51e647..6711e29 100644 --- a/TESTING.md +++ b/TESTING.md @@ -13,3 +13,4 @@ This will copy the entire contents of the currently checked out branch of gr-gsm to a temp folder, and attempt to build the docker images according to the definitions in the .docker files located under gr-gsm/dockerfiles. Once the images are created, the script instantiates a container for testing the rtlsdr scanner on each band, against each Docker image built. This can take quite a while. If you're running on Mac, consider using the ```caffeinate``` command to keep your machine from sleeping. + \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/5690 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice89f3757e9ef672e7b8910f19d5e9512f94ba04 Gerrit-PatchSet: 1 Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Owner: Piotr Krysik
gr-gsm[master]: Just a change to be discarded in gerrit
Patch Set 1: Code-Review-1 The commit was added solely to discard it. Trying to do that but I suppose I don't have enough rights to do that. Is group "gr-gsm Reviewers" linked to gr-gsm project. -- To view, visit https://gerrit.osmocom.org/5690 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ice89f3757e9ef672e7b8910f19d5e9512f94ba04 Gerrit-PatchSet: 1 Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No
gr-gsm[master]: Just a change to be discarded in gerrit
Patch Set 1: -Code-Review I've got the "abandon" button, but the point of this patch was to check if I have ability to give "+2" or "-2" for new patches (sorry for posting this reply in the wrong place before). -- To view, visit https://gerrit.osmocom.org/5690 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ice89f3757e9ef672e7b8910f19d5e9512f94ba04 Gerrit-PatchSet: 1 Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Max Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No
gr-gsm[master]: README.md: Turn URLs into hyperlinks (video, mailing list)
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5635 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iacf7c4b13b0e32ea7761b859f7422ab630c8616f Gerrit-PatchSet: 2 Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No
gr-gsm[master]: README.md: Change mailing list address to osmocom.org
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5634 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7b474138444f0ceea160f74df4b693030ea07a8 Gerrit-PatchSet: 2 Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No
[MERGED] gr-gsm[master]: README.md: Change mailing list address to osmocom.org
Piotr Krysik has submitted this change and it was merged. Change subject: README.md: Change mailing list address to osmocom.org .. README.md: Change mailing list address to osmocom.org Change-Id: Ie7b474138444f0ceea160f74df4b693030ea07a8 --- M README.md 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified Harald Welte: Looks good to me, but someone else must approve diff --git a/README.md b/README.md index 86ca1e8..983873d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Current gr-gsm project's mailing list address is following: -gr-...@googlegroups.com +gr-...@lists.osmocom.org Mailing list is a place for general discussions, questions about the usage and installation. In case of problem with installation please try to provide full information that will help reproducing it. Minimum information should contain: - operating system with version, @@ -20,9 +20,9 @@ - version of gnuradio (it can be obtained with: gnuradio-companion --version) - error messages (in case of pybombs installation they can be obtained after switching it to verbous mode with -v option). -To join the group with any e-mail addres (google account is not required) use this link: +To join the group with any e-mail address, use this link: -https://groups.google.com/forum/#!forum/gr-gsm/join +https://lists.osmocom.org/mailman/listinfo/gr-gsm Development === -- To view, visit https://gerrit.osmocom.org/5634 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7b474138444f0ceea160f74df4b693030ea07a8 Gerrit-PatchSet: 2 Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy
[MERGED] gr-gsm[master]: README.md: Turn URLs into hyperlinks (video, mailing list)
Piotr Krysik has submitted this change and it was merged. Change subject: README.md: Turn URLs into hyperlinks (video, mailing list) .. README.md: Turn URLs into hyperlinks (video, mailing list) Change-Id: Iacf7c4b13b0e32ea7761b859f7422ab630c8616f --- M README.md 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/README.md b/README.md index 983873d..b31b679 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ To join the group with any e-mail address, use this link: -https://lists.osmocom.org/mailman/listinfo/gr-gsm +<https://lists.osmocom.org/mailman/listinfo/gr-gsm> Development === @@ -34,7 +34,7 @@ == Short presentation of *Airprobe*'like application of *gr-gsm*: -https://www.youtube.com/watch?v=Eofnb7zr8QE +<https://www.youtube.com/watch?v=Eofnb7zr8QE> Credits === -- To view, visit https://gerrit.osmocom.org/5635 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iacf7c4b13b0e32ea7761b859f7422ab630c8616f Gerrit-PatchSet: 2 Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy
gr-gsm[master]: Just a change to be discarded in gerrit
Patch Set 1: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/5690 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ice89f3757e9ef672e7b8910f19d5e9512f94ba04 Gerrit-PatchSet: 1 Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Max Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No
gr-gsm[master]: I've got the "abandon" button, but the point of this patch w...
Patch Set 1: Code-Review-2 This was a result of me clicking the "floow up" button instead of "reply". Rejecting it then :). -- To view, visit https://gerrit.osmocom.org/5776 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ieb4ffab11837f6381e88f61e568e523609a34bca Gerrit-PatchSet: 1 Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Piotr Krysik Gerrit-HasComments: No
[ABANDON] gr-gsm[master]: Just a change to be discarded in gerrit
Piotr Krysik has abandoned this change. Change subject: Just a change to be discarded in gerrit .. Abandoned Rejected it, now lets abandon it :) -- To view, visit https://gerrit.osmocom.org/5690 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ice89f3757e9ef672e7b8910f19d5e9512f94ba04 Gerrit-PatchSet: 1 Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Max Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy
Change in gr-gsm[master]: Foobar change to test gerrit again
Piotr Krysik has uploaded this change for review. ( https://gerrit.osmocom.org/9971 Change subject: Foobar change to test gerrit again .. Foobar change to test gerrit again Change-Id: I818b5296e2a208df9f096bcc9d13b88ffe01379c --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/71/9971/1 diff --git a/README.md b/README.md index b6decde..999ea85 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -The gr-gsm project +The gr-gsm project == The *gr-gsm* project is based on the *gsm-receiver* written by Piotr Krysik (also the main author of *gr-gsm*) for the *Airprobe* project. -- To view, visit https://gerrit.osmocom.org/9971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I818b5296e2a208df9f096bcc9d13b88ffe01379c Gerrit-Change-Number: 9971 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik
Change in gr-gsm[master]: Foobar change to test gerrit again
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/9971 ) Change subject: Foobar change to test gerrit again .. Patch Set 1: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/9971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I818b5296e2a208df9f096bcc9d13b88ffe01379c Gerrit-Change-Number: 9971 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Thu, 12 Jul 2018 09:17:50 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmocom-bb[master]: trxcon: fix tail bits at the front of Access burst
Piotr Krysik has uploaded this change for review. (
https://gerrit.osmocom.org/10001
Change subject: trxcon: fix tail bits at the front of Access burst
..
trxcon: fix tail bits at the front of Access burst
Currently Access Burst generated by trxcon
has 8 zero bits at the beginning. According to
the 3GPP 05.02 specification (Chapter 5.2.7
Access burst) custom 8-bit extended tail bits
sequence should be used:
(BN0, BN1, BN2 ... BN7) = (0,0,1,1,1,0,1,0)
After this fix trxcon sets correct 8-bit
sequence at the front of Access burst.
Change-Id: I1f624e783de6c585d2e292965c9e5810b0a4f27d
---
M src/host/trxcon/sched_lchan_rach.c
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/01/10001/1
diff --git a/src/host/trxcon/sched_lchan_rach.c
b/src/host/trxcon/sched_lchan_rach.c
index 2a09a37..3f6e2e1 100644
--- a/src/host/trxcon/sched_lchan_rach.c
+++ b/src/host/trxcon/sched_lchan_rach.c
@@ -42,6 +42,15 @@
#include "l1ctl.h"
/**
+ * 8-bit RACH extended tail bits
+ * GSM 05.02 Chapter 5.2.7 Access burst (AB)
+ */
+
+static ubit_t rach_ext_tail_bits[] = {
+ 0, 0, 1, 1, 1, 0, 1, 0,
+};
+
+/**
* 41-bit RACH synchronization sequence
* GSM 05.02 Chapter 5.2.7 Access burst (AB)
*/
@@ -79,7 +88,7 @@
}
/* Compose RACH burst */
- memset(burst, 0, 8); /* TB */
+ memcpy(burst, rach_ext_tail_bits, 8); /* TB */
memcpy(burst + 8, rach_synch_seq, 41); /* sync seq */
memcpy(burst + 49, payload, 36); /* payload */
memset(burst + 85, 0, 63); /* TB + GP */
--
To view, visit https://gerrit.osmocom.org/10001
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f624e783de6c585d2e292965c9e5810b0a4f27d
Gerrit-Change-Number: 10001
Gerrit-PatchSet: 1
Gerrit-Owner: Piotr Krysik
Change in gr-gsm[master]: trx/txtime_setter: print error if reference fn is missing
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12395 ) Change subject: trx/txtime_setter: print error if reference fn is missing .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2a6e3f41b6fe79b92d85ff98bc2cd9afd9bdc568 Gerrit-Change-Number: 12395 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Thu, 27 Dec 2018 20:47:48 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/txtime_setter: reduce code nesting in process_txtime_of_burst()
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/12394 )
Change subject: trx/txtime_setter: reduce code nesting in
process_txtime_of_burst()
..
trx/txtime_setter: reduce code nesting in process_txtime_of_burst()
Change-Id: I5c334e16d6b28a5e32cd62a177ad56bfc8e748ee
---
M lib/transmitter/txtime_setter_impl.cc
1 file changed, 39 insertions(+), 39 deletions(-)
Approvals:
Harald Welte: Looks good to me, but someone else must approve
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/lib/transmitter/txtime_setter_impl.cc
b/lib/transmitter/txtime_setter_impl.cc
index 3c07cc6..50092f4 100644
--- a/lib/transmitter/txtime_setter_impl.cc
+++ b/lib/transmitter/txtime_setter_impl.cc
@@ -116,52 +116,52 @@
void txtime_setter_impl::process_txtime_of_burst(pmt::pmt_t msg_in)
{
- if (d_fn_ref != UNKNOWN_FN)
- {
-pmt::pmt_t blob = pmt::cdr(msg_in);
+ if (d_fn_ref == UNKNOWN_FN)
+return;
-// Extract GSMTAP header from message
-gsmtap_hdr *header = (gsmtap_hdr *) pmt::blob_data(blob);
-uint32_t frame_nr = be32toh(header->frame_number);
-uint32_t ts_num = header->timeslot;
+ pmt::pmt_t blob = pmt::cdr(msg_in);
-time_format txtime = fn_time_delta_cpp(d_fn_ref, d_time_ref,
- frame_nr, d_time_hint, ts_num, d_ts_ref);
+ // Extract GSMTAP header from message
+ gsmtap_hdr *header = (gsmtap_hdr *) pmt::blob_data(blob);
+ uint32_t frame_nr = be32toh(header->frame_number);
+ uint32_t ts_num = header->timeslot;
-time_spec_t txtime_spec = time_spec_t(txtime.first, txtime.second);
-txtime_spec -= d_delay_correction;
-txtime_spec -= d_timing_advance;
+ time_format txtime = fn_time_delta_cpp(d_fn_ref, d_time_ref,
+frame_nr, d_time_hint, ts_num, d_ts_ref);
-time_spec_t current_time_estimate = time_spec_t(d_time_hint.first,
d_time_hint.second);
+ time_spec_t txtime_spec = time_spec_t(txtime.first, txtime.second);
+ txtime_spec -= d_delay_correction;
+ txtime_spec -= d_timing_advance;
-if (txtime_spec <= current_time_estimate) { // Drop too late bursts
- std::cout << "lB" << std::flush;
-} else if (txtime_spec > current_time_estimate + MAX_EARLY_TIME_DIFF)
{ // Drop too early bursts
- std::cout << "eB" << std::flush; //TODO: too early condition
might happen when changing BTSes.
-//Wrong fn_time is applied to
new or old bursts in such situation.
-//This solution is not perfect
as MS might be blocked upto
-//MAX_EARLY_TIME_DIFF seconds.
-//Better solution would be to
indentify fn_time and burst coming
-//from given BTS (i.e. based
on ARFCN) and dropping bursts for which
-//the bts_id doesn't match
with bts_id of fn_time.
-} else { //process bursts that are in the right time-frame
- pmt::pmt_t tags_dict = pmt::dict_add(
-pmt::make_dict(),
-pmt::intern("tx_time"),
-pmt::make_tuple(
- pmt::from_uint64(txtime_spec.get_full_secs()),
- pmt::from_double(txtime_spec.get_frac_secs()))
- );
+ time_spec_t current_time_estimate = time_spec_t(d_time_hint.first,
d_time_hint.second);
- tags_dict = pmt::dict_add(tags_dict,
-pmt::intern("fn"), pmt::from_uint64(frame_nr));
- tags_dict = pmt::dict_add(tags_dict,
-pmt::intern("ts"), pmt::from_uint64(ts_num));
+ if (txtime_spec <= current_time_estimate) { // Drop too late bursts
+std::cout << "lB" << std::flush;
+ } else if (txtime_spec > current_time_estimate + MAX_EARLY_TIME_DIFF) {
// Drop too early bursts
+std::cout << "eB" << std::flush; //TODO: too early condition
might happen when changing BTSes.
+ //Wrong fn_time is applied to
new or old bursts in such situation.
+ //This solution is not perfect
as MS might be blocked upto
+ //MAX_EARLY_TIME_DIFF seconds.
+ //Better solution would be to
indentify fn_time and burst coming
+ //from given BTS (i.e. based on
ARFCN) and dropping bursts for which
+ //the bts_id doesn't match with
bts_id of fn_time.
+ } else { //process bursts that a
Change in gr-gsm[master]: trx/txtime_setter: reduce code nesting in process_txtime_of_burst()
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12394 ) Change subject: trx/txtime_setter: reduce code nesting in process_txtime_of_burst() .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c334e16d6b28a5e32cd62a177ad56bfc8e748ee Gerrit-Change-Number: 12394 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Thu, 27 Dec 2018 20:49:38 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/txtime_setter: print error if reference fn is missing
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/12395 )
Change subject: trx/txtime_setter: print error if reference fn is missing
..
trx/txtime_setter: print error if reference fn is missing
Change-Id: I2a6e3f41b6fe79b92d85ff98bc2cd9afd9bdc568
---
M lib/transmitter/txtime_setter_impl.cc
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Harald Welte: Looks good to me, but someone else must approve
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/lib/transmitter/txtime_setter_impl.cc
b/lib/transmitter/txtime_setter_impl.cc
index 50092f4..9f3a24d 100644
--- a/lib/transmitter/txtime_setter_impl.cc
+++ b/lib/transmitter/txtime_setter_impl.cc
@@ -116,9 +116,6 @@
void txtime_setter_impl::process_txtime_of_burst(pmt::pmt_t msg_in)
{
- if (d_fn_ref == UNKNOWN_FN)
-return;
-
pmt::pmt_t blob = pmt::cdr(msg_in);
// Extract GSMTAP header from message
@@ -126,6 +123,13 @@
uint32_t frame_nr = be32toh(header->frame_number);
uint32_t ts_num = header->timeslot;
+ if (d_fn_ref == UNKNOWN_FN) {
+std::cout << "Missing reference TDMA frame number, dropping "
+ << format("burst (fn=%u, tn=%u)", frame_nr, ts_num)
+ << std::endl;
+return;
+ }
+
time_format txtime = fn_time_delta_cpp(d_fn_ref, d_time_ref,
frame_nr, d_time_hint, ts_num, d_ts_ref);
--
To view, visit https://gerrit.osmocom.org/12395
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a6e3f41b6fe79b92d85ff98bc2cd9afd9bdc568
Gerrit-Change-Number: 12395
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Piotr Krysik
Change in gr-gsm[master]: trx/txtime_setter: print error if reference fn is missing
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12395 ) Change subject: trx/txtime_setter: print error if reference fn is missing .. Patch Set 1: I was a bit too quick to accept this patch. It is corrected in one of the next commits. -- To view, visit https://gerrit.osmocom.org/12395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2a6e3f41b6fe79b92d85ff98bc2cd9afd9bdc568 Gerrit-Change-Number: 12395 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-CC: Vasil Velichkov Gerrit-Comment-Date: Sat, 29 Dec 2018 09:52:41 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in gr-gsm[master]: trx/radio_if.py: reset UHD device time at startup
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10418 ) Change subject: trx/radio_if.py: reset UHD device time at startup .. Patch Set 1: Verified+1 Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/10418/1/python/trx/radio_if.py File python/trx/radio_if.py: https://gerrit.osmocom.org/#/c/10418/1/python/trx/radio_if.py@264 PS1, Line 264: self.phy_sink.set_time_now(uhd.time_spec(0.0)) set_time_now needs to be done only once, either for source or sink (I'm having fun with gerrit review window ;) ) -- To view, visit https://gerrit.osmocom.org/10418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315 Gerrit-Change-Number: 10418 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:27:17 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/radio_if.py: reset UHD device time at startup
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10418 ) Change subject: trx/radio_if.py: reset UHD device time at startup .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315 Gerrit-Change-Number: 10418 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:41:36 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: apps/grgsm_trx: print bind / remote address and port
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10426 ) Change subject: apps/grgsm_trx: print bind / remote address and port .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If750d476f3972f1ab5c5b637438d14d40b1e3d87 Gerrit-Change-Number: 10426 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:43:00 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/ctrl_if.py: send control responses to where commands are from
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10423 ) Change subject: trx/ctrl_if.py: send control responses to where commands are from .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196 Gerrit-Change-Number: 10423 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:24 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: apps/grgsm_trx: introduce bind address option
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10425 ) Change subject: apps/grgsm_trx: introduce bind address option .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3339f686b53db07cfd1bff9a516f4bdc28058cd9 Gerrit-Change-Number: 10425 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:13 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: apps/grgsm_trx: also print Piotr as a copyright holder
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10416 ) Change subject: apps/grgsm_trx: also print Piotr as a copyright holder .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icca7c679d84f99440ff502219f624e0f73112744 Gerrit-Change-Number: 10416 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:46:01 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: gsm_trx_burst_if: allow to customize the bind address
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10424 ) Change subject: gsm_trx_burst_if: allow to customize the bind address .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e5f7b7119ac454217b8dd04f9ee0dd3b23972b6 Gerrit-Change-Number: 10424 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:18 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/udp_link.py: set SO_REUSEADDR socket option
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10422 ) Change subject: trx/udp_link.py: set SO_REUSEADDR socket option .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6d256683a7aa0419cd5bd0a3eaa97aefdf3254f9 Gerrit-Change-Number: 10422 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:30 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: apps/grgsm_trx: use format string for help message
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10420 ) Change subject: apps/grgsm_trx: use format string for help message .. Patch Set 2: Verified+1 Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/10420/1/apps/grgsm_trx File apps/grgsm_trx: https://gerrit.osmocom.org/#/c/10420/1/apps/grgsm_trx@99 PS1, Line 99: note: for parsing arguments we could use optparse (https://docs.python.org/2/library/optparse.html) or argparse (https://docs.python.org/2/library/argparse.html#module-argparse) -- To view, visit https://gerrit.osmocom.org/10420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1bf0ef3ded86aa92faeb9b63eb286283f5c8c3d Gerrit-Change-Number: 10420 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:41 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in gr-gsm[master]: grgsm_trx: change default TRX port number to 6700
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10417 ) Change subject: grgsm_trx: change default TRX port number to 6700 .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaf0c78733bfefcb0b0938abf6d316e27d03ecab4 Gerrit-Change-Number: 10417 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:56 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/radio_if.py: drop useless import of osmosdr
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10419 ) Change subject: trx/radio_if.py: drop useless import of osmosdr .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iacd5ca118957e3ecf05df81f511b17bb9a8982b5 Gerrit-Change-Number: 10419 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:47 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/udp_link.py: close socket in destructor
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/10421 )
Change subject: trx/udp_link.py: close socket in destructor
..
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
---
M apps/grgsm_trx
M python/trx/ctrl_if_bb.py
M python/trx/udp_link.py
3 files changed, 3 insertions(+), 8 deletions(-)
Approvals:
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index b925fc1..668b0be 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -83,7 +83,6 @@
def shutdown(self):
print("[i] Shutting down...")
- self.server.shutdown()
self.radio.shutdown()
def print_copyright(self):
diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py
index 5874e59..7886e23 100644
--- a/python/trx/ctrl_if_bb.py
+++ b/python/trx/ctrl_if_bb.py
@@ -35,10 +35,6 @@
# Power measurement
self.pm = pm
- def shutdown(self):
- print("[i] Shutdown CTRL interface")
- ctrl_if.shutdown(self)
-
def parse_cmd(self, request):
# Power control
if self.verify_cmd(request, "POWERON", 0):
diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py
index 675ef5c..cedcb1b 100644
--- a/python/trx/udp_link.py
+++ b/python/trx/udp_link.py
@@ -35,6 +35,9 @@
self.remote_addr = remote_addr
self.remote_port = remote_port
+ def __del__(self):
+ self.sock.close()
+
def loop(self):
r_event, w_event, x_event = select.select([self.sock], [], [])
@@ -43,9 +46,6 @@
data, addr = self.sock.recvfrom(128)
self.handle_rx(data.decode())
- def shutdown(self):
- self.sock.close();
-
def send(self, data):
if type(data) not in [bytearray, bytes]:
data = data.encode()
--
To view, visit https://gerrit.osmocom.org/10421
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief7aa21d1e50682a90616833b679741957193aae
Gerrit-Change-Number: 10421
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy
Gerrit-Reviewer: Piotr Krysik
Change in gr-gsm[master]: trx/udp_link.py: close socket in destructor
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10421 ) Change subject: trx/udp_link.py: close socket in destructor .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ief7aa21d1e50682a90616833b679741957193aae Gerrit-Change-Number: 10421 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:35 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: apps/grgsm_trx: also print Piotr as a copyright holder
Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10416 ) Change subject: apps/grgsm_trx: also print Piotr as a copyright holder .. 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 --- M apps/grgsm_trx 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 128adab..eafc726 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -31,6 +31,7 @@ COPYRIGHT = \ "Copyright (C) 2016-2017 by Vadim Yanitskiy \n" \ + "Copyright (C) 2017 by Piotr Krysik \n" \ "License GPLv2+: GNU GPL version 2 or later " \ "<http://gnu.org/licenses/gpl.html>\n" \ "This is free software: you are free to change and redistribute it.\n" \ -- To view, visit https://gerrit.osmocom.org/10416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icca7c679d84f99440ff502219f624e0f73112744 Gerrit-Change-Number: 10416 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik
Change in gr-gsm[master]: trx/udp_link.py: set SO_REUSEADDR socket option
Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10422 ) Change subject: trx/udp_link.py: set SO_REUSEADDR socket option .. trx/udp_link.py: set SO_REUSEADDR socket option Setting this option allows one to reuse existing connections, for example, by injecting CTRL commands or DATA bursts into existing connections. Cherry-picked from: I0882c76affa9a668a12d10967081054d2b666ed1 Change-Id: I6d256683a7aa0419cd5bd0a3eaa97aefdf3254f9 --- M python/trx/udp_link.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py index cedcb1b..1fae8b4 100644 --- a/python/trx/udp_link.py +++ b/python/trx/udp_link.py @@ -28,6 +28,7 @@ class udp_link: def __init__(self, remote_addr, remote_port, bind_port): self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) self.sock.bind((remote_addr, bind_port)) self.sock.setblocking(0) -- To view, visit https://gerrit.osmocom.org/10422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6d256683a7aa0419cd5bd0a3eaa97aefdf3254f9 Gerrit-Change-Number: 10422 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik
Change in gr-gsm[master]: trx/radio_if.py: reset UHD device time at startup
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/10418 )
Change subject: trx/radio_if.py: reset UHD device time at startup
..
trx/radio_if.py: reset UHD device time at startup
Some UHD devices, such as UmTRX, require one to manually reset the
hardware clock, otherwise the burst transmission doesn't work.
Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315
---
M python/trx/radio_if.py
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index 355312b..119b237 100644
--- a/python/trx/radio_if.py
+++ b/python/trx/radio_if.py
@@ -257,6 +257,12 @@
(self.dict_toggle_sign, 'dict_out'),
(self.msg_to_tag_sink, 'msg'))
+
+ # Some UHD devices (such as UmTRX) do start the clock
+ # not from 0, so it's required to reset it manually.
+ # Resetting UHD source will also affect the sink.
+ self.phy_src.set_time_now(uhd.time_spec(0.0))
+
def shutdown(self):
print("[i] Shutdown Radio interface")
self.stop()
--
To view, visit https://gerrit.osmocom.org/10418
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315
Gerrit-Change-Number: 10418
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy
Gerrit-Reviewer: Piotr Krysik
Change in gr-gsm[master]: apps/grgsm_trx: use format string for help message
Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10420 ) Change subject: apps/grgsm_trx: use format string for help message .. 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 --- M apps/grgsm_trx 1 file changed, 15 insertions(+), 8 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index eb7fbdb..b925fc1 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -96,20 +96,27 @@ # TRX specific s += " TRX interface specific\n" \ -" -i --remote-addr Set remote address (default 127.0.0.1)\n" \ -" -p --base-portSet base port number (default 5700)\n\n" +" -i --remote-addr Set remote address (default %s)\n" \ +" -p --base-portSet base port number (default %d)\n\n" # PHY specific s += " Radio interface specific\n" \ " -a --device-args Set device arguments\n" \ " -s --sample-rate Set sample rate\n" \ -" -g --rx-gain Set RX gain (default 30)\n" \ -" -G --tx-gain Set TX gain (default 10)\n" \ -" --rx-antenna Set RX antenna (default RX2)\n" \ -" --tx-antenna Set TX antenna (default TX/RX)\n" \ -" --ppm Set frequency correction (default 0)\n" +" -g --rx-gain Set RX gain (default %d)\n" \ +" -G --tx-gain Set TX gain (default %d)\n" \ +" --rx-antenna Set RX antenna (default %s)\n" \ +" --tx-antenna Set TX antenna (default %s)\n" \ +" --ppm Set frequency correction (default %d)\n" - print(s) + print(s % ( + self.remote_addr, + self.base_port, + self.phy_rx_gain, + self.phy_tx_gain, + self.phy_rx_antenna, + self.phy_tx_antenna, + self.phy_ppm)) def parse_argv(self): try: -- To view, visit https://gerrit.osmocom.org/10420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib1bf0ef3ded86aa92faeb9b63eb286283f5c8c3d Gerrit-Change-Number: 10420 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik
Change in gr-gsm[master]: trx/radio_if.py: drop useless import of osmosdr
Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10419 ) Change subject: trx/radio_if.py: drop useless import of osmosdr .. trx/radio_if.py: drop useless import of osmosdr Change-Id: Iacd5ca118957e3ecf05df81f511b17bb9a8982b5 --- M python/trx/radio_if.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 119b237..2648cc9 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -26,7 +26,6 @@ import pmt import time import grgsm -import osmosdr from math import pi -- To view, visit https://gerrit.osmocom.org/10419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iacd5ca118957e3ecf05df81f511b17bb9a8982b5 Gerrit-Change-Number: 10419 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik
Change in gr-gsm[master]: trx/ctrl_if.py: send control responses to where commands are from
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/10423 )
Change subject: trx/ctrl_if.py: send control responses to where commands are
from
..
trx/ctrl_if.py: send control responses to where commands are from
When we receive a control command, we should not simply send the
response to the default destination, but send it back to the exact
IP/prt from which the command originated.
This ensures correct routing of responses even in case multiple
programs are interfacing concurrently with a control socket.
Cherry-picked from: I24a0bba6eed059b101af95dac7d059f34dd715fc
Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196
---
M python/trx/ctrl_if.py
M python/trx/udp_link.py
2 files changed, 12 insertions(+), 9 deletions(-)
Approvals:
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/python/trx/ctrl_if.py b/python/trx/ctrl_if.py
index 7dee0f8..ae5cf05 100644
--- a/python/trx/ctrl_if.py
+++ b/python/trx/ctrl_if.py
@@ -25,15 +25,15 @@
from grgsm.trx import udp_link
class ctrl_if(udp_link):
- def handle_rx(self, data):
+ def handle_rx(self, data, remote):
if self.verify_req(data):
request = self.prepare_req(data)
rc = self.parse_cmd(request)
if type(rc) is tuple:
- self.send_response(request, rc[0], rc[1])
+ self.send_response(request, remote, rc[0],
rc[1])
else:
- self.send_response(request, rc)
+ self.send_response(request, remote, rc)
else:
print("[!] Wrong data on CTRL interface")
@@ -65,7 +65,7 @@
return True
- def send_response(self, request, response_code, params = None):
+ def send_response(self, request, remote, response_code, params = None):
# Include status code, for example ["TXTUNE", "0", "941600"]
request.insert(1, str(response_code))
@@ -76,7 +76,7 @@
# Add the response signature, and join back to string
response = "RSP " + " ".join(request) + "\0"
# Now we have something like "RSP TXTUNE 0 941600"
- self.send(response)
+ self.send(response, remote)
def parse_cmd(self, request):
raise NotImplementedError
diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py
index 1fae8b4..d96a6aa 100644
--- a/python/trx/udp_link.py
+++ b/python/trx/udp_link.py
@@ -45,13 +45,16 @@
# Check for incoming data
if self.sock in r_event:
data, addr = self.sock.recvfrom(128)
- self.handle_rx(data.decode())
+ self.handle_rx(data.decode(), addr)
- def send(self, data):
+ def send(self, data, remote = None):
if type(data) not in [bytearray, bytes]:
data = data.encode()
- self.sock.sendto(data, (self.remote_addr, self.remote_port))
+ if remote is None:
+ remote = (self.remote_addr, self.remote_port)
- def handle_rx(self, data):
+ self.sock.sendto(data, remote)
+
+ def handle_rx(self, data, remote):
raise NotImplementedError
--
To view, visit https://gerrit.osmocom.org/10423
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196
Gerrit-Change-Number: 10423
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy
Gerrit-Reviewer: Piotr Krysik
Change in gr-gsm[master]: apps/grgsm_trx: introduce bind address option
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/10425 )
Change subject: apps/grgsm_trx: introduce bind address option
..
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
---
M apps/grgsm_trx
M python/trx/ctrl_if_bb.py
M python/trx/radio_if.py
M python/trx/udp_link.py
4 files changed, 23 insertions(+), 15 deletions(-)
Approvals:
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index 668b0be..1c0581f 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -3,7 +3,7 @@
# GR-GSM based transceiver
#
-# (C) 2016-2017 by Vadim Yanitskiy
+# (C) 2016-2018 by Vadim Yanitskiy
#
# All Rights Reserved
#
@@ -30,7 +30,7 @@
from grgsm.trx import fake_pm
COPYRIGHT = \
- "Copyright (C) 2016-2017 by Vadim Yanitskiy \n" \
+ "Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \
"Copyright (C) 2017 by Piotr Krysik \n" \
"License GPLv2+: GNU GPL version 2 or later " \
"<http://gnu.org/licenses/gpl.html>\n" \
@@ -40,6 +40,7 @@
class Application:
# Application variables
remote_addr = "127.0.0.1"
+ bind_addr = "0.0.0.0"
base_port = 6700
# PHY specific
@@ -63,7 +64,8 @@
self.radio = radio_if(self.phy_args, self.phy_sample_rate,
self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm,
self.phy_rx_antenna, self.phy_tx_antenna,
- self.remote_addr, self.base_port)
+ self.bind_addr, self.remote_addr,
+ self.base_port)
# Power measurement emulation
# Noise: -120 .. -105
@@ -71,8 +73,9 @@
self.pm = fake_pm(-120, -105, -75, -50)
# Init TRX CTRL interface
- self.server = ctrl_if_bb(self.remote_addr,
- self.base_port + 101, self.base_port + 1,
+ self.server = ctrl_if_bb(
+ self.remote_addr, self.base_port + 101,
+ self.bind_addr, self.base_port + 1,
self.radio, self.pm)
print("[i] Init complete")
@@ -96,6 +99,7 @@
# TRX specific
s += " TRX interface specific\n" \
" -i --remote-addr Set remote address (default
%s)\n" \
+" -b --bind-addrSet bind address (default %s)\n" \
" -p --base-portSet base port number (default
%d)\n\n"
# PHY specific
@@ -110,6 +114,7 @@
print(s % (
self.remote_addr,
+ self.bind_addr,
self.base_port,
self.phy_rx_gain,
self.phy_tx_gain,
@@ -120,10 +125,10 @@
def parse_argv(self):
try:
opts, args = getopt.getopt(sys.argv[1:],
- "i:p:a:s:g:G:h",
- ["help", "remote-addr=", "base-port=",
"device-args=",
- "sample-rate=", "rx-gain=", "tx-gain=", "ppm=",
- "rx-antenna=", "tx-antenna="])
+ "i:b:p:a:s:g:G:h",
+ ["help", "remote-addr=", "bind-addr=",
"base-port=",
+ "device-args=", "sample-rate=", "rx-gain=",
"tx-gain=",
+ "ppm=", "rx-antenna=", "tx-antenna="])
except getopt.GetoptError as err:
# Print(help and exit)
self.print_help()
@@ -138,6 +143,8 @@
# TRX specific
elif o in ("-i", "--remote-addr"):
self.remote_addr = v
+ elif o in ("-b", "--bind-addr"):
+ self.bind_addr = v
elif o in ("-p", "--base-port"):
if int(v) >= 0 and int(v) <= 65535:
self.base_port = int(v)
diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py
index 7886e23..f5a
Change in gr-gsm[master]: grgsm_trx: change default TRX port number to 6700
Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10417 ) Change subject: grgsm_trx: change default TRX port number to 6700 .. 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 --- M apps/grgsm_trx 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index eafc726..eb7fbdb 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -40,7 +40,7 @@ class Application: # Application variables remote_addr = "127.0.0.1" - base_port = 5700 + base_port = 6700 # PHY specific phy_sample_rate = 4 * 1625000 / 6 -- To view, visit https://gerrit.osmocom.org/10417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaf0c78733bfefcb0b0938abf6d316e27d03ecab4 Gerrit-Change-Number: 10417 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik
Change in gr-gsm[master]: gsm_trx_burst_if: allow to customize the bind address
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/10424 )
Change subject: gsm_trx_burst_if: allow to customize the bind address
..
gsm_trx_burst_if: allow to customize the bind address
Pleviously remote address for DATA interface was also used as the
bind address, what is definitely wrong. Let's change the API a bit
in order to allow one to specify a custom bind address.
Change-Id: I6e5f7b7119ac454217b8dd04f9ee0dd3b23972b6
---
M grc/trx/gsm_trx_burst_if.xml
M include/grgsm/misc_utils/udp_socket.h
M include/grgsm/trx/trx_burst_if.h
M lib/misc_utils/udp_socket.cc
M lib/trx/trx_burst_if_impl.cc
M lib/trx/trx_burst_if_impl.h
M python/trx/radio_if.py
7 files changed, 26 insertions(+), 11 deletions(-)
Approvals:
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/grc/trx/gsm_trx_burst_if.xml b/grc/trx/gsm_trx_burst_if.xml
index 99427b3..49979a3 100644
--- a/grc/trx/gsm_trx_burst_if.xml
+++ b/grc/trx/gsm_trx_burst_if.xml
@@ -3,7 +3,7 @@
TRX Burst Interface
gsm_trx_burst_if
import grgsm
- grgsm.trx_burst_if($remote_addr, $base_port)
+ grgsm.trx_burst_if($bind_addr, $remote_addr, $base_port)
base_port
@@ -13,6 +13,13 @@
+bind_addr
+bind_addr
+0.0.0.0
+string
+
+
+
remote_addr
remote_addr
127.0.0.1
diff --git a/include/grgsm/misc_utils/udp_socket.h
b/include/grgsm/misc_utils/udp_socket.h
index 15b2c66..d1ceb9f 100644
--- a/include/grgsm/misc_utils/udp_socket.h
+++ b/include/grgsm/misc_utils/udp_socket.h
@@ -53,8 +53,9 @@
public:
udp_socket(
-const std::string &remote_addr,
+const std::string &bind_addr,
const std::string &src_port,
+const std::string &remote_addr,
const std::string &dst_port,
size_t mtu);
~udp_socket();
diff --git a/include/grgsm/trx/trx_burst_if.h b/include/grgsm/trx/trx_burst_if.h
index 0e7a35a..9277dc5 100644
--- a/include/grgsm/trx/trx_burst_if.h
+++ b/include/grgsm/trx/trx_burst_if.h
@@ -48,6 +48,7 @@
* creating new instances.
*/
static sptr make(
+const std::string &bind_addr,
const std::string &remote_addr,
const std::string &base_port);
};
diff --git a/lib/misc_utils/udp_socket.cc b/lib/misc_utils/udp_socket.cc
index 73393a0..c43f183 100644
--- a/lib/misc_utils/udp_socket.cc
+++ b/lib/misc_utils/udp_socket.cc
@@ -38,8 +38,9 @@
namespace gsm {
udp_socket::udp_socket(
- const std::string &remote_addr,
+ const std::string &bind_addr,
const std::string &src_port,
+ const std::string &remote_addr,
const std::string &dst_port,
size_t mtu)
{
@@ -50,7 +51,7 @@
udp::resolver resolver(d_io_service);
udp::resolver::query rx_query(
-udp::v4(), remote_addr, src_port,
+udp::v4(), bind_addr, src_port,
boost::asio::ip::resolver_query_base::passive);
udp::resolver::query tx_query(
udp::v4(), remote_addr, dst_port,
diff --git a/lib/trx/trx_burst_if_impl.cc b/lib/trx/trx_burst_if_impl.cc
index e3fcc89..f72eecd 100644
--- a/lib/trx/trx_burst_if_impl.cc
+++ b/lib/trx/trx_burst_if_impl.cc
@@ -48,19 +48,22 @@
trx_burst_if::sptr
trx_burst_if::make(
+ const std::string &bind_addr,
const std::string &remote_addr,
const std::string &base_port)
{
int base_port_int = boost::lexical_cast (base_port);
return gnuradio::get_initial_sptr
-(new trx_burst_if_impl(remote_addr, base_port_int));
+(new trx_burst_if_impl(bind_addr, remote_addr,
+ base_port_int));
}
/*
* The private constructor
*/
trx_burst_if_impl::trx_burst_if_impl(
+ const std::string &bind_addr,
const std::string &remote_addr,
int base_port
) : gr::block("trx_burst_if",
@@ -79,8 +82,8 @@
std::string data_dst_port = boost::lexical_cast
(base_port + 102);
// Init DATA interface
-d_data_sock = new udp_socket(remote_addr,
- data_src_port, data_dst_port, DATA_IF_MTU);
+d_data_sock = new udp_socket(bind_addr, data_src_port,
+ remote_addr, data_dst_port, DATA_IF_MTU);
// Bind DATA interface handler
d_data_sock->udp_rx_handler = boost::bind(
diff --git a/lib/trx/trx_burst_if_impl.h b/lib/trx/trx_burst_if_impl.h
index 27ec259..fdb49f2 100644
--- a/lib/trx/trx_burst_if_impl.h
+++ b/lib/trx/trx_burst_if_impl.h
@@ -40,7 +40,8 @@
void burst_pack(pmt::pmt_t msg, uint8_t *buf);
public:
- trx_burst_if_impl(const std::string &remote_addr, int base_port);
+ trx_burst_if_impl(const std::string &bind_addr,
+const std::string &remote_addr, int base_port);
~trx_burst_if_impl();
void handle_dl_burst(pmt::pmt_t msg);
diff
Change in gr-gsm[master]: apps/grgsm_trx: print bind / remote address and port
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/10426 )
Change subject: apps/grgsm_trx: print bind / remote address and port
..
apps/grgsm_trx: print bind / remote address and port
Change-Id: If750d476f3972f1ab5c5b637438d14d40b1e3d87
---
M python/trx/ctrl_if_bb.py
M python/trx/radio_if.py
M python/trx/udp_link.py
3 files changed, 11 insertions(+), 2 deletions(-)
Approvals:
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py
index f5a9fa3..fe0002e 100644
--- a/python/trx/ctrl_if_bb.py
+++ b/python/trx/ctrl_if_bb.py
@@ -27,10 +27,11 @@
class ctrl_if_bb(ctrl_if):
def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb,
pm):
- print("[i] Init CTRL interface")
ctrl_if.__init__(self, remote_addr, remote_port,
bind_addr, bind_port)
+ print("[i] Init CTRL interface (%s)" % self.desc_link())
+
# Set link to the follow graph (top block)
self.tb = tb
# Power measurement
diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index 1c7f003..d2afcf6 100644
--- a/python/trx/radio_if.py
+++ b/python/trx/radio_if.py
@@ -84,7 +84,9 @@
trx_bind_addr, trx_remote_addr,
trx_base_port):
- print("[i] Init Radio interface")
+ print("[i] Init Radio interface (L:%s:%u <-> R:%s:%u)"
+ % (trx_bind_addr, trx_base_port + 2,
+ trx_remote_addr, trx_base_port + 102))
# PHY specific variables
self.sample_rate = phy_sample_rate
diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py
index efa701b..ad84e5a 100644
--- a/python/trx/udp_link.py
+++ b/python/trx/udp_link.py
@@ -47,6 +47,12 @@
data, addr = self.sock.recvfrom(128)
self.handle_rx(data.decode(), addr)
+ def desc_link(self):
+ (bind_addr, bind_port) = self.sock.getsockname()
+
+ return "L:%s:%u <-> R:%s:%u" \
+ % (bind_addr, bind_port, self.remote_addr,
self.remote_port)
+
def send(self, data, remote = None):
if type(data) not in [bytearray, bytes]:
data = data.encode()
--
To view, visit https://gerrit.osmocom.org/10426
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: If750d476f3972f1ab5c5b637438d14d40b1e3d87
Gerrit-Change-Number: 10426
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy
Gerrit-Reviewer: Piotr Krysik
Change in gr-gsm[master]: Format the output into ostringstream and then write it at once.
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10731 ) Change subject: Format the output into ostringstream and then write it at once. .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1012ed26371b4c67163545652f0a1ce0f576af9e Gerrit-Change-Number: 10731 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-Comment-Date: Wed, 05 Sep 2018 10:30:44 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: apps/grgsm_trx: add baseband frequency shift feature
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10770 ) Change subject: apps/grgsm_trx: add baseband frequency shift feature .. Patch Set 2: Verified+1 Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/10770/2/apps/grgsm_trx File apps/grgsm_trx: https://gerrit.osmocom.org/#/c/10770/2/apps/grgsm_trx@50 PS2, Line 50: phy_freq_offset_hz The way parameters (especially their default values) are handled currently is a bit messy. I'll migrate it to optparse or argparse. -- To view, visit https://gerrit.osmocom.org/10770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I42e397e47402a87f4141ef31b25eff4c8c1267e2 Gerrit-Change-Number: 10770 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Wed, 05 Sep 2018 10:50:06 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in gr-gsm[master]: grgsm_trx: Migrated argument parsing to argparse
Piotr Krysik has uploaded this change for review. (
https://gerrit.osmocom.org/10782
Change subject: grgsm_trx: Migrated argument parsing to argparse
..
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
---
M apps/grgsm_trx
M python/trx/radio_if.py
2 files changed, 280 insertions(+), 300 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/82/10782/1
diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index 45312e6..712b0b7 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -4,6 +4,7 @@
# GR-GSM based transceiver
#
# (C) 2016-2018 by Vadim Yanitskiy
+# (C) 2017-2018 by Piotr Krysik
#
# All Rights Reserved
#
@@ -30,34 +31,40 @@
from grgsm.trx import ctrl_if_bb
from grgsm.trx import radio_if
from grgsm.trx import fake_pm
+from argparse import ArgumentParser
COPYRIGHT = \
"Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \
- "Copyright (C) 2017 by Piotr Krysik \n" \
+ "Copyright (C) 2017-2018 by Piotr Krysik \n" \
"License GPLv2+: GNU GPL version 2 or later " \
"<http://gnu.org/licenses/gpl.html>\n" \
"This is free software: you are free to change and redistribute it.\n" \
"There is NO WARRANTY, to the extent permitted by law.\n"
-class Application:
- # Application variables
- remote_addr = "127.0.0.1"
- bind_addr = "0.0.0.0"
- base_port = 6700
-
- # PHY specific
- phy_sample_rate = 4 * 1625000 / 6
- phy_freq_offset_hz = None
- phy_tx_antenna = "TX/RX"
- phy_rx_antenna = "RX2"
- phy_rx_gain = 30
- phy_tx_gain = 10
- phy_args = ""
- phy_ppm = 0
-
- def __init__(self):
- self.print_copyright()
- self.parse_argv()
+class grgsm_trx:
+ def __init__(self,
+remote_addr,
+bind_addr,
+base_port,
+args,
+sample_rate,
+rx_gain,
+tx_gain,
+rx_antenna,
+tx_antenna,
+freq_offset,
+ppm):
+ self.remote_addr = remote_addr
+ self.bind_addr = bind_addr
+ self.base_port = base_port
+ self.phy_args = args
+ self.phy_sample_rate = sample_rate
+ self.phy_rx_gain = rx_gain
+ self.phy_tx_gain = tx_gain
+ self.phy_rx_antenna = rx_antenna
+ self.phy_tx_antenna = tx_antenna
+ self.phy_freq_offset = freq_offset
+ self.phy_ppm = ppm
# Set up signal handlers
signal.signal(signal.SIGINT, self.sig_handler)
@@ -66,14 +73,10 @@
# Init Radio interface
self.radio = radio_if(self.phy_args, self.phy_sample_rate,
self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm,
- self.phy_rx_antenna, self.phy_tx_antenna,
+ self.phy_rx_antenna, self.phy_tx_antenna,
self.phy_freq_offset,
self.bind_addr, self.remote_addr,
self.base_port)
- # Optional frequency offset
- if self.phy_freq_offset_hz is not None:
- self.radio.freq_offset_hz = self.phy_freq_offset_hz
-
# Power measurement emulation
# Noise: -120 .. -105
# BTS: -75 .. -50
@@ -95,97 +98,73 @@
print("[i] Shutting down...")
self.radio.shutdown()
- def print_copyright(self):
- print(COPYRIGHT)
-
- def print_help(self):
- s = " Usage: " + sys.argv[0] + " [options]\n\n" \
-" Some help...\n" \
-" -h --help this text\n\n"
-
- # TRX specific
- s += " TRX interface specific\n" \
-" -i --remote-addr Set remote address (default
%s)\n" \
-" -b --bind-addrSet bind address (default %s)\n" \
-" -p --base-portSet base port number (default
%d)\n\n"
-
- # PHY specific
- s += " Radio interface specific\n" \
-" -a --device-args Set device
Change in gr-gsm[master]: grgsm_trx: Migrated argument parsing to argparse
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/10782 )
Change subject: grgsm_trx: Migrated argument parsing to argparse
..
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
---
M apps/grgsm_trx
M python/trx/radio_if.py
2 files changed, 280 insertions(+), 300 deletions(-)
Objections:
Vadim Yanitskiy: I would prefer this is not merged as is
diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index 45312e6..712b0b7 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -4,6 +4,7 @@
# GR-GSM based transceiver
#
# (C) 2016-2018 by Vadim Yanitskiy
+# (C) 2017-2018 by Piotr Krysik
#
# All Rights Reserved
#
@@ -30,34 +31,40 @@
from grgsm.trx import ctrl_if_bb
from grgsm.trx import radio_if
from grgsm.trx import fake_pm
+from argparse import ArgumentParser
COPYRIGHT = \
"Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \
- "Copyright (C) 2017 by Piotr Krysik \n" \
+ "Copyright (C) 2017-2018 by Piotr Krysik \n" \
"License GPLv2+: GNU GPL version 2 or later " \
"<http://gnu.org/licenses/gpl.html>\n" \
"This is free software: you are free to change and redistribute it.\n" \
"There is NO WARRANTY, to the extent permitted by law.\n"
-class Application:
- # Application variables
- remote_addr = "127.0.0.1"
- bind_addr = "0.0.0.0"
- base_port = 6700
-
- # PHY specific
- phy_sample_rate = 4 * 1625000 / 6
- phy_freq_offset_hz = None
- phy_tx_antenna = "TX/RX"
- phy_rx_antenna = "RX2"
- phy_rx_gain = 30
- phy_tx_gain = 10
- phy_args = ""
- phy_ppm = 0
-
- def __init__(self):
- self.print_copyright()
- self.parse_argv()
+class grgsm_trx:
+ def __init__(self,
+remote_addr,
+bind_addr,
+base_port,
+args,
+sample_rate,
+rx_gain,
+tx_gain,
+rx_antenna,
+tx_antenna,
+freq_offset,
+ppm):
+ self.remote_addr = remote_addr
+ self.bind_addr = bind_addr
+ self.base_port = base_port
+ self.phy_args = args
+ self.phy_sample_rate = sample_rate
+ self.phy_rx_gain = rx_gain
+ self.phy_tx_gain = tx_gain
+ self.phy_rx_antenna = rx_antenna
+ self.phy_tx_antenna = tx_antenna
+ self.phy_freq_offset = freq_offset
+ self.phy_ppm = ppm
# Set up signal handlers
signal.signal(signal.SIGINT, self.sig_handler)
@@ -66,14 +73,10 @@
# Init Radio interface
self.radio = radio_if(self.phy_args, self.phy_sample_rate,
self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm,
- self.phy_rx_antenna, self.phy_tx_antenna,
+ self.phy_rx_antenna, self.phy_tx_antenna,
self.phy_freq_offset,
self.bind_addr, self.remote_addr,
self.base_port)
- # Optional frequency offset
- if self.phy_freq_offset_hz is not None:
- self.radio.freq_offset_hz = self.phy_freq_offset_hz
-
# Power measurement emulation
# Noise: -120 .. -105
# BTS: -75 .. -50
@@ -95,97 +98,73 @@
print("[i] Shutting down...")
self.radio.shutdown()
- def print_copyright(self):
- print(COPYRIGHT)
-
- def print_help(self):
- s = " Usage: " + sys.argv[0] + " [options]\n\n" \
-" Some help...\n" \
-" -h --help this text\n\n"
-
- # TRX specific
- s += " TRX interface specific\n" \
-" -i --remote-addr Set remote address (default
%s)\n" \
-" -b --bind-addrSet bind address (default %s)\n" \
-" -p --base-portSet base port number (default
%d)\n\n"
-
- # PHY specific
- s += " Radio interface specific\n" \
-" -a --device-args Set device
Change in gr-gsm[master]: apps/grgsm_trx: migrate from getopt to argparse
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10832 ) Change subject: apps/grgsm_trx: migrate from getopt to argparse .. Patch Set 1: Verified+1 Code-Review+2 (2 comments) This is not just rework of the previous change, some of my changes were just thrown away without explanation. See the comments. https://gerrit.osmocom.org/#/c/10832/1/apps/grgsm_trx File apps/grgsm_trx: https://gerrit.osmocom.org/#/c/10832/1/apps/grgsm_trx@55 PS1, Line 55: argv _hz suffix is redundant, of course frequency is in Hz https://gerrit.osmocom.org/#/c/10832/1/apps/grgsm_trx@71 PS1, Line 71: self.radio.freq_offset_hz = self.phy_freq_offset_hz this should be passed as parameter to radio_if, there is no reason to set it to None in any circumstances, it can safely be 0 by default -- To view, visit https://gerrit.osmocom.org/10832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d Gerrit-Change-Number: 10832 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 11 Sep 2018 07:41:49 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in gr-gsm[master]: grgsm_scanner: Add --debug option
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10784 ) Change subject: grgsm_scanner: Add --debug option .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11e99facb5a1ab9c9bfee3c314a91a74f98a2523 Gerrit-Change-Number: 10784 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-Comment-Date: Tue, 11 Sep 2018 07:42:30 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: Format the output into ostringstream and then write it at once.
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10731 ) Change subject: Format the output into ostringstream and then write it at once. .. Patch Set 1: -Verified -Code-Review -- To view, visit https://gerrit.osmocom.org/10731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1012ed26371b4c67163545652f0a1ce0f576af9e Gerrit-Change-Number: 10731 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-Comment-Date: Tue, 11 Sep 2018 07:43:45 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: Format the output into ostringstream and then write it at once.
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10731 ) Change subject: Format the output into ostringstream and then write it at once. .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1012ed26371b4c67163545652f0a1ce0f576af9e Gerrit-Change-Number: 10731 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-Comment-Date: Tue, 11 Sep 2018 07:43:52 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: grgsm_scanner: Add --debug option
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/10784 )
Change subject: grgsm_scanner: Add --debug option
..
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
---
M apps/grgsm_scanner
1 file changed, 21 insertions(+), 16 deletions(-)
Approvals:
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/apps/grgsm_scanner b/apps/grgsm_scanner
index b57569d..32210ed 100755
--- a/apps/grgsm_scanner
+++ b/apps/grgsm_scanner
@@ -297,7 +297,7 @@
return "ARFCN: %4u, Freq: %6.1fM, CID: %5u, LAC: %5u, MCC: %3u, MNC:
%3u, Pwr: %3i" % (
self.arfcn, self.freq / 1e6, self.cid, self.lac, self.mcc,
self.mnc, self.power)
-def do_scan(samp_rate, band, speed, ppm, gain, args, prn = None):
+def do_scan(samp_rate, band, speed, ppm, gain, args, prn = None, debug =
False):
signallist = []
channels_num = int(samp_rate / 0.2e6)
for arfcn_range in grgsm.arfcn.get_arfcn_ranges(band):
@@ -311,14 +311,15 @@
while current_freq < stop_freq:
-# silence rtl_sdr output:
-# open 2 fds
-null_fds = [os.open(os.devnull, os.O_RDWR) for x in xrange(2)]
-# save the current file descriptors to a tuple
-save = os.dup(1), os.dup(2)
-# put /dev/null fds on 1 and 2
-os.dup2(null_fds[0], 1)
-os.dup2(null_fds[1], 2)
+if not debug:
+# silence rtl_sdr output:
+# open 2 fds
+null_fds = [os.open(os.devnull, os.O_RDWR) for x in xrange(2)]
+# save the current file descriptors to a tuple
+save = os.dup(1), os.dup(2)
+# put /dev/null fds on 1 and 2
+os.dup2(null_fds[0], 1)
+os.dup2(null_fds[1], 2)
# instantiate scanner and processor
scanner = wideband_scanner(rec_len=6 - speed,
@@ -359,12 +360,14 @@
scanner = None
-# restore file descriptors so we can print the results
-os.dup2(save[0], 1)
-os.dup2(save[1], 2)
-# close the temporary fds
-os.close(null_fds[0])
-os.close(null_fds[1])
+
+if not debug:
+# restore file descriptors so we can print the results
+os.dup2(save[0], 1)
+os.dup2(save[1], 2)
+# close the temporary fds
+os.close(null_fds[0])
+os.close(null_fds[1])
if prn:
prn(found_list)
signallist.extend(found_list)
@@ -389,6 +392,8 @@
help="Scan speed [default=%default]. Value range 0-5.")
parser.add_option("-v", "--verbose", action="store_true",
help="If set, verbose information output is printed:
ccch configuration, cell ARFCN's, neighbour ARFCN's")
+parser.add_option("-d", "--debug", action="store_true",
+ help="Print additional debug messages")
"""
Dont forget: sudo sysctl kernel.shmmni=32000
@@ -415,7 +420,7 @@
print info.get_verbose_info()
print ""
do_scan(options.samp_rate, options.band, options.speed,
-options.ppm, options.gain, options.args, prn = printfunc)
+options.ppm, options.gain, options.args, prn = printfunc, debug =
options.debug)
if __name__ == '__main__':
main()
--
To view, visit https://gerrit.osmocom.org/10784
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I11e99facb5a1ab9c9bfee3c314a91a74f98a2523
Gerrit-Change-Number: 10784
Gerrit-PatchSet: 2
Gerrit-Owner: Vasil Velichkov
Gerrit-Reviewer: Piotr Krysik
Gerrit-Reviewer: Vasil Velichkov
Change in gr-gsm[master]: apps/grgsm_trx: migrate from getopt to argparse
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10832 ) Change subject: apps/grgsm_trx: migrate from getopt to argparse .. Patch Set 1: -Verified -Code-Review -- To view, visit https://gerrit.osmocom.org/10832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d Gerrit-Change-Number: 10832 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Sep 2018 08:33:38 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: Format the output into ostringstream and then write it at once.
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/10731 )
Change subject: Format the output into ostringstream and then write it at once.
..
Format the output into ostringstream and then write it at once.
This fixes the garbled output when multiple printers are used in a
flowgraph.
closes #255
closes #420
Change-Id: I1012ed26371b4c67163545652f0a1ce0f576af9e
---
M lib/misc_utils/bursts_printer_impl.cc
M lib/misc_utils/message_printer_impl.cc
2 files changed, 21 insertions(+), 16 deletions(-)
Approvals:
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/lib/misc_utils/bursts_printer_impl.cc
b/lib/misc_utils/bursts_printer_impl.cc
index c22e60b..ab9c319 100644
--- a/lib/misc_utils/bursts_printer_impl.cc
+++ b/lib/misc_utils/bursts_printer_impl.cc
@@ -66,48 +66,50 @@
return;
}
-std::cout << d_prepend_string;
+std::ostringstream out;
+out << d_prepend_string;
if (d_prepend_fnr)
{
-std::cout << frame_nr;
+out << frame_nr;
}
if (d_prepend_fnr && d_prepend_frame_count)
{
-std::cout << " ";
+out << " ";
}
if (d_prepend_frame_count)
{
// calculate fn count using libosmogsm
-std::cout << osmo_a5_fn_count(frame_nr);
+out << osmo_a5_fn_count(frame_nr);
}
if (d_prepend_fnr || d_prepend_frame_count)
{
-std::cout << ": ";
+out << ": ";
}
if (d_print_payload_only)
{
for (int ii=0; ii<57; ii++)
{
-std::cout << std::setprecision(1) << static_cast(burst[ii
+ 3]);
+out << std::setprecision(1) << static_cast(burst[ii + 3]);
}
for (int ii=0; ii<57; ii++)
{
-std::cout << std::setprecision(1) << static_cast(burst[ii
+ 88]);
+out << std::setprecision(1) << static_cast(burst[ii +
88]);
}
}
else
{
for(int ii=0; ii(burst[ii]);
+ out << std::setprecision(1) << static_cast(burst[ii]);
}
}
-std::cout << std::endl;
+out << std::endl;
+std::cout << out.str() << std::flush;
}
bool bursts_printer_impl::is_dummy_burst(int8_t *burst, size_t burst_len)
diff --git a/lib/misc_utils/message_printer_impl.cc
b/lib/misc_utils/message_printer_impl.cc
index e8aa2d3..8342946 100644
--- a/lib/misc_utils/message_printer_impl.cc
+++ b/lib/misc_utils/message_printer_impl.cc
@@ -46,26 +46,27 @@
gsmtap_hdr * header = (gsmtap_hdr *)message_plus_header;
uint32_t frame_nr = be32toh(header->frame_number);
-std::cout << d_prepend_string;
+std::ostringstream out;
+out << d_prepend_string;
if (d_prepend_fnr)
{
-std::cout << frame_nr;
+out << frame_nr;
}
if (d_prepend_fnr && d_prepend_frame_count)
{
-std::cout << " ";
+out << " ";
}
if (d_prepend_frame_count)
{
// calculate fn count using libosmogsm
-std::cout << osmo_a5_fn_count(frame_nr);
+out << osmo_a5_fn_count(frame_nr);
}
if (d_prepend_fnr || d_prepend_frame_count)
{
-std::cout << ": ";
+out << ": ";
}
int start_index = sizeof(gsmtap_hdr);
@@ -77,9 +78,11 @@
for(int ii=start_index; iihttps://gerrit.osmocom.org/10731
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1012ed26371b4c67163545652f0a1ce0f576af9e
Gerrit-Change-Number: 10731
Gerrit-PatchSet: 2
Gerrit-Owner: Vasil Velichkov
Gerrit-Reviewer: Piotr Krysik
Gerrit-Reviewer: Vasil Velichkov
Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10831 ) Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c309588fa0f7822abfb3919327639735db07679 Gerrit-Change-Number: 10831 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Sep 2018 09:39:15 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation
Piotr Krysik has abandoned this change. ( https://gerrit.osmocom.org/10831 ) Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation .. Abandoned -- To view, visit https://gerrit.osmocom.org/10831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I0c309588fa0f7822abfb3919327639735db07679 Gerrit-Change-Number: 10831 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy
Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation
Piotr Krysik has restored this change. ( https://gerrit.osmocom.org/10831 ) Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation .. Restored -- To view, visit https://gerrit.osmocom.org/10831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: restore Gerrit-Change-Id: I0c309588fa0f7822abfb3919327639735db07679 Gerrit-Change-Number: 10831 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy
Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation
Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10831 ) Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation .. apps/grgsm_trx: fix inaccurate sample rate calculation Change-Id: I0c309588fa0f7822abfb3919327639735db07679 --- M apps/grgsm_trx M python/trx/radio_if.py 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 45312e6..6efed07 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -46,7 +46,7 @@ base_port = 6700 # PHY specific - phy_sample_rate = 4 * 1625000 / 6 + phy_sample_rate = radio_if.SAMPLE_RATE phy_freq_offset_hz = None phy_tx_antenna = "TX/RX" phy_rx_antenna = "RX2" diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 407e724..2aeb49a 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -75,6 +75,9 @@ GSM_TS_PERIOD_uS = GSM_SYM_PERIOD_uS * 156.25 GSM_UL_DL_SHIFT_uS = -(GSM_TS_PERIOD_uS * 3) + # TODO: explain where do these values come from? + SAMPLE_RATE = 4.0 * 1625000.0 / 6.0 + # FIXME: shall be measured (automatically?) for # particular device and particular clock rate. # The current value is measured for USRP B2X0 at 26e6. -- To view, visit https://gerrit.osmocom.org/10831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0c309588fa0f7822abfb3919327639735db07679 Gerrit-Change-Number: 10831 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy
Change in gr-gsm[master]: trx/radio_if.py: clarify magic numbers in sample rate calculation
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10880 ) Change subject: trx/radio_if.py: clarify magic numbers in sample rate calculation .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I55f283113d0324a0236b7bbf13bce5718003b857 Gerrit-Change-Number: 10880 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Thu, 13 Sep 2018 08:34:14 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: apps/grgsm_trx: migrate from getopt to argparse
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10832 ) Change subject: apps/grgsm_trx: migrate from getopt to argparse .. Patch Set 3: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d Gerrit-Change-Number: 10832 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Sep 2018 08:34:20 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10831 ) Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation .. Patch Set 3: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c309588fa0f7822abfb3919327639735db07679 Gerrit-Change-Number: 10831 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Sep 2018 08:34:05 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/radio_if.py: clarify magic numbers in sample rate calculation
Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10880 ) Change subject: trx/radio_if.py: clarify magic numbers in sample rate calculation .. trx/radio_if.py: clarify magic numbers in sample rate calculation Change-Id: I55f283113d0324a0236b7bbf13bce5718003b857 --- M python/trx/radio_if.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Piotr Krysik: Looks good to me, approved; Verified diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 2aeb49a..f7f124f 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -75,8 +75,8 @@ GSM_TS_PERIOD_uS = GSM_SYM_PERIOD_uS * 156.25 GSM_UL_DL_SHIFT_uS = -(GSM_TS_PERIOD_uS * 3) - # TODO: explain where do these values come from? - SAMPLE_RATE = 4.0 * 1625000.0 / 6.0 + GSM_SYM_RATE = (1.0 / GSM_SYM_PERIOD_uS) * 1e6 + SAMPLE_RATE = GSM_SYM_RATE * osr # FIXME: shall be measured (automatically?) for # particular device and particular clock rate. -- To view, visit https://gerrit.osmocom.org/10880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I55f283113d0324a0236b7bbf13bce5718003b857 Gerrit-Change-Number: 10880 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik
Change in gr-gsm[master]: apps/grgsm_trx: migrate from getopt to argparse
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/10832 )
Change subject: apps/grgsm_trx: migrate from getopt to argparse
..
apps/grgsm_trx: migrate from getopt to argparse
Change-Id: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d
---
M apps/grgsm_trx
1 file changed, 69 insertions(+), 106 deletions(-)
Approvals:
Harald Welte: Looks good to me, but someone else must approve
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index 6efed07..d57c979 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -4,6 +4,7 @@
# GR-GSM based transceiver
#
# (C) 2016-2018 by Vadim Yanitskiy
+# (C) 2017-2018 by Piotr Krysik
#
# All Rights Reserved
#
@@ -22,9 +23,10 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import signal
-import getopt
import sys
+from argparse import ArgumentParser
+from argparse import ArgumentTypeError
from gnuradio import eng_notation
from grgsm.trx import ctrl_if_bb
@@ -33,31 +35,25 @@
COPYRIGHT = \
"Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \
- "Copyright (C) 2017 by Piotr Krysik \n" \
+ "Copyright (C) 2017-2018 by Piotr Krysik \n" \
"License GPLv2+: GNU GPL version 2 or later " \
"<http://gnu.org/licenses/gpl.html>\n" \
"This is free software: you are free to change and redistribute it.\n" \
"There is NO WARRANTY, to the extent permitted by law.\n"
class Application:
- # Application variables
- remote_addr = "127.0.0.1"
- bind_addr = "0.0.0.0"
- base_port = 6700
-
- # PHY specific
- phy_sample_rate = radio_if.SAMPLE_RATE
- phy_freq_offset_hz = None
- phy_tx_antenna = "TX/RX"
- phy_rx_antenna = "RX2"
- phy_rx_gain = 30
- phy_tx_gain = 10
- phy_args = ""
- phy_ppm = 0
-
- def __init__(self):
- self.print_copyright()
- self.parse_argv()
+ def __init__(self, argv):
+ self.remote_addr = argv.remote_addr
+ self.bind_addr = argv.bind_addr
+ self.base_port = argv.base_port
+ self.phy_args = argv.args
+ self.phy_sample_rate = argv.sample_rate
+ self.phy_rx_gain = argv.rx_gain
+ self.phy_tx_gain = argv.tx_gain
+ self.phy_rx_antenna = argv.rx_antenna
+ self.phy_tx_antenna = argv.tx_antenna
+ self.phy_freq_offset_hz = argv.freq_offset
+ self.phy_ppm = argv.ppm
# Set up signal handlers
signal.signal(signal.SIGINT, self.sig_handler)
@@ -95,97 +91,64 @@
print("[i] Shutting down...")
self.radio.shutdown()
- def print_copyright(self):
- print(COPYRIGHT)
-
- def print_help(self):
- s = " Usage: " + sys.argv[0] + " [options]\n\n" \
-" Some help...\n" \
-" -h --help this text\n\n"
-
- # TRX specific
- s += " TRX interface specific\n" \
-" -i --remote-addr Set remote address (default
%s)\n" \
-" -b --bind-addrSet bind address (default %s)\n" \
-" -p --base-portSet base port number (default
%d)\n\n"
-
- # PHY specific
- s += " Radio interface specific\n" \
-" -a --device-args Set device arguments\n" \
-" -s --sample-rate Set sample rate\n" \
-" -g --rx-gain Set RX gain (default %d)\n" \
-" -G --tx-gain Set TX gain (default %d)\n" \
-" --rx-antenna Set RX antenna (default %s)\n" \
-" --tx-antenna Set TX antenna (default %s)\n" \
-" --freq-offset Shift baseband freq. (e.g.
-500M)\n" \
-" --ppm Set frequency correction (default
%d)\n"
-
- print(s % (
- self.remote_addr,
- self.bind_addr,
- self.base_port,
- self.phy_rx_gain,
- self.phy_tx_gain,
- self.phy_rx_antenna,
- self.phy_tx_antenna,
- self.phy_ppm))
-
- def parse_argv(self):
- try:
- opts, args = getopt.getopt(sys.argv[1:],
- "i:b:p:a:s:g:G:h&qu
Change in gr-gsm[master]: burst_file_source: Fix reading longer bursts
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10881 ) Change subject: burst_file_source: Fix reading longer bursts .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc Gerrit-Change-Number: 10881 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Sep 2018 09:35:24 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: burst_file_source: Fix reading longer bursts
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/10881 )
Change subject: burst_file_source: Fix reading longer bursts
..
burst_file_source: Fix reading longer bursts
- Read bursts with pmt::deserialize directly from the std::filebuf
- Remove the unused unserialized variable
- Add tests
Since df978693 when the rx_time tags are present in the incomming stream
the gsm receiver adds fm_time to the burst's PMT and the bursts that
burst file sink writes becomes longer because of the additional field.
The burst file source block was expecting all burst to be 147 bytes long
and reading files with longer bursts was failing with an unhandled exception.
terminate called after throwing an instance of 'pmt::exception'
thread[thread-per-block[5]: ]: pmt_cdr:
wrong_type : #f
what(): pmt::deserialize: malformed input stream, tag value = : 115
Change-Id: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc
---
M lib/misc_utils/burst_file_source_impl.cc
M lib/qa_utils/burst_source_impl.cc
M python/CMakeLists.txt
A python/qa_burst_file_source.py
4 files changed, 109 insertions(+), 13 deletions(-)
Approvals:
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/lib/misc_utils/burst_file_source_impl.cc
b/lib/misc_utils/burst_file_source_impl.cc
index 4367150..85d5ad9 100644
--- a/lib/misc_utils/burst_file_source_impl.cc
+++ b/lib/misc_utils/burst_file_source_impl.cc
@@ -28,8 +28,6 @@
#include "burst_file_source_impl.h"
#include "stdio.h"
-#define PMT_SIZE 174
-
namespace gr {
namespace gsm {
@@ -86,16 +84,13 @@
void burst_file_source_impl::run()
{
-char *unserialized = (char*)malloc(sizeof(char) * PMT_SIZE);
-while (d_input_file.read(unserialized, PMT_SIZE) && !d_finished)
+std::filebuf* pbuf = d_input_file.rdbuf();
+while (!d_finished)
{
-if (d_input_file.bad())
-{
+pmt::pmt_t burst = pmt::deserialize(*pbuf);
+if (pmt::is_eof_object(burst)) {
break;
}
-
-std::string s(unserialized, PMT_SIZE);
-pmt::pmt_t burst = pmt::deserialize_str(s);
message_port_pub(pmt::mp("out"), burst);
}
d_input_file.close();
diff --git a/lib/qa_utils/burst_source_impl.cc
b/lib/qa_utils/burst_source_impl.cc
index db3d85a..f415eaf 100644
--- a/lib/qa_utils/burst_source_impl.cc
+++ b/lib/qa_utils/burst_source_impl.cc
@@ -31,8 +31,6 @@
#include
#include
-#define PMT_SIZE 174
-
namespace gr {
namespace gsm {
@@ -110,8 +108,6 @@
void burst_source_impl::run()
{
-char *unserialized = (char*)malloc(sizeof(char) * PMT_SIZE);
-
for (int i=0; i
+# @section LICENSE
+#
+# Gr-gsm 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.
+#
+# Gr-gsm 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 gr-gsm; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+#
+
+from gnuradio import gr, gr_unittest, blocks
+import grgsm_swig as grgsm
+import tempfile
+
+class qa_burst_file_sink (gr_unittest.TestCase):
+
+def setUp (self):
+self.tb = gr.top_block ()
+
+def tearDown (self):
+self.tb = None
+
+def test_blob_only (self):
+# prepare the input burst file
+temp = tempfile.NamedTemporaryFile()
+handle = open(temp.name, "wb")
+handle.write(bytearray([
+0x07, 0x06, 0x0a, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x01, 0x00, 0x02,
0x04, 0x03, 0x01, 0x00, 0x6f,
+0xcd, 0x00, 0x00, 0x25, 0xc9, 0x82, 0x06, 0x1c, 0xf5, 0x38, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00,
0x01, 0x00, 0x01, 0x01, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
0x01, 0x01, 0x01, 0x01, 0x00,
+0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00,
0x01, 0x01, 0x00, 0x01, 0x01,
+0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00,
0x01, 0x01, 0x00, 0x01, 0x01,
+0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x01, 0x00, 0x01,
+0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01,
0x00, 0x
Change in gr-gsm[master]: trx/radio_if: add freq_offset parameter to constructor
Piotr Krysik has uploaded this change for review. (
https://gerrit.osmocom.org/10929
Change subject: trx/radio_if: add freq_offset parameter to constructor
..
trx/radio_if: add freq_offset parameter to constructor
Change-Id: Ie1db02b719a0fec478b8a8b8a95643fb10fdfce5
---
M apps/grgsm_trx
M python/trx/radio_if.py
2 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/29/10929/1
diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index d57c979..5c3dace 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -63,8 +63,8 @@
self.radio = radio_if(self.phy_args, self.phy_sample_rate,
self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm,
self.phy_rx_antenna, self.phy_tx_antenna,
- self.bind_addr, self.remote_addr,
- self.base_port)
+ self.phy_freq_offset_hz, self.bind_addr,
+ self.remote_addr, self.base_port)
# Optional frequency offset
if self.phy_freq_offset_hz is not None:
diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index f7f124f..11f1d40 100644
--- a/python/trx/radio_if.py
+++ b/python/trx/radio_if.py
@@ -86,8 +86,8 @@
def __init__(self, phy_args, phy_sample_rate,
phy_rx_gain, phy_tx_gain, phy_ppm,
phy_rx_antenna, phy_tx_antenna,
- trx_bind_addr, trx_remote_addr,
- trx_base_port):
+ phy_freq_offset_hz, trx_bind_addr,
+ trx_remote_addr, trx_base_port):
print("[i] Init Radio interface (L:%s:%u <-> R:%s:%u)"
% (trx_bind_addr, trx_base_port + 2,
@@ -98,6 +98,7 @@
self.rx_gain = phy_rx_gain
self.tx_gain = phy_tx_gain
self.ppm = phy_ppm
+ self.freq_offset_hz = phy_freq_offset_hz
gr.top_block.__init__(self, "GR-GSM TRX")
--
To view, visit https://gerrit.osmocom.org/10929
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1db02b719a0fec478b8a8b8a95643fb10fdfce5
Gerrit-Change-Number: 10929
Gerrit-PatchSet: 1
Gerrit-Owner: Piotr Krysik
Change in gr-gsm[master]: apps/grgsm_trx: remove unnecessary checks of freq_offset
Piotr Krysik has uploaded this change for review. (
https://gerrit.osmocom.org/10930
Change subject: apps/grgsm_trx: remove unnecessary checks of freq_offset
..
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: Ie8bae1ccde60d07fc25e0b874afa5c04d8a7
---
M apps/grgsm_trx
M python/trx/radio_if.py
2 files changed, 8 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/30/10930/1
diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index 5c3dace..b53d12a 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -66,10 +66,6 @@
self.phy_freq_offset_hz, self.bind_addr,
self.remote_addr, self.base_port)
- # Optional frequency offset
- if self.phy_freq_offset_hz is not None:
- self.radio.freq_offset_hz = self.phy_freq_offset_hz
-
# Power measurement emulation
# Noise: -120 .. -105
# BTS: -75 .. -50
diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index 11f1d40..a9b0358 100644
--- a/python/trx/radio_if.py
+++ b/python/trx/radio_if.py
@@ -60,7 +60,6 @@
class radio_if(gr.top_block):
# PHY specific variables
- freq_offset_hz = None
rx_freq = 935e6
tx_freq = 890e6
osr = 4
@@ -280,21 +279,19 @@
return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate
def set_rx_freq(self, fc):
- if self.freq_offset_hz is not None:
- fc += self.freq_offset_hz
- print("[#] Shifting RX freq. to %s (offset is %s)"
- % (eng_notation.num_to_str(fc),
-
eng_notation.num_to_str(self.freq_offset_hz)))
+ fc += self.freq_offset_hz
+ print("[#] Shifting RX freq. to %s (offset is %s)"
+ % (eng_notation.num_to_str(fc),
+ eng_notation.num_to_str(self.freq_offset_hz)))
self.phy_src.set_center_freq(fc, 0)
self.rotator_src.set_phase_inc(self.calc_phase_inc(fc))
self.rx_freq = fc
def set_tx_freq(self, fc):
- if self.freq_offset_hz is not None:
- fc += self.freq_offset_hz
- print("[#] Shifting TX freq. to %s (offset is %s)"
- % (eng_notation.num_to_str(fc),
-
eng_notation.num_to_str(self.freq_offset_hz)))
+ fc += self.freq_offset_hz
+ print("[#] Shifting TX freq. to %s (offset is %s)"
+ % (eng_notation.num_to_str(fc),
+ eng_notation.num_to_str(self.freq_offset_hz)))
self.phy_sink.set_center_freq(fc, 0)
self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc))
self.tx_freq = fc
--
To view, visit https://gerrit.osmocom.org/10930
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8bae1ccde60d07fc25e0b874afa5c04d8a7
Gerrit-Change-Number: 10930
Gerrit-PatchSet: 1
Gerrit-Owner: Piotr Krysik
Change in gr-gsm[master]: README.md: fix white space
Piotr Krysik has abandoned this change. ( https://gerrit.osmocom.org/9971 ) Change subject: README.md: fix white space .. Abandoned -- To view, visit https://gerrit.osmocom.org/9971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I818b5296e2a208df9f096bcc9d13b88ffe01379c Gerrit-Change-Number: 9971 Gerrit-PatchSet: 2 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol
Change in gr-gsm[master]: trx/radio_if: add freq_offset parameter to constructor
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10929 ) Change subject: trx/radio_if: add freq_offset parameter to constructor .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1db02b719a0fec478b8a8b8a95643fb10fdfce5 Gerrit-Change-Number: 10929 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Thu, 13 Sep 2018 12:57:24 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/radio_if: add freq_offset parameter to constructor
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/10929 )
Change subject: trx/radio_if: add freq_offset parameter to constructor
..
trx/radio_if: add freq_offset parameter to constructor
Change-Id: Ie1db02b719a0fec478b8a8b8a95643fb10fdfce5
---
M apps/grgsm_trx
M python/trx/radio_if.py
2 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index d57c979..5c3dace 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -63,8 +63,8 @@
self.radio = radio_if(self.phy_args, self.phy_sample_rate,
self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm,
self.phy_rx_antenna, self.phy_tx_antenna,
- self.bind_addr, self.remote_addr,
- self.base_port)
+ self.phy_freq_offset_hz, self.bind_addr,
+ self.remote_addr, self.base_port)
# Optional frequency offset
if self.phy_freq_offset_hz is not None:
diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index f7f124f..11f1d40 100644
--- a/python/trx/radio_if.py
+++ b/python/trx/radio_if.py
@@ -86,8 +86,8 @@
def __init__(self, phy_args, phy_sample_rate,
phy_rx_gain, phy_tx_gain, phy_ppm,
phy_rx_antenna, phy_tx_antenna,
- trx_bind_addr, trx_remote_addr,
- trx_base_port):
+ phy_freq_offset_hz, trx_bind_addr,
+ trx_remote_addr, trx_base_port):
print("[i] Init Radio interface (L:%s:%u <-> R:%s:%u)"
% (trx_bind_addr, trx_base_port + 2,
@@ -98,6 +98,7 @@
self.rx_gain = phy_rx_gain
self.tx_gain = phy_tx_gain
self.ppm = phy_ppm
+ self.freq_offset_hz = phy_freq_offset_hz
gr.top_block.__init__(self, "GR-GSM TRX")
--
To view, visit https://gerrit.osmocom.org/10929
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1db02b719a0fec478b8a8b8a95643fb10fdfce5
Gerrit-Change-Number: 10929
Gerrit-PatchSet: 1
Gerrit-Owner: Piotr Krysik
Gerrit-Reviewer: Piotr Krysik
Change in gr-gsm[master]: apps/grgsm_trx: remove unnecessary checks of freq_offset
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/10930 )
Change subject: apps/grgsm_trx: remove unnecessary checks of freq_offset
..
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: Ie8bae1ccde60d07fc25e0b874afa5c04d8a7
---
M apps/grgsm_trx
M python/trx/radio_if.py
2 files changed, 8 insertions(+), 15 deletions(-)
Approvals:
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index 5c3dace..b53d12a 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -66,10 +66,6 @@
self.phy_freq_offset_hz, self.bind_addr,
self.remote_addr, self.base_port)
- # Optional frequency offset
- if self.phy_freq_offset_hz is not None:
- self.radio.freq_offset_hz = self.phy_freq_offset_hz
-
# Power measurement emulation
# Noise: -120 .. -105
# BTS: -75 .. -50
diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index 11f1d40..a9b0358 100644
--- a/python/trx/radio_if.py
+++ b/python/trx/radio_if.py
@@ -60,7 +60,6 @@
class radio_if(gr.top_block):
# PHY specific variables
- freq_offset_hz = None
rx_freq = 935e6
tx_freq = 890e6
osr = 4
@@ -280,21 +279,19 @@
return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate
def set_rx_freq(self, fc):
- if self.freq_offset_hz is not None:
- fc += self.freq_offset_hz
- print("[#] Shifting RX freq. to %s (offset is %s)"
- % (eng_notation.num_to_str(fc),
-
eng_notation.num_to_str(self.freq_offset_hz)))
+ fc += self.freq_offset_hz
+ print("[#] Shifting RX freq. to %s (offset is %s)"
+ % (eng_notation.num_to_str(fc),
+ eng_notation.num_to_str(self.freq_offset_hz)))
self.phy_src.set_center_freq(fc, 0)
self.rotator_src.set_phase_inc(self.calc_phase_inc(fc))
self.rx_freq = fc
def set_tx_freq(self, fc):
- if self.freq_offset_hz is not None:
- fc += self.freq_offset_hz
- print("[#] Shifting TX freq. to %s (offset is %s)"
- % (eng_notation.num_to_str(fc),
-
eng_notation.num_to_str(self.freq_offset_hz)))
+ fc += self.freq_offset_hz
+ print("[#] Shifting TX freq. to %s (offset is %s)"
+ % (eng_notation.num_to_str(fc),
+ eng_notation.num_to_str(self.freq_offset_hz)))
self.phy_sink.set_center_freq(fc, 0)
self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc))
self.tx_freq = fc
--
To view, visit https://gerrit.osmocom.org/10930
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8bae1ccde60d07fc25e0b874afa5c04d8a7
Gerrit-Change-Number: 10930
Gerrit-PatchSet: 1
Gerrit-Owner: Piotr Krysik
Gerrit-Reviewer: Piotr Krysik
Change in gr-gsm[master]: apps/grgsm_trx: remove unnecessary checks of freq_offset
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10930 ) Change subject: apps/grgsm_trx: remove unnecessary checks of freq_offset .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie8bae1ccde60d07fc25e0b874afa5c04d8a7 Gerrit-Change-Number: 10930 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Krysik Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Thu, 13 Sep 2018 12:57:16 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: grgsm_channelize: Add ichar data type
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10909 ) Change subject: grgsm_channelize: Add ichar data type .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia489eca9ec7defc3a83946c42f1ae3f136efe4e8 Gerrit-Change-Number: 10909 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vasil Velichkov Gerrit-Comment-Date: Thu, 13 Sep 2018 12:59:30 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: grgsm_channelize: Add ichar data type
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/10909 )
Change subject: grgsm_channelize: Add ichar data type
..
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
---
M apps/helpers/grgsm_channelize
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/apps/helpers/grgsm_channelize b/apps/helpers/grgsm_channelize
index 9b00bd7..5eaeb3b 100755
--- a/apps/helpers/grgsm_channelize
+++ b/apps/helpers/grgsm_channelize
@@ -79,6 +79,10 @@
self.blocks_file_source = blocks.file_source(gr.sizeof_short,
input_file, False)
self.source = blocks.interleaved_short_to_complex(False, False)
self.connect((self.blocks_file_source, 0), (self.source, 0))
+elif data_type == "ichar":
+self.blocks_file_source = blocks.file_source(gr.sizeof_char,
input_file, False)
+self.source = blocks.interleaved_char_to_complex(False)
+self.connect((self.blocks_file_source, 0), (self.source, 0))
elif data_type == "complex":
self.source = blocks.file_source(gr.sizeof_gr_complex, input_file,
False)
@@ -114,7 +118,7 @@
help="Sample rate of the output capture files [default=%(default)s]")
parser.add_argument("-i", "--input_file", dest="input_file", type=str,
required=True,
help="Path to wideband GSM capture file")
-parser.add_argument("-t", "--data_type", dest="data_type", type=str,
choices=["complex","ishort"], default="complex",
+parser.add_argument("-t", "--data_type", dest="data_type", type=str,
choices=["complex","ishort","ichar"], default="complex",
help="Type of the input file [default=%(default)s]")
parser.add_argument("-d", "--dest_dir", dest="dest_dir", type=str,
help="Destination directory - if not given defaults to input file name
without extension")
--
To view, visit https://gerrit.osmocom.org/10909
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia489eca9ec7defc3a83946c42f1ae3f136efe4e8
Gerrit-Change-Number: 10909
Gerrit-PatchSet: 2
Gerrit-Owner: Vasil Velichkov
Gerrit-Reviewer: Piotr Krysik
Gerrit-Reviewer: Vasil Velichkov
Change in gr-gsm[master]: apps/grgsm_trx: remove redundant unit from freq_offset variable name
Piotr Krysik has uploaded this change for review. (
https://gerrit.osmocom.org/10933
Change subject: apps/grgsm_trx: remove redundant unit from freq_offset variable
name
..
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
---
M apps/grgsm_trx
M python/trx/radio_if.py
2 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/33/10933/1
diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index b53d12a..efb9c24 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -52,7 +52,7 @@
self.phy_tx_gain = argv.tx_gain
self.phy_rx_antenna = argv.rx_antenna
self.phy_tx_antenna = argv.tx_antenna
- self.phy_freq_offset_hz = argv.freq_offset
+ self.phy_freq_offset = argv.freq_offset
self.phy_ppm = argv.ppm
# Set up signal handlers
@@ -63,7 +63,7 @@
self.radio = radio_if(self.phy_args, self.phy_sample_rate,
self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm,
self.phy_rx_antenna, self.phy_tx_antenna,
- self.phy_freq_offset_hz, self.bind_addr,
+ self.phy_freq_offset, self.bind_addr,
self.remote_addr, self.base_port)
# Power measurement emulation
diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index a9b0358..85970a9 100644
--- a/python/trx/radio_if.py
+++ b/python/trx/radio_if.py
@@ -85,7 +85,7 @@
def __init__(self, phy_args, phy_sample_rate,
phy_rx_gain, phy_tx_gain, phy_ppm,
phy_rx_antenna, phy_tx_antenna,
- phy_freq_offset_hz, trx_bind_addr,
+ phy_freq_offset, trx_bind_addr,
trx_remote_addr, trx_base_port):
print("[i] Init Radio interface (L:%s:%u <-> R:%s:%u)"
@@ -97,7 +97,7 @@
self.rx_gain = phy_rx_gain
self.tx_gain = phy_tx_gain
self.ppm = phy_ppm
- self.freq_offset_hz = phy_freq_offset_hz
+ self.freq_offset = phy_freq_offset
gr.top_block.__init__(self, "GR-GSM TRX")
@@ -279,19 +279,19 @@
return self.ppm / 1.0e6 * 2 * pi * fc / self.sample_rate
def set_rx_freq(self, fc):
- fc += self.freq_offset_hz
+ fc += self.freq_offset
print("[#] Shifting RX freq. to %s (offset is %s)"
% (eng_notation.num_to_str(fc),
- eng_notation.num_to_str(self.freq_offset_hz)))
+ eng_notation.num_to_str(self.freq_offset)))
self.phy_src.set_center_freq(fc, 0)
self.rotator_src.set_phase_inc(self.calc_phase_inc(fc))
self.rx_freq = fc
def set_tx_freq(self, fc):
- fc += self.freq_offset_hz
+ fc += self.freq_offset
print("[#] Shifting TX freq. to %s (offset is %s)"
% (eng_notation.num_to_str(fc),
- eng_notation.num_to_str(self.freq_offset_hz)))
+ eng_notation.num_to_str(self.freq_offset)))
self.phy_sink.set_center_freq(fc, 0)
self.rotator_sink.set_phase_inc(-self.calc_phase_inc(fc))
self.tx_freq = fc
--
To view, visit https://gerrit.osmocom.org/10933
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I509771c3fe072069a680f66b0763ae6825f6d529
Gerrit-Change-Number: 10933
Gerrit-PatchSet: 1
Gerrit-Owner: Piotr Krysik
Change in gr-gsm[master]: apps/grgsm_trx: (re)structurize help message
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/11050 )
Change subject: apps/grgsm_trx: (re)structurize help message
..
apps/grgsm_trx: (re)structurize help message
Change-Id: I612d8ae7d3ff99fee809e10d95919989bfbe0f59
---
M apps/grgsm_trx
1 file changed, 13 insertions(+), 11 deletions(-)
Approvals:
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index efb9c24..6b3565d 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -104,40 +104,42 @@
parser = ArgumentParser(prog = "grgsm_trx")
# TRX interface specific
- parser.add_argument("-i", "--remote-addr",
+ trx_group = parser.add_argument_group("TRX interface")
+ trx_group.add_argument("-i", "--remote-addr",
dest = "remote_addr", type = str, default = "127.0.0.1",
help = "Set remote address (default %(default)s)")
- parser.add_argument("-b", "--bind-addr",
+ trx_group.add_argument("-b", "--bind-addr",
dest = "bind_addr", type = str, default = "0.0.0.0",
help = "Set bind address (default %(default)s)")
- parser.add_argument("-p", "--base_port",
+ trx_group.add_argument("-p", "--base_port",
dest = "base_port", type = int, default = 6700,
help = "Set base port number (default %(default)s)")
# PHY specific
- parser.add_argument("-a", "--args",
+ phy_group = parser.add_argument_group("PHY parameters")
+ phy_group.add_argument("-a", "--args",
dest = "args", type = str, default = "",
help = "Set device arguments")
- parser.add_argument("-s", "--sample-rate",
+ phy_group.add_argument("-s", "--sample-rate",
dest = "sample_rate", type = eng_float,
default = radio_if.SAMPLE_RATE,
help = "Set samp_rate (default %(default)s)")
- parser.add_argument("-g", "--rx-gain",
+ phy_group.add_argument("-g", "--rx-gain",
dest = "rx_gain", type = float, default = 30,
help = "Set RX gain (default %(default)s)")
- parser.add_argument("-G", "--tx-gain",
+ phy_group.add_argument("-G", "--tx-gain",
dest = "tx_gain", type = float, default = 10,
help = "Set TX gain (default %(default)s)")
- parser.add_argument("--rx-antenna",
+ phy_group.add_argument("--rx-antenna",
dest = "rx_antenna", type = str, default = "RX2",
help = "Set RX antenna (default %(default)s)")
- parser.add_argument("--tx-antenna",
+ phy_group.add_argument("--tx-antenna",
dest = "tx_antenna", type = str, default = "TX/RX",
help = "Set TX antenna (default %(default)s)")
- parser.add_argument("--freq-offset",
+ phy_group.add_argument("--freq-offset",
dest = "freq_offset", type = eng_float, default = 0,
help = "Shift baseband freq. (e.g. -500M)")
- parser.add_argument("--ppm",
+ phy_group.add_argument("--ppm",
dest = "ppm", type = float, default = 0,
help = "Set frequency correction (default %(default)s)")
--
To view, visit https://gerrit.osmocom.org/11050
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I612d8ae7d3ff99fee809e10d95919989bfbe0f59
Gerrit-Change-Number: 11050
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy
Gerrit-Reviewer: Piotr Krysik
Change in gr-gsm[master]: apps/grgsm_trx: (re)structurize help message
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/11050 ) Change subject: apps/grgsm_trx: (re)structurize help message .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I612d8ae7d3ff99fee809e10d95919989bfbe0f59 Gerrit-Change-Number: 11050 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 21 Sep 2018 08:23:49 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: python/trx/__init__.py: cosmetic: add missing new line
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12574 ) Change subject: python/trx/__init__.py: cosmetic: add missing new line .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I379b321866bd892a52b0c272ed50c670da380a17 Gerrit-Change-Number: 12574 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 10:45:01 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: python/trx: rename 'change_sign_of_dict_elements' to 'dict_toggle_sign'
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12575 ) Change subject: python/trx: rename 'change_sign_of_dict_elements' to 'dict_toggle_sign' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie75e1d6e5e74c7c1cf34154633c1472e4b85dbb6 Gerrit-Change-Number: 12575 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 10:46:06 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/radio_if.py: use existing 'dict_toggle_sign' block
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12576 ) Change subject: trx/radio_if.py: use existing 'dict_toggle_sign' block .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifa616644a858f493b9f8706663f9e7fed717f3d0 Gerrit-Change-Number: 12576 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 10:46:43 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: python/trx: use CamelCase naming for basic classes
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12629 ) Change subject: python/trx: use CamelCase naming for basic classes .. Patch Set 1: Verified+1 Code-Review+2 This change moves us to the Dark Side (TM) IMO ;). But let it be this way. -- To view, visit https://gerrit.osmocom.org/12629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ica9c56d01191dda38e63b51caba2ec8c63b671c9 Gerrit-Change-Number: 12629 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 10:49:25 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: apps/grgsm_trx: move init code from run() to __init__()
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12630 ) Change subject: apps/grgsm_trx: move init code from run() to __init__() .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1bcc9c8a2d37d156bbec93be3838200f6c4a80c2 Gerrit-Change-Number: 12630 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 10:50:05 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: python/trx: get rid of FakePM class
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12631 ) Change subject: python/trx: get rid of FakePM class .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie96eb9735ecaa3329135c7be976ffd277a2f64f4 Gerrit-Change-Number: 12631 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 10:55:54 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/radio_if.py: do not init both rx_freq and tx_freq
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12632 ) Change subject: trx/radio_if.py: do not init both rx_freq and tx_freq .. Patch Set 1: Verified+1 Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/12632/1/python/trx/radio_if.py File python/trx/radio_if.py: https://gerrit.osmocom.org/#/c/12632/1/python/trx/radio_if.py@230 PS1, Line 230: self.DUMMY_FREQ, phy_sample_rate, osr = self.osr) the DUMMY_FREQ is never changed. It should be updated in set_rx_freq. This problem existed before - self.rx_freq wasn't updated as well. We should add updating of this value. -- To view, visit https://gerrit.osmocom.org/12632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f251958ec90141d144fdb027aff20182131a1d1 Gerrit-Change-Number: 12632 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 11:03:49 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/radio_if.py: introduce a new @property 'ready'
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12633 ) Change subject: trx/radio_if.py: introduce a new @property 'ready' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I513da0f45c6a608d15fbd0e8eafe14d6af8833d7 Gerrit-Change-Number: 12633 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 11:45:12 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: python/trx: introduce and use Transceiver class
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12635 ) Change subject: python/trx: introduce and use Transceiver class .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6dc88edbb69a68746cc8e01206dc86f7ea2fa80f Gerrit-Change-Number: 12635 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 11:52:26 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/radio_if.py: do not print anything if freq. shift is 0
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12636 ) Change subject: trx/radio_if.py: do not print anything if freq. shift is 0 .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I100ce2ab8effc00e164e13253894445bdc816f06 Gerrit-Change-Number: 12636 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 11:53:32 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/radio_if.py: update clock_offset_control in set_rx_freq()
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12637 ) Change subject: trx/radio_if.py: update clock_offset_control in set_rx_freq() .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I065bf664f775099c90c123c9ff75f262a73bf1be Gerrit-Change-Number: 12637 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 11:54:07 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/ctrl_if.py: use relative import for UDPLink
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12672 ) Change subject: trx/ctrl_if.py: use relative import for UDPLink .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If4b00f6332461d3c37cde5a1f724906ca3d3a30f Gerrit-Change-Number: 12672 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 12:02:05 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: python/trx: fork RadioInterfaceUHD from RadioInterface
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12673 ) Change subject: python/trx: fork RadioInterfaceUHD from RadioInterface .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1644a3f6b8da0d5f2a1a133058269e5383948fda Gerrit-Change-Number: 12673 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 12:06:43 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: trx/radio_if.py: print type of RadioInterface
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12674 ) Change subject: trx/radio_if.py: print type of RadioInterface .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6c1ba8546caec122cd1ea0ed87656f691abec068 Gerrit-Change-Number: 12674 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 12:07:40 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: apps/grgsm_trx: add RadioInterface driver selection argument
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12675 ) Change subject: apps/grgsm_trx: add RadioInterface driver selection argument .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic11f878c176bad16b057f25725ab0cfecc01782f Gerrit-Change-Number: 12675 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 12:07:59 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: apps/grgsm_trx: introduce initial LMS driver support
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12676 ) Change subject: apps/grgsm_trx: introduce initial LMS driver support .. Patch Set 2: Verified+1 Code-Review+2 I suppose it will be pure fun to make the LMS support work ;). -- To view, visit https://gerrit.osmocom.org/12676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie983b10d1814906b6e659213f865e58d0f5c08e4 Gerrit-Change-Number: 12676 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Tue, 05 Feb 2019 12:09:29 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
