January 2021 - Developers - lists.chirpmyradio.com

[chirp_devel] [PATCH] Driver Maintenance: tdxone_tdq8a.py
by Jim Unroe 01 Jan '21

01 Jan '21

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1609477536 18000 # Fri Jan 01 00:05:36 2021 -0500 # Node ID 9cc4b30bd7b041a697e60530f83b778e65b2cef7 # Parent c27c4a4c2eb0ab814cb5e40c89f0c020c2849381 Driver Maintenance: tdxone_tdq8a.py 1. Add to PEP8 manifest 2. Perform PEP8 cleanup 3. Remove unused code fixes #8629 diff -r c27c4a4c2eb0 -r 9cc4b30bd7b0 chirp/drivers/tdxone_tdq8a.py --- a/chirp/drivers/tdxone_tdq8a.py Thu Dec 31 23:23:32 2020 -0500 +++ b/chirp/drivers/tdxone_tdq8a.py Fri Jan 01 00:05:36 2021 -0500 @@ -138,13 +138,11 @@ """ -##### MAGICS ######################################################### +# #### MAGICS ######################################################### # TDXone TD-Q8A magic string MSTRING_TDQ8A = "\x02PYNCRAM" -#STIMEOUT = 2 - LIST_DTMF = ["QT", "QT+DTMF"] LIST_VOICE = ["Off", "Chinese", "English"] LIST_OFF1TO9 = ["Off"] + list("123456789") @@ -174,10 +172,9 @@ LIST_SAVE = ["Off", "1:1", "1:2", "1:3", "1:4"] LIST_SHIFTD = ["Off", "+", "-"] LIST_STEDELAY = ["Off"] + ["%s ms" % x for x in range(100, 1100, 100)] -#LIST_STEP = [str(x) for x in STEPS] LIST_TXPOWER = ["High", "Low"] -LIST_DTMF_SPECIAL_DIGITS = [ "*", "#", "A", "B", "C", "D"] -LIST_DTMF_SPECIAL_VALUES = [ 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x00] +LIST_DTMF_SPECIAL_DIGITS = ["*", "#", "A", "B", "C", "D"] +LIST_DTMF_SPECIAL_VALUES = [0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x00] CHARSET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ?+-*" STEPS = [2.5, 5.0, 6.25, 10.0, 12.5, 25.0] @@ -187,14 +184,6 @@ (400000000, 520000000)] -#def _clean_buffer(radio): -# radio.pipe.timeout = 0.005 -# junk = radio.pipe.read(256) -# radio.pipe.timeout = STIMEOUT -# if junk: -# LOG.debug("Got %i bytes of junk before starting" % len(junk)) - - def _rawrecv(radio, amount): """Raw read from the radio device""" data = "" @@ -252,12 +241,8 @@ def _do_ident(radio, magic): """Put the radio in PROGRAM mode""" - # set the serial discipline + # set the serial discipline radio.pipe.baudrate = 9600 - ####radio.pipe.timeout = STIMEOUT - - ## flush input buffer - #_clean_buffer(radio) # send request to enter program mode _rawsend(radio, magic) @@ -277,7 +262,7 @@ if not ident.startswith("P3107"): # bad response msg = "Unexpected response, got this:" - msg += util.hexprint(ident) + msg += util.hexprint(ident) LOG.debug(msg) raise errors.RadioError("Unexpected response from radio.") @@ -344,8 +329,6 @@ raise errors.RadioError( "Radio refused to send block 0x%04x" % addr) - ####time.sleep(0.05) - # aggregate the data data += d @@ -364,8 +347,6 @@ # put radio in program mode _ident_radio(radio) - - addr = 0x0f80 frame = _make_frame("R", addr, radio._recv_block_size) # DEBUG @@ -387,8 +368,6 @@ raise errors.RadioError( "Radio refused to send block 0x%04x" % addr) - - _ranges = radio._ranges # UI progress @@ -407,7 +386,6 @@ frame = _make_frame("W", addr, radio._send_block_size, data) _rawsend(radio, frame) - #time.sleep(0.05) # receiving the response ack = _rawrecv(radio, 1) @@ -454,22 +432,12 @@ VENDOR = "TDXone" MODEL = "TD-Q8A" - ####_fileid = [TDQ8A_fp1, ] - - _magic = [MSTRING_TDQ8A, MSTRING_TDQ8A,] + _magic = [MSTRING_TDQ8A, MSTRING_TDQ8A, ] _magic_response_length = 8 _fw_ver_start = 0x1EF0 _recv_block_size = 0x40 _mem_size = 0x2000 - #_ranges = [(0x0000, 0x2000)] - # same as radio - #_ranges = [(0x0010, 0x0810), - # (0x0F10, 0x0F30), - # (0x1010, 0x1810), - # (0x0E20, 0x0E60), - # (0x1F10, 0x1F30)] - # in increasing order _ranges = [(0x0010, 0x0810), (0x0E20, 0x0E60), (0x0F10, 0x0F30), @@ -477,14 +445,6 @@ (0x1F10, 0x1F30)] _send_block_size = 0x10 - #DTCS_CODES = sorted(chirp_common.DTCS_CODES + [645]) - #DTCS_CODES = sorted(chirp_common.ALL_DTCS_CODES) - #POWER_LEVELS = [chirp_common.PowerLevel("Low", watts=1.00), - # chirp_common.PowerLevel("High", watts=5.00)] - #VALID_BANDS = [(136000000, 174000000), - # (400000000, 520000000)] - - @classmethod def get_prompts(cls): rp = chirp_common.RadioPrompts() @@ -512,7 +472,6 @@ """)) return rp - def get_features(self): """Get the radio's features""" @@ -524,31 +483,20 @@ rf.has_name = True rf.has_offset = True rf.has_mode = True - rf.has_dtcs = False #True - rf.has_rx_dtcs = False #True - rf.has_dtcs_polarity = False #True + rf.has_dtcs = False + rf.has_rx_dtcs = False + rf.has_dtcs_polarity = False rf.has_ctone = True rf.has_cross = True rf.valid_modes = ["FM", "NFM"] - #rf.valid_characters = self.VALID_CHARS rf.valid_characters = CHARSET rf.valid_name_length = 6 rf.valid_duplexes = ["", "-", "+", "split", "off"] - #rf.valid_tmodes = ['', 'Tone', 'TSQL', 'DTCS', 'Cross'] - #rf.valid_cross_modes = [ - # "Tone->Tone", - # "DTCS->", - # "->DTCS", - # "Tone->DTCS", - # "DTCS->Tone", - # "->Tone", - # "DTCS->DTCS"] rf.valid_tmodes = ['', 'Tone', 'TSQL', 'Cross'] rf.valid_cross_modes = [ "Tone->Tone", "->Tone"] rf.valid_skips = ["", "S"] - #rf.valid_dtcs_codes = self.DTCS_CODES rf.memory_bounds = (1, 128) rf.valid_power_levels = POWER_LEVELS rf.valid_tuning_steps = STEPS @@ -556,12 +504,10 @@ return rf - def process_mmap(self): """Process the mem map into the mem object""" self._memobj = bitwise.parse(MEM_FORMAT, self._mmap) - def sync_in(self): """Download from radio""" try: @@ -578,7 +524,6 @@ self._mmap = memmap.MemoryMap(data) self.process_mmap() - def sync_out(self): """Upload to radio""" try: @@ -590,14 +535,12 @@ raise errors.RadioError('Unexpected error communicating ' 'with the radio') - def _is_txinh(self, _mem): raw_tx = "" for i in range(0, 4): raw_tx += _mem.txfreq[i].get_raw() return raw_tx == "\xFF\xFF\xFF\xFF" - def _get_mem(self, number): return self._memobj.memory[number - 1] @@ -625,7 +568,8 @@ # TX freq set offset = (int(_mem.txfreq) * 10) - mem.freq if offset != 0: - if _split(self.get_features(), mem.freq, int(_mem.txfreq) * 10): + if _split(self.get_features(), mem.freq, int( + _mem.txfreq) * 10): mem.duplex = "split" mem.offset = int(_mem.txfreq) * 10 elif offset < 0: @@ -645,8 +589,6 @@ break mem.name = mem.name.rstrip() - #dtcs_pol = ["N", "N"] - if _mem.txtone in [0, 0xFFFF]: txmode = "" elif _mem.txtone >= 0x0258: @@ -655,17 +597,6 @@ else: LOG.warn("Bug: txtone is %04x" % _mem.txtone) - #elif _mem.txtone <= 0x0258: - # txmode = "DTCS" - # if _mem.txtone > 0x69: - # index = _mem.txtone - 0x6A - # dtcs_pol[0] = "R" - # else: - # index = _mem.txtone - 1 - # mem.dtcs = self.DTCS_CODES[index] - #else: - # LOG.warn("Bug: txtone is %04x" % _mem.txtone) - if _mem.rxtone in [0, 0xFFFF]: rxmode = "" elif _mem.rxtone >= 0x0258: @@ -674,17 +605,6 @@ else: LOG.warn("Bug: rxtone is %04x" % _mem.rxtone) - #elif _mem.rxtone <= 0x0258: - # rxmode = "DTCS" - # if _mem.rxtone >= 0x6A: - # index = _mem.rxtone - 0x6A - # dtcs_pol[1] = "R" - # else: - # index = _mem.rxtone - 1 - # mem.rx_dtcs = self.DTCS_CODES[index] - #else: - # LOG.warn("Bug: rxtone is %04x" % _mem.rxtone) - if txmode == "Tone" and not rxmode: mem.tmode = "Tone" elif txmode == rxmode and txmode == "Tone" and mem.rtone == mem.ctone: @@ -693,14 +613,6 @@ mem.tmode = "Cross" mem.cross_mode = "%s->%s" % (txmode, rxmode) - #elif txmode == rxmode and txmode == "DTCS" and mem.dtcs == mem.rx_dtcs: - # mem.tmode = "DTCS" - #elif rxmode or txmode: - # mem.tmode = "Cross" - # mem.cross_mode = "%s->%s" % (txmode, rxmode) - - #mem.dtcs_polarity = "".join(dtcs_pol) - if not _mem.scan: mem.skip = "S" @@ -721,7 +633,6 @@ return mem - def _set_mem(self, number): return self._memobj.memory[number - 1] @@ -733,12 +644,11 @@ _nam = self._get_nam(mem.number) if mem.empty: - _mem.set_raw("\xff" * 12 + "\xbf" +"\xff" * 3) + _mem.set_raw("\xff" * 12 + "\xbf" + "\xff" * 3) _nam.set_raw("\xff" * 16) return - #_mem.set_raw("\x00" * 16) - _mem.set_raw("\xff" * 12 + "\x9f" +"\xff" * 3) + _mem.set_raw("\xff" * 12 + "\x9f" + "\xff" * 3) _mem.rxfreq = mem.freq / 10 @@ -768,33 +678,20 @@ elif mem.tmode == "TSQL": _mem.txtone = int(mem.ctone * 10) _mem.rxtone = int(mem.ctone * 10) - #elif mem.tmode == "DTCS": - # rxmode = txmode = "DTCS" - # _mem.txtone = self.DTCS_CODES.index(mem.dtcs) + 1 - # _mem.rxtone = self.DTCS_CODES.index(mem.dtcs) + 1 elif mem.tmode == "Cross": txmode, rxmode = mem.cross_mode.split("->", 1) if txmode == "Tone": _mem.txtone = int(mem.rtone * 10) - #elif txmode == "DTCS": - # _mem.txtone = self.DTCS_CODES.index(mem.dtcs) + 1 else: _mem.txtone = 0 if rxmode == "Tone": _mem.rxtone = int(mem.ctone * 10) - #elif rxmode == "DTCS": - # _mem.rxtone = self.DTCS_CODES.index(mem.rx_dtcs) + 1 else: _mem.rxtone = 0 else: _mem.rxtone = 0 _mem.txtone = 0 - #if txmode == "DTCS" and mem.dtcs_polarity[0] == "R": - # _mem.txtone += 0x69 - #if rxmode == "DTCS" and mem.dtcs_polarity[1] == "R": - # _mem.rxtone += 0x69 - _mem.scan = mem.skip != "S" _mem.wide = mem.mode == "FM" @@ -803,25 +700,17 @@ for setting in mem.extra: setattr(_mem, setting.get_name(), setting.value) - def get_settings(self): - # """Translate the bit in the mem_struct into settings in the UI""" + """Translate the bit in the mem_struct into settings in the UI""" _mem = self._memobj basic = RadioSettingGroup("basic", "Basic Settings") advanced = RadioSettingGroup("advanced", "Advanced Settings") - #other = RadioSettingGroup("other", "Other Settings") - #work = RadioSettingGroup("work", "Work Mode Settings") - #fm_preset = RadioSettingGroup("fm_preset", "FM Preset") - #dtmfe = RadioSettingGroup("dtmfe", "DTMF Encode Settings") - #dtmfd = RadioSettingGroup("dtmfd", "DTMF Decode Settings") - #service = RadioSettingGroup("service", "Service Settings") - #top = RadioSettings(basic, advanced, other, work, fm_preset, dtmfe, - # dtmfd, service) top = RadioSettings(basic, advanced, ) # Basic settings rs = RadioSetting("settings.beep", "Beep", - RadioSettingValueBoolean(_mem.settings.beep)) + RadioSettingValueBoolean( + _mem.settings.beep)) basic.append(rs) if _mem.settings.squelcha > 0x09: @@ -829,19 +718,19 @@ else: val = _mem.settings.squelcha rs = RadioSetting("squelcha", "Squelch Level A", - RadioSettingValueInteger(0, 9, _mem.settings.squelcha)) + RadioSettingValueInteger( + 0, 9, _mem.settings.squelcha)) basic.append(rs) - if _mem.settings.squelchb > 0x09: val = 0x00 else: val = _mem.settings.squelchb rs = RadioSetting("squelchb", "Squelch Level B", - RadioSettingValueInteger(0, 9, _mem.settings.squelchb)) + RadioSettingValueInteger( + 0, 9, _mem.settings.squelchb)) basic.append(rs) - if _mem.settings.voice > 0x02: val = 0x01 else: @@ -945,7 +834,8 @@ rs = RadioSetting("settings.pttid", "When to send PTT ID", RadioSettingValueList(LIST_PTTID, - LIST_PTTID[_mem.settings.pttid])) + LIST_PTTID[ + _mem.settings.pttid])) basic.append(rs) rs = RadioSetting("settings.dtmfst", "DTMF Sidetone", @@ -1027,62 +917,6 @@ return top - - - """ - # Other settings - def _filter(name): - filtered = "" - for char in str(name): - if char in chirp_common.CHARSET_ASCII: - filtered += char - else: - filtered += " " - return filtered - - _msg = _mem.sixpoweron_msg - val = RadioSettingValueString(0, 7, _filter(_msg.line1)) - val.set_mutable(False) - rs = RadioSetting("sixpoweron_msg.line1", "6+Power-On Message 1", val) - other.append(rs) - val = RadioSettingValueString(0, 7, _filter(_msg.line2)) - val.set_mutable(False) - rs = RadioSetting("sixpoweron_msg.line2", "6+Power-On Message 2", val) - other.append(rs) - - _msg = _mem.poweron_msg - rs = RadioSetting("poweron_msg.line1", "Power-On Message 1", - RadioSettingValueString( - 0, 7, _filter(_msg.line1))) - other.append(rs) - rs = RadioSetting("poweron_msg.line2", "Power-On Message 2", - RadioSettingValueString( - 0, 7, _filter(_msg.line2))) - other.append(rs) - - # DTMF encode settings - - if _mem.ani.dtmfon > 0xC3: - val = 0x03 - else: - val = _mem.ani.dtmfon - rs = RadioSetting("ani.dtmfon", "DTMF Speed (on)", - RadioSettingValueList(LIST_DTMFSPEED, - LIST_DTMFSPEED[val])) - dtmfe.append(rs) - - if _mem.ani.dtmfoff > 0xC3: - val = 0x03 - else: - val = _mem.ani.dtmfoff - rs = RadioSetting("ani.dtmfoff", "DTMF Speed (off)", - RadioSettingValueList(LIST_DTMFSPEED, - LIST_DTMFSPEED[val])) - dtmfe.append(rs) - - """ - - def set_settings(self, settings): _settings = self._memobj.settings _mem = self._memobj @@ -1135,7 +969,6 @@ LOG.debug(element.get_name()) raise - @classmethod def match_model(cls, filedata, filename): match_size = False @@ -1148,7 +981,7 @@ # testing the model fingerprint match_model = model_match(cls, filedata) - #if match_size and match_model: + # if match_size and match_model: if match_size and match_model: return True else: diff -r c27c4a4c2eb0 -r 9cc4b30bd7b0 tools/cpep8.manifest --- a/tools/cpep8.manifest Thu Dec 31 23:23:32 2020 -0500 +++ b/tools/cpep8.manifest Fri Jan 01 00:05:36 2021 -0500 @@ -81,6 +81,7 @@ ./chirp/drivers/retevis_rt23.py ./chirp/drivers/retevis_rt26.py ./chirp/drivers/rfinder.py +./chirp/drivers/tdxone_tdq8a.py ./chirp/drivers/template.py ./chirp/drivers/th350.py ./chirp/drivers/th9800.py

