<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10832">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">apps/grgsm_trx: migrate from getopt to argparse<br><br>Change-Id: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d<br>---<br>M apps/grgsm_trx<br>1 file changed, 69 insertions(+), 106 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/32/10832/1</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 6efed07..d57c979 100755</span><br><span>--- a/apps/grgsm_trx</span><br><span>+++ b/apps/grgsm_trx</span><br><span>@@ -4,6 +4,7 @@</span><br><span> # GR-GSM based transceiver</span><br><span> #</span><br><span> # (C) 2016-2018 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span style="color: hsl(120, 100%, 40%);">+# (C) 2017-2018 by Piotr Krysik <ptrkrysik@gmail.com></span><br><span> #</span><br><span> # All Rights Reserved</span><br><span> #</span><br><span>@@ -22,9 +23,10 @@</span><br><span> # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span> </span><br><span> import signal</span><br><span style="color: hsl(0, 100%, 40%);">-import getopt</span><br><span> import sys</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+from argparse import ArgumentParser</span><br><span style="color: hsl(120, 100%, 40%);">+from argparse import ArgumentTypeError</span><br><span> from gnuradio import eng_notation</span><br><span> </span><br><span> from grgsm.trx import ctrl_if_bb</span><br><span>@@ -33,31 +35,25 @@</span><br><span> </span><br><span> COPYRIGHT = \</span><br><span> "Copyright (C) 2016-2018 by Vadim Yanitskiy <axilirator@gmail.com>\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- "Copyright (C) 2017 by Piotr Krysik <ptrkrysik@gmail.com>\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Copyright (C) 2017-2018 by Piotr Krysik <ptrkrysik@gmail.com>\n" \</span><br><span> "License GPLv2+: GNU GPL version 2 or later " \</span><br><span> "<http://gnu.org/licenses/gpl.html>\n" \</span><br><span> "This is free software: you are free to change and redistribute it.\n" \</span><br><span> "There is NO WARRANTY, to the extent permitted by law.\n"</span><br><span> </span><br><span> class Application:</span><br><span style="color: hsl(0, 100%, 40%);">- # Application variables</span><br><span style="color: hsl(0, 100%, 40%);">- remote_addr = "127.0.0.1"</span><br><span style="color: hsl(0, 100%, 40%);">- bind_addr = "0.0.0.0"</span><br><span style="color: hsl(0, 100%, 40%);">- base_port = 6700</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # PHY specific</span><br><span style="color: hsl(0, 100%, 40%);">- phy_sample_rate = radio_if.SAMPLE_RATE</span><br><span style="color: hsl(0, 100%, 40%);">- phy_freq_offset_hz = None</span><br><span style="color: hsl(0, 100%, 40%);">- phy_tx_antenna = "TX/RX"</span><br><span style="color: hsl(0, 100%, 40%);">- phy_rx_antenna = "RX2"</span><br><span style="color: hsl(0, 100%, 40%);">- phy_rx_gain = 30</span><br><span style="color: hsl(0, 100%, 40%);">- phy_tx_gain = 10</span><br><span style="color: hsl(0, 100%, 40%);">- phy_args = ""</span><br><span style="color: hsl(0, 100%, 40%);">- phy_ppm = 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self):</span><br><span style="color: hsl(0, 100%, 40%);">- self.print_copyright()</span><br><span style="color: hsl(0, 100%, 40%);">- self.parse_argv()</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, argv):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_addr = argv.remote_addr</span><br><span style="color: hsl(120, 100%, 40%);">+ self.bind_addr = argv.bind_addr</span><br><span style="color: hsl(120, 100%, 40%);">+ self.base_port = argv.base_port</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_args = argv.args</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_sample_rate = argv.sample_rate</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_rx_gain = argv.rx_gain</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_tx_gain = argv.tx_gain</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_rx_antenna = argv.rx_antenna</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_tx_antenna = argv.tx_antenna</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_freq_offset_hz = argv.freq_offset</span><br><span style="color: hsl(120, 100%, 40%);">+ self.phy_ppm = argv.ppm</span><br><span> </span><br><span> # Set up signal handlers</span><br><span> signal.signal(signal.SIGINT, self.sig_handler)</span><br><span>@@ -95,97 +91,64 @@</span><br><span> print("[i] Shutting down...")</span><br><span> self.radio.shutdown()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def print_copyright(self):</span><br><span style="color: hsl(0, 100%, 40%);">- print(COPYRIGHT)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def print_help(self):</span><br><span style="color: hsl(0, 100%, 40%);">- s = " Usage: " + sys.argv[0] + " [options]\n\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " Some help...\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " -h --help this text\n\n"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # TRX specific</span><br><span style="color: hsl(0, 100%, 40%);">- s += " TRX interface specific\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " -i --remote-addr Set remote address (default %s)\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " -b --bind-addr Set bind address (default %s)\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " -p --base-port Set base port number (default %d)\n\n"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # PHY specific</span><br><span style="color: hsl(0, 100%, 40%);">- s += " Radio interface specific\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " -a --device-args Set device arguments\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " -s --sample-rate Set sample rate\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " -g --rx-gain Set RX gain (default %d)\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " -G --tx-gain Set TX gain (default %d)\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " --rx-antenna Set RX antenna (default %s)\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " --tx-antenna Set TX antenna (default %s)\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " --freq-offset Shift baseband freq. (e.g. -500M)\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- " --ppm Set frequency correction (default %d)\n"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- print(s % (</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_addr,</span><br><span style="color: hsl(0, 100%, 40%);">- self.bind_addr,</span><br><span style="color: hsl(0, 100%, 40%);">- self.base_port,</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_rx_gain,</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_tx_gain,</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_rx_antenna,</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_tx_antenna,</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_ppm))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def parse_argv(self):</span><br><span style="color: hsl(0, 100%, 40%);">- try:</span><br><span style="color: hsl(0, 100%, 40%);">- opts, args = getopt.getopt(sys.argv[1:],</span><br><span style="color: hsl(0, 100%, 40%);">- "i:b:p:a:s:g:G:h",</span><br><span style="color: hsl(0, 100%, 40%);">- ["help", "remote-addr=", "bind-addr=", "base-port=",</span><br><span style="color: hsl(0, 100%, 40%);">- "device-args=", "sample-rate=", "rx-gain=", "tx-gain=",</span><br><span style="color: hsl(0, 100%, 40%);">- "ppm=", "rx-antenna=", "tx-antenna=", "freq-offset="])</span><br><span style="color: hsl(0, 100%, 40%);">- except getopt.GetoptError as err:</span><br><span style="color: hsl(0, 100%, 40%);">- # Print(help and exit)</span><br><span style="color: hsl(0, 100%, 40%);">- self.print_help()</span><br><span style="color: hsl(0, 100%, 40%);">- print("[!] " + str(err))</span><br><span style="color: hsl(0, 100%, 40%);">- sys.exit(2)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for o, v in opts:</span><br><span style="color: hsl(0, 100%, 40%);">- if o in ("-h", "--help"):</span><br><span style="color: hsl(0, 100%, 40%);">- self.print_help()</span><br><span style="color: hsl(0, 100%, 40%);">- sys.exit(2)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # TRX specific</span><br><span style="color: hsl(0, 100%, 40%);">- elif o in ("-i", "--remote-addr"):</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_addr = v</span><br><span style="color: hsl(0, 100%, 40%);">- elif o in ("-b", "--bind-addr"):</span><br><span style="color: hsl(0, 100%, 40%);">- self.bind_addr = v</span><br><span style="color: hsl(0, 100%, 40%);">- elif o in ("-p", "--base-port"):</span><br><span style="color: hsl(0, 100%, 40%);">- if int(v) >= 0 and int(v) <= 65535:</span><br><span style="color: hsl(0, 100%, 40%);">- self.base_port = int(v)</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- print("[!] The port number should be in range [0-65536]")</span><br><span style="color: hsl(0, 100%, 40%);">- sys.exit(2)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # PHY specific</span><br><span style="color: hsl(0, 100%, 40%);">- elif o in ("-a", "--device-args"):</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_args = v</span><br><span style="color: hsl(0, 100%, 40%);">- elif o in ("-s", "--sample-rate"):</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_sample_rate = int(v)</span><br><span style="color: hsl(0, 100%, 40%);">- elif o in ("-g", "--rx-gain"):</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_rx_gain = int(v)</span><br><span style="color: hsl(0, 100%, 40%);">- elif o in ("-G", "--tx-gain"):</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_tx_gain = int(v)</span><br><span style="color: hsl(0, 100%, 40%);">- elif o in ("--rx-antenna"):</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_rx_antenna = v</span><br><span style="color: hsl(0, 100%, 40%);">- elif o in ("--tx-antenna"):</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_tx_antenna = v</span><br><span style="color: hsl(0, 100%, 40%);">- elif o in ("--ppm"):</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_ppm = int(v)</span><br><span style="color: hsl(0, 100%, 40%);">- elif o in ("--freq-offset"):</span><br><span style="color: hsl(0, 100%, 40%);">- # Convert /\d+(\.\d+)?(M|k)?/ to Hz</span><br><span style="color: hsl(0, 100%, 40%);">- offset_hz = eng_notation.str_to_num(v)</span><br><span style="color: hsl(0, 100%, 40%);">- self.phy_freq_offset_hz = offset_hz</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> def sig_handler(self, signum, frame):</span><br><span> print("Signal %d received" % signum)</span><br><span> if signum is signal.SIGINT:</span><br><span> self.shutdown()</span><br><span> sys.exit(0)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+def eng_float(value):</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ return eng_notation.str_to_num(value)</span><br><span style="color: hsl(120, 100%, 40%);">+ except:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ArgumentTypeError("invalid engineering notation "</span><br><span style="color: hsl(120, 100%, 40%);">+ "value: {0}".format(value))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def parse_argv():</span><br><span style="color: hsl(120, 100%, 40%);">+ parser = ArgumentParser(prog = "grgsm_trx")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # TRX interface specific</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_argument("-i", "--remote-addr",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "remote_addr", type = str, default = "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "Set remote address (default %(default)s)")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_argument("-b", "--bind-addr",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "bind_addr", type = str, default = "0.0.0.0",</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "Set bind address (default %(default)s)")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_argument("-p", "--base_port",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "base_port", type = int, default = 6700,</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "Set base port number (default %(default)s)")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # PHY specific</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_argument("-a", "--args",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "args", type = str, default = "",</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "Set device arguments")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_argument("-s", "--sample-rate",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "sample_rate", type = eng_float,</span><br><span style="color: hsl(120, 100%, 40%);">+ default = radio_if.SAMPLE_RATE,</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "Set samp_rate (default %(default)s)")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_argument("-g", "--rx-gain",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "rx_gain", type = float, default = 30,</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "Set RX gain (default %(default)s)")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_argument("-G", "--tx-gain",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "tx_gain", type = float, default = 10,</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "Set TX gain (default %(default)s)")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_argument("--rx-antenna",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "rx_antenna", type = str, default = "RX2",</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "Set RX antenna (default %(default)s)")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_argument("--tx-antenna",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "tx_antenna", type = str, default = "TX/RX",</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "Set TX antenna (default %(default)s)")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_argument("--freq-offset",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "freq_offset", type = eng_float, default = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "Shift baseband freq. (e.g. -500M)")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_argument("--ppm",</span><br><span style="color: hsl(120, 100%, 40%);">+ dest = "ppm", type = float, default = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ help = "Set frequency correction (default %(default)s)")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return parser.parse_args()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if __name__ == '__main__':</span><br><span style="color: hsl(0, 100%, 40%);">- app = Application()</span><br><span style="color: hsl(120, 100%, 40%);">+ print(COPYRIGHT)</span><br><span style="color: hsl(120, 100%, 40%);">+ argv = parse_argv()</span><br><span style="color: hsl(120, 100%, 40%);">+ app = Application(argv)</span><br><span> app.run()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10832">change 10832</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/10832"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d </div>
<div style="display:none"> Gerrit-Change-Number: 10832 </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: Piotr Krysik <ptrkrysik@gmail.com> </div>