Hoernchen has uploaded this change for review.

View Change

ms: adjust tx scaling for tx samples

The "safe" scaling factor introduced in
7ac54b10d3373865cddd0f2e3821b0346cb9dd7c is too low and dates back to
the beginning and the move from usrp1->uhd, but the modulator will
exceed +-1 so "proper" scaling leads to overflows. Let's just do what
osmotrx has been doing for many years...

Change-Id: I75a2eba1f7f7b81249c06ce3fc9dfeee08878cb9
---
M Transceiver52M/ms/ms.cpp
M Transceiver52M/ms/uhd_specific.h
2 files changed, 17 insertions(+), 2 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/42/31642/1
diff --git a/Transceiver52M/ms/ms.cpp b/Transceiver52M/ms/ms.cpp
index 6f63a73..ec2c5f8 100644
--- a/Transceiver52M/ms/ms.cpp
+++ b/Transceiver52M/ms/ms.cpp
@@ -58,7 +58,7 @@
pthread_setschedparam(pthread_self(), SCHED_FIFO, &sch_params);

auto burst = genRandAccessBurst(0, 4, 0);
- scaleVector(*burst, t->txFullScale * 0.7);
+ scaleVector(*burst, t->txFullScale);

// float -> int16
blade_sample_type burst_buf[burst->size()];
diff --git a/Transceiver52M/ms/uhd_specific.h b/Transceiver52M/ms/uhd_specific.h
index edf7f79..8295a54 100644
--- a/Transceiver52M/ms/uhd_specific.h
+++ b/Transceiver52M/ms/uhd_specific.h
@@ -82,7 +82,7 @@
{
delete[] one_pkt_buf;
}
- uhd_hw() : rxFullScale(32767), txFullScale(32767), rxtxdelay(-67)
+ uhd_hw() : rxFullScale(32767), txFullScale(32767 * 0.3), rxtxdelay(-67)
{
}


To view, visit change 31642. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I75a2eba1f7f7b81249c06ce3fc9dfeee08878cb9
Gerrit-Change-Number: 31642
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild@sysmocom.de>
Gerrit-MessageType: newchange