1 0

[chirp_devel] [PATCH] Driver Maintenance: retevis_rt26.py
by Jim Unroe 01 Jan '21

01 Jan '21

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1609475012 18000 # Thu Dec 31 23:23:32 2020 -0500 # Node ID c27c4a4c2eb0ab814cb5e40c89f0c020c2849381 # Parent c5dfa079ca7e77f508c607848bac320ce2e365a4 Driver Maintenance: retevis_rt26.py 1. Add to PEP8 manifest 2. Perform PEP8 cleanup fixes #8627 diff -r c5dfa079ca7e -r c27c4a4c2eb0 chirp/drivers/retevis_rt26.py --- a/chirp/drivers/retevis_rt26.py Thu Dec 31 23:14:29 2020 -0500 +++ b/chirp/drivers/retevis_rt26.py Thu Dec 31 23:23:32 2020 -0500 @@ -119,12 +119,12 @@ DTMF_CHARSET = NUMERIC_CHARSET + list("ABCD*#") RT26_POWER_LEVELS = [chirp_common.PowerLevel("Low", watts=5.00), - chirp_common.PowerLevel("High", watts=10.00)] + chirp_common.PowerLevel("High", watts=10.00)] RT26_DTCS = sorted(chirp_common.DTCS_CODES + [645]) LIST_PTTID = ["Off", "BOT", "EOT", "Both"] -LIST_SHORT_PRESS = ["Off", "Monitor On/Off", "", "Scan", "Alarm", +LIST_SHORT_PRESS = ["Off", "Monitor On/Off", "", "Scan", "Alarm", "Power High/Low"] LIST_LONG_PRESS = ["Off", "Monitor On/Off", "Monitor(momentary)", "Scan", "Alarm", "Power High/Low"] @@ -159,18 +159,18 @@ "scandelay": LIST_SCANDELAY, "digtime": LIST_DIGTIME, "digdelay": LIST_DIGDELAY, - "starhash" : LIST_STARHASH, - "codespace" : LIST_CODESPACE, - "groupcode" : LIST_GROUPCODE, - "resettime" : LIST_RESETTIME, - "decodeto" : LIST_DECODETO, - "stuntype" : LIST_STUNTYPE, + "starhash": LIST_STARHASH, + "codespace": LIST_CODESPACE, + "groupcode": LIST_GROUPCODE, + "resettime": LIST_RESETTIME, + "decodeto": LIST_DECODETO, + "stuntype": LIST_STUNTYPE, } # Retevis RT26 fingerprints RT26_UHF_fp = "PDK80" + "\xF3\x00\x00" # RT26 UHF model -MODELS = [RT26_UHF_fp,] +MODELS = [RT26_UHF_fp, ] def _model_from_data(data): @@ -710,8 +710,8 @@ val = _settings.scanspeed rs = RadioSetting("scanspeed", "Scan Speed[ms]", RadioSettingValueList( - LIST_SCANSPEED, - LIST_SCANSPEED[val])) + LIST_SCANSPEED, + LIST_SCANSPEED[val])) basic.append(rs) if _settings.scandelay > 27: @@ -842,7 +842,7 @@ LIST_STUNTYPE[_mem.dtmf.stuntype])) dtmf.append(rs) - ## setup stun entry + # setup stun entry objname = "code3" strname = "Stun Code" dtmfsetting = getattr(_mem.dtmf, objname) diff -r c5dfa079ca7e -r c27c4a4c2eb0 tools/cpep8.manifest --- a/tools/cpep8.manifest Thu Dec 31 23:14:29 2020 -0500 +++ b/tools/cpep8.manifest Thu Dec 31 23:23:32 2020 -0500 @@ -79,6 +79,7 @@ ./chirp/drivers/retevis_rt21.py ./chirp/drivers/retevis_rt22.py ./chirp/drivers/retevis_rt23.py +./chirp/drivers/retevis_rt26.py ./chirp/drivers/rfinder.py ./chirp/drivers/template.py ./chirp/drivers/th350.py

