<p>Piotr Krysik <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12629">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, but someone else must approve
Piotr Krysik: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">python/trx: use CamelCase naming for basic classes<br><br>Change-Id: Ica9c56d01191dda38e63b51caba2ec8c63b671c9<br>---<br>M apps/grgsm_trx<br>M python/trx/__init__.py<br>M python/trx/ctrl_if.py<br>M python/trx/ctrl_if_bb.py<br>M python/trx/fake_pm.py<br>M python/trx/radio_if.py<br>M python/trx/radio_if_grc.py<br>M python/trx/udp_link.py<br>8 files changed, 25 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/grgsm_trx b/apps/grgsm_trx</span><br><span>index 6b3565d..23268b8 100755</span><br><span>--- a/apps/grgsm_trx</span><br><span>+++ b/apps/grgsm_trx</span><br><span>@@ -29,9 +29,9 @@</span><br><span> from argparse import ArgumentTypeError</span><br><span> from gnuradio import eng_notation</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from grgsm.trx import ctrl_if_bb</span><br><span style="color: hsl(0, 100%, 40%);">-from grgsm.trx import radio_if</span><br><span style="color: hsl(0, 100%, 40%);">-from grgsm.trx import fake_pm</span><br><span style="color: hsl(120, 100%, 40%);">+from grgsm.trx import CTRLInterfaceBB</span><br><span style="color: hsl(120, 100%, 40%);">+from grgsm.trx import RadioInterface</span><br><span style="color: hsl(120, 100%, 40%);">+from grgsm.trx import FakePM</span><br><span> </span><br><span> COPYRIGHT = \</span><br><span> "Copyright (C) 2016-2018 by Vadim Yanitskiy <axilirator@gmail.com>\n" \</span><br><span>@@ -60,7 +60,7 @@</span><br><span> </span><br><span> def run(self):</span><br><span> # Init Radio interface</span><br><span style="color: hsl(0, 100%, 40%);">- self.radio = radio_if(self.phy_args, self.phy_sample_rate,</span><br><span style="color: hsl(120, 100%, 40%);">+ self.radio = RadioInterface(self.phy_args, self.phy_sample_rate,</span><br><span> self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm,</span><br><span> self.phy_rx_antenna, self.phy_tx_antenna,</span><br><span> self.phy_freq_offset, self.bind_addr,</span><br><span>@@ -69,10 +69,10 @@</span><br><span> # Power measurement emulation</span><br><span> # Noise: -120 .. -105</span><br><span> # BTS: -75 .. -50</span><br><span style="color: hsl(0, 100%, 40%);">- self.pm = fake_pm(-120, -105, -75, -50)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.pm = FakePM(-120, -105, -75, -50)</span><br><span> </span><br><span> # Init TRX CTRL interface</span><br><span style="color: hsl(0, 100%, 40%);">- self.server = ctrl_if_bb(</span><br><span style="color: hsl(120, 100%, 40%);">+ self.server = CTRLInterfaceBB(</span><br><span> self.remote_addr, self.base_port + 101,</span><br><span> self.bind_addr, self.base_port + 1,</span><br><span> self.radio, self.pm)</span><br><span>@@ -122,7 +122,7 @@</span><br><span> help = "Set device arguments")</span><br><span> phy_group.add_argument("-s", "--sample-rate",</span><br><span> dest = "sample_rate", type = eng_float,</span><br><span style="color: hsl(0, 100%, 40%);">- default = radio_if.SAMPLE_RATE,</span><br><span style="color: hsl(120, 100%, 40%);">+ default = RadioInterface.SAMPLE_RATE,</span><br><span> help = "Set samp_rate (default %(default)s)")</span><br><span> phy_group.add_argument("-g", "--rx-gain",</span><br><span> dest = "rx_gain", type = float, default = 30,</span><br><span>diff --git a/python/trx/__init__.py b/python/trx/__init__.py</span><br><span>index fda783e..c512262 100644</span><br><span>--- a/python/trx/__init__.py</span><br><span>+++ b/python/trx/__init__.py</span><br><span>@@ -20,10 +20,11 @@</span><br><span> This is a set of helper classes for the grgsm_trx application.</span><br><span> '''</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from udp_link import udp_link</span><br><span style="color: hsl(0, 100%, 40%);">-from ctrl_if import ctrl_if</span><br><span style="color: hsl(0, 100%, 40%);">-from ctrl_if_bb import ctrl_if_bb</span><br><span style="color: hsl(0, 100%, 40%);">-from fake_pm import fake_pm</span><br><span style="color: hsl(0, 100%, 40%);">-from radio_if_grc import radio_if_grc</span><br><span style="color: hsl(0, 100%, 40%);">-from radio_if import radio_if</span><br><span style="color: hsl(120, 100%, 40%);">+from udp_link import UDPLink</span><br><span style="color: hsl(120, 100%, 40%);">+from ctrl_if import CTRLInterface</span><br><span style="color: hsl(120, 100%, 40%);">+from ctrl_if_bb import CTRLInterfaceBB</span><br><span style="color: hsl(120, 100%, 40%);">+from fake_pm import FakePM</span><br><span style="color: hsl(120, 100%, 40%);">+from radio_if_grc import RadioInterfaceGRC</span><br><span style="color: hsl(120, 100%, 40%);">+from radio_if import RadioInterface</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> from dict_toggle_sign import dict_toggle_sign</span><br><span>diff --git a/python/trx/ctrl_if.py b/python/trx/ctrl_if.py</span><br><span>index ae5cf05..fc43b7f 100644</span><br><span>--- a/python/trx/ctrl_if.py</span><br><span>+++ b/python/trx/ctrl_if.py</span><br><span>@@ -22,9 +22,9 @@</span><br><span> # with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span> # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from grgsm.trx import udp_link</span><br><span style="color: hsl(120, 100%, 40%);">+from grgsm.trx import UDPLink</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class ctrl_if(udp_link):</span><br><span style="color: hsl(120, 100%, 40%);">+class CTRLInterface(UDPLink):</span><br><span> def handle_rx(self, data, remote):</span><br><span> if self.verify_req(data):</span><br><span> request = self.prepare_req(data)</span><br><span>diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py</span><br><span>index fe0002e..781c35c 100644</span><br><span>--- a/python/trx/ctrl_if_bb.py</span><br><span>+++ b/python/trx/ctrl_if_bb.py</span><br><span>@@ -23,11 +23,12 @@</span><br><span> # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span> </span><br><span> import grgsm</span><br><span style="color: hsl(0, 100%, 40%);">-from ctrl_if import ctrl_if</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class ctrl_if_bb(ctrl_if):</span><br><span style="color: hsl(120, 100%, 40%);">+from ctrl_if import CTRLInterface</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class CTRLInterfaceBB(CTRLInterface):</span><br><span> def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb, pm):</span><br><span style="color: hsl(0, 100%, 40%);">- ctrl_if.__init__(self, remote_addr, remote_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRLInterface.__init__(self, remote_addr, remote_port,</span><br><span> bind_addr, bind_port)</span><br><span> </span><br><span> print("[i] Init CTRL interface (%s)" % self.desc_link())</span><br><span>diff --git a/python/trx/fake_pm.py b/python/trx/fake_pm.py</span><br><span>index 72cf771..1d76916 100644</span><br><span>--- a/python/trx/fake_pm.py</span><br><span>+++ b/python/trx/fake_pm.py</span><br><span>@@ -24,7 +24,7 @@</span><br><span> </span><br><span> from random import randint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class fake_pm:</span><br><span style="color: hsl(120, 100%, 40%);">+class FakePM:</span><br><span> # Freq. list for good power level</span><br><span> bts_list = []</span><br><span> </span><br><span>diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py</span><br><span>index 49e6788..55c8d92 100644</span><br><span>--- a/python/trx/radio_if.py</span><br><span>+++ b/python/trx/radio_if.py</span><br><span>@@ -40,7 +40,7 @@</span><br><span> </span><br><span> from dict_toggle_sign import dict_toggle_sign</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class radio_if(gr.top_block):</span><br><span style="color: hsl(120, 100%, 40%);">+class RadioInterface(gr.top_block):</span><br><span> # PHY specific variables</span><br><span> rx_freq = 935e6</span><br><span> tx_freq = 890e6</span><br><span>diff --git a/python/trx/radio_if_grc.py b/python/trx/radio_if_grc.py</span><br><span>index 8a92f6e..fb9b100 100755</span><br><span>--- a/python/trx/radio_if_grc.py</span><br><span>+++ b/python/trx/radio_if_grc.py</span><br><span>@@ -24,7 +24,7 @@</span><br><span> import time</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class radio_if_grc(gr.top_block):</span><br><span style="color: hsl(120, 100%, 40%);">+class RadioInterfaceGRC(gr.top_block):</span><br><span> </span><br><span> def __init__(self, delay_correction=285.616e-6, osr=4, ppm=-0.799427, rx_freq=935e6+36*0.2e6, rx_gain=40, samp_rate=13e6/12.0, timing_advance=0, trx_base_port="5710", trx_remote_addr="127.0.0.1", tx_freq=935e6+36*0.2e6-45e6, tx_gain=40, uplink_shift=-(6.0/1625000*(156.25)*3)):</span><br><span> gr.top_block.__init__(self, "Trx radio interface")</span><br><span>@@ -255,7 +255,7 @@</span><br><span> return parser</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def main(top_block_cls=radio_if_grc, options=None):</span><br><span style="color: hsl(120, 100%, 40%);">+def main(top_block_cls=RadioInterfaceGRC, options=None):</span><br><span> if options is None:</span><br><span> options, _ = argument_parser().parse_args()</span><br><span> </span><br><span>diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py</span><br><span>index ad84e5a..f726751 100644</span><br><span>--- a/python/trx/udp_link.py</span><br><span>+++ b/python/trx/udp_link.py</span><br><span>@@ -25,7 +25,7 @@</span><br><span> import socket</span><br><span> import select</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class udp_link:</span><br><span style="color: hsl(120, 100%, 40%);">+class UDPLink:</span><br><span> def __init__(self, remote_addr, remote_port, bind_addr = '0.0.0.0', bind_port = 0):</span><br><span> self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)</span><br><span> self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12629">change 12629</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/12629"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: gr-gsm </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ica9c56d01191dda38e63b51caba2ec8c63b671c9 </div>
<div style="display:none"> Gerrit-Change-Number: 12629 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Piotr Krysik <ptrkrysik@gmail.com> </div>