From 00ce98dcc853a033437c4778e65dc0803871561a Mon Sep 17 00:00:00 2001 From: Fred C Date: Sun, 21 Apr 2024 14:53:18 -0700 Subject: [PATCH] Bug Fix: When you try to do 2 things at the same time you end up with bugs --- sa818.py | 16 ++++++++-------- setup.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sa818.py b/sa818.py index d97edf8..3d3c31e 100755 --- a/sa818.py +++ b/sa818.py @@ -128,12 +128,12 @@ def set_radio(self, opts): tx_tone, rx_tone = ['0000', '0000'] if opts.offset == 0.0: - tx_freq = rx_freq = "{opts.frequency:.4f}" + tx_freq = rx_freq = f"{opts.frequency:.4f}" else: - rx_freq = "{opts.frequency:.4f}" - tx_freq = "{opts.frequency + opts.offset:.4f}" + rx_freq = f"{opts.frequency:.4f}" + tx_freq = f"{opts.frequency + opts.offset:.4f}" - cmd = "{self.SETGRP}={opts.bw},{tx_freq},{rx_freq},{tx_tone},{opts.squelch},{rx_tone}" + cmd = f"{self.SETGRP}={opts.bw},{tx_freq},{rx_freq},{tx_tone},{opts.squelch},{rx_tone}" self.send(cmd) time.sleep(1) response = self.readline() @@ -161,7 +161,7 @@ def set_radio(self, opts): def set_filter(self, opts): _yn = {True: "Yes", False: "No"} # filters are pre-emphasis, high-pass, low-pass - cmd = "{self.FILTER}={nt(not opts.emphasis)},{int(opts.highpass)},{int(opts.lowpass)}" + cmd = f"{self.FILTER}={int(not opts.emphasis)},{int(opts.highpass)},{int(opts.lowpass)}" self.send(cmd) time.sleep(1) response = self.readline() @@ -172,7 +172,7 @@ def set_filter(self, opts): response, _yn[opts.emphasis], _yn[opts.highpass], _yn[opts.lowpass]) def set_volume(self, opts): - cmd = "{self.VOLUME}={opts.level:d}" + cmd = f"{self.VOLUME}={opts.level:d}" self.send(cmd) time.sleep(1) response = self.readline() @@ -183,7 +183,7 @@ def set_volume(self, opts): def close_tail(self, opts): _yn = {True: "Yes", False: "No"} - cmd = "{self.TAIL}={int(opts.close_tail)}" + cmd = f"{self.TAIL}={int(opts.close_tail)}" self.send(cmd) time.sleep(1) response = self.readline() @@ -246,7 +246,7 @@ def type_dcs(parg): code, direction = code[:-1], code[-1] try: - dcs = "{int(code):03d}" + dcs = f"{int(code):03d}" if dcs not in DCS_CODES: logger.error(err_msg) raise argparse.ArgumentError diff --git a/setup.py b/setup.py index 4d19ad5..323bdc7 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ """ __author__ = "Fred C. (W6BSD)" -__version__ = '0.2.3' +__version__ = '0.2.4' __license__ = 'BSD' py_version = sys.version_info[:2]