1 0

[chirp_devel] [PATCH] Driver Maintenance: retevis_rt23.py
by Jim Unroe 01 Jan '21

01 Jan '21

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1609474469 18000 # Thu Dec 31 23:14:29 2020 -0500 # Node ID c5dfa079ca7e77f508c607848bac320ce2e365a4 # Parent 9cc1087843d14fe429bfbd72d50de6f8065a490d Driver Maintenance: retevis_rt23.py 1. Add to PEP8 manifest 2. Perform PEP8 cleanup fixes #8625 diff -r 9cc1087843d1 -r c5dfa079ca7e chirp/drivers/retevis_rt23.py --- a/chirp/drivers/retevis_rt23.py Thu Dec 31 23:02:21 2020 -0500 +++ b/chirp/drivers/retevis_rt23.py Thu Dec 31 23:14:29 2020 -0500 @@ -500,7 +500,8 @@ # TX freq set offset = (int(_mem.txfreq) * 10) - mem.freq if offset != 0: - if _split(self.get_features(), mem.freq, int(_mem.txfreq) * 10): + if _split(self.get_features(), mem.freq, int( + _mem.txfreq) * 10): mem.duplex = "split" mem.offset = int(_mem.txfreq) * 10 elif offset < 0: @@ -543,7 +544,8 @@ rs = RadioSetting("signaling", "Optional Signaling", RadioSettingValueList(LIST_SIGNALING, - LIST_SIGNALING[_mem.signaling])) + LIST_SIGNALING[ + _mem.signaling])) mem.extra.append(rs) return mem @@ -645,8 +647,9 @@ RadioSettingValueBoolean(_settings.beep)) basic.append(beep) - color = RadioSetting("color", "Background Color", RadioSettingValueList( - LIST_COLOR, LIST_COLOR[_settings.color - 1])) + color = RadioSetting("color", "Background Color", + RadioSettingValueList( + LIST_COLOR, LIST_COLOR[_settings.color - 1])) basic.append(color) vot = RadioSetting("vot", "VOX Delay Time", RadioSettingValueList( @@ -693,7 +696,6 @@ 0, 7, _filter(_msg.line1))) basic.append(ponmsg) - scans = RadioSetting("scans", "Scan Mode", RadioSettingValueList( LIST_SCANS, LIST_SCANS[_settings.scans])) basic.append(scans) @@ -706,7 +708,7 @@ RadioSettingValueBoolean(_settings.name)) basic.append(name) - rptrl = RadioSetting("rptrl", "Repeater TX Delay", + rptrl = RadioSetting("rptrl", "Repeater TX Delay", RadioSettingValueList(LIST_RPTRL, LIST_RPTRL[ _settings.rptrl])) basic.append(rptrl) @@ -716,7 +718,7 @@ basic.append(rptspk) rptptt = RadioSetting("rptptt", "Repeater PTT Switch", - RadioSettingValueBoolean(_settings.rptptt)) + RadioSettingValueBoolean(_settings.rptptt)) basic.append(rptptt) rptmod = RadioSetting("rptmod", "Repeater Mode", @@ -730,7 +732,7 @@ basic.append(volmod) dst = RadioSetting("dst", "DTMF Side Tone", - RadioSettingValueBoolean(_settings.dst)) + RadioSettingValueBoolean(_settings.dst)) basic.append(dst) txsel = RadioSetting("txsel", "Priority TX Channel", @@ -742,7 +744,7 @@ RadioSettingValueBoolean(_settings.ste)) basic.append(ste) - #advanced + # advanced if _settings.pf1 > 0x0A: val = 0x00 else: @@ -786,7 +788,7 @@ rs = RadioSetting("limits.uhf.upper", "UHF high", val) other.append(rs) - #work mode + # work mode vfomr_a = RadioSetting("vfomr_a", "Display Mode A", RadioSettingValueList( LIST_VFOMR, LIST_VFOMR[_settings.vfomr_a])) @@ -807,7 +809,7 @@ 1, 128, _settings.mrchb)) workmode.append(mrchb) - #fm radio + # fm radio vfomr_fm = RadioSetting("vfomr_fm", "FM Radio Display Mode", RadioSettingValueList( LIST_VFOMRFM, LIST_VFOMRFM[ diff -r 9cc1087843d1 -r c5dfa079ca7e tools/cpep8.manifest --- a/tools/cpep8.manifest Thu Dec 31 23:02:21 2020 -0500 +++ b/tools/cpep8.manifest Thu Dec 31 23:14:29 2020 -0500 @@ -78,6 +78,7 @@ ./chirp/drivers/retevis_rt1.py ./chirp/drivers/retevis_rt21.py ./chirp/drivers/retevis_rt22.py +./chirp/drivers/retevis_rt23.py ./chirp/drivers/rfinder.py ./chirp/drivers/template.py ./chirp/drivers/th350.py

