Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation
Vadim Yanitskiy has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/31/10831/1 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: newchange Gerrit-Change-Id: I0c309588fa0f7822abfb3919327639735db07679 Gerrit-Change-Number: 10831 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy
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
Vadim Yanitskiy 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: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Sep 2018 19:46:15 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10831 ) Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation .. Patch Set 3: Code-Review+1 -- 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: Wed, 12 Sep 2018 07:41:07 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
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]: 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
