- Developers - lists.chirpmyradio.com

[chirp_devel] [PATCH] [termn8r] Add Anytone TERMN-8R Support #2437
by Jim Unroe 04 Apr '15

04 Apr '15

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1428029723 14400 # Node ID 276bcdf9e7adfea093fb32847bfeb24472ff96ce # Parent ee81cedd447b16eacca70ff6e8bff3552e4a5227 [termn8r] Add Anytone TERMN-8R Support #2437 Add basic spreadsheet editor support Add a few "Function Setup" settings to get started - Welcome Message (line 1 & line 2) - Display Mode - Automatic Power-off Add an "extra" setting to get started - Busy Channel Lockout Bonus: Add equivalent Anytone OBLTR-8R support #2437 diff -r ee81cedd447b -r 276bcdf9e7ad chirp/drivers/anytone_ht.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/chirp/drivers/anytone_ht.py Thu Apr 02 22:55:23 2015 -0400 @@ -0,0 +1,587 @@ +# Copyright 2013 Dan Smith <dsmith(a)danplanet.com> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import os +import struct +import time +import logging + +from chirp import bitwise +from chirp import chirp_common +from chirp import directory +from chirp import errors +from chirp import memmap +from chirp import util +from chirp.settings import RadioSetting, RadioSettingGroup, \ + RadioSettingValueInteger, RadioSettingValueList, \ + RadioSettingValueBoolean, RadioSettingValueString, \ + RadioSettingValueFloat, InvalidValueError, RadioSettings + +LOG = logging.getLogger(__name__) + +mem_format = """ +struct memory { + bbcd freq[4]; + bbcd offset[4]; + u8 unknown1:4, + tune_step:4; + u8 unknown2:2, + txdcsextra:1, + txinv:1, + channel_width:2, + unknown3:1, + tx_off:1; + u8 unknown4:2, + rxdcsextra:1, + rxinv:1, + power:2, + duplex:2; + u8 unknown5:4, + rxtmode:2, + txtmode:2; + u8 unknown6:2, + txtone:6; + u8 unknown7:2, + rxtone:6; + u8 txcode; + u8 rxcode; + u8 unknown8[3]; + char name[6]; + u8 squelch:4, + unknown9:2, + bcl:2; + u8 unknownA; + u8 unknownB:7, + sqlmode:1; + u8 unknownC[4]; +}; + +#seekto 0x0010; +struct { + u8 unknown1; + u8 unknown2:5, + bands1:3; + 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]; + char seller[16]; +} oem_info; + +#seekto 0x0100; +u8 used_flags[50]; + +#seekto 0x0120; +u8 skip_flags[50]; + +#seekto 0x0220; +struct { + u8 unknown1:6, + display:2; + u8 unknown2[19]; + u8 unknown3:3, + apo:5; +} settings; + +#seekto 0x03E0; +struct { + char line1[6]; + char line2[6]; +} welcome_msg; + +#seekto 0x2000; +struct memory memory[200]; +""" + + +def _echo_write(radio, data): + try: + radio.pipe.write(data) + except Exception, e: + LOG.error("Error writing to radio: %s" % e) + raise errors.RadioError("Unable to write to radio") + + +def _read(radio, length): + try: + data = radio.pipe.read(length) + except Exception, e: + LOG.error("Error reading from radio: %s" % e) + raise errors.RadioError("Unable to read from radio") + + if len(data) != length: + LOG.error("Short read from radio (%i, expected %i)" % + (len(data), length)) + LOG.debug(util.hexprint(data)) + raise errors.RadioError("Short read from radio") + return data + +valid_model = ['TERMN8R', 'OBLTR8R'] + + +def _ident(radio): + radio.pipe.setTimeout(1) + _echo_write(radio, "PROGRAM") + response = radio.pipe.read(3) + if response != "QX\x06": + LOG.debug("Response was:\n%s" % util.hexprint(response)) + raise errors.RadioError("Radio did not respond. Check connection.") + _echo_write(radio, "\x02") + response = radio.pipe.read(16) + LOG.debug(util.hexprint(response)) + if radio._file_ident not in response: + LOG.debug("Response was:\n%s" % util.hexprint(response)) + raise errors.RadioError("Unsupported model") + + +def _finish(radio): + endframe = "\x45\x4E\x44" + _echo_write(radio, endframe) + result = radio.pipe.read(1) + if result != "\x06": + LOG.debug("Got:\n%s" % util.hexprint(result)) + raise errors.RadioError("Radio did not finish cleanly") + + +def _checksum(data): + cs = 0 + for byte in data: + cs += ord(byte) + return cs % 256 + + +def _send(radio, cmd, addr, length, data=None): + frame = struct.pack(">cHb", cmd, addr, length) + if data: + frame += data + frame += chr(_checksum(frame[1:])) + frame += "\x06" + _echo_write(radio, frame) + LOG.debug("Sent:\n%s" % util.hexprint(frame)) + if data: + result = radio.pipe.read(1) + if result != "\x06": + LOG.debug("Ack was: %s" % repr(result)) + raise errors.RadioError( + "Radio did not accept block at %04x" % addr) + return + result = _read(radio, length + 6) + LOG.debug("Got:\n%s" % util.hexprint(result)) + header = result[0:4] + data = result[4:-2] + ack = result[-1] + if ack != "\x06": + LOG.debug("Ack was: %s" % repr(ack)) + raise errors.RadioError("Radio NAK'd block at %04x" % addr) + _cmd, _addr, _length = struct.unpack(">cHb", header) + if _addr != addr or _length != _length: + LOG.debug("Expected/Received:") + LOG.debug(" Length: %02x/%02x" % (length, _length)) + LOG.debug(" Addr: %04x/%04x" % (addr, _addr)) + raise errors.RadioError("Radio send unexpected block") + cs = _checksum(result[1:-2]) + if cs != ord(result[-2]): + LOG.debug("Calculated: %02x" % cs) + LOG.debug("Actual: %02x" % ord(result[-2])) + raise errors.RadioError("Block at 0x%04x failed checksum" % addr) + return data + + +def _download(radio): + _ident(radio) + + memobj = None + + data = "" + for start, end in radio._ranges: + for addr in range(start, end, 0x10): + block = _send(radio, 'R', addr, 0x10) + data += block + + status = chirp_common.Status() + status.cur = len(data) + status.max = end + status.msg = "Cloning from radio" + radio.status_fn(status) + + _finish(radio) + + return memmap.MemoryMap(data) + + +def _upload(radio): + _ident(radio) + + for start, end in radio._ranges: + for addr in range(start, end, 0x10): + if addr < 0x0100: + continue + block = radio._mmap[addr:addr + 0x10] + _send(radio, 'W', addr, len(block), block) + + status = chirp_common.Status() + status.cur = addr + status.max = end + status.msg = "Cloning to radio" + radio.status_fn(status) + + _finish(radio) + + +APO = ['Off', '30 Min', '1 Hour', '2 Hours'] +BCLO = ['Off', 'Repeater', 'Busy'] +CHARSET = chirp_common.CHARSET_ASCII +DISPLAY = ['Frequency', 'Channel', 'Name'] +DUPLEXES = ['', 'N/A', '-', '+', 'split', 'off'] +MODES = ["FM", "NFM"] +POWER_LEVELS = [chirp_common.PowerLevel("High", watts=5), + chirp_common.PowerLevel("Mid", watts=2), + chirp_common.PowerLevel("Low", watts=1)] +TMODES = ['', 'Tone', 'DTCS', ''] +TONES = [62.5] + list(chirp_common.TONES) + + +(a)directory.register +class AnyToneTERMN8RRadio(chirp_common.CloneModeRadio, + chirp_common.ExperimentalRadio): + """AnyTone TERMN-8R""" + VENDOR = "AnyTone" + MODEL = "TERMN-8R" + BAUD_RATE = 9600 + _file_ident = "TERMN8R" + + # May try to mirror the OEM behavior later + _ranges = [ + (0x0000, 0x8000), + ] + + @classmethod + def get_prompts(cls): + rp = chirp_common.RadioPrompts() + rp.experimental = ("The Anytone driver is currently experimental. " + "There are no known issues with it, but you should " + "proceed with caution.") + return rp + + def get_features(self): + rf = chirp_common.RadioFeatures() + rf.has_settings = True + rf.has_bank = False + rf.has_cross = True + rf.has_tuning_step = False + rf.has_rx_dtcs = True + rf.valid_skips = ["", "S"] + rf.valid_modes = MODES + rf.valid_tmodes = ['', 'Tone', 'TSQL', 'DTCS', 'Cross'] + rf.valid_cross_modes = ["Tone->Tone", "Tone->DTCS", "DTCS->Tone", + "->Tone", "->DTCS", "DTCS->", "DTCS->DTCS"] + rf.valid_dtcs_codes = chirp_common.ALL_DTCS_CODES + rf.valid_bands = [(136000000, 174000000), + (400000000, 520000000)] + rf.valid_characters = CHARSET + rf.valid_name_length = 6 + rf.valid_power_levels = POWER_LEVELS + rf.valid_duplexes = DUPLEXES + rf.can_odd_split = True + rf.memory_bounds = (0, 199) + return rf + + def sync_in(self): + self._mmap = _download(self) + self.process_mmap() + + def sync_out(self): + _upload(self) + + def process_mmap(self): + self._memobj = bitwise.parse(mem_format, self._mmap) + + def _get_dcs_index(self, _mem, which): + base = getattr(_mem, '%scode' % which) + extra = getattr(_mem, '%sdcsextra' % which) + return (int(extra) << 8) | int(base) + + def _set_dcs_index(self, _mem, which, index): + base = getattr(_mem, '%scode' % which) + extra = getattr(_mem, '%sdcsextra' % which) + base.set_value(index & 0xFF) + extra.set_value(index >> 8) + + def get_memory(self, number): + bitpos = (1 << (number % 8)) + bytepos = (number / 8) + + _mem = self._memobj.memory[number] + _skp = self._memobj.skip_flags[bytepos] + _usd = self._memobj.used_flags[bytepos] + + mem = chirp_common.Memory() + mem.number = number + + if _usd & bitpos: + mem.empty = True + return mem + + mem.freq = int(_mem.freq) * 100 + mem.offset = int(_mem.offset) * 100 + mem.name = self.filter_name(str(_mem.name).rstrip()) + mem.duplex = DUPLEXES[_mem.duplex] + mem.mode = MODES[_mem.channel_width] + + if _mem.tx_off == True: + mem.duplex = "off" + mem.offset = 0 + + rxtone = txtone = None + rxmode = TMODES[_mem.rxtmode] + txmode = TMODES[_mem.txtmode] + if txmode == "Tone": + txtone = TONES[_mem.txtone] + elif txmode == "DTCS": + txtone = chirp_common.ALL_DTCS_CODES[self._get_dcs_index(_mem, + 'tx')] + if rxmode == "Tone": + rxtone = TONES[_mem.rxtone] + elif rxmode == "DTCS": + rxtone = chirp_common.ALL_DTCS_CODES[self._get_dcs_index(_mem, + 'rx')] + + rxpol = _mem.rxinv and "R" or "N" + txpol = _mem.txinv and "R" or "N" + + chirp_common.split_tone_decode(mem, + (txmode, txtone, txpol), + (rxmode, rxtone, rxpol)) + + if _skp & bitpos: + mem.skip = "S" + + mem.power = POWER_LEVELS[_mem.power] + + mem.extra = RadioSettingGroup("Extra", "extra") + + rs = RadioSetting("bcl", "Busy Channel Lockout", + RadioSettingValueList(BCLO, + BCLO[_mem.bcl])) + mem.extra.append(rs) + + return mem + + def set_memory(self, mem): + bitpos = (1 << (mem.number % 8)) + bytepos = (mem.number / 8) + + _mem = self._memobj.memory[mem.number] + _skp = self._memobj.skip_flags[bytepos] + _usd = self._memobj.used_flags[bytepos] + + if mem.empty: + _usd |= bitpos + _skp |= bitpos + _mem.set_raw("\xFF" * 32) + return + _usd &= ~bitpos + + if _mem.get_raw() == ("\xFF" * 32): + LOG.debug("Initializing empty memory") + _mem.set_raw("\x00" * 32) + _mem.squelch = 3 + + _mem.freq = mem.freq / 100 + + if mem.duplex == "off": + _mem.duplex = DUPLEXES.index("") + _mem.offset = 0 + _mem.tx_off = True + elif mem.duplex == "split": + diff = mem.offset - mem.freq + _mem.duplex = DUPLEXES.index("-") if diff < 0 \ + else DUPLEXES.index("+") + _mem.offset = abs(diff) / 100 + else: + _mem.offset = mem.offset / 100 + _mem.duplex = DUPLEXES.index(mem.duplex) + + _mem.name = mem.name.ljust(6) + + try: + _mem.channel_width = MODES.index(mem.mode) + except ValueError: + _mem.channel_width = 0 + + ((txmode, txtone, txpol), + (rxmode, rxtone, rxpol)) = chirp_common.split_tone_encode(mem) + + _mem.txtmode = TMODES.index(txmode) + _mem.rxtmode = TMODES.index(rxmode) + if txmode == "Tone": + _mem.txtone = TONES.index(txtone) + elif txmode == "DTCS": + self._set_dcs_index(_mem, 'tx', + chirp_common.ALL_DTCS_CODES.index(txtone)) + if rxmode == "Tone": + _mem.sqlmode = 1 + _mem.rxtone = TONES.index(rxtone) + elif rxmode == "DTCS": + _mem.sqlmode = 1 + self._set_dcs_index(_mem, 'rx', + chirp_common.ALL_DTCS_CODES.index(rxtone)) + else: + _mem.sqlmode = 0 + + _mem.txinv = txpol == "R" + _mem.rxinv = rxpol == "R" + + if mem.skip: + _skp |= bitpos + else: + _skp &= ~bitpos + + if mem.power: + _mem.power = POWER_LEVELS.index(mem.power) + else: + _mem.power = 0 + + for setting in mem.extra: + setattr(_mem, setting.get_name(), setting.value) + + def get_settings(self): + _msg = self._memobj.welcome_msg + _oem = self._memobj.oem_info + _settings = self._memobj.settings + cfg_grp = RadioSettingGroup("cfg_grp", "Function Setup") + oem_grp = RadioSettingGroup("oem_grp", "OEM Info") + + group = RadioSettings(cfg_grp, + oem_grp) + + def _filter(name): + filtered = "" + for char in str(name): + if char in chirp_common.CHARSET_ASCII: + filtered += char + else: + filtered += " " + return filtered + + # + # Function Setup + # + + rs = RadioSetting("welcome_msg.line1", "Welcome Message 1", + RadioSettingValueString( + 0, 6, _filter(_msg.line1))) + cfg_grp.append(rs) + + rs = RadioSetting("welcome_msg.line2", "Welcome Message 2", + RadioSettingValueString( + 0, 6, _filter(_msg.line2))) + cfg_grp.append(rs) + + rs = RadioSetting("display", "Display Mode", + RadioSettingValueList(DISPLAY, + DISPLAY[_settings.display])) + cfg_grp.append(rs) + + rs = RadioSetting("apo", "Automatic Power Off", + RadioSettingValueList(APO, + APO[_settings.apo])) + cfg_grp.append(rs) + + # + # OEM info + # + + val = RadioSettingValueString(0, 7, _filter(_oem.model)) + val.set_mutable(False) + rs = RadioSetting("oem_info.model", "Model", val) + oem_grp.append(rs) + + val = RadioSettingValueString(0, 9, _filter(_oem.date)) + val.set_mutable(False) + rs = RadioSetting("oem_info.date", "Date", val) + oem_grp.append(rs) + + val = RadioSettingValueString(0, 16, _filter(_oem.dealer)) + val.set_mutable(False) + rs = RadioSetting("oem_info.dealer", "Dealer Code", val) + oem_grp.append(rs) + + val = RadioSettingValueString(0, 9, _filter(_oem.stockdate)) + val.set_mutable(False) + rs = RadioSetting("oem_info.stockdate", "Stock Date", val) + oem_grp.append(rs) + + val = RadioSettingValueString(0, 9, _filter(_oem.selldate)) + val.set_mutable(False) + rs = RadioSetting("oem_info.selldate", "Sell Date", val) + oem_grp.append(rs) + + return group + + def set_settings(self, settings): + _settings = self._memobj.settings + for element in settings: + if not isinstance(element, RadioSetting): + self.set_settings(element) + continue + else: + try: + name = element.get_name() + if "." in name: + bits = name.split(".") + obj = self._memobj + for bit in bits[:-1]: + if "/" in bit: + bit, index = bit.split("/", 1) + index = int(index) + obj = getattr(obj, bit)[index] + else: + obj = getattr(obj, bit) + setting = bits[-1] + else: + obj = _settings + setting = element.get_name() + + if element.has_apply_callback(): + LOG.debug("Using apply callback") + element.run_apply_callback() + else: + LOG.debug("Setting %s = %s" % (setting, element.value)) + setattr(obj, setting, element.value) + except Exception, e: + LOG.debug(element.get_name()) + raise + + @classmethod + def match_model(cls, filedata, filename): + return cls._file_ident in filedata[0x10:0x20] + +(a)directory.register +class AnyToneOBLTR8RRadio(AnyToneTERMN8RRadio): + """AnyTone OBLTR-8R""" + VENDOR = "AnyTone" + MODEL = "OBLTR-8R" + _file_ident = "OBLTR8R"