1 0

[chirp_devel] [PATCH] Driver Maintenance: retevis_rt21.py
by Jim Unroe 01 Jan '21

01 Jan '21

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1609473741 18000 # Thu Dec 31 23:02:21 2020 -0500 # Node ID 9cc1087843d14fe429bfbd72d50de6f8065a490d # Parent d2bf7bc5e74ccd1bd453ee429ac2d4140e9394ae Driver Maintenance: retevis_rt21.py 1. Add to PEP8 manifest 2. Perform PEP8 cleanup fixes #8623 diff -r d2bf7bc5e74c -r 9cc1087843d1 chirp/drivers/retevis_rt21.py --- a/chirp/drivers/retevis_rt21.py Thu Dec 31 22:47:47 2020 -0500 +++ b/chirp/drivers/retevis_rt21.py Thu Dec 31 23:02:21 2020 -0500 @@ -38,7 +38,7 @@ unknown2:3; u8 unknown3:2, highpower:1, // Power Level - wide:1, // Bandwidth + wide:1, // Bandwidth unknown4:4; u8 scramble_type:4, unknown5:4; @@ -57,14 +57,14 @@ u8 use_scramble; // Scramble Enable u8 unknown1[2]; u8 voice; // Voice Annunciation - u8 tot; // Time-out Timer - u8 totalert; // Time-out Timer Pre-alert + u8 tot; // Time-out Timer + u8 totalert; // Time-out Timer Pre-alert u8 unknown2[2]; - u8 squelch; // Squelch Level - u8 save; // Battery Saver + u8 squelch; // Squelch Level + u8 save; // Battery Saver u8 unknown3[3]; - u8 use_vox; // VOX Enable - u8 vox; // VOX Gain + u8 use_vox; // VOX Enable + u8 vox; // VOX Gain } settings; #seekto 0x017E; @@ -78,7 +78,7 @@ chirp_common.PowerLevel("High", watts=2.50)] -RT21_DTCS = sorted(chirp_common.DTCS_CODES + +RT21_DTCS = sorted(chirp_common.DTCS_CODES + [17, 50, 55, 135, 217, 254, 305, 645, 765]) BCL_LIST = ["Off", "Carrier", "QT/DQT"] @@ -382,7 +382,8 @@ rs = RadioSetting("scramble_type", "Scramble Type", RadioSettingValueList(SCRAMBLE_LIST, - SCRAMBLE_LIST[_mem.scramble_type - 8])) + SCRAMBLE_LIST[ + _mem.scramble_type - 8])) mem.extra.append(rs) return mem @@ -518,7 +519,7 @@ basic.append(rs) def apply_pf1_listvalue(setting, obj): - LOG.debug("Setting value: "+ str(setting.value) + " from list") + LOG.debug("Setting value: " + str(setting.value) + " from list") val = str(setting.value) index = PF1_CHOICES.index(val) val = PF1_VALUES[index] @@ -564,7 +565,7 @@ except Exception, e: LOG.debug(element.get_name()) raise - + @classmethod def match_model(cls, filedata, filename): match_size = False @@ -581,4 +582,3 @@ return True else: return False - diff -r d2bf7bc5e74c -r 9cc1087843d1 tools/cpep8.manifest --- a/tools/cpep8.manifest Thu Dec 31 22:47:47 2020 -0500 +++ b/tools/cpep8.manifest Thu Dec 31 23:02:21 2020 -0500 @@ -76,6 +76,7 @@ ./chirp/drivers/puxing.py ./chirp/drivers/radioddity_r2.py ./chirp/drivers/retevis_rt1.py +./chirp/drivers/retevis_rt21.py ./chirp/drivers/retevis_rt22.py ./chirp/drivers/rfinder.py ./chirp/drivers/template.py

1 0

[chirp_devel] [PATCH] Driver Maintenance: retevis_rt1
by Jim Unroe 01 Jan '21

01 Jan '21

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1609472867 18000 # Thu Dec 31 22:47:47 2020 -0500 # Node ID d2bf7bc5e74ccd1bd453ee429ac2d4140e9394ae # Parent 4875b98c7c39959e200b63e4f58ee1279731a42c Driver Maintenance: retevis_rt1 1. Add to PEP8 manifest 2. Perform PEP8 cleanup fixes #8621 diff -r 4875b98c7c39 -r d2bf7bc5e74c chirp/drivers/retevis_rt1.py --- a/chirp/drivers/retevis_rt1.py Thu Dec 31 22:29:14 2020 -0500 +++ b/chirp/drivers/retevis_rt1.py Thu Dec 31 22:47:47 2020 -0500 @@ -304,7 +304,7 @@ bands = ["VHF", "UHF"] image_band = radio_band = "unknown" - for i in range(0,2): + for i in range(0, 2): if image_model == MODELS[i]: image_band = bands[i] if radio_model == MODELS[i]: @@ -672,8 +672,8 @@ val = _settings.scanspeed rs = RadioSetting("scanspeed", "Scan Speed[ms]", RadioSettingValueList( - LIST_SCANSPEED, - LIST_SCANSPEED[val])) + LIST_SCANSPEED, + LIST_SCANSPEED[val])) basic.append(rs) if _settings.scandelay > 27: @@ -738,7 +738,7 @@ # testing the file data size if len(filedata) in [0x0400, ]: match_size = True - + # testing the model fingerprint match_model = model_match(cls, filedata) diff -r 4875b98c7c39 -r d2bf7bc5e74c tools/cpep8.manifest --- a/tools/cpep8.manifest Thu Dec 31 22:29:14 2020 -0500 +++ b/tools/cpep8.manifest Thu Dec 31 22:47:47 2020 -0500 @@ -75,6 +75,7 @@ ./chirp/drivers/mursv1.py ./chirp/drivers/puxing.py ./chirp/drivers/radioddity_r2.py +./chirp/drivers/retevis_rt1.py ./chirp/drivers/retevis_rt22.py ./chirp/drivers/rfinder.py ./chirp/drivers/template.py

1 1

[chirp_devel] [PATCH] Driver Maintenance: mursv1.py
by Jim Unroe 01 Jan '21

