<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/23745">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit: change coding of 'PWR' and 'SCPIR' fields<br><br>During an internal discussion, it was decided to keep field 'PWR'<br>as-is and move 'SCPIR' into a separate octet. This is easier to<br>parse, less confusing, and would save us some CPU cycles.<br><br>Change-Id: I482f72fd9305c51f43a0339d03904fb693d90ac9<br>Related: OS#4006, SYS#4895<br>---<br>M src/target/trx_toolkit/trxd_proto.py<br>1 file changed, 6 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/trxd_proto.py b/src/target/trx_toolkit/trxd_proto.py</span><br><span>index 80d8de8..7afa484 100644</span><br><span>--- a/src/target/trx_toolkit/trxd_proto.py</span><br><span>+++ b/src/target/trx_toolkit/trxd_proto.py</span><br><span>@@ -75,35 +75,6 @@</span><br><span> return 1 * GMSK_BURST_LEN</span><br><span> raise ValueError('Unknown modulation type')</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class Power(codec.Codec):</span><br><span style="color: hsl(0, 100%, 40%);">- ''' SCPIR and Tx power reduction (TRXDv2 and higher).</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- +-----------------+---------------------------------+</span><br><span style="color: hsl(0, 100%, 40%);">- | 7 6 5 4 3 2 1 0 | Description |</span><br><span style="color: hsl(0, 100%, 40%);">- +-----------------+---------------------------------+</span><br><span style="color: hsl(0, 100%, 40%);">- | . . . . x x x x | Power REDuction (in 2 dB steps) |</span><br><span style="color: hsl(0, 100%, 40%);">- +-----------------+---------------------------------+</span><br><span style="color: hsl(0, 100%, 40%);">- | . x x x . . . . | SCPIR value (in 2 dB steps) |</span><br><span style="color: hsl(0, 100%, 40%);">- +-----------------+---------------------------------+</span><br><span style="color: hsl(0, 100%, 40%);">- | x . . . . . . . | SCPIR sign indicator |</span><br><span style="color: hsl(0, 100%, 40%);">- +-----------------+---------------------------------+</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- '''</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def from_bytes(self, vals: dict, data: bytes) -> int:</span><br><span style="color: hsl(0, 100%, 40%);">- blob = ord(data) # Convert a byte to an int</span><br><span style="color: hsl(0, 100%, 40%);">- vals['red'] = (blob & 0b1111) * 2</span><br><span style="color: hsl(0, 100%, 40%);">- vals['scpir'] = ((blob >> 4) & 0b111) * 2</span><br><span style="color: hsl(0, 100%, 40%);">- if blob & (1 << 7): # negative sign</span><br><span style="color: hsl(0, 100%, 40%);">- vals['scpir'] *= -1</span><br><span style="color: hsl(0, 100%, 40%);">- return 1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def to_bytes(self, vals: dict) -> bytes:</span><br><span style="color: hsl(0, 100%, 40%);">- blob = (vals['red'] & 0b1111) \</span><br><span style="color: hsl(0, 100%, 40%);">- | (abs(vals['scpir']) << 4) // 2 \</span><br><span style="color: hsl(0, 100%, 40%);">- | (0x80 if (vals['scpir'] < 0) else 0x00)</span><br><span style="color: hsl(0, 100%, 40%);">- return bytes((blob,))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> class BurstBits(codec.Buf):</span><br><span> ''' Soft-/hard-bits with variable length. '''</span><br><span> </span><br><span>@@ -188,14 +159,18 @@</span><br><span> STRUCT = (</span><br><span> Header(ver=2, batched=True),</span><br><span> MTS(),</span><br><span style="color: hsl(0, 100%, 40%);">- Power(),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Uint('pwr'),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Int('scpir'),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Spare(len=3),</span><br><span> BurstBits('hard-bits'),</span><br><span> )</span><br><span> </span><br><span> STRUCT = (</span><br><span> Header(ver=2),</span><br><span> MTS(),</span><br><span style="color: hsl(0, 100%, 40%);">- Power(),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Uint('pwr'),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Int('scpir'),</span><br><span style="color: hsl(120, 100%, 40%);">+ codec.Spare(len=3),</span><br><span> codec.Uint32BE('fn'),</span><br><span> BurstBits('hard-bits'),</span><br><span> codec.Sequence(item=BPDU()).f('bpdu'),</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/23745">change 23745</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmocom-bb/+/23745"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I482f72fd9305c51f43a0339d03904fb693d90ac9 </div>
<div style="display:none"> Gerrit-Change-Number: 23745 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>