3 6

[chirp_devel] [PATCH] [termn8r] Add Anytone TERMN-8R Support #2437
by Jim Unroe 04 Apr '15

04 Apr '15

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1428107687 14400 # Node ID b0ff1816e063aa7b0cd2bdcdfa7738f5b0af8c81 # Parent ee81cedd447b16eacca70ff6e8bff3552e4a5227 [termn8r] Add Anytone TERMN-8R Support #2437 Add basic spreadsheet editor support Add a few "Function Setup" settings to get started - Welcome Message (line 1 & line 2) - Display Mode - Automatic Power-off Add an "extra" setting to get started - Busy Channel Lockout Bonus: Add equivalent Anytone OBLTR-8R support #2437 diff -r ee81cedd447b -r b0ff1816e063 chirp/drivers/anytone_ht.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/chirp/drivers/anytone_ht.py Fri Apr 03 20:34:47 2015 -0400 @@ -0,0 +1,587 @@ +# Copyright 2015 Jim Unroe <rock.unroe(a)gmail.com> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import os +import struct +import time +import logging + +from chirp import bitwise +from chirp import chirp_common +from chirp import directory +from chirp import errors +from chirp import memmap +from chirp import util +from chirp.settings import RadioSetting, RadioSettingGroup, \ + RadioSettingValueInteger, RadioSettingValueList, \ + RadioSettingValueBoolean, RadioSettingValueString, \ + RadioSettingValueFloat, InvalidValueError, RadioSettings + +LOG = logging.getLogger(__name__) + +mem_format = """ +struct memory { + bbcd freq[4]; + bbcd offset[4]; + u8 unknown1:4, + tune_step:4; + u8 unknown2:2, + txdcsextra:1, + txinv:1, + channel_width:2, + unknown3:1, + tx_off:1; + u8 unknown4:2, + rxdcsextra:1, + rxinv:1, + power:2, + duplex:2; + u8 unknown5:4, + rxtmode:2, + txtmode:2; + u8 unknown6:2, + txtone:6; + u8 unknown7:2, + rxtone:6; + u8 txcode; + u8 rxcode; + u8 unknown8[3]; + char name[6]; + u8 squelch:4, + unknown9:2, + bcl:2; + u8 unknownA; + u8 unknownB:7, + sqlmode:1; + u8 unknownC[4]; +}; + +#seekto 0x0010; +struct { + u8 unknown1; + u8 unknown2:5, + bands1:3; + 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]; + char seller[16]; +} oem_info; + +#seekto 0x0100; +u8 used_flags[50]; + +#seekto 0x0120; +u8 skip_flags[50]; + +#seekto 0x0220; +struct { + u8 unknown1:6, + display:2; + u8 unknown2[19]; + u8 unknown3:3, + apo:5; +} settings; + +#seekto 0x03E0; +struct { + char line1[6]; + char line2[6]; +} welcome_msg; + +#seekto 0x2000; +struct memory memory[200]; +""" + + +def _echo_write(radio, data): + try: + radio.pipe.write(data) + except Exception, e: + LOG.error("Error writing to radio: %s" % e) + raise errors.RadioError("Unable to write to radio") + + +def _read(radio, length): + try: + data = radio.pipe.read(length) + except Exception, e: + LOG.error("Error reading from radio: %s" % e) + raise errors.RadioError("Unable to read from radio") + + if len(data) != length: + LOG.error("Short read from radio (%i, expected %i)" % + (len(data), length)) + LOG.debug(util.hexprint(data)) + raise errors.RadioError("Short read from radio") + return data + +valid_model = ['TERMN8R', 'OBLTR8R'] + + +def _ident(radio): + radio.pipe.setTimeout(1) + _echo_write(radio, "PROGRAM") + response = radio.pipe.read(3) + if response != "QX\x06": + LOG.debug("Response was:\n%s" % util.hexprint(response)) + raise errors.RadioError("Radio did not respond. Check connection.") + _echo_write(radio, "\x02") + response = radio.pipe.read(16) + LOG.debug(util.hexprint(response)) + if radio._file_ident not in response: + LOG.debug("Response was:\n%s" % util.hexprint(response)) + raise errors.RadioError("Unsupported model") + + +def _finish(radio): + endframe = "\x45\x4E\x44" + _echo_write(radio, endframe) + result = radio.pipe.read(1) + if result != "\x06": + LOG.debug("Got:\n%s" % util.hexprint(result)) + raise errors.RadioError("Radio did not finish cleanly") + + +def _checksum(data): + cs = 0 + for byte in data: + cs += ord(byte) + return cs % 256 + + +def _send(radio, cmd, addr, length, data=None): + frame = struct.pack(">cHb", cmd, addr, length) + if data: + frame += data + frame += chr(_checksum(frame[1:])) + frame += "\x06" + _echo_write(radio, frame) + LOG.debug("Sent:\n%s" % util.hexprint(frame)) + if data: + result = radio.pipe.read(1) + if result != "\x06": + LOG.debug("Ack was: %s" % repr(result)) + raise errors.RadioError( + "Radio did not accept block at %04x" % addr) + return + result = _read(radio, length + 6) + LOG.debug("Got:\n%s" % util.hexprint(result)) + header = result[0:4] + data = result[4:-2] + ack = result[-1] + if ack != "\x06": + LOG.debug("Ack was: %s" % repr(ack)) + raise errors.RadioError("Radio NAK'd block at %04x" % addr) + _cmd, _addr, _length = struct.unpack(">cHb", header) + if _addr != addr or _length != _length: + LOG.debug("Expected/Received:") + LOG.debug(" Length: %02x/%02x" % (length, _length)) + LOG.debug(" Addr: %04x/%04x" % (addr, _addr)) + raise errors.RadioError("Radio send unexpected block") + cs = _checksum(result[1:-2]) + if cs != ord(result[-2]): + LOG.debug("Calculated: %02x" % cs) + LOG.debug("Actual: %02x" % ord(result[-2])) + raise errors.RadioError("Block at 0x%04x failed checksum" % addr) + return data + + +def _download(radio): + _ident(radio) + + memobj = None + + data = "" + for start, end in radio._ranges: + for addr in range(start, end, 0x10): + block = _send(radio, 'R', addr, 0x10) + data += block + + status = chirp_common.Status() + status.cur = len(data) + status.max = end + status.msg = "Cloning from radio" + radio.status_fn(status) + + _finish(radio) + + return memmap.MemoryMap(data) + + +def _upload(radio): + _ident(radio) + + for start, end in radio._ranges: + for addr in range(start, end, 0x10): + if addr < 0x0100: + continue + block = radio._mmap[addr:addr + 0x10] + _send(radio, 'W', addr, len(block), block) + + status = chirp_common.Status() + status.cur = addr + status.max = end + status.msg = "Cloning to radio" + radio.status_fn(status) + + _finish(radio) + + +APO = ['Off', '30 Min', '1 Hour', '2 Hours'] +BCLO = ['Off', 'Repeater', 'Busy'] +CHARSET = chirp_common.CHARSET_ASCII +DISPLAY = ['Frequency', 'Channel', 'Name'] +DUPLEXES = ['', 'N/A', '-', '+', 'split', 'off'] +MODES = ["FM", "NFM"] +POWER_LEVELS = [chirp_common.PowerLevel("High", watts=5), + chirp_common.PowerLevel("Mid", watts=2), + chirp_common.PowerLevel("Low", watts=1)] +TMODES = ['', 'Tone', 'DTCS', ''] +TONES = [62.5] + list(chirp_common.TONES) + + +(a)directory.register +class AnyToneTERMN8RRadio(chirp_common.CloneModeRadio, + chirp_common.ExperimentalRadio): + """AnyTone TERMN-8R""" + VENDOR = "AnyTone" + MODEL = "TERMN-8R" + BAUD_RATE = 9600 + _file_ident = "TERMN8R" + + # May try to mirror the OEM behavior later + _ranges = [ + (0x0000, 0x8000), + ] + + @classmethod + def get_prompts(cls): + rp = chirp_common.RadioPrompts() + rp.experimental = ("The Anytone driver is currently experimental. " + "There are no known issues with it, but you should " + "proceed with caution.") + return rp + + def get_features(self): + rf = chirp_common.RadioFeatures() + rf.has_settings = True + rf.has_bank = False + rf.has_cross = True + rf.has_tuning_step = False + rf.has_rx_dtcs = True + rf.valid_skips = ["", "S"] + rf.valid_modes = MODES + rf.valid_tmodes = ['', 'Tone', 'TSQL', 'DTCS', 'Cross'] + rf.valid_cross_modes = ["Tone->Tone", "Tone->DTCS", "DTCS->Tone", + "->Tone", "->DTCS", "DTCS->", "DTCS->DTCS"] + rf.valid_dtcs_codes = chirp_common.ALL_DTCS_CODES + rf.valid_bands = [(136000000, 174000000), + (400000000, 520000000)] + rf.valid_characters = CHARSET + rf.valid_name_length = 6 + rf.valid_power_levels = POWER_LEVELS + rf.valid_duplexes = DUPLEXES + rf.can_odd_split = True + rf.memory_bounds = (0, 199) + return rf + + def sync_in(self): + self._mmap = _download(self) + self.process_mmap() + + def sync_out(self): + _upload(self) + + def process_mmap(self): + self._memobj = bitwise.parse(mem_format, self._mmap) + + def _get_dcs_index(self, _mem, which): + base = getattr(_mem, '%scode' % which) + extra = getattr(_mem, '%sdcsextra' % which) + return (int(extra) << 8) | int(base) + + def _set_dcs_index(self, _mem, which, index): + base = getattr(_mem, '%scode' % which) + extra = getattr(_mem, '%sdcsextra' % which) + base.set_value(index & 0xFF) + extra.set_value(index >> 8) + + def get_memory(self, number): + bitpos = (1 << (number % 8)) + bytepos = (number / 8) + + _mem = self._memobj.memory[number] + _skp = self._memobj.skip_flags[bytepos] + _usd = self._memobj.used_flags[bytepos] + + mem = chirp_common.Memory() + mem.number = number + + if _usd & bitpos: + mem.empty = True + return mem + + mem.freq = int(_mem.freq) * 100 + mem.offset = int(_mem.offset) * 100 + mem.name = self.filter_name(str(_mem.name).rstrip()) + mem.duplex = DUPLEXES[_mem.duplex] + mem.mode = MODES[_mem.channel_width] + + if _mem.tx_off == True: + mem.duplex = "off" + mem.offset = 0 + + rxtone = txtone = None + rxmode = TMODES[_mem.rxtmode] + txmode = TMODES[_mem.txtmode] + if txmode == "Tone": + txtone = TONES[_mem.txtone] + elif txmode == "DTCS": + txtone = chirp_common.ALL_DTCS_CODES[self._get_dcs_index(_mem, + 'tx')] + if rxmode == "Tone": + rxtone = TONES[_mem.rxtone] + elif rxmode == "DTCS": + rxtone = chirp_common.ALL_DTCS_CODES[self._get_dcs_index(_mem, + 'rx')] + + rxpol = _mem.rxinv and "R" or "N" + txpol = _mem.txinv and "R" or "N" + + chirp_common.split_tone_decode(mem, + (txmode, txtone, txpol), + (rxmode, rxtone, rxpol)) + + if _skp & bitpos: + mem.skip = "S" + + mem.power = POWER_LEVELS[_mem.power] + + mem.extra = RadioSettingGroup("Extra", "extra") + + rs = RadioSetting("bcl", "Busy Channel Lockout", + RadioSettingValueList(BCLO, + BCLO[_mem.bcl])) + mem.extra.append(rs) + + return mem + + def set_memory(self, mem): + bitpos = (1 << (mem.number % 8)) + bytepos = (mem.number / 8) + + _mem = self._memobj.memory[mem.number] + _skp = self._memobj.skip_flags[bytepos] + _usd = self._memobj.used_flags[bytepos] + + if mem.empty: + _usd |= bitpos + _skp |= bitpos + _mem.set_raw("\xFF" * 32) + return + _usd &= ~bitpos + + if _mem.get_raw() == ("\xFF" * 32): + LOG.debug("Initializing empty memory") + _mem.set_raw("\x00" * 32) + _mem.squelch = 3 + + _mem.freq = mem.freq / 100 + + if mem.duplex == "off": + _mem.duplex = DUPLEXES.index("") + _mem.offset = 0 + _mem.tx_off = True + elif mem.duplex == "split": + diff = mem.offset - mem.freq + _mem.duplex = DUPLEXES.index("-") if diff < 0 \ + else DUPLEXES.index("+") + _mem.offset = abs(diff) / 100 + else: + _mem.offset = mem.offset / 100 + _mem.duplex = DUPLEXES.index(mem.duplex) + + _mem.name = mem.name.ljust(6) + + try: + _mem.channel_width = MODES.index(mem.mode) + except ValueError: + _mem.channel_width = 0 + + ((txmode, txtone, txpol), + (rxmode, rxtone, rxpol)) = chirp_common.split_tone_encode(mem) + + _mem.txtmode = TMODES.index(txmode) + _mem.rxtmode = TMODES.index(rxmode) + if txmode == "Tone": + _mem.txtone = TONES.index(txtone) + elif txmode == "DTCS": + self._set_dcs_index(_mem, 'tx', + chirp_common.ALL_DTCS_CODES.index(txtone)) + if rxmode == "Tone": + _mem.sqlmode = 1 + _mem.rxtone = TONES.index(rxtone) + elif rxmode == "DTCS": + _mem.sqlmode = 1 + self._set_dcs_index(_mem, 'rx', + chirp_common.ALL_DTCS_CODES.index(rxtone)) + else: + _mem.sqlmode = 0 + + _mem.txinv = txpol == "R" + _mem.rxinv = rxpol == "R" + + if mem.skip: + _skp |= bitpos + else: + _skp &= ~bitpos + + if mem.power: + _mem.power = POWER_LEVELS.index(mem.power) + else: + _mem.power = 0 + + for setting in mem.extra: + setattr(_mem, setting.get_name(), setting.value) + + def get_settings(self): + _msg = self._memobj.welcome_msg + _oem = self._memobj.oem_info + _settings = self._memobj.settings + cfg_grp = RadioSettingGroup("cfg_grp", "Function Setup") + oem_grp = RadioSettingGroup("oem_grp", "OEM Info") + + group = RadioSettings(cfg_grp, + oem_grp) + + def _filter(name): + filtered = "" + for char in str(name): + if char in chirp_common.CHARSET_ASCII: + filtered += char + else: + filtered += " " + return filtered + + # + # Function Setup + # + + rs = RadioSetting("welcome_msg.line1", "Welcome Message 1", + RadioSettingValueString( + 0, 6, _filter(_msg.line1))) + cfg_grp.append(rs) + + rs = RadioSetting("welcome_msg.line2", "Welcome Message 2", + RadioSettingValueString( + 0, 6, _filter(_msg.line2))) + cfg_grp.append(rs) + + rs = RadioSetting("display", "Display Mode", + RadioSettingValueList(DISPLAY, + DISPLAY[_settings.display])) + cfg_grp.append(rs) + + rs = RadioSetting("apo", "Automatic Power Off", + RadioSettingValueList(APO, + APO[_settings.apo])) + cfg_grp.append(rs) + + # + # OEM info + # + + val = RadioSettingValueString(0, 7, _filter(_oem.model)) + val.set_mutable(False) + rs = RadioSetting("oem_info.model", "Model", val) + oem_grp.append(rs) + + val = RadioSettingValueString(0, 9, _filter(_oem.date)) + val.set_mutable(False) + rs = RadioSetting("oem_info.date", "Date", val) + oem_grp.append(rs) + + val = RadioSettingValueString(0, 16, _filter(_oem.dealer)) + val.set_mutable(False) + rs = RadioSetting("oem_info.dealer", "Dealer Code", val) + oem_grp.append(rs) + + val = RadioSettingValueString(0, 9, _filter(_oem.stockdate)) + val.set_mutable(False) + rs = RadioSetting("oem_info.stockdate", "Stock Date", val) + oem_grp.append(rs) + + val = RadioSettingValueString(0, 9, _filter(_oem.selldate)) + val.set_mutable(False) + rs = RadioSetting("oem_info.selldate", "Sell Date", val) + oem_grp.append(rs) + + return group + + def set_settings(self, settings): + _settings = self._memobj.settings + for element in settings: + if not isinstance(element, RadioSetting): + self.set_settings(element) + continue + else: + try: + name = element.get_name() + if "." in name: + bits = name.split(".") + obj = self._memobj + for bit in bits[:-1]: + if "/" in bit: + bit, index = bit.split("/", 1) + index = int(index) + obj = getattr(obj, bit)[index] + else: + obj = getattr(obj, bit) + setting = bits[-1] + else: + obj = _settings + setting = element.get_name() + + if element.has_apply_callback(): + LOG.debug("Using apply callback") + element.run_apply_callback() + else: + LOG.debug("Setting %s = %s" % (setting, element.value)) + setattr(obj, setting, element.value) + except Exception, e: + LOG.debug(element.get_name()) + raise + + @classmethod + def match_model(cls, filedata, filename): + return cls._file_ident in filedata[0x10:0x20] + +(a)directory.register +class AnyToneOBLTR8RRadio(AnyToneTERMN8RRadio): + """AnyTone OBLTR-8R""" + VENDOR = "AnyTone" + MODEL = "OBLTR-8R" + _file_ident = "OBLTR8R"