01 Jan '21

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1609471754 18000 # Thu Dec 31 22:29:14 2020 -0500 # Node ID 4875b98c7c39959e200b63e4f58ee1279731a42c # Parent 1b1ea7a628879e699c2707422932102d345d8a09 Driver Maintenance: mursv1.py 1. Add to PEP8 manifest 2. Perform PEP8 cleanup fixes #8619 diff -r 1b1ea7a62887 -r 4875b98c7c39 chirp/drivers/mursv1.py --- a/chirp/drivers/mursv1.py Thu Dec 31 22:15:12 2020 -0500 +++ b/chirp/drivers/mursv1.py Thu Dec 31 22:29:14 2020 -0500 @@ -19,8 +19,6 @@ import logging import re -LOG = logging.getLogger(__name__) - from chirp.drivers import baofeng_common from chirp import chirp_common, directory, memmap from chirp import bitwise, errors, util @@ -31,12 +29,14 @@ InvalidValueError from textwrap import dedent -##### MAGICS ######################################################### +LOG = logging.getLogger(__name__) + +# #### MAGICS ######################################################### # BTECH MURS-V1 magic string MSTRING_MURSV1 = "\x50\x5F\x20\x15\x12\x15\x4D" -##### ID strings ##################################################### +# #### ID strings ##################################################### # BTECH MURS-V1 MURSV1_fp1 = "USM2402" @@ -70,6 +70,7 @@ MURS_FREQS = [151.820, 151.880, 151.940, 154.570, 154.600] * 3 FM_MODE = [3, 4, 8, 9, 13, 14] + def model_match(cls, data): """Match the opened/downloaded image to the correct version""" rid = data[0x1EF0:0x1EF7] @@ -150,7 +151,6 @@ return rf - MEM_FORMAT = """ #seekto 0x0010; struct { @@ -590,7 +590,7 @@ basic.append(rs) rs = RadioSetting("settings.beep", "Beep", - RadioSettingValueBoolean(_mem.settings.beep)) + RadioSettingValueBoolean(_mem.settings.beep)) basic.append(rs) if _mem.settings.timeout > 0x27: @@ -698,7 +698,7 @@ rs = RadioSetting("settings.rogerrx", "Roger Beep (RX)", RadioSettingValueList( LIST_OFFAB, LIST_OFFAB[ - _mem.settings.rogerrx])) + _mem.settings.rogerrx])) basic.append(rs) # Advanced settings @@ -771,12 +771,12 @@ rs = RadioSetting("wmchannel.mrcha", "MR A Channel", RadioSettingValueInteger(1, 15, - _mem.wmchannel.mrcha)) + _mem.wmchannel.mrcha)) work.append(rs) rs = RadioSetting("wmchannel.mrchb", "MR B Channel", RadioSettingValueInteger(1, 15, - _mem.wmchannel.mrchb)) + _mem.wmchannel.mrchb)) work.append(rs) # broadcast FM settings @@ -847,7 +847,7 @@ key = "squelch.vhf.sql%i" % (index) _obj = self._memobj.squelch.vhf val = RadioSettingValueInteger(0, 123, - getattr(_obj, "sql%i" % (index))) + getattr(_obj, "sql%i" % (index))) if index == 0: val.set_mutable(False) name = "Squelch %i" % (index) diff -r 1b1ea7a62887 -r 4875b98c7c39 tools/cpep8.manifest --- a/tools/cpep8.manifest Thu Dec 31 22:15:12 2020 -0500 +++ b/tools/cpep8.manifest Thu Dec 31 22:29:14 2020 -0500 @@ -72,6 +72,7 @@ ./chirp/drivers/kyd.py ./chirp/drivers/leixen.py ./chirp/drivers/lt725uv.py +./chirp/drivers/mursv1.py ./chirp/drivers/puxing.py ./chirp/drivers/radioddity_r2.py ./chirp/drivers/retevis_rt22.py

1 0

[chirp_devel] [PATCH] Driver Maintenance: lt725uv.py
by Jim Unroe 01 Jan '21

