Change in ...osmo-trx[master]: fixup: pullRadioVector(): properly set modulation type

fixeria gerrit-no-reply at lists.osmocom.org
Mon Jul 15 18:09:17 UTC 2019


fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/14784


Change subject: fixup: pullRadioVector(): properly set modulation type
......................................................................

fixup: pullRadioVector(): properly set modulation type

Change-Id: Ie576762b8074047dc77bddc32d16fc8ad7ed9c5d
---
M Transceiver52M/Transceiver.cpp
1 file changed, 6 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/84/14784/1

diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index 57a602c..b73e698 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -618,7 +618,7 @@
   bi->toa = 0.0;
   bi->noise = 0.0;
   bi->idle = false;
-  bi->modulation = (type == EDGE) ? MODULATION_8PSK : MODULATION_GMSK;
+  bi->modulation = MODULATION_GMSK;
   bi->tss = 0; /* TODO: we only support tss 0 right now */
   bi->tsc = 0;
   bi->ci = 0.0;
@@ -674,10 +674,13 @@
   rxBurst = demodAnyBurst(*burst, mSPSRx, ebp.amp, ebp.toa, type);
 
   /* EDGE demodulator returns 444 (gSlotLen * 3) bits */
-  if (rxBurst->size() == EDGE_BURST_NBITS)
+  if (rxBurst->size() == EDGE_BURST_NBITS) {
+    bi->modulation = MODULATION_8PSK;
     bi->nbits = EDGE_BURST_NBITS;
-  else /* size() here is actually gSlotLen + 8, due to guard periods */
+  } else { /* size() here is actually gSlotLen + 8, due to guard periods */
+    bi->modulation = MODULATION_GMSK;
     bi->nbits = gSlotLen;
+  }
 
   // Convert -1..+1 soft bits to 0..1 soft bits
   vectorSlicer(bi->rx_burst, rxBurst->begin(), bi->nbits);

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14784
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: Ie576762b8074047dc77bddc32d16fc8ad7ed9c5d
Gerrit-Change-Number: 14784
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190715/062e1f06/attachment.html>


More information about the gerrit-log mailing list