<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/18641">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fake_trx: Support SETPOWER and NOMTXPOWER TRXC cmds<br><br>By default RSSI on the Rx side is computed based on transmitter's<br>tx power and then substracting the the Rx path loss.<br>If FAKE_RSSI is used, then the values in there are used instead.<br><br>A default hardcoded value of tx nominal power = 50 dBm is set to keep<br>old behavior of RSSI=-60dB after calculations.<br><br>Change-Id: I3ee1a32ca22c3272e66b3ca78e4f67d283844c80<br>---<br>M src/target/trx_toolkit/ctrl_if_trx.py<br>M src/target/trx_toolkit/fake_trx.py<br>2 files changed, 40 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/ctrl_if_trx.py b/src/target/trx_toolkit/ctrl_if_trx.py</span><br><span>index 65198cf..e841975 100644</span><br><span>--- a/src/target/trx_toolkit/ctrl_if_trx.py</span><br><span>+++ b/src/target/trx_toolkit/ctrl_if_trx.py</span><br><span>@@ -239,6 +239,19 @@</span><br><span> % (self.trx, ver_cur, ver_req))</span><br><span> return ver_req</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Set Power Attenuation</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.verify_cmd(request, "SETPOWER", 1):</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug("(%s) Recv SETPOWER cmd" % self.trx)</span><br><span style="color: hsl(120, 100%, 40%);">+ # Parse the requested Tx Power Attenuation</span><br><span style="color: hsl(120, 100%, 40%);">+ att_req = int(request[1])</span><br><span style="color: hsl(120, 100%, 40%);">+ self.trx.tx_att_base = att_req</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Retrieve Nominal Tx power</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.verify_cmd(request, "NOMTXPOWER", 0):</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug("(%s) Recv NOMTXPOWER cmd" % self.trx)</span><br><span style="color: hsl(120, 100%, 40%);">+ return (0, [str(self.trx.tx_power_base)])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Wrong / unknown command</span><br><span> else:</span><br><span> # We don't care about other commands,</span><br><span>diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py</span><br><span>index f14d143..4a49fa3 100755</span><br><span>--- a/src/target/trx_toolkit/fake_trx.py</span><br><span>+++ b/src/target/trx_toolkit/fake_trx.py</span><br><span>@@ -106,8 +106,11 @@</span><br><span> </span><br><span> """</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ NOMINAL_TX_POWER_DEFAULT = 50 # dBm</span><br><span style="color: hsl(120, 100%, 40%);">+ TX_ATT_DEFAULT = 0 # dB</span><br><span style="color: hsl(120, 100%, 40%);">+ PATH_LOSS_DEFAULT = 110 # dB</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> TOA256_BASE_DEFAULT = 0</span><br><span style="color: hsl(0, 100%, 40%);">- RSSI_BASE_DEFAULT = -60</span><br><span> CI_BASE_DEFAULT = 90</span><br><span> </span><br><span> # Default values for NOPE / IDLE indications</span><br><span>@@ -118,9 +121,15 @@</span><br><span> def __init__(self, *trx_args, **trx_kwargs):</span><br><span> Transceiver.__init__(self, *trx_args, **trx_kwargs)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # fake RSSI is disabled by default, only enabled through TRXC FAKE_RSSI.</span><br><span style="color: hsl(120, 100%, 40%);">+ # When disabled, RSSI is calculated based on Tx power and Rx path loss</span><br><span style="color: hsl(120, 100%, 40%);">+ self.fake_rssi_enabled = False</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Actual ToA, RSSI, C/I, TA values</span><br><span style="color: hsl(120, 100%, 40%);">+ self.tx_power_base = self.NOMINAL_TX_POWER_DEFAULT</span><br><span style="color: hsl(120, 100%, 40%);">+ self.tx_att_base = self.TX_ATT_DEFAULT</span><br><span> self.toa256_base = self.TOA256_BASE_DEFAULT</span><br><span style="color: hsl(0, 100%, 40%);">- self.rssi_base = self.RSSI_BASE_DEFAULT</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rssi_base = self.NOMINAL_TX_POWER_DEFAULT - self.TX_ATT_DEFAULT - self.PATH_LOSS_DEFAULT</span><br><span> self.ci_base = self.CI_BASE_DEFAULT</span><br><span> self.ta = 0</span><br><span> </span><br><span>@@ -156,6 +165,10 @@</span><br><span> return random.randint(rssi_min, rssi_max)</span><br><span> </span><br><span> @property</span><br><span style="color: hsl(120, 100%, 40%);">+ def tx_power(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.tx_power_base - self.tx_att_base</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ @property</span><br><span> def ci(self):</span><br><span> # Check if randomization is required</span><br><span> if self.ci_rand_threshold == 0:</span><br><span>@@ -224,7 +237,12 @@</span><br><span> </span><br><span> # Complete message header</span><br><span> msg.toa256 = self.toa256</span><br><span style="color: hsl(0, 100%, 40%);">- msg.rssi = self.rssi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Apply RSSI based on transmitter:</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.fake_rssi_enabled:</span><br><span style="color: hsl(120, 100%, 40%);">+ msg.rssi = src_trx.tx_power - src_msg.pwr - self.PATH_LOSS_DEFAULT</span><br><span style="color: hsl(120, 100%, 40%);">+ else: # Apply fake RSSI</span><br><span style="color: hsl(120, 100%, 40%);">+ msg.rssi = self.rssi</span><br><span> </span><br><span> # Version specific fields</span><br><span> if msg.ver >= 0x01:</span><br><span>@@ -272,9 +290,15 @@</span><br><span> elif self.ctrl_if.verify_cmd(request, "FAKE_RSSI", 2):</span><br><span> log.debug("(%s) Recv FAKE_RSSI cmd" % self)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Use negative threshold to disable fake_rssi if previously enabled:</span><br><span style="color: hsl(120, 100%, 40%);">+ if int(request[2]) < 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.fake_rssi_enabled = False</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Parse and apply both base and threshold</span><br><span> self.rssi_base = int(request[1])</span><br><span> self.rssi_rand_threshold = int(request[2])</span><br><span style="color: hsl(120, 100%, 40%);">+ self.fake_rssi_enabled = True</span><br><span> return 0</span><br><span> </span><br><span> # RSSI simulation</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/18641">change 18641</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/+/18641"/><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: I3ee1a32ca22c3272e66b3ca78e4f67d283844c80 </div>
<div style="display:none"> Gerrit-Change-Number: 18641 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>