01 Jan '21

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1609470912 18000 # Thu Dec 31 22:15:12 2020 -0500 # Node ID 1b1ea7a628879e699c2707422932102d345d8a09 # Parent 57bc22d49930ad0a418cc8e34a87b5c4932ab172 Driver Maintenance: lt725uv.py 1. Add to PEP8 manifext 2. Perform PEP8 cleanup fixes #8617 diff -r 57bc22d49930 -r 1b1ea7a62887 chirp/drivers/lt725uv.py --- a/chirp/drivers/lt725uv.py Thu Dec 31 21:47:28 2020 -0500 +++ b/chirp/drivers/lt725uv.py Thu Dec 31 22:15:12 2020 -0500 @@ -19,16 +19,16 @@ import logging import re -LOG = logging.getLogger(__name__) - from chirp import chirp_common, directory, memmap from chirp import bitwise, errors, util from chirp.settings import RadioSettingGroup, RadioSetting, \ RadioSettingValueBoolean, RadioSettingValueList, \ RadioSettingValueString, RadioSettingValueInteger, \ - RadioSettingValueFloat, RadioSettings,InvalidValueError + RadioSettingValueFloat, RadioSettings, InvalidValueError from textwrap import dedent +LOG = logging.getLogger(__name__) + MEM_FORMAT = """ #seekto 0x0200; struct { @@ -199,36 +199,37 @@ for x in chirp_common.DTCS_CODES: LIST_CTCSS.append("D{:03d}R".format(x)) LIST_BW = ["Narrow", "Wide"] -LIST_SHIFT = ["Off"," + ", " - "] +LIST_SHIFT = ["Off", " + ", " - "] STEPS = [2.5, 5.0, 6.25, 10.0, 12.5, 20.0, 25.0, 50.0] LIST_STEPS = [str(x) for x in STEPS] LIST_STATE = ["Normal", "Stun", "Kill"] LIST_SSF = ["1000", "1450", "1750", "2100"] -LIST_DTMFTX = ["50", "100", "150", "200", "300","500"] +LIST_DTMFTX = ["50", "100", "150", "200", "300", "500"] SETTING_LISTS = { -"init_bank": LIST_TDR_DEF , -"tot": LIST_TIMEOUT, -"wtled": LIST_COLOR, -"rxled": LIST_COLOR, -"txled": LIST_COLOR, -"sig_freq": LIST_SSF, -"dtmf_txms": LIST_DTMFTX, -"ledsw": LIST_LEDSW, -"frq_chn_mode": LIST_VFOMODE, -"rx_tone": LIST_CTCSS, -"tx_tone": LIST_CTCSS, -"rx_mode": LIST_RECVMODE, -"launch_sig": LIST_SIGNAL, -"tx_end_sig": LIST_SIGNAL, -"bpower":LIST_BPOWER, -"fm_bw": LIST_BW, -"shift": LIST_SHIFT, -"step": LIST_STEPS, -"ring": LIST_RING, -"state_now": LIST_STATE + "init_bank": LIST_TDR_DEF, + "tot": LIST_TIMEOUT, + "wtled": LIST_COLOR, + "rxled": LIST_COLOR, + "txled": LIST_COLOR, + "sig_freq": LIST_SSF, + "dtmf_txms": LIST_DTMFTX, + "ledsw": LIST_LEDSW, + "frq_chn_mode": LIST_VFOMODE, + "rx_tone": LIST_CTCSS, + "tx_tone": LIST_CTCSS, + "rx_mode": LIST_RECVMODE, + "launch_sig": LIST_SIGNAL, + "tx_end_sig": LIST_SIGNAL, + "bpower": LIST_BPOWER, + "fm_bw": LIST_BW, + "shift": LIST_SHIFT, + "step": LIST_STEPS, + "ring": LIST_RING, + "state_now": LIST_STATE } + def _clean_buffer(radio): radio.pipe.timeout = 0.005 junk = radio.pipe.read(256) @@ -634,7 +635,7 @@ val = _mem.recvmode recvmode = RadioSetting("recvmode", "Receiving mode", RadioSettingValueList(LIST_RECVMODE, - LIST_RECVMODE[val])) + LIST_RECVMODE[val])) mem.extra.append(recvmode) if _mem.botsignal == 0xFF: @@ -643,7 +644,7 @@ val = _mem.botsignal botsignal = RadioSetting("botsignal", "Launch signaling", RadioSettingValueList(LIST_SIGNAL, - LIST_SIGNAL[val])) + LIST_SIGNAL[val])) mem.extra.append(botsignal) if _mem.eotsignal == 0xFF: @@ -770,7 +771,8 @@ # Basic Settings bnd_mode = RadioSetting("settings.init_bank", "TDR Band Default", RadioSettingValueList(LIST_TDR_DEF, - LIST_TDR_DEF[ _sets.init_bank])) + LIST_TDR_DEF[ + _sets.init_bank])) basic.append(bnd_mode) volume = RadioSetting("settings.volume", "Volume", @@ -790,7 +792,7 @@ def my_word2raw(setting, obj, atrb, mlt=10): """Callback function to convert UI floating value to u16 int""" if str(setting.value) == "Off": - frq = 0x0FFFF + frq = 0x0FFFF else: frq = int(float(str(setting.value)) * float(mlt)) if frq == 0: @@ -801,7 +803,7 @@ def my_adjraw(setting, obj, atrb, fix): """Callback: add or subtract fix from value.""" vx = int(str(setting.value)) - value = vx + int(fix) + value = vx + int(fix) if value < 0: value = 0 if atrb == "frq_chn_mode" and int(str(setting.value)) == 2: @@ -829,7 +831,7 @@ def my_spcl(setting, obj, atrb): """Callback: Special handling based on atrb.""" if atrb == "frq_chn_mode": - idx = LIST_VFOMODE.index (str(setting.value)) # Returns 0 or 1 + idx = LIST_VFOMODE.index(str(setting.value)) # Returns 0 or 1 value = idx * 2 # Set bit 1 setattr(obj, atrb, value) return @@ -930,7 +932,7 @@ tmp = str(int(_sets.tot) * 30) # 30 sec step counter rs = RadioSetting("settings.tot", "Transmit Timeout (Secs)", - RadioSettingValueList(LIST_TIMEOUT, tmp)) + RadioSettingValueList(LIST_TIMEOUT, tmp)) rs.set_apply_callback(my_val_list, _sets, "tot") basic.append(rs) @@ -960,7 +962,7 @@ rs.set_apply_callback(my_spcl, _vfoa, "frq_chn_mode") a_band.append(rs) - val =_vfoa.chan_num + 1 # Add 1 for 1-128 displayed + val = _vfoa.chan_num + 1 # Add 1 for 1-128 displayed rs = RadioSetting("upper.vfoa.chan_num", "Initial Chan", RadioSettingValueInteger(1, 128, val)) rs.set_apply_callback(my_adjraw, _vfoa, "chan_num", -1) @@ -995,10 +997,10 @@ rs = RadioSetting("upper.vfoa.launch_sig", "Launch Signaling", RadioSettingValueList(LIST_SIGNAL, - LIST_SIGNAL[_vfoa.launch_sig])) + LIST_SIGNAL[_vfoa.launch_sig])) a_band.append(rs) - rx = RadioSettingValueList(LIST_SIGNAL,LIST_SIGNAL[_vfoa.tx_end_sig]) + rx = RadioSettingValueList(LIST_SIGNAL, LIST_SIGNAL[_vfoa.tx_end_sig]) rs = RadioSetting("upper.vfoa.tx_end_sig", "Xmit End Signaling", rx) a_band.append(rs) @@ -1028,7 +1030,7 @@ tmp = str(_vfoa.step / 100.0) rs = RadioSetting("step", "Freq step (KHz)", RadioSettingValueList(LIST_STEPS, tmp)) - rs.set_apply_callback(my_word2raw, _vfoa,"step", 100) + rs.set_apply_callback(my_word2raw, _vfoa, "step", 100) a_band.append(rs) # LOWER BAND SETTINGS @@ -1071,11 +1073,11 @@ "txdtcs_pol", "tx_tone") b_band.append(rs) - rx = RadioSettingValueList(LIST_SIGNAL,LIST_SIGNAL[_vfob.launch_sig]) + rx = RadioSettingValueList(LIST_SIGNAL, LIST_SIGNAL[_vfob.launch_sig]) rs = RadioSetting("lower.vfob.launch_sig", "Launch Signaling", rx) b_band.append(rs) - rx = RadioSettingValueList(LIST_SIGNAL,LIST_SIGNAL[_vfob.tx_end_sig]) + rx = RadioSettingValueList(LIST_SIGNAL, LIST_SIGNAL[_vfob.tx_end_sig]) rs = RadioSetting("lower.vfob.tx_end_sig", "Xmit End Signaling", rx) b_band.append(rs) @@ -1120,14 +1122,16 @@ """Callback: convert 7-char string to char array with count.""" ary = "" knt = 7 - for j in range (6, -1, -1): # Strip trailing spaces + for j in range(6, -1, -1): # Strip trailing spaces if str(setting.value)[j] == "" or str(setting.value)[j] == " ": knt = knt - 1 else: break for j in range(0, 7, 1): - if j < knt: ary += str(setting.value)[j] - else: ary += chr(0xFF) + if j < knt: + ary += str(setting.value)[j] + else: + ary += chr(0xFF) setattr(obj, atrba, ary) setattr(obj, atrbc, knt) return @@ -1141,7 +1145,7 @@ tmp = chars2str(_lims.hello2, _lims.hello2_cnt) rs = RadioSetting("hello_lims.hello2", "Power-On Message 2", RadioSettingValueString(0, 7, tmp)) - rs.set_apply_callback(my_str2ary, _lims,"hello2", "hello2_cnt") + rs.set_apply_callback(my_str2ary, _lims, "hello2", "hello2_cnt") lims.append(rs) # VALID_BANDS = [(136000000, 176000000),400000000, 480000000)] @@ -1184,7 +1188,7 @@ """Generate the DTMF code 1-8, NOT a callback.""" tmp = "" if knt > 0 and knt != 0xff: - for val in ary[:knt]: + for val in ary[:knt]: if val > 0 and val <= 9: tmp += chr(val + 48) elif val == 0x0a: @@ -1210,7 +1214,7 @@ """Callback: DTMF Code; sends 5 or 7-byte string.""" draw = [] knt = syz - for j in range (syz - 1, -1, -1): # Strip trailing spaces + for j in range(syz - 1, -1, -1): # Strip trailing spaces if str(setting.value)[j] == "" or str(setting.value)[j] == " ": knt = knt - 1 else: @@ -1220,19 +1224,19 @@ obx = ord(bx) dig = 0x0ff if j < knt and knt > 0: # (Else) is pads - if bx == "0": + if bx == "0": dig = 0x0a - elif bx == "A": + elif bx == "A": dig = 0x0d - elif bx == "B": + elif bx == "B": dig = 0x0e - elif bx == "C": + elif bx == "C": dig = 0x0f - elif bx == "D": + elif bx == "D": dig = 0x00 - elif bx == "*": + elif bx == "*": dig = 0x0b - elif bx == "#": + elif bx == "#": dig = 0x0c elif obx >= 49 and obx <= 57: dig = obx - 48 @@ -1258,14 +1262,14 @@ rs = RadioSetting("codes.master_id_code", "Master Control ID Code", RadioSettingValueString(0, 7, tmp)) rs.set_apply_callback(my_dtmf2raw, _codes, "master_id_code", - "master_id_cnt",7) + "master_id_cnt", 7) codes.append(rs) tmp = make_dtmf(_codes.alarm_code, _codes.alarm_cnt) rs = RadioSetting("codes.alarm_code", "Alarm Code", - RadioSettingValueString(0, 5, tmp)) + RadioSettingValueString(0, 5, tmp)) rs.set_apply_callback(my_dtmf2raw, _codes, "alarm_code", - "alarm_cnt", 5) + "alarm_cnt", 5) codes.append(rs) tmp = make_dtmf(_codes.id_disp_code, _codes.id_disp_cnt) @@ -1278,7 +1282,7 @@ tmp = make_dtmf(_codes.revive_code, _codes.revive_cnt) rs = RadioSetting("codes.revive_code", "Revive Code", RadioSettingValueString(0, 5, tmp)) - rs.set_apply_callback(my_dtmf2raw, _codes,"revive_code", + rs.set_apply_callback(my_dtmf2raw, _codes, "revive_code", "revive_cnt", 5) codes.append(rs) @@ -1361,7 +1365,6 @@ return group # END get_settings() - def set_settings(self, settings): _settings = self._memobj.settings _mem = self._memobj @@ -1397,7 +1400,6 @@ LOG.debug(element.get_name()) raise - @classmethod def match_model(cls, filedata, filename): match_size = False diff -r 57bc22d49930 -r 1b1ea7a62887 tools/cpep8.manifest --- a/tools/cpep8.manifest Thu Dec 31 21:47:28 2020 -0500 +++ b/tools/cpep8.manifest Thu Dec 31 22:15:12 2020 -0500 @@ -71,6 +71,7 @@ ./chirp/drivers/kguv9dplus.py ./chirp/drivers/kyd.py ./chirp/drivers/leixen.py +./chirp/drivers/lt725uv.py ./chirp/drivers/puxing.py ./chirp/drivers/radioddity_r2.py ./chirp/drivers/retevis_rt22.py

1 0

[chirp_devel] [PATCH] Driver Maintenance: gmrsuv1.py
by Jim Unroe 01 Jan '21

