From 3fed8b4a8db46af4e4e23e72f63663361639dd75 Mon Sep 17 00:00:00 2001 From: Conrad Lara Date: Sat, 11 May 2024 15:15:27 -0700 Subject: [PATCH] Fix idrp python3 conversion Fixes #11252 Co-Authored-By: Dan Smith --- chirp/drivers/idrp.py | 14 +++++++------- chirp/util.py | 4 ++-- rpttool | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/chirp/drivers/idrp.py b/chirp/drivers/idrp.py index 1c024172..74ec78b0 100644 --- a/chirp/drivers/idrp.py +++ b/chirp/drivers/idrp.py @@ -81,7 +81,7 @@ def set_freq(pipe, freq): resp = send(pipe, buf) for frame in resp: if len(frame) == 6: - if frame[4] == b"\xfb": + if frame[4] == 251: return True raise errors.InvalidDataError("Repeater reported error") @@ -96,14 +96,14 @@ def get_freq(pipe): resp = send(pipe, buf) for frame in resp: - if frame[4] == b"\x03": + if frame[4] == 3: els = frame[5:10] - freq = int("%02x%02x%02x%02x%02x" % (ord(els[4]), - ord(els[3]), - ord(els[2]), - ord(els[1]), - ord(els[0]))) + freq = int("%02x%02x%02x%02x%02x" % (els[4], + els[3], + els[2], + els[1], + els[0])) LOG.debug("Freq: %f" % freq) return freq else: diff --git a/chirp/util.py b/chirp/util.py index 392c05f2..3ea55051 100644 --- a/chirp/util.py +++ b/chirp/util.py @@ -86,9 +86,9 @@ def bcd_encode(val, bigendian=True, width=None): digits = [] while val != 0: digits.append(val % 10) - val /= 10 + val //= 10 - result = "" + result = b"" if len(digits) % 2 != 0: digits.append(0) diff --git a/rpttool b/rpttool index 7f43c24e..9e5597a3 100755 --- a/rpttool +++ b/rpttool @@ -86,8 +86,8 @@ def _set_freq(rp): return True -def set_freq(): - rp = open_device() +def set_freq(dev): + rp = open_device(dev) if not rp: return