1 0

[chirp_devel] Adding a New Driver
by Jim Unroe 03 Apr '15

03 Apr '15

What is the correct way to add a new driver? What I did was put it in the \chirp\drivers folder and then did "hg add". This seemed to do what I "think" I want but when I execute "run_all_test.bat" I don't think the new file is tested. Jim KC9HI

2 5

[chirp_devel] Kenwood TS-2000 Support
by Chucks 29 Mar '15

29 Mar '15

I've been messing with Tom Hayward's initial work on the TS-2000 driver, and looks like it's working now. Got read/write functionality working with my Kenwood TS-2000. Split mode is still broken, and I had to tool up the kenwood_live driver some in the process. I'll work on split later this weekend, but it's enough to send out to the list. Looks like the past convention was to add the models directly into the kenwood_live.py file instead of separating them, and I haven't done that either. 73 DE Charles Stewart, KK4TSJ chuckination(a)gmail.com <ccstewart(a)gmail.com>

1 1

[chirp_devel] Anytone TERMN8R Support
by Jim Unroe 26 Mar '15

26 Mar '15

I have been working on the basic channel editing support for the Anytone TERMN8R radio. Up until now, I have been using a separate driver file that I have in a work folder and I am loading as a module. What I want to know is what is the best/correct way to submit this. It is enough different from the current driver that it needs to remain separate. But I would still expect that it should be added to the anytone.py driver similar to how several models are handled in the wouxun.py driver. Also note that the OBLTR8R and NSTIG8R models will follow this one and should share some, if not most, of the TERMN8R's code. Any advice from the resident gurus on how I should go about this. Thanks, Jim