01 Jan '21

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1609469248 18000 # Thu Dec 31 21:47:28 2020 -0500 # Node ID 57bc22d49930ad0a418cc8e34a87b5c4932ab172 # Parent 31d355946d47e8b575ac5378434aae5fdf4364df Driver Maintenance: gmrsuv1.py 1. Add to PEP8 manifest 2. Perform PEP8 cleanup fixes #8615 diff -r 31d355946d47 -r 57bc22d49930 chirp/drivers/gmrsuv1.py --- a/chirp/drivers/gmrsuv1.py Thu Dec 31 21:26:55 2020 -0500 +++ b/chirp/drivers/gmrsuv1.py Thu Dec 31 21:47:28 2020 -0500 @@ -19,8 +19,6 @@ import logging import re -LOG = logging.getLogger(__name__) - from chirp.drivers import baofeng_common from chirp import chirp_common, directory, memmap from chirp import bitwise, errors, util @@ -31,18 +29,20 @@ InvalidValueError from textwrap import dedent -##### MAGICS ######################################################### +LOG = logging.getLogger(__name__) + +# #### MAGICS ######################################################### # BTECH GMRS-V1 magic string MSTRING_GMRSV1 = "\x50\x5F\x20\x15\x12\x15\x4D" -##### ID strings ##################################################### +# #### ID strings ##################################################### # BTECH GMRS-V1 -GMRSV1_fp1 = "US32411" # original -GMRSV1_fp2 = "US32416" # original -GMRSV1_fp3 = "US32418" # new rules -GMRSV1_fp4 = "US32412" # original +GMRSV1_fp1 = "US32411" # original +GMRSV1_fp2 = "US32416" # original +GMRSV1_fp3 = "US32418" # new rules +GMRSV1_fp4 = "US32412" # original DTMF_CHARS = "0123456789 *#ABCD" STEPS = [2.5, 5.0, 6.25, 10.0, 12.5, 20.0, 25.0, 50.0] @@ -81,6 +81,7 @@ GMRS_FREQS_ORIG = GMRS_FREQS1 + GMRS_FREQS3 * 2 GMRS_FREQS_2017 = GMRS_FREQS1 + GMRS_FREQS2 + GMRS_FREQS3 * 2 + def model_match(cls, data): """Match the opened/downloaded image to the correct version""" rid = data[0x1EF0:0x1EF7] @@ -128,7 +129,6 @@ PTTID_LIST = LIST_PTTID SCODE_LIST = LIST_SCODE - def get_features(self): """Get the radio's features""" @@ -167,7 +167,6 @@ return rf - MEM_FORMAT = """ #seekto 0x0000; struct { @@ -193,157 +192,157 @@ u8 code[5]; u8 unused[11]; } pttid[15]; - + #seekto 0x0CAA; struct { - u8 code[5]; - u8 unused1:6, - aniid:2; - u8 unknown[2]; - u8 dtmfon; - u8 dtmfoff; - } ani; - - #seekto 0x0E20; - struct { - u8 unused01:4, - squelch:4; - u8 unused02; - u8 unused03; - u8 unused04:5, - save:3; - u8 unused05:4, - vox:4; - u8 unused06; - u8 unused07:4, - abr:4; - u8 unused08:7, - tdr:1; - u8 unused09:7, - beep:1; - u8 unused10:2, - timeout:6; - u8 unused11[4]; - u8 unused12:6, - voice:2; - u8 unused13; - u8 unused14:6, - dtmfst:2; - u8 unused15; - u8 unused16:6, - screv:2; - u8 unused17:6, - pttid:2; - u8 unused18:2, - pttlt:6; - u8 unused19:6, - mdfa:2; - u8 unused20:6, - mdfb:2; - u8 unused21; - u8 unused22:7, - sync:1; - u8 unused23[4]; - u8 unused24:6, - wtled:2; - u8 unused25:6, - rxled:2; - u8 unused26:6, - txled:2; - u8 unused27:6, - almod:2; - u8 unused28:7, - dbptt:1; - u8 unused29:6, - tdrab:2; - u8 unused30:7, - ste:1; - u8 unused31:4, - rpste:4; - u8 unused32:4, - rptrl:4; - u8 unused33:7, - ponmsg:1; - u8 unused34:7, - roger:1; - u8 unused35:6, - rtone:2; - u8 unused36; - u8 unused37:6, - rogerrx:2; - u8 unused38; - u8 displayab:1, - unknown1:2, - fmradio:1, - alarm:1, - unknown2:1, - reset:1, - menu:1; - u8 unused39; - u8 workmode; - u8 keylock; - u8 cht; - } settings; - - #seekto 0x0E76; - struct { - u8 unused1:1, - mrcha:7; - u8 unused2:1, - mrchb:7; - } wmchannel; - - struct vfo { - u8 unknown0[8]; - u8 freq[8]; - u8 unknown1; - u8 offset[4]; - u8 unknown2; - ul16 rxtone; - ul16 txtone; - u8 unused1:7, - band:1; - u8 unknown3; - u8 unused2:2, - sftd:2, - scode:4; - u8 unknown4; - u8 unused3:1 - step:3, - unused4:4; - u8 txpower:1, - widenarr:1, - unknown5:4, - txpower3:2; - }; - - #seekto 0x0F00; - struct { + u8 code[5]; + u8 unused1:6, + aniid:2; + u8 unknown[2]; + u8 dtmfon; + u8 dtmfoff; + } ani; + + #seekto 0x0E20; + struct { + u8 unused01:4, + squelch:4; + u8 unused02; + u8 unused03; + u8 unused04:5, + save:3; + u8 unused05:4, + vox:4; + u8 unused06; + u8 unused07:4, + abr:4; + u8 unused08:7, + tdr:1; + u8 unused09:7, + beep:1; + u8 unused10:2, + timeout:6; + u8 unused11[4]; + u8 unused12:6, + voice:2; + u8 unused13; + u8 unused14:6, + dtmfst:2; + u8 unused15; + u8 unused16:6, + screv:2; + u8 unused17:6, + pttid:2; + u8 unused18:2, + pttlt:6; + u8 unused19:6, + mdfa:2; + u8 unused20:6, + mdfb:2; + u8 unused21; + u8 unused22:7, + sync:1; + u8 unused23[4]; + u8 unused24:6, + wtled:2; + u8 unused25:6, + rxled:2; + u8 unused26:6, + txled:2; + u8 unused27:6, + almod:2; + u8 unused28:7, + dbptt:1; + u8 unused29:6, + tdrab:2; + u8 unused30:7, + ste:1; + u8 unused31:4, + rpste:4; + u8 unused32:4, + rptrl:4; + u8 unused33:7, + ponmsg:1; + u8 unused34:7, + roger:1; + u8 unused35:6, + rtone:2; + u8 unused36; + u8 unused37:6, + rogerrx:2; + u8 unused38; + u8 displayab:1, + unknown1:2, + fmradio:1, + alarm:1, + unknown2:1, + reset:1, + menu:1; + u8 unused39; + u8 workmode; + u8 keylock; + u8 cht; + } settings; + + #seekto 0x0E76; + struct { + u8 unused1:1, + mrcha:7; + u8 unused2:1, + mrchb:7; + } wmchannel; + + struct vfo { + u8 unknown0[8]; + u8 freq[8]; + u8 unknown1; + u8 offset[4]; + u8 unknown2; + ul16 rxtone; + ul16 txtone; + u8 unused1:7, + band:1; + u8 unknown3; + u8 unused2:2, + sftd:2, + scode:4; + u8 unknown4; + u8 unused3:1 + step:3, + unused4:4; + u8 txpower:1, + widenarr:1, + unknown5:4, + txpower3:2; + }; + + #seekto 0x0F00; + struct { struct vfo a; struct vfo b; } vfo; - + #seekto 0x0F4E; u16 fm_presets; - + #seekto 0x1000; struct { char name[7]; u8 unknown1[9]; } names[128]; - + #seekto 0x1ED0; struct { char line1[7]; char line2[7]; } sixpoweron_msg; - + #seekto 0x1EE0; struct { char line1[7]; char line2[7]; } poweron_msg; - + #seekto 0x1EF0; struct { char line1[7]; @@ -362,7 +361,7 @@ u8 sql8; u8 sql9; }; - + #seekto 0x1F60; struct { struct squelch vhf; @@ -679,7 +678,7 @@ basic.append(rs) rs = RadioSetting("settings.beep", "Beep", - RadioSettingValueBoolean(_mem.settings.beep)) + RadioSettingValueBoolean(_mem.settings.beep)) basic.append(rs) if _mem.settings.timeout > 0x27: @@ -785,7 +784,7 @@ val = _mem.settings.rpste rs = RadioSetting("settings.rpste", "Squelch Tail Eliminate (repeater)", - RadioSettingValueList( + RadioSettingValueList( LIST_RPSTE, LIST_RPSTE[val])) basic.append(rs) @@ -815,7 +814,7 @@ rs = RadioSetting("settings.rogerrx", "Roger Beep (RX)", RadioSettingValueList( LIST_OFFAB, LIST_OFFAB[ - _mem.settings.rogerrx])) + _mem.settings.rogerrx])) basic.append(rs) # Advanced settings @@ -894,12 +893,12 @@ rs = RadioSetting("wmchannel.mrcha", "MR A Channel", RadioSettingValueInteger(0, 127, - _mem.wmchannel.mrcha)) + _mem.wmchannel.mrcha)) work.append(rs) rs = RadioSetting("wmchannel.mrchb", "MR B Channel", RadioSettingValueInteger(0, 127, - _mem.wmchannel.mrchb)) + _mem.wmchannel.mrchb)) work.append(rs) def convert_bytes_to_freq(bytes): @@ -1022,7 +1021,8 @@ elif band == "uhf": _obj = self._memobj.squelch.uhf val = RadioSettingValueInteger(0, 123, - getattr(_obj, "sql%i" % (index))) + getattr(_obj, "sql%i" % ( + index))) if index == 0: val.set_mutable(False) name = "%s Squelch %i" % (band.upper(), index) diff -r 31d355946d47 -r 57bc22d49930 tools/cpep8.manifest --- a/tools/cpep8.manifest Thu Dec 31 21:26:55 2020 -0500 +++ b/tools/cpep8.manifest Thu Dec 31 21:47:28 2020 -0500 @@ -38,6 +38,7 @@ ./chirp/drivers/generic_csv.py ./chirp/drivers/generic_tpe.py ./chirp/drivers/generic_xml.py +./chirp/drivers/gmrsuv1.py ./chirp/drivers/h777.py ./chirp/drivers/ic208.py ./chirp/drivers/ic2100.py

