<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/19839">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: 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;">fake_trx: Implement RFMUTE TRXC cmd<br><br>Change-Id: I67d16858cd70cb0527c1da77bd3787d5e53100b4<br>---<br>M src/target/trx_toolkit/burst_fwd.py<br>M src/target/trx_toolkit/ctrl_if_trx.py<br>M src/target/trx_toolkit/data_msg.py<br>M src/target/trx_toolkit/fake_trx.py<br>4 files changed, 20 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py</span><br><span>index dbaded6..0b69fe2 100644</span><br><span>--- a/src/target/trx_toolkit/burst_fwd.py</span><br><span>+++ b/src/target/trx_toolkit/burst_fwd.py</span><br><span>@@ -50,6 +50,10 @@</span><br><span> # so let's precalculate its Tx frequency in advance</span><br><span> tx_freq = src_trx.get_tx_freq(rx_msg.fn)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if src_trx.rf_muted:</span><br><span style="color: hsl(120, 100%, 40%);">+ del rx_msg.burst # burst bits are omited</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_msg.burst = None</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Iterate over all known transceivers</span><br><span> for trx in self.trx_list:</span><br><span> if trx == src_trx:</span><br><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 0e5106a..ea08e7e 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>@@ -251,6 +251,13 @@</span><br><span> log.debug("(%s) Recv NOMTXPOWER cmd" % self.trx)</span><br><span> return (0, [str(self.trx.tx_power_base)])</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Lock/Unlock RF emission+reception</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.verify_cmd(request, "RFMUTE", 1):</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug("(%s) Recv RFMUTE cmd" % self.trx)</span><br><span style="color: hsl(120, 100%, 40%);">+ # Parse the requested RFMUTE state (1=locked, 0=unlocked)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.trx.rf_muted = int(request[1]) > 0</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0</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/data_msg.py b/src/target/trx_toolkit/data_msg.py</span><br><span>index 88376ed..86670fc 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>@@ -413,6 +413,8 @@</span><br><span> # Convert burst bits</span><br><span> if self.burst is not None:</span><br><span> msg.burst = self.ubit2sbit(self.burst)</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ msg.nope_ind = True</span><br><span> </span><br><span> return msg</span><br><span> </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 ded8dc4..6f46473 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>@@ -125,6 +125,8 @@</span><br><span> # When disabled, RSSI is calculated based on Tx power and Rx path loss</span><br><span> self.fake_rssi_enabled = False</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ self.rf_muted = False</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Actual ToA, RSSI, C/I, TA values</span><br><span> self.tx_power_base = self.NOMINAL_TX_POWER_DEFAULT</span><br><span> self.tx_att_base = self.TX_ATT_DEFAULT</span><br><span>@@ -215,8 +217,11 @@</span><br><span> # simulates RF path parameters (such as RSSI),</span><br><span> # and sends towards the L1</span><br><span> def handle_data_msg(self, src_trx, src_msg, msg):</span><br><span style="color: hsl(0, 100%, 40%);">- # Path loss simulation</span><br><span style="color: hsl(0, 100%, 40%);">- msg.nope_ind = self.sim_burst_drop(msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.rf_muted:</span><br><span style="color: hsl(120, 100%, 40%);">+ msg.nope_ind = True</span><br><span style="color: hsl(120, 100%, 40%);">+ elif not msg.nope_ind:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Path loss simulation</span><br><span style="color: hsl(120, 100%, 40%);">+ msg.nope_ind = self.sim_burst_drop(msg)</span><br><span> if msg.nope_ind:</span><br><span> # Before TRXDv1, we simply drop the message</span><br><span> if msg.ver < 0x01:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/19839">change 19839</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/+/19839"/><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: I67d16858cd70cb0527c1da77bd3787d5e53100b4 </div>
<div style="display:none"> Gerrit-Change-Number: 19839 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>