<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/14647">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit/data_msg.py: mark bit conversion methods as @staticmethod<br><br>Change-Id: I2f9fdd514908f186b1c6c043ee9b31c27a396900<br>---<br>M src/target/trx_toolkit/data_msg.py<br>1 file changed, 14 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/47/14647/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py</span><br><span>index 9ad19f6..511f692 100644</span><br><span>--- a/src/target/trx_toolkit/data_msg.py</span><br><span>+++ b/src/target/trx_toolkit/data_msg.py</span><br><span>@@ -108,7 +108,8 @@</span><br><span> return result</span><br><span> </span><br><span> # Converts unsigned soft-bits {254..0} to soft-bits {-127..127}</span><br><span style="color: hsl(0, 100%, 40%);">- def usbit2sbit(self, bits):</span><br><span style="color: hsl(120, 100%, 40%);">+ @staticmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def usbit2sbit(bits):</span><br><span> buf = []</span><br><span> </span><br><span> for bit in bits:</span><br><span>@@ -120,7 +121,8 @@</span><br><span> return buf</span><br><span> </span><br><span> # Converts soft-bits {-127..127} to unsigned soft-bits {254..0}</span><br><span style="color: hsl(0, 100%, 40%);">- def sbit2usbit(self, bits):</span><br><span style="color: hsl(120, 100%, 40%);">+ @staticmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def sbit2usbit(bits):</span><br><span> buf = []</span><br><span> </span><br><span> for bit in bits:</span><br><span>@@ -129,7 +131,8 @@</span><br><span> return buf</span><br><span> </span><br><span> # Converts soft-bits {-127..127} to bits {1..0}</span><br><span style="color: hsl(0, 100%, 40%);">- def sbit2ubit(self, bits):</span><br><span style="color: hsl(120, 100%, 40%);">+ @staticmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def sbit2ubit(bits):</span><br><span> buf = []</span><br><span> </span><br><span> for bit in bits:</span><br><span>@@ -138,7 +141,8 @@</span><br><span> return buf</span><br><span> </span><br><span> # Converts bits {1..0} to soft-bits {-127..127}</span><br><span style="color: hsl(0, 100%, 40%);">- def ubit2sbit(self, bits):</span><br><span style="color: hsl(120, 100%, 40%);">+ @staticmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def ubit2sbit(bits):</span><br><span> buf = []</span><br><span> </span><br><span> for bit in bits:</span><br><span>@@ -572,18 +576,18 @@</span><br><span> sbits_ref = list(range(-127, 128))</span><br><span> </span><br><span> # Test both usbit2sbit() and sbit2usbit()</span><br><span style="color: hsl(0, 100%, 40%);">- sbits = msg_trx2l1_ref.usbit2sbit(usbits_ref)</span><br><span style="color: hsl(0, 100%, 40%);">- usbits = msg_trx2l1_ref.sbit2usbit(sbits)</span><br><span style="color: hsl(120, 100%, 40%);">+ sbits = DATAMSG.usbit2sbit(usbits_ref)</span><br><span style="color: hsl(120, 100%, 40%);">+ usbits = DATAMSG.sbit2usbit(sbits)</span><br><span> assert(usbits[:255] == usbits_ref[:255])</span><br><span> assert(usbits[255] == 254)</span><br><span> </span><br><span> log.info("Check both usbit2sbit() and sbit2usbit(): OK")</span><br><span> </span><br><span> # Test both sbit2ubit() and ubit2sbit()</span><br><span style="color: hsl(0, 100%, 40%);">- ubits = msg_trx2l1_ref.sbit2ubit(sbits_ref)</span><br><span style="color: hsl(120, 100%, 40%);">+ ubits = DATAMSG.sbit2ubit(sbits_ref)</span><br><span> assert(ubits == ([1] * 127 + [0] * 128))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sbits = msg_trx2l1_ref.ubit2sbit(ubits)</span><br><span style="color: hsl(120, 100%, 40%);">+ sbits = DATAMSG.ubit2sbit(ubits)</span><br><span> assert(sbits == ([-127] * 127 + [127] * 128))</span><br><span> </span><br><span> log.info("Check both sbit2ubit() and ubit2sbit(): OK")</span><br><span>@@ -598,7 +602,7 @@</span><br><span> assert(msg_trx2l1_dec.fn == msg_l12trx_ref.fn)</span><br><span> assert(msg_trx2l1_dec.tn == msg_l12trx_ref.tn)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- assert(msg_l12trx_dec.burst == msg_l12trx_dec.sbit2ubit(burst_trx2l1_ref))</span><br><span style="color: hsl(0, 100%, 40%);">- assert(msg_trx2l1_dec.burst == msg_trx2l1_dec.ubit2sbit(burst_l12trx_ref))</span><br><span style="color: hsl(120, 100%, 40%);">+ assert(msg_l12trx_dec.burst == DATAMSG.sbit2ubit(burst_trx2l1_ref))</span><br><span style="color: hsl(120, 100%, 40%);">+ assert(msg_trx2l1_dec.burst == DATAMSG.ubit2sbit(burst_l12trx_ref))</span><br><span> </span><br><span> log.info("Check L12TRX <-> TRX2L1 type transformations: OK")</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/14647">change 14647</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/+/14647"/><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: I2f9fdd514908f186b1c6c043ee9b31c27a396900 </div>
<div style="display:none"> Gerrit-Change-Number: 14647 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>