1 0

[chirp_devel] [PATCH] Driver Maintenance: baofeng_common.py
by Jim Unroe 01 Jan '21

01 Jan '21

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1609468015 18000 # Thu Dec 31 21:26:55 2020 -0500 # Node ID 31d355946d47e8b575ac5378434aae5fdf4364df # Parent 8dff5da71b9effd76a376c0b2091bc7fbe8d493c Driver Maintenance: baofeng_common.py 1. Add to PEP8 manifest 2. Perform PEP8 cleanup fixes #8613 diff -r 8dff5da71b9e -r 31d355946d47 chirp/drivers/baofeng_common.py --- a/chirp/drivers/baofeng_common.py Thu Dec 31 21:14:30 2020 -0500 +++ b/chirp/drivers/baofeng_common.py Thu Dec 31 21:26:55 2020 -0500 @@ -140,7 +140,7 @@ if not ident.startswith("\xaa") or not ident.endswith("\xdd"): # bad response msg = "Unexpected response, got this:" - msg += util.hexprint(ident) + msg += util.hexprint(ident) LOG.debug(msg) raise errors.RadioError("Unexpected response from radio.") @@ -307,6 +307,7 @@ # if you get here is because the freq pairs are split return True + class BaofengCommonHT(chirp_common.CloneModeRadio, chirp_common.ExperimentalRadio): """Baofeng HT Sytle Radios""" @@ -342,7 +343,7 @@ LOG.exception('Unexpected error during upload') raise errors.RadioError('Unexpected error communicating ' 'with the radio') - + def get_features(self): """Get the radio's features""" @@ -380,7 +381,7 @@ rf.valid_tuning_steps = [2.5, 5.0, 6.25, 10.0, 12.5, 20.0, 25.0, 50.0] return rf - + def _is_txinh(self, _mem): raw_tx = "" for i in range(0, 4): @@ -408,7 +409,8 @@ # TX freq set offset = (int(_mem.txfreq) * 10) - mem.freq if offset != 0: - if _split(self.get_features(), mem.freq, int(_mem.txfreq) * 10): + if _split(self.get_features(), mem.freq, int( + _mem.txfreq) * 10): mem.duplex = "split" mem.offset = int(_mem.txfreq) * 10 elif offset < 0: diff -r 8dff5da71b9e -r 31d355946d47 tools/cpep8.manifest --- a/tools/cpep8.manifest Thu Dec 31 21:14:30 2020 -0500 +++ b/tools/cpep8.manifest Thu Dec 31 21:26:55 2020 -0500 @@ -15,6 +15,7 @@ ./chirp/drivers/anytone.py ./chirp/drivers/anytone_ht.py ./chirp/drivers/ap510.py +./chirp/drivers/baofeng_common.py ./chirp/drivers/baofeng_uv3r.py ./chirp/drivers/baofeng_wp970i.py ./chirp/drivers/bjuv55.py

1 0

[chirp_devel] [PATCH] Driver Maintenance: anytone_ht.py
by Jim Unroe 01 Jan '21

01 Jan '21

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1609467270 18000 # Thu Dec 31 21:14:30 2020 -0500 # Node ID 8dff5da71b9effd76a376c0b2091bc7fbe8d493c # Parent 84716a8e7b8ee1e8a45e5d5288d185191bd7cfc4 Driver Maintenance: anytone_ht.py 1. Add to PEP8 manifest 2. Perform PEP8 cleanup fixes #8611 diff -r 84716a8e7b8e -r 8dff5da71b9e chirp/drivers/anytone_ht.py --- a/chirp/drivers/anytone_ht.py Thu Dec 31 19:09:17 2020 -0500 +++ b/chirp/drivers/anytone_ht.py Thu Dec 31 21:14:30 2020 -0500 @@ -34,36 +34,36 @@ mem_format = """ struct memory { bbcd freq[4]; - bbcd offset[4]; - u8 unknown1:4, + bbcd offset[4]; + u8 unknown1:4, tune_step:4; - u8 unknown2:2, + u8 unknown2:2, txdcsextra:1, txinv:1, channel_width:2, unknown3:1, tx_off:1; - u8 unknown4:2, + u8 unknown4:2, rxdcsextra:1, rxinv:1, power:2, duplex:2; - u8 unknown5:4, + u8 unknown5:4, rxtmode:2, txtmode:2; - u8 unknown6:2, + u8 unknown6:2, txtone:6; - u8 unknown7:2, + u8 unknown7:2, rxtone:6; - u8 txcode; - u8 rxcode; - u8 unknown8[3]; - char name[6]; - u8 squelch:4, + u8 txcode; + u8 rxcode; + u8 unknown8[3]; + char name[6]; + u8 squelch:4, unknown9:2, bcl:2; - u8 unknownA; - u8 unknownB:7, + u8 unknownA; + u8 unknownB:7, sqlmode:1; u8 unknownC[4]; }; @@ -71,22 +71,22 @@ #seekto 0x0010; struct { u8 unknown1; - u8 unknown2:5, + u8 unknown2:5, bands1:3; - char model[7]; - u8 unknown3:5, + char model[7]; + u8 unknown3:5, bands2:3; - u8 unknown4[6]; - u8 unknown5[16]; - char date[9]; - u8 unknown6[7]; - u8 unknown7[16]; - u8 unknown8[16]; - char dealer[16]; - char stockdate[9]; - u8 unknown9[7]; - char selldate[9]; - u8 unknownA[7]; + u8 unknown4[6]; + u8 unknown5[16]; + char date[9]; + u8 unknown6[7]; + u8 unknown7[16]; + u8 unknown8[16]; + char dealer[16]; + char stockdate[9]; + u8 unknown9[7]; + char selldate[9]; + u8 unknownA[7]; char seller[16]; } oem_info; @@ -405,7 +405,7 @@ @directory.register class AnyToneTERMN8RRadio(chirp_common.CloneModeRadio, - chirp_common.ExperimentalRadio): + chirp_common.ExperimentalRadio): """AnyTone TERMN-8R""" VENDOR = "AnyTone" MODEL = "TERMN-8R" @@ -448,7 +448,7 @@ rf.can_odd_split = True rf.memory_bounds = (0, 199) return rf - + def sync_in(self): self._mmap = _download(self) self.process_mmap() @@ -497,7 +497,7 @@ mem.duplex = DUPLEXES[_mem.duplex] mem.mode = MODES[_mem.channel_width] - if _mem.tx_off == True: + if _mem.tx_off is True: mem.duplex = "off" mem.offset = 0 @@ -712,7 +712,8 @@ rs = RadioSetting("backlight", "Backlight", RadioSettingValueList(BACKLIGHT, - BACKLIGHT[_settings.backlight])) + BACKLIGHT[ + _settings.backlight])) cfg_grp.append(rs) rs = RadioSetting("color", "Backlight Color", @@ -945,6 +946,7 @@ def match_model(cls, filedata, filename): return cls._file_ident in filedata[0x10:0x20] + @directory.register class AnyToneOBLTR8RRadio(AnyToneTERMN8RRadio): """AnyTone OBLTR-8R""" diff -r 84716a8e7b8e -r 8dff5da71b9e tools/cpep8.manifest --- a/tools/cpep8.manifest Thu Dec 31 19:09:17 2020 -0500 +++ b/tools/cpep8.manifest Thu Dec 31 21:14:30 2020 -0500 @@ -13,6 +13,7 @@ ./chirp/drivers/__init__.py ./chirp/drivers/alinco.py ./chirp/drivers/anytone.py +./chirp/drivers/anytone_ht.py ./chirp/drivers/ap510.py ./chirp/drivers/baofeng_uv3r.py ./chirp/drivers/baofeng_wp970i.py

1 0