2 5

[chirp_devel] Build test results: Successful
by Build System 24 Mar '15

24 Mar '15

Tested changes: [Richard Cochran <ag6qr(a)sonic.net>] [ft2900] Add support for ft2900 banks (#2381) This adds support for banks in the FT-2900/FT-1900. This radio implements banks in much the same way as the Yaesu VX-6, and much of the code was lifted from the VX-6 driver. Full log: Started by an SCM change Building in workspace /var/lib/jenkins/jobs/chirp-test/workspace [workspace] $ hg showconfig paths.default [workspace] $ hg pull --rev default [workspace] $ hg update --clean --rev default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [workspace] $ hg log --rev . --template {node} [workspace] $ hg log --rev . --template {rev} [workspace] $ hg log --rev 05bc6d0ff5d3f7c48131963030ed3d393c456875 [workspace] $ hg log --template "<changeset node='{node}' author='{author|xmlescape}' rev='{rev}' date='{date}'><msg>{desc|xmlescape}</msg><added>{file_adds|stringify|xmlescape}</added><deleted>{file_dels|stringify|xmlescape}</deleted><files>{files|stringify|xmlescape}</files><parents>{parents}</parents></changeset>\n" --rev default:0 --follow --prune 05bc6d0ff5d3f7c48131963030ed3d393c456875 No emails were triggered. [workspace] $ /bin/sh -xe /tmp/hudson1819773697984221592.sh + ./run_all_tests.sh test_bit_array (tests.unit.test_bitwise.TestBitType) ... ok test_bit_array_fail (tests.unit.test_bitwise.TestBitType) ... ok test_bitfield_u16 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_u24 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_u8 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_ul16 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_ul24 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bbcd (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_bbcd_array (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_lbcd (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_lbcd_array (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_int_array (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u16 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u24 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u32 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u8 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul16 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul24 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul32 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_char (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string_invalid_chars (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string_wrong_length (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_comment_cppstyle (tests.unit.test_bitwise.TestBitwiseComments) ... ok test_comment_inline_cppstyle (tests.unit.test_bitwise.TestBitwiseComments) ... ok test_missing_semicolon (tests.unit.test_bitwise.TestBitwiseErrors) ... ok test_seek (tests.unit.test_bitwise.TestBitwiseSeek) ... ok test_seekto (tests.unit.test_bitwise.TestBitwiseSeek) ... ok test_struct_one_element (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok test_struct_two_elements (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok test_struct_writes (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok split_tone_encode_test_cross_dtcs_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_none_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_none_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_tone_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_tone_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_none (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_tsql (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_dtcs_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_dtcs_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_none_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_none_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_tone_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_tone_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_none (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_tsql (tests.unit.test_chirp_common.TestSplitTone) ... ok test_fix_rounded_step_250 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_fix_rounded_step_500 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_fix_rounded_step_750 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_12_5 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_2_5 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_5_0 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_6_25 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_fractional_step (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_required_step (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_required_step_fail (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_format_freq (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_bad (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_decimal (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_whitespace (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_whole (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_ensure_has_calls_almost_full (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_empty (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_partial (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_rptcall_full1 (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_rptcall_full2 (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_urcall_full (tests.unit.test_import_logic.DstarTests) ... ok test_import_bank (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_dtcs_diffA_dtcs (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_dtcs_diffB_dtcs (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_negative (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_too_big_vhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_uhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_vhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem_with_errors (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem_with_warnings (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_invalid (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_valid_am (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_valid_fm (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_name (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_closest (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_no_dst (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_no_src (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_same (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_tone_diffA_tsql (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_tone_diffB_tsql (tests.unit.test_import_logic.ImportFieldTests) ... ok test_mapping (tests.unit.test_mappingmodel.TestBaseBank) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestBaseBank) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseBankModel) ... ok test_get_name (tests.unit.test_mappingmodel.TestBaseBankModel) ... ok test_mapping (tests.unit.test_mappingmodel.TestBaseMapping) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestBaseMapping) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseMappingModel) ... ok test_get_name (tests.unit.test_mappingmodel.TestBaseMappingModel) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseMappingModelIndexInterface) ... ok test_add_memory_to_mapping (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_mapping_memories (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_memory_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_num_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping_no_bank (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping_wrong_bank (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_icom_bank (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_mapping (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_add_memory_to_mapping (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_index_bounds (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_mapping_memories (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_memory_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_memory_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_next_mapping_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_num_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping_no_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping_wrong_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index_bad_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index_bad_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_auto_tone_mode_cross (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs_pol (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs_rx (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_tone (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_tsql (tests.unit.test_memedit_edits.TestEdits) ... ok test_init (tests.unit.test_platform.Win32PlatformTest) ... ok test_serial_ports_bad_portnames (tests.unit.test_platform.Win32PlatformTest) ... ok test_serial_ports_sorted (tests.unit.test_platform.Win32PlatformTest) ... ok test_apply_callback (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting_group (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting_multi (tests.unit.test_settings.TestSettingContainers) ... ok test_changed (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_boolean (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_float (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_integer (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_list (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_string (tests.unit.test_settings.TestSettingValues) ... ok test_validate_callback (tests.unit.test_settings.TestSettingValues) ... ok test_delete_hole_with_all (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_with_all_full (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_with_hole (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_without_hole (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_insert_hole_with_space (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_insert_hole_without_space (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok ---------------------------------------------------------------------- Ran 151 tests in 0.060s OK Patch 'tip' is OK Checking for PEP8 regressions... real 0m11.994s user 0m9.830s sys 0m0.189s ================================================ Tests OK Email was triggered for: Success Sending email for trigger: Success

1 0

[chirp_devel] [PATCH] [ft2900] Add support for ft2900 banks (#2381)
by Richard Cochran 24 Mar '15

24 Mar '15

# HG changeset patch # User Richard Cochran <ag6qr(a)sonic.net> # Date 1427168290 25200 # Mon Mar 23 20:38:10 2015 -0700 # Node ID ee81cedd447b16eacca70ff6e8bff3552e4a5227 # Parent 05bc6d0ff5d3f7c48131963030ed3d393c456875 [ft2900] Add support for ft2900 banks (#2381) This adds support for banks in the FT-2900/FT-1900. This radio implements banks in much the same way as the Yaesu VX-6, and much of the code was lifted from the VX-6 driver. diff -r 05bc6d0ff5d3 -r ee81cedd447b chirp/drivers/ft2900.py --- a/chirp/drivers/ft2900.py Thu Mar 19 21:08:24 2015 -0700 +++ b/chirp/drivers/ft2900.py Mon Mar 23 20:38:10 2015 -0700 @@ -157,6 +157,11 @@ _send(radio.pipe, chr(cs & 0xFF)) MEM_FORMAT = """ +#seekto 0x00c0; +struct { + u16 in_use; +} bank_used[8]; + #seekto 0x00ef; u8 currentTone; @@ -166,18 +171,32 @@ #seekto 0x0127; u8 curChannelNum; +#seekto 0x012a; + u8 banksoff1; + #seekto 0x15f; u8 checksum1; #seekto 0x16f; u8 curentTone2; -#seekto 0x1a7; - u8 curChannelMem2[20]; +#seekto 0x1aa; + u16 banksoff2; #seekto 0x1df; u8 checksum2; +#seekto 0x0360; +struct{ + u8 name[6]; +} bank_names[8]; + + +#seekto 0x03c4; +struct{ + u16 channels[50]; +} banks[8]; + #seekto 0x06e4; struct { u8 even_pskip:1, @@ -283,6 +302,98 @@ mem.set_raw("\xff" * (mem.size() / 8)) +class FT2900Bank(chirp_common.NamedBank): + def get_name(self): + _bank = self._model._radio._memobj.bank_names[self.index] + name = "" + for i in _bank.name: + if i == 0xff: + break + name += CHARSET[i & 0x7f] + + return name.rstrip() + + def set_name(self, name): + name = name.upper().ljust(6)[:6] + _bank = self._model._radio._memobj.bank_names[self.index] + _bank.name = [CHARSET.index(x) for x in name.ljust(6)[:6]] + + +class FT2900BankModel(chirp_common.BankModel): + def get_num_mappings(self): + return 8 + + def get_mappings(self): + banks = self._radio._memobj.banks + bank_mappings = [] + for index, _bank in enumerate(banks): + bank = FT2900Bank(self, "%i" % index, "b%i" % (index + 1)) + bank.index = index + bank_mappings.append(bank) + + return bank_mappings + + def _get_channel_numbers_in_bank(self, bank): + _bank_used = self._radio._memobj.bank_used[bank.index] + if _bank_used.in_use == 0xffff: + return set() + + _members = self._radio._memobj.banks[bank.index] + return set([int(ch) for ch in _members.channels if ch != 0xffff]) + + def _update_bank_with_channel_numbers(self, bank, channels_in_bank): + _members = self._radio._memobj.banks[bank.index] + if len(channels_in_bank) > len(_members.channels): + raise Exception("More than %i entries in bank %d" % + (len(_members.channels), bank.index)) + + empty = 0 + for index, channel_number in enumerate(sorted(channels_in_bank)): + _members.channels[index] = channel_number + empty = index + 1 + for index in range(empty, len(_members.channels)): + _members.channels[index] = 0xffff + + _bank_used = self._radio._memobj.bank_used[bank.index] + if empty == 0: + _bank_used.in_use = 0xffff + else: + _bank_used.in_use = empty - 1 + + def add_memory_to_mapping(self, memory, bank): + channels_in_bank = self._get_channel_numbers_in_bank(bank) + channels_in_bank.add(memory.number) + self._update_bank_with_channel_numbers(bank, channels_in_bank) + + # tells radio that banks are active + self._radio._memobj.banksoff1 = bank.index + self._radio._memobj.banksoff2 = bank.index + + def remove_memory_from_mapping(self, memory, bank): + channels_in_bank = self._get_channel_numbers_in_bank(bank) + try: + channels_in_bank.remove(memory.number) + except KeyError: + raise Exception("Memory %i is not in bank %s. Cannot remove" % + (memory.number, bank)) + self._update_bank_with_channel_numbers(bank, channels_in_bank) + + def get_mapping_memories(self, bank): + memories = [] + for channel in self._get_channel_numbers_in_bank(bank): + memories.append(self._radio.get_memory(channel)) + + return memories + + def get_memory_mappings(self, memory): + banks = [] + for bank in self.get_mappings(): + if memory.number in self._get_channel_numbers_in_bank(bank): + banks.append(bank) + + return banks + + @directory.register class FT2900Radio(YaesuCloneModeRadio): """Yaesu FT-2900""" @@ -303,7 +414,8 @@ rf.has_rx_dtcs = True rf.has_cross = True rf.has_dtcs_polarity = False - rf.has_bank = False + rf.has_bank = True + rf.has_bank_names = True rf.valid_tuning_steps = STEPS rf.valid_modes = MODES @@ -493,6 +605,9 @@ LOG.debug("encoded mem\n%s\n" % (util.hexprint(_mem.get_raw()[0:20]))) + def get_bank_model(self): + return FT2900BankModel(self) + @classmethod def match_model(cls, filedata, filename): return len(filedata) == cls._memsize

1 0

[chirp_devel] Build test results: Successful
by Build System 20 Mar '15

20 Mar '15

Tested changes: [Richard Cochran <ag6qr(a)sonic.net>] [ft2900] Fix cross tone when channel entered via Radio panel (#2445) This submission makes FT-2900 cross tone support more robust, and protects against a problem where the radio would sometimes use the high order bit of the tone and/or DTCS code field as a bit flag. The code had been using the entire byte as an index into the TONES or DTCS_CODES array, and when the high order bit was set, the value was too high by 128, resulting an array bounds error. Fix is to alter MEM_FORMAT to separate the high order bit flags from the lower 7 bit tone and code fields. This also adds some error checking via a "try" block to catch any remaining array bounds errors (though none are expected). And it adds code which attempts to set those bit flags the way the radio would have set them, even though the flags seem to have no effect on the way the radio transmits or receives. Thanks to Chris Fosnight for finding and reporting the problem. [Marco Filippi <iz3gme.marco(a)gmail.com>] [chirpc] Allow deleting an already empty memory On some radio (eg ft817) empty channels can contain valid data, deleting again such a memory usually clean data Improves #2343 [Marco Filippi <iz3gme.marco(a)gmail.com>] [chirpc] Allow memnum arg to be a string to access special channels Special channels are identified by extd_number which can be a string Improves #2343 [Marco Filippi <iz3gme.marco(a)gmail.com>] [chirpc] Add --list-special-mem Add to chirpc the capability to list special channels if any The string memory representation have been changed to print the extd_number when present instead of number Improves #2343 Full log: Started by an SCM change Building in workspace /var/lib/jenkins/jobs/chirp-test/workspace [workspace] $ hg showconfig paths.default [workspace] $ hg pull --rev default [workspace] $ hg update --clean --rev default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved [workspace] $ hg log --rev . --template {node} [workspace] $ hg log --rev . --template {rev} [workspace] $ hg log --rev 5c8ac5597f34af143915667c51ed5882e97e30f7 [workspace] $ hg log --template "<changeset node='{node}' author='{author|xmlescape}' rev='{rev}' date='{date}'><msg>{desc|xmlescape}</msg><added>{file_adds|stringify|xmlescape}</added><deleted>{file_dels|stringify|xmlescape}</deleted><files>{files|stringify|xmlescape}</files><parents>{parents}</parents></changeset>\n" --rev default:0 --follow --prune 5c8ac5597f34af143915667c51ed5882e97e30f7 No emails were triggered. [workspace] $ /bin/sh -xe /tmp/hudson3699824311155019816.sh + ./run_all_tests.sh test_bit_array (tests.unit.test_bitwise.TestBitType) ... ok test_bit_array_fail (tests.unit.test_bitwise.TestBitType) ... ok test_bitfield_u16 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_u24 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_u8 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_ul16 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_ul24 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bbcd (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_bbcd_array (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_lbcd (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_lbcd_array (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_int_array (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u16 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u24 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u32 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u8 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul16 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul24 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul32 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_char (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string_invalid_chars (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string_wrong_length (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_comment_cppstyle (tests.unit.test_bitwise.TestBitwiseComments) ... ok test_comment_inline_cppstyle (tests.unit.test_bitwise.TestBitwiseComments) ... ok test_missing_semicolon (tests.unit.test_bitwise.TestBitwiseErrors) ... ok test_seek (tests.unit.test_bitwise.TestBitwiseSeek) ... ok test_seekto (tests.unit.test_bitwise.TestBitwiseSeek) ... ok test_struct_one_element (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok test_struct_two_elements (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok test_struct_writes (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok split_tone_encode_test_cross_dtcs_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_none_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_none_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_tone_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_tone_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_none (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_tsql (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_dtcs_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_dtcs_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_none_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_none_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_tone_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_tone_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_none (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_tsql (tests.unit.test_chirp_common.TestSplitTone) ... ok test_fix_rounded_step_250 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_fix_rounded_step_500 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_fix_rounded_step_750 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_12_5 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_2_5 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_5_0 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_6_25 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_fractional_step (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_required_step (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_required_step_fail (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_format_freq (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_bad (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_decimal (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_whitespace (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_whole (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_ensure_has_calls_almost_full (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_empty (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_partial (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_rptcall_full1 (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_rptcall_full2 (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_urcall_full (tests.unit.test_import_logic.DstarTests) ... ok test_import_bank (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_dtcs_diffA_dtcs (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_dtcs_diffB_dtcs (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_negative (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_too_big_vhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_uhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_vhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem_with_errors (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem_with_warnings (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_invalid (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_valid_am (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_valid_fm (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_name (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_closest (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_no_dst (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_no_src (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_same (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_tone_diffA_tsql (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_tone_diffB_tsql (tests.unit.test_import_logic.ImportFieldTests) ... ok test_mapping (tests.unit.test_mappingmodel.TestBaseBank) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestBaseBank) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseBankModel) ... ok test_get_name (tests.unit.test_mappingmodel.TestBaseBankModel) ... ok test_mapping (tests.unit.test_mappingmodel.TestBaseMapping) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestBaseMapping) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseMappingModel) ... ok test_get_name (tests.unit.test_mappingmodel.TestBaseMappingModel) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseMappingModelIndexInterface) ... ok test_add_memory_to_mapping (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_mapping_memories (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_memory_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_num_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping_no_bank (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping_wrong_bank (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_icom_bank (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_mapping (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_add_memory_to_mapping (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_index_bounds (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_mapping_memories (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_memory_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_memory_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_next_mapping_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_num_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping_no_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping_wrong_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index_bad_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index_bad_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_auto_tone_mode_cross (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs_pol (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs_rx (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_tone (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_tsql (tests.unit.test_memedit_edits.TestEdits) ... ok test_init (tests.unit.test_platform.Win32PlatformTest) ... ok test_serial_ports_bad_portnames (tests.unit.test_platform.Win32PlatformTest) ... ok test_serial_ports_sorted (tests.unit.test_platform.Win32PlatformTest) ... ok test_apply_callback (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting_group (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting_multi (tests.unit.test_settings.TestSettingContainers) ... ok test_changed (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_boolean (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_float (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_integer (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_list (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_string (tests.unit.test_settings.TestSettingValues) ... ok test_validate_callback (tests.unit.test_settings.TestSettingValues) ... ok test_delete_hole_with_all (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_with_all_full (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_with_hole (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_without_hole (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_insert_hole_with_space (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_insert_hole_without_space (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok ---------------------------------------------------------------------- Ran 151 tests in 0.095s OK Patch 'tip' is OK Checking for PEP8 regressions... real 0m12.003s user 0m9.823s sys 0m0.200s ================================================ Tests OK Email was triggered for: Success Sending email for trigger: Success

1 0

[chirp_devel] [ft2900] Fix cross tone when channel entered via Radio panel (#2445)
by Richard Cochran 20 Mar '15

20 Mar '15

# HG changeset patch # User Richard Cochran <ag6qr(a)sonic.net> # Date 1426824504 25200 # Thu Mar 19 21:08:24 2015 -0700 # Node ID 4a118c9afda7f5fc4781be63d630fca1dbeaa570 # Parent 5c8ac5597f34af143915667c51ed5882e97e30f7 [ft2900] Fix cross tone when channel entered via Radio panel (#2445) This submission makes FT-2900 cross tone support more robust, and protects against a problem where the radio would sometimes use the high order bit of the tone and/or DTCS code field as a bit flag. The code had been using the entire byte as an index into the TONES or DTCS_CODES array, and when the high order bit was set, the value was too high by 128, resulting an array bounds error. Fix is to alter MEM_FORMAT to separate the high order bit flags from the lower 7 bit tone and code fields. This also adds some error checking via a "try" block to catch any remaining array bounds errors (though none are expected). And it adds code which attempts to set those bit flags the way the radio would have set them, even though the flags seem to have no effect on the way the radio transmits or receives. Thanks to Chris Fosnight for finding and reporting the problem. diff -r 5c8ac5597f34 -r 4a118c9afda7 chirp/drivers/ft2900.py --- a/chirp/drivers/ft2900.py Mon Mar 16 21:00:42 2015 -0700 +++ b/chirp/drivers/ft2900.py Thu Mar 19 21:08:24 2015 -0700 @@ -205,11 +205,15 @@ tmode:3; u8 name[6]; bbcd offset[3]; - u8 ctone; - u8 rx_dtcs; + u8 ctonesplitflag:1, + ctone:7; + u8 rx_dtcssplitflag:1, + rx_dtcs:7; u8 unknown5; - u8 rtone; - u8 dtcs; + u8 rtonesplitflag:1, + rtone:7; + u8 dtcssplitflag:1, + dtcs:7; } memory[200]; """ @@ -229,6 +233,24 @@ STEPS = [5.0, 10.0, 12.5, 15.0, 20.0, 25.0, 50.0, 100.0] +def _decode_tone(radiotone): + try: + chirptone = chirp_common.TONES[radiotone] + except IndexError: + chirptone = 100 + LOG.debug("found invalid radio tone: %i\n" % radiotone) + return chirptone + + +def _decode_dtcs(radiodtcs): + try: + chirpdtcs = chirp_common.DTCS_CODES[radiodtcs] + except IndexError: + chirpdtcs = 23 + LOG.debug("found invalid radio dtcs code: %i\n" % radiodtcs) + return chirpdtcs + + def _decode_name(mem): name = "" for i in mem: @@ -359,17 +381,19 @@ else: mem.tmode = "Cross" mem.cross_mode = CROSS_MODES[_mem.tmode - TMODES.index("Cross")] - mem.rtone = chirp_common.TONES[_mem.rtone] - mem.ctone = chirp_common.TONES[_mem.ctone] + + mem.rtone = _decode_tone(_mem.rtone) + mem.ctone = _decode_tone(_mem.ctone) # check for unequal ctone/rtone in TSQL mode. map it as a # cross tone mode - if mem.rtone != mem.ctone and mem.tmode == "TSQL": + if mem.rtone != mem.ctone and (mem.tmode == "TSQL" or + mem.tmode == "Tone"): mem.tmode = "Cross" mem.cross_mode = "Tone->Tone" - mem.dtcs = chirp_common.DTCS_CODES[_mem.dtcs] - mem.rx_dtcs = chirp_common.DTCS_CODES[_mem.rx_dtcs] + mem.dtcs = _decode_dtcs(_mem.dtcs) + mem.rx_dtcs = _decode_dtcs(_mem.rx_dtcs) # check for unequal dtcs/rx_dtcs in DTCS mode. map it as a # cross tone mode @@ -434,14 +458,16 @@ _mem.rx_dtcs = chirp_common.DTCS_CODES.index(mem.rx_dtcs) if mem.cross_mode == "Tone->Tone": # tone->tone cross mode is treated as - # TSQL, but with separate tones for + # Tone, but with separate tones for # send and receive - _mem.tmode = TMODES.index("TSQL") + _mem.tmode = TMODES.index("Tone") + _mem.rtonesplitflag = 1 elif mem.cross_mode == "DTCS->DTCS": # DTCS->DTCS cross mode is treated as # DTCS, but with separate codes for # send and receive _mem.tmode = TMODES.index("DTCS") + _mem.dtcssplitflag = 1 else: _mem.tmode = TMODES.index("Cross") + \ CROSS_MODES.index(mem.cross_mode)

1 0

[chirp_devel] [PATCH 1 of 3] [chirpc] Add --list-special-mem
by Marco Filippi IZ3GME 18 Mar '15

18 Mar '15

# HG changeset patch # User Marco Filippi <iz3gme.marco(a)gmail.com> # Date 1426686272 -3600 # Wed Mar 18 14:44:32 2015 +0100 # Node ID 8d57cc100059afe033fd4d3daf27a94f4a17cb4d # Parent 5c8ac5597f34af143915667c51ed5882e97e30f7 [chirpc] Add --list-special-mem Add to chirpc the capability to list special channels if any The string memory representation have been changed to print the extd_number when present instead of number Improves #2343 diff --git a/chirp/chirp_common.py b/chirp/chirp_common.py --- a/chirp/chirp_common.py +++ b/chirp/chirp_common.py @@ -364,8 +364,9 @@ else: dup = self.duplex - return "Memory %i: %s%s%s %s (%s) r%.1f%s c%.1f%s d%03i%s%s [%.2f]" % \ - (self.number, + return \ + "Memory %s: %s%s%s %s (%s) r%.1f%s c%.1f%s d%03i%s%s [%.2f]" % \ + (self.number if self.extd_number == "" else self.extd_number, format_freq(self.freq), dup, format_freq(self.offset), diff --git a/chirpc b/chirpc --- a/chirpc +++ b/chirpc @@ -105,6 +105,9 @@ memarg.add_argument("--list-mem", action="store_true", help="List all memory locations") + memarg.add_argument("--list-special-mem", action="store_true", + help="List all special memory locations") + memarg.add_argument("--raw", action="store_true", help="Dump raw memory location") @@ -233,6 +236,15 @@ print mem sys.exit(0) + if options.list_special_mem: + rf = radio.get_features() + for i in sorted(rf.valid_special_chans): + mem = radio.get_memory(i) + if mem.empty and not logger.is_visible(logging.INFO): + continue + print mem + sys.exit(0) + if options.copy_mem: src = parse_memory_number(radio, args) dst = parse_memory_number(radio, args[1:])

1 2