- Developers - lists.chirpmyradio.com

[chirp_devel] [PATCH] Settings support added to IC-V80 driver. Fixes #174
by Kosta A. 28 Sep '21

28 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632859623 25200 # Tue Sep 28 13:07:03 2021 -0700 # Branch icom # Node ID 8a801f6e14388614d4456466af77f847d52cac27 # Parent 4b8bcf8e6e7e1f446b553847ca6679fb88937dbe Settings support added to IC-V80 driver. Fixes #174 diff --git a/chirp/drivers/icv80.py b/chirp/drivers/icv80.py --- a/chirp/drivers/icv80.py +++ b/chirp/drivers/icv80.py @@ -60,6 +60,61 @@ #seekto 0x0d10; u8 unused[32]; +#seekto 0x0e50; +struct { + u8 unknown1:6, + beep:2; + u8 unknown2:3, + tot:5; + u8 unknown3; + u8 unknown4:6, + auto_pwr_off:2; + u8 unknown5:6, + lockout:2; + u8 unknown6:7, + squelch_delay:1; + u8 unknown7[2]; + u8 unknown8:6, + mem_display:2; + u8 unknown9:7, + dial_func:1; + u8 unknown10:7, + lcd:1; + u8 unknown11:5, + pwr_save:3; + u8 unknown12:7, + sel_speed:1; + u8 unknown13:6, + mic_mode:2; + u8 unknown14:6, + battery_save:2; + u8 unknown15; + u8 unknown16:6, + resume:2; + u8 unknown17:5, + func_mode:3; + u8 unknown18:6, + backlight:2; + u8 unknown19; + u8 unknown:4, + vox_gain:4; + u8 unknown20:6, + mic_gain:2; + u8 unknown21:5 + vox_delay:3; + u8 unknown22:4, + vox_tot:4; + u8 unknown23[2]; + u8 unknown24:6, + edge:2; + u8 unknown25; + u8 unknown26:7, + auto_low_pwr:1; + u8 unknown27[3]; + +} settings; + + """ SPECIAL_CHANNELS = { @@ -118,7 +173,7 @@ rf.has_ctone = True rf.has_offset = True rf.has_bank = False - rf.has_settings = False + rf.has_settings = True return rf @@ -134,6 +189,185 @@ def process_mmap(self): self._memobj = bitwise.parse(ICV80_MEM_FORMAT, self._mmap) + def get_settings(self): + _settings = self._memobj.settings + + setmode = RadioSettingGroup("setmode", "Set Mode") + display = RadioSettingGroup("display", "Display") + sounds = RadioSettingGroup("display", "Sounds") + scan = RadioSettingGroup("scan", "Scan") + settings = RadioSettings(setmode, display, sounds, scan) + + # TOT + opts = ["Off"] + ["%d min" % t for t in range(1, 31)] + setmode.append( + RadioSetting( + "tot", "Time out Timer", + RadioSettingValueList(opts, opts[_settings.tot]))) + + # Lockout + opts = ["Off", "Rpt", "Busy"] + setmode.append( + RadioSetting( + "lockout", "Lockout", + RadioSettingValueList(opts, opts[_settings.lockout]))) + + # Auto Power Off + opts = ["Off", "30 min", "1 hr", "2 hrs"] + setmode.append( + RadioSetting( + "auto_pwr_off", "Auto Power Off", + RadioSettingValueList(opts, opts[_settings.auto_pwr_off]))) + + # Power Save + opts = ["Off", "1:2", "1:8", "1:16", "Auto"] + setmode.append( + RadioSetting( + "pwr_save", "Power Save", + RadioSettingValueList(opts, opts[_settings.pwr_save]))) + + # Battery Save + opts = ["Off", "Ni-MH", "Li-Ion"] + setmode.append( + RadioSetting( + "battery_save", "Battery Save", + RadioSettingValueList(opts, opts[_settings.battery_save]))) + + # Auto Low Power + opts = ["Off", "On"] + setmode.append( + RadioSetting( + "auto_low_pwr", "Auto Low Power", + RadioSettingValueList(opts, opts[_settings.auto_low_pwr]))) + + # Squelch Delay + opts = ["Short", "Long"] + setmode.append( + RadioSetting( + "squelch_delay", "Squelch Delay", + RadioSettingValueList(opts, opts[_settings.squelch_delay]))) + + # MIC Simple Mode + opts = ["Simple", "Normal 1", "Normal 2"] + setmode.append( + RadioSetting( + "mic_mode", "Mic Simple Mode", + RadioSettingValueList(opts, opts[_settings.mic_mode]))) + + # MIC Gain + opts = ["1", "2", "3", "4"] + setmode.append( + RadioSetting( + "mic_gain", "Mic Gain", + RadioSettingValueList(opts, opts[_settings.mic_gain]))) + + # VOX Gain + opts = ["Off"] + ["%d" % t for t in range(1, 11)] + setmode.append( + RadioSetting( + "vox_gain", "VOX Gain", + RadioSettingValueList(opts, opts[_settings.vox_gain]))) + + # VOX Delay + opts = ["0.5 sec", "1.0 sec", "1.5 sec", "2.0 sec", "2.5 sec", "3.0 sec"] + setmode.append( + RadioSetting( + "vox_delay", "VOX Delay", + RadioSettingValueList(opts, opts[_settings.vox_delay]))) + + # VOX Time out Timer + opts = ["Off", "1 min", "2 min", "3 min", "4 min", "5 min", "10 min", "15 min"] + setmode.append( + RadioSetting( + "vox_tot", "VOX Time-Out Timer", + RadioSettingValueList(opts, opts[_settings.vox_tot]))) + + # Select Speed + opts = ["Manual", "Auto"] + setmode.append( + RadioSetting( + "sel_speed", "Select Speed", + RadioSettingValueList(opts, opts[_settings.sel_speed]))) + + # Dial Function + opts = ["Audio Volume", "Tuning Dial"] + setmode.append( + RadioSetting( + "dial_func", "Dial Function", + RadioSettingValueList(opts, opts[_settings.dial_func]))) + + # Function Mode + opts = ["0 sec", "1 sec", "2 sec", "3 sec", "Manual"] + setmode.append( + RadioSetting( + "func_mode", "Function Mode", + RadioSettingValueList(opts, opts[_settings.func_mode]))) + + # Backlight + opts = ["Off", "On", "Auto"] + display.append( + RadioSetting( + "backlight", "Backlight", + RadioSettingValueList(opts, opts[_settings.backlight]))) + + # LCD Contrast + opts = ["Low", "Auto"] + display.append( + RadioSetting( + "lcd", "LCD Contrast", + RadioSettingValueList(opts, opts[_settings.lcd]))) + + # Memory Display + opts = ["Frequency", "Channel", "Name"] + display.append( + RadioSetting( + "mem_display", "Memory Display", + RadioSettingValueList(opts, opts[_settings.mem_display]))) + + # Beep + opts = ["Off", "1", "2", "3"] + sounds.append( + RadioSetting( + "beep", "Beep", + RadioSettingValueList(opts, opts[_settings.beep]))) + + # Edge + opts = ["All", "P1", "P2", "P3"] + scan.append( + RadioSetting( + "edge", "Edge", + RadioSettingValueList(opts, opts[_settings.edge]))) + + # Resume + opts = ["T-5", "T-10", "T-15", "P-2"] + scan.append( + RadioSetting( + "resume", "Resume", + RadioSettingValueList(opts, opts[_settings.resume]))) + + return settings + + def set_settings(self, settings): + _settings = self._memobj.settings + for element in settings: + if not isinstance(element, RadioSetting): + self.set_settings(element) + continue + if not element.changed(): + continue + + try: + if element.has_apply_callback(): + LOG.debug("Using apply callback") + element.run_apply_callback() + else: + setting = element.get_name() + LOG.debug("Setting %s = %s" % (setting, element.value)) + setattr(_settings, setting, element.value) + except Exception, e: + LOG.debug(element.get_name()) + raise + def _get_memory(self, number, extd_number = None): bit = 1 << (number % 8) byte = int(number / 8) @@ -229,7 +463,7 @@ _mem = self._memobj.memory[mem.number] _unused = self._memobj.unused[byte] - _skip = (mem.extd_number == "") and self._memobj.skip[byte] else None + _skip = (mem.extd_number == "") and self._memobj.skip[byte] or None assert(_mem) if mem.empty:

1 0

[chirp_devel] [PATCH] Mark IC-V8 as experimental radio. Fixes #797
by Kosta A. 27 Sep '21

27 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632786532 25200 # Mon Sep 27 16:48:52 2021 -0700 # Branch ic-v8 # Node ID 0eadc225ec3556689c057d1688f20ad0644a10fa # Parent 3f9fe94cbb74db71f5b091237193d1d2d293469e Mark IC-V8 as experimental radio. Fixes #797 diff --git a/chirp/drivers/icv8.py b/chirp/drivers/icv8.py --- a/chirp/drivers/icv8.py +++ b/chirp/drivers/icv8.py @@ -77,7 +77,7 @@ @directory.register -class ICV8Radio(icf.IcomCloneModeRadio): +class ICV8Radio(icf.IcomCloneModeRadio, chirp_common.ExperimentalRadio): """Icom IC-V8""" VENDOR = "Icom" MODEL = "IC-V8" @@ -221,7 +221,7 @@ _mem = self._memobj.memory[mem.number] _unused = self._memobj.unused[byte] - _skip = (mem.extd_number == "") and self._memobj.skip[byte] else None + _skip = (mem.extd_number == "") and self._memobj.skip[byte] or None assert(_mem) if mem.empty:

1 0

[chirp_devel] [PATCH] Minor fix to get raw memories for IC-V86
by Kosta A. 27 Sep '21

27 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632769324 25200 # Mon Sep 27 12:02:04 2021 -0700 # Branch ic-v86 # Node ID 2f0fe9b098c661b27fe2a4bcee180e25813bb4db # Parent 5aa2294d78ea241c6573dcf1929475b072e73685 Minor fix to get raw memories for IC-V86. diff --git a/chirp/drivers/icv86.py b/chirp/drivers/icv86.py --- a/chirp/drivers/icv86.py +++ b/chirp/drivers/icv86.py @@ -80,20 +80,14 @@ """ -SPECIAL = { + +SPECIAL_CHANNELS = { "0A": 200, "0B": 201, "1A": 202, "1B": 203, "2A": 204, "2B": 205, "C": 206, } -SPECIAL_REV = { - 200: "0A", 201: "0B", - 202: "1A", 203: "1B", - 204: "2A", 205: "2B", - 206: "C", -} - TMODES = ["", "Tone", "TSQL", "DTCS", "DTCS-R"] MODES = ["FM", "NFM"] SKIPS = ["", "S"] @@ -132,7 +126,7 @@ rf.valid_power_levels = POWER_LEVELS rf.valid_skips = SKIPS rf.valid_name_length = 5 - rf.valid_special_chans = sorted(SPECIAL.keys()) + rf.valid_special_chans = sorted(SPECIAL_CHANNELS.keys()) rf.valid_bands = [(136000000, 174000000)] rf.has_ctone = True rf.has_offset = True @@ -213,7 +207,7 @@ LOG.debug(element.get_name()) raise - def _get_memory(self, number): + def _get_memory(self, number, extd_number = None): bit = 1 << (number % 8) byte = int(number / 8) @@ -226,7 +220,7 @@ _usd = self._memobj.used[byte] _skp = self._memobj.skips[byte] else: - mem.extd_number = SPECIAL_REV[number] + mem.extd_number = extd_number mem.immutable = ["name", "number", "extd_number", "skip"] _usd = self._memobj.used[byte] if (number <= 206) else None _skp = None @@ -272,13 +266,15 @@ assert(self._mmap) + extd_number = None if isinstance(number, str): try: - number = SPECIAL[number] + extd_number = number + number = SPECIAL_CHANNELS[number] except KeyError: raise errors.InvalidMemoryLocation("Unknown channel %s" % number) - return self._get_memory(number) + return self._get_memory(number, extd_number) def _fill_memory(self, number): _mem = self._memobj.memory[number] @@ -287,7 +283,7 @@ # zero-fill _mem.freq = 146010000 - _mem.offset = 146010000 + _mem.offset = 0x0 _mem.name = str("").ljust(5) _mem.reserved1 = 0x0 _mem.rtone = 0x8 @@ -320,7 +316,6 @@ _mem = self._memobj.memory[mem.number] _usd = self._memobj.used[byte] if mem.number <= 206 else None _skp = self._memobj.skips[byte] if mem.number < 200 else None - assert(_mem) if mem.empty: @@ -352,10 +347,8 @@ _usd &= ~bit if _skp is not None: - if mem.skip == "S": - _skp |= bit - else: - _skp &= ~bit + if mem.skip == "S": _skp |= bit + else: _skp &= ~bit def set_memory(self, mem): if not self._mmap: @@ -366,6 +359,5 @@ return self._set_memory(mem) def get_raw_memory(self, number): - return repr(self._memobj.memory[number]) + \ - repr(self._memobj.flags[(number)]) + return repr(self._memobj.memory[number])

1 0

[chirp_devel] [PATCH] Initial commit of ICOM IC-V8 driver. Fixes #797
by Kosta A. 27 Sep '21

27 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632769135 25200 # Mon Sep 27 11:58:55 2021 -0700 # Branch ic-v8 # Node ID 3f9fe94cbb74db71f5b091237193d1d2d293469e # Parent 5aa2294d78ea241c6573dcf1929475b072e73685 Initial commit of ICOM IC-V8 driver. Fixes #797 diff --git a/chirp/drivers/icv8.py b/chirp/drivers/icv8.py new file mode 100644 --- /dev/null +++ b/chirp/drivers/icv8.py @@ -0,0 +1,262 @@ +# Copyright 2008 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 logging + +from chirp.drivers import icf +from chirp import chirp_common, memmap, bitwise, errors, directory +from chirp.settings import RadioSetting, RadioSettingGroup, \ + RadioSettingValueInteger, RadioSettingValueList, \ + RadioSettingValueBoolean, RadioSettingValueString, \ + RadioSettingValueFloat, RadioSettings + +LOG = logging.getLogger(__name__) + + +ICV8_MEM_FORMAT = """ + +#seekto 0x0000; +struct { + u16 freq; + u16 offset; + u8 mult:1, + offset_mult:1, + unknown:1, + tmode:2, + unknown:3; + u8 duplex:2, + power:1, + unknown:5; + u8 unknown:6, + reverse_duplex:1, + tx_inhibit:1; + char name[5]; + u8 unknown:2, + rtone:6; + u8 unknown:2, + ctone:6; + u8 unknown:1, + dtcs:7; + u8 unknown; +} memory[107]; + +#seekto 0x06c0; +u8 skip[16]; + +#seekto 0x06d0; +u8 unused[16]; + +""" + +SPECIAL_CHANNELS = { + "1A": 100, "1B": 101, + "2A": 102, "2B": 103, + "3A": 104, "3B": 105, + "C": 106, +} + +TMODES = ["", "Tone", "TSQL", "DTCS"] +SKIPS = ["", "S"] +DUPLEXES = ["", "", "-", "+"] +POWER_LEVELS = [ + chirp_common.PowerLevel("High", watts=5.5), + chirp_common.PowerLevel("Low", watts=0.5) +] + + +(a)directory.register +class ICV8Radio(icf.IcomCloneModeRadio): + """Icom IC-V8""" + VENDOR = "Icom" + MODEL = "IC-V8" + + _model = "\x24\x68\x00\x01" + _memsize = 1936 + _endframe = "Icom Inc\x2eCD" + + _ranges = [(0x0000, 1936, 16)] + + @classmethod + def get_prompts(cls): + rp = chirp_common.RadioPrompts() + rp.experimental = ("This radio driver is currently under development, " + "and not all the features or functions may work as" + "expected. You should proceed with caution.") + return rp + + def get_features(self): + rf = chirp_common.RadioFeatures() + + rf.memory_bounds = (0, 99) + rf.valid_tmodes = TMODES + rf.valid_duplexes = DUPLEXES + rf.valid_power_levels = POWER_LEVELS + rf.valid_skips = SKIPS + rf.valid_name_length = 5 + rf.valid_special_chans = sorted(SPECIAL_CHANNELS.keys()) + rf.valid_bands = [(136000000, 174000000)] + rf.has_mode = False + rf.has_dtcs_polarity = False + rf.has_tuning_step = False + rf.has_ctone = True + rf.has_offset = True + rf.has_bank = False + rf.has_settings = False + + return rf + + def __init__(self, pipe): + icf.IcomCloneModeRadio.__init__(self, pipe) + + def sync_in(self): + icf.IcomCloneModeRadio.sync_in(self) + + def sync_out(self): + icf.IcomCloneModeRadio.sync_out(self) + + def process_mmap(self): + self._memobj = bitwise.parse(ICV8_MEM_FORMAT, self._mmap) + + def _get_memory(self, number, extd_number = None): + bit = 1 << (number % 8) + byte = int(number / 8) + + _mem = self._memobj.memory[number] + _unused = self._memobj.unused[byte] + _skip = self._memobj.skip[byte] + assert(_mem) + + + mem = chirp_common.Memory(number) + + if not extd_number is None: + mem.extd_number = extd_number + mem.immutable = ["number", "extd_number", "skip"] + if extd_number == "C": + _unused = False + + if (_unused & bit): + mem.empty = True + return mem + + mem.freq = int(_mem.freq) * (_mem.mult and 6250 or 5000) + mem.offset = int(_mem.offset) * (_mem.offset_mult and 6250 or 5000) + mem.name = str(_mem.name).rstrip() + if mem.extd_number == "": + mem.skip = (_skip & bit) and "S" or "" + mem.duplex = DUPLEXES[_mem.duplex] + mem.power = POWER_LEVELS[_mem.power] + mem.tmode = TMODES[_mem.tmode] + mem.rtone = chirp_common.TONES[_mem.rtone] + mem.ctone = chirp_common.TONES[_mem.ctone] + mem.dtcs = chirp_common.DTCS_CODES[_mem.dtcs] + + # Reverse duplex + mem.extra = RadioSettingGroup("extra", "Extra") + rev = RadioSetting("reverse_duplex", "Reverse duplex", + RadioSettingValueBoolean(bool(_mem.reverse_duplex))) + rev.set_doc("Reverse duplex") + mem.extra.append(rev) + + # Tx inhibit + tx_inhibit = RadioSetting("tx_inhibit", "TX inhibit", + RadioSettingValueBoolean(bool(_mem.tx_inhibit))) + tx_inhibit.set_doc("TX inhibit") + mem.extra.append(tx_inhibit) + + return mem + + def get_memory(self, number): + if not self._mmap: + self.sync_in() + + extd_number = None + if isinstance(number, str): + try: + extd_number = number + number = SPECIAL_CHANNELS[number] + except KeyError: + raise errors.InvalidMemoryLocation("Unknown channel %s" % number) + + return self._get_memory(number, extd_number) + + def _fill_memory(self, number): + _mem = self._memobj.memory[number] + assert(_mem) + + # zero-fill + _mem.freq = 146010000 / 6250 + _mem.offset = 600000 / 6250 + _mem.mult = 0x1 + _mem.offset_mult = 0x1 + _mem.name = str("").ljust(5) + _mem.duplex = 0x0 + _mem.reverse_duplex = 0x0 + _mem.tx_inhibit = 0x0 + _mem.power = 0x0 + _mem.tmode = 0x0 + _mem.rtone = 0x8 + _mem.ctone = 0x8 + _mem.dtcs = 0x0 + + for setting in mem.extra: + setattr(_mem, setting.get_name(), setting.value) + + + def _set_memory(self, mem): + bit = 1 << (number % 8) + byte = int(number / 8) + + _mem = self._memobj.memory[mem.number] + _unused = self._memobj.unused[byte] + _skip = (mem.extd_number == "") and self._memobj.skip[byte] else None + assert(_mem) + + if mem.empty: + self._fill_memory(mem.number) + _unused |= bit + if skip is not None: + _skip |= bit + return + + _mem.mult = chirp_common.is_fractional_step(mem.freq) + _mem.freq = mem.freq / (_mem.mult and 6250 or 5000) + _mem.offset_mult = chirp_common.is_fractional_step(mem.offset) + _mem.offset = int(mem.offset) / (_mem.offset_mult and 6250 or 5000) + _mem.name = str(mem.name).ljust(5) + _mem.duplex = DUPLEXES.index(mem.duplex) + _mem.power = POWER_LEVELS.index(mem.power) + _mem.tmode = TMODES.index(mem.tmode) + _mem.rtone = chirp_common.TONES.index(mem.rtone) + _mem.ctone = chirp_common.TONES.index(mem.ctone) + _mem.dtcs = chirp_common.DTCS_CODES.index(mem.dtcs) + + # Set used + _unused &= ~bit + + # Set skip + if _skip is not None: + if mem.skip == "S": _skip |= bit + else: _skip &= ~bit + + def set_memory(self, mem): + if not self._mmap: + self.sync_in() + assert(self._mmap) + + return self._set_memory(mem) + + def get_raw_memory(self, number): + return repr(self._memobj.memory[number])

1 0

[chirp_devel] [PATCH] Subsequent support for skip memories in IC-V80 driver. Fixes #174
by Kosta A. 27 Sep '21

27 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632768989 25200 # Mon Sep 27 11:56:29 2021 -0700 # Branch ic-v80 # Node ID 3ab4ec573170d5dc4e39c9cb205ca859ca203d7c # Parent 3ad6b73fb2b466d3c14bb8c30d4d046d821a0568 Subsequent support for skip memories in IC-V80 driver. Fixes #174 diff --git a/chirp/drivers/icv80.py b/chirp/drivers/icv80.py --- a/chirp/drivers/icv80.py +++ b/chirp/drivers/icv80.py @@ -157,7 +157,7 @@ mem.freq = int(_mem.freq) * 5000 mem.offset = int(_mem.offset) * 5000 - if extd_number is None: + if mem.extd_number == "": mem.name = str(_mem.name).rstrip() mem.skip = (_skip & bit) and "S" or "" mem.duplex = DUPLEXES[_mem.duplex] @@ -229,12 +229,14 @@ _mem = self._memobj.memory[mem.number] _unused = self._memobj.unused[byte] + _skip = (mem.extd_number == "") and self._memobj.skip[byte] else None assert(_mem) if mem.empty: self._fill_memory(mem.number) _unused |= bit - _skip |= bit + if _skip is not None: + _skip |= bit return _mem.freq = mem.freq / 5000 @@ -251,13 +253,12 @@ _mem.dtcs_polarity = DTCS_POLARITY.index(mem.dtcs_polarity) # Set used - _usd &= ~bit + _unused &= ~bit # Set skip - if mem.skip == "S": - _skp |= bit - else: - _skp &= ~bit + if _skip is not None: + if mem.skip == "S": _skip |= bit + else: _skip &= ~bit def set_memory(self, mem): if not self._mmap: @@ -267,6 +268,4 @@ return self._set_memory(mem) def get_raw_memory(self, number): - return repr(self._memobj.memory[number]) + \ - repr(self._memobj.flags[(number)]) - + return repr(self._memobj.memory[number])

1 0

[chirp_devel] [PATCH] Subsequent support for skip memories in IC-V85 driver. Fixes #276
by Kosta A. 27 Sep '21

27 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632768644 25200 # Mon Sep 27 11:50:44 2021 -0700 # Branch ic-v85 # Node ID 162de81d78bdf12eb5da8e206e84d781957bc1eb # Parent a478d318143bb7ded2bac5e241156e6c707b0042 Subsequent support for skip memories in IC-V85 driver. Fixes #276 diff --git a/chirp/drivers/icv85.py b/chirp/drivers/icv85.py --- a/chirp/drivers/icv85.py +++ b/chirp/drivers/icv85.py @@ -65,8 +65,8 @@ SPECIAL_CHANNELS = { "1A": 100, "1B": 101, - "2A": 102, "1B": 103, - "3A": 104, "1B": 105, + "2A": 102, "2B": 103, + "3A": 104, "3B": 105, "C": 106, } @@ -168,9 +168,9 @@ mem.freq = int(_mem.freq) * 5000 mem.offset = int(_mem.offset) * 5000 - if number < 100: + if mem.extd_number == "": mem.name = str(_mem.name).rstrip() - if not extd_number == "C": + if not mem.extd_number == "C": mem.skip = (_flag.skip) and "S" or "" mem.duplex = DUPLEXES[_mem.duplex] mem.power = POWER_LEVELS[_mem.power] @@ -257,8 +257,12 @@ _mem.dtcs = chirp_common.DTCS_CODES.index(mem.dtcs) _mem.dtcs_polarity = DTCS_POLARITY.index(mem.dtcs_polarity) + # Set used _flag.unused = False - _flag.skip = mem.skip == "S" + + # Set skip + if not mem.extd_number == "C": + _flag.skip = mem.skip == "S" def set_memory(self, mem): if not self._mmap:

1 0

[chirp_devel] [PATCH] Initial commit of ICOM IC-V85. Fixes #276
by Kosta A. 26 Sep '21

26 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632720415 25200 # Sun Sep 26 22:26:55 2021 -0700 # Branch ic-v85 # Node ID a478d318143bb7ded2bac5e241156e6c707b0042 # Parent 5aa2294d78ea241c6573dcf1929475b072e73685 Initial commit of ICOM IC-V85. Fixes #276 diff --git a/chirp/drivers/icv85.py b/chirp/drivers/icv85.py new file mode 100644 --- /dev/null +++ b/chirp/drivers/icv85.py @@ -0,0 +1,273 @@ +# Copyright 2008 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 logging + +from chirp.drivers import icf +from chirp import chirp_common, memmap, bitwise, errors, directory +from chirp.settings import RadioSetting, RadioSettingGroup, \ + RadioSettingValueInteger, RadioSettingValueList, \ + RadioSettingValueBoolean, RadioSettingValueString, \ + RadioSettingValueFloat, RadioSettings + +LOG = logging.getLogger(__name__) + + +ICV85_MEM_FORMAT = """ + +struct { + ul16 freq; + ul16 offset; + char name[5]; + u8 unknown0:2, + rtone:6; + u8 unknown1:2, + ctone:6; + u8 unknown2:1, + dtcs:7; + u8 unknown3; + u8 unknown4:1, + tuning_step:3, + unknown5:4; + u8 unknown6:2, + power:2, + tmode:2, + dtcs_polarity:2; + u8 duplex:2, + unknown7:2, + reverse_duplex:1, + tx_inhibit:1, + unknown8:2; +} memory[108]; + +#seekto 0x06b0; +struct { + u8 unknown1:2, + unused:1, + skip:1, + bank:4; +} flags[108]; + + +""" + +SPECIAL_CHANNELS = { + "1A": 100, "1B": 101, + "2A": 102, "1B": 103, + "3A": 104, "1B": 105, + "C": 106, +} + +TMODES = ["", "Tone", "TSQL", "DTCS"] +MODES = ["FM"] +SKIPS = ["", "S"] +DUPLEXES = ["", "-", "+"] +DTCS_POLARITY = ["NN", "NR", "RN", "RR"] +TUNING_STEPS = [5., 10., 12.5, 15., 20., 25., 30., 50.] +POWER_LEVELS = [ + chirp_common.PowerLevel("High", watts=7.0), + chirp_common.PowerLevel("Low", watts=0.5), + chirp_common.PowerLevel("Mid", watts=4.0) +] + + +(a)directory.register +class ICV85Radio(icf.IcomCloneModeRadio, chirp_common.ExperimentalRadio): + """Icom IC-V85""" + VENDOR = "Icom" + MODEL = "IC-V85" + + _model = "\x29\x64\x00\x01" + _memsize = 2240 + _endframe = "Icom Inc\x2e" + + _ranges = [(0x0000, 2240, 16)] + + @classmethod + def get_prompts(cls): + rp = chirp_common.RadioPrompts() + rp.experimental = ("This radio driver is currently under development, " + "and not all the features or functions may work as" + "expected. You should proceed with caution.") + return rp + + def get_features(self): + rf = chirp_common.RadioFeatures() + + rf.memory_bounds = (0, 99) + rf.valid_modes = MODES + rf.valid_tmodes = TMODES + rf.valid_duplexes = DUPLEXES + rf.valid_tuning_steps = TUNING_STEPS + rf.valid_power_levels = POWER_LEVELS + rf.valid_skips = SKIPS + rf.valid_name_length = 5 + rf.valid_special_chans = sorted(SPECIAL_CHANNELS.keys()) + rf.valid_bands = [(136000000, 174000000)] + rf.has_ctone = True + rf.has_offset = True + rf.has_bank = True + rf.has_settings = False + + return rf + + def __init__(self, pipe): + icf.IcomCloneModeRadio.__init__(self, pipe) + + def sync_in(self): + icf.IcomCloneModeRadio.sync_in(self) + + def sync_out(self): + icf.IcomCloneModeRadio.sync_out(self) + + def process_mmap(self): + self._memobj = bitwise.parse(ICV85_MEM_FORMAT, self._mmap) + + def _get_bank(self, number): + _flag = self._memobj.flags[number] + if _flag.bank == 0x0a: + return None + else: + return _flag.bank + + def _set_bank(self, number, bank): + _flag = self._memobj.flags[number] + if bank is None: + _flag.bank = 0x0a + else: + _flag.bank = bank + + def _get_memory(self, number, extd_number = None): + _mem = self._memobj.memory[number] + _flag = self._memobj.flags[number] + assert(_mem and _flag) + + mem = chirp_common.Memory(number) + + if number >= 100: + mem.extd_number = extd_number + mem.immutable = ["name", "number", "extd_number"] + if extd_number == "C": + mem.immutable.append("skip") + + if _flag.unused: + mem.empty = True + return mem + + mem.freq = int(_mem.freq) * 5000 + mem.offset = int(_mem.offset) * 5000 + if number < 100: + mem.name = str(_mem.name).rstrip() + if not extd_number == "C": + mem.skip = (_flag.skip) and "S" or "" + mem.duplex = DUPLEXES[_mem.duplex] + mem.power = POWER_LEVELS[_mem.power] + mem.tuning_step = TUNING_STEPS[_mem.tuning_step] + mem.tmode = TMODES[_mem.tmode] + mem.rtone = chirp_common.TONES[_mem.rtone] + mem.ctone = chirp_common.TONES[_mem.ctone] + mem.dtcs = chirp_common.DTCS_CODES[_mem.dtcs] + mem.dtcs_polarity = DTCS_POLARITY[_mem.dtcs_polarity] + + # Reverse duplex + mem.extra = RadioSettingGroup("extra", "Extra") + rev = RadioSetting("reverse_duplex", "Reverse duplex", + RadioSettingValueBoolean(bool(_mem.reverse_duplex))) + rev.set_doc("Reverse duplex") + mem.extra.append(rev) + + # Tx inhibit + tx_inhibit = RadioSetting("tx_inhibit", "TX inhibit", + RadioSettingValueBoolean(bool(not _mem.tx_inhibit))) + tx_inhibit.set_doc("TX inhibit") + mem.extra.append(tx_inhibit) + + return mem + + def get_memory(self, number): + if not self._mmap: + self.sync_in() + assert(self._mmap) + + extd_number = None + if isinstance(number, str): + try: + extd_number = number + number = SPECIAL_CHANNELS[number] + except KeyError: + raise errors.InvalidMemoryLocation("Unknown channel %s" % number) + + return self._get_memory(number, extd_number) + + def _fill_memory(self, number): + _mem = self._memobj.memory[number] + assert(_mem) + + # zero-fill + _mem.freq = 146010000 / 5000 + _mem.offset = 600000 / 5000 + _mem.name = str("").ljust(5) + _mem.duplex = 0x0 + _mem.reverse_duplex = 0x0 + _mem.tx_inhibit = 0x1 + _mem.power = 0x0 + _mem.tuning_step = 0x0 + _mem.tmode = 0x0 + _mem.skip = 0x0 + _mem.rtone = 0x8 + _mem.ctone = 0x8 + _mem.dtcs = 0x0 + _mem.dtcs_polarity = 0x0 + + for setting in mem.extra: + setattr(_mem, setting.get_name(), setting.value) + + + def _set_memory(self, mem): + _mem = self._memobj.memory[mem.number] + _flag = self._memobj.flags[number] + assert(_mem and _flag) + + if mem.empty: + self._fill_memory(mem.number) + _flag.unused = True + return + + _mem.freq = mem.freq / 5000 + _mem.offset = int(mem.offset) / 5000 + _mem.name = str(mem.name).ljust(5) + _mem.duplex = DUPLEXES.index(mem.duplex) + _mem.power = POWER_LEVELS.index(mem.power) + _mem.tuning_step = TUNING_STEPS.index(mem.tuning_step) + _mem.tmode = TMODES.index(mem.tmode) + _mem.rtone = chirp_common.TONES.index(mem.rtone) + _mem.ctone = chirp_common.TONES.index(mem.ctone) + _mem.dtcs = chirp_common.DTCS_CODES.index(mem.dtcs) + _mem.dtcs_polarity = DTCS_POLARITY.index(mem.dtcs_polarity) + + _flag.unused = False + _flag.skip = mem.skip == "S" + + def set_memory(self, mem): + if not self._mmap: + self.sync_in() + assert(self._mmap) + + return self._set_memory(mem) + + def get_raw_memory(self, number): + return repr(self._memobj.memory[number]) + \ + repr(self._memobj.flags[(number)]) +

1 0

[chirp_devel] [PATCH] Initial commit of ICOM IC-V80 driver. Fixes #174
by Kosta A. 26 Sep '21

26 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632720172 25200 # Sun Sep 26 22:22:52 2021 -0700 # Branch ic-v80 # Node ID 3ad6b73fb2b466d3c14bb8c30d4d046d821a0568 # Parent 5aa2294d78ea241c6573dcf1929475b072e73685 Initial commit of ICOM IC-V80 driver. Fixes #174 diff --git a/chirp/drivers/icv80.py b/chirp/drivers/icv80.py new file mode 100644 --- /dev/null +++ b/chirp/drivers/icv80.py @@ -0,0 +1,272 @@ +# Copyright 2008 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 logging + +from chirp.drivers import icf +from chirp import chirp_common, memmap, bitwise, errors, directory +from chirp.settings import RadioSetting, RadioSettingGroup, \ + RadioSettingValueInteger, RadioSettingValueList, \ + RadioSettingValueBoolean, RadioSettingValueString, \ + RadioSettingValueFloat, RadioSettings + +LOG = logging.getLogger(__name__) + + +ICV80_MEM_FORMAT = """ + +#seekto 0x0000; +struct { + ul16 freq; + ul16 offset; + char name[5]; + u8 unknown0:2, + rtone:6; + u8 unknown1:2, + ctone:6; + u8 unknown2:1, + dtcs:7; + u8 unknown3:5, + tuning_step:3; + u8 unknown4:2, + mode:1, + reverse_duplex:1, + duplex:2, + unknown5:2; + u8 unknown6:2, + dtcs_polarity:2, + unknown8:2, + tmode:2; + u8 unknown8:5, + tx_inhibit:1, + power:2; +} memory[208]; + +#seekto 0x0cf0; +u8 skip[32]; + +#seekto 0x0d10; +u8 unused[32]; + +""" + +SPECIAL_CHANNELS = { + "1A": 200, "1B": 201, + "2A": 202, "2B": 203, + "3A": 204, "3B": 205, + "C": 206, +} + +TMODES = ["", "Tone", "TSQL", "DTCS"] +MODES = ["FM", "NFM"] +SKIPS = ["", "S"] +DUPLEXES = ["", "-", "+"] +DTCS_POLARITY = ["NN", "NR", "RN", "RR"] +TUNING_STEPS = [5., 10., 12.5, 15., 20., 25., 30., 50.] +POWER_LEVELS = [ + chirp_common.PowerLevel("High", watts=5.5), + chirp_common.PowerLevel("Low", watts=0.5), + chirp_common.PowerLevel("Mid", watts=2.5) +] + + +(a)directory.register +class ICV80Radio(icf.IcomCloneModeRadio, chirp_common.ExperimentalRadio): + """Icom IC-V80""" + VENDOR = "Icom" + MODEL = "IC-V80" + + _model = "\x32\x54\x00\x01" + _memsize = 3712 + _endframe = "Icom Inc\x2e" + + _ranges = [(0x0000, 3712, 16)] + + @classmethod + def get_prompts(cls): + rp = chirp_common.RadioPrompts() + rp.experimental = ("This radio driver is currently under development, " + "and not all the features or functions may work as" + "expected. You should proceed with caution.") + return rp + + def get_features(self): + rf = chirp_common.RadioFeatures() + + rf.memory_bounds = (0, 199) + rf.valid_modes = MODES + rf.valid_tmodes = TMODES + rf.valid_duplexes = DUPLEXES + rf.valid_tuning_steps = TUNING_STEPS + rf.valid_power_levels = POWER_LEVELS + rf.valid_skips = SKIPS + rf.valid_name_length = 5 + rf.valid_special_chans = sorted(SPECIAL_CHANNELS.keys()) + rf.valid_bands = [(136000000, 174000000)] + rf.has_ctone = True + rf.has_offset = True + rf.has_bank = False + rf.has_settings = False + + return rf + + def __init__(self, pipe): + icf.IcomCloneModeRadio.__init__(self, pipe) + + def sync_in(self): + icf.IcomCloneModeRadio.sync_in(self) + + def sync_out(self): + icf.IcomCloneModeRadio.sync_out(self) + + def process_mmap(self): + self._memobj = bitwise.parse(ICV80_MEM_FORMAT, self._mmap) + + def _get_memory(self, number, extd_number = None): + bit = 1 << (number % 8) + byte = int(number / 8) + + _mem = self._memobj.memory[number] + _unused = self._memobj.unused[byte] + _skip = self._memobj.skip[byte] + assert(_mem) + + mem = chirp_common.Memory(number) + + if not extd_number is None: + mem.extd_number = extd_number + mem.immutable = ["name", "number", "extd_number", "skip"] + if extd_number == "C": + _unused = False + + if (_unused & bit): + mem.empty = True + return mem + + mem.freq = int(_mem.freq) * 5000 + mem.offset = int(_mem.offset) * 5000 + if extd_number is None: + mem.name = str(_mem.name).rstrip() + mem.skip = (_skip & bit) and "S" or "" + mem.duplex = DUPLEXES[_mem.duplex] + mem.power = POWER_LEVELS[_mem.power] + mem.tuning_step = TUNING_STEPS[_mem.tuning_step] + mem.mode = MODES[_mem.mode] + mem.tmode = TMODES[_mem.tmode] + mem.rtone = chirp_common.TONES[_mem.rtone] + mem.ctone = chirp_common.TONES[_mem.ctone] + mem.dtcs = chirp_common.DTCS_CODES[_mem.dtcs] + mem.dtcs_polarity = DTCS_POLARITY[_mem.dtcs_polarity] + + # Reverse duplex + mem.extra = RadioSettingGroup("extra", "Extra") + rev = RadioSetting("reverse_duplex", "Reverse duplex", + RadioSettingValueBoolean(bool(_mem.reverse_duplex))) + rev.set_doc("Reverse duplex") + mem.extra.append(rev) + + # Tx inhibit + tx_inhibit = RadioSetting("tx_inhibit", "TX inhibit", + RadioSettingValueBoolean(bool(not _mem.tx_inhibit))) + tx_inhibit.set_doc("TX inhibit") + mem.extra.append(tx_inhibit) + + return mem + + def get_memory(self, number): + if not self._mmap: + self.sync_in() + + extd_number = None + if isinstance(number, str): + try: + extd_number = number + number = SPECIAL_CHANNELS[number] + except KeyError: + raise errors.InvalidMemoryLocation("Unknown channel %s" % number) + + return self._get_memory(number, extd_number) + + def _fill_memory(self, number): + _mem = self._memobj.memory[number] + assert(_mem) + + # zero-fill + _mem.freq = 146010000 / 5000 + _mem.offset = 600000 / 5000 + _mem.name = str("").ljust(5) + _mem.duplex = 0x0 + _mem.reverse_duplex = 0x0 + _mem.tx_inhibit = 0x1 + _mem.power = 0x0 + _mem.tuning_step = 0x0 + _mem.mode = 0x0 + _mem.tmode = 0x0 + _mem.rtone = 0x8 + _mem.ctone = 0x8 + _mem.dtcs = 0x0 + _mem.dtcs_polarity = 0x0 + + for setting in mem.extra: + setattr(_mem, setting.get_name(), setting.value) + + + def _set_memory(self, mem): + bit = 1 << (number % 8) + byte = int(number / 8) + + _mem = self._memobj.memory[mem.number] + _unused = self._memobj.unused[byte] + assert(_mem) + + if mem.empty: + self._fill_memory(mem.number) + _unused |= bit + _skip |= bit + return + + _mem.freq = mem.freq / 5000 + _mem.offset = int(mem.offset) / 5000 + _mem.name = str(mem.name).ljust(5) + _mem.duplex = DUPLEXES.index(mem.duplex) + _mem.power = POWER_LEVELS.index(mem.power) + _mem.tuning_step = TUNING_STEPS.index(mem.tuning_step) + _mem.mode = MODES.index(mem.mode) + _mem.tmode = TMODES.index(mem.tmode) + _mem.rtone = chirp_common.TONES.index(mem.rtone) + _mem.ctone = chirp_common.TONES.index(mem.ctone) + _mem.dtcs = chirp_common.DTCS_CODES.index(mem.dtcs) + _mem.dtcs_polarity = DTCS_POLARITY.index(mem.dtcs_polarity) + + # Set used + _usd &= ~bit + + # Set skip + if mem.skip == "S": + _skp |= bit + else: + _skp &= ~bit + + def set_memory(self, mem): + if not self._mmap: + self.sync_in() + assert(self._mmap) + + return self._set_memory(mem) + + def get_raw_memory(self, number): + return repr(self._memobj.memory[number]) + \ + repr(self._memobj.flags[(number)]) +

1 0

[chirp_devel] [PATCH] [wxui] Replace deprecated use of Append to AppendSubMenu Fixes #9395
by Joseph.P.Scanlan＠n7xsd.us 26 Sep '21

26 Sep '21

# HG changeset patch # User <Joseph.P.Scanlan(a)n7xsd.us> # Date 1632699023 25200 # Sun Sep 26 16:30:23 2021 -0700 # Branch py3 # Node ID 9fb5b8995942e5d2d19090967aa2d591c37eb796 # Parent 587f8b0d752f180bb0991c702bc921224e800bd2 [wxui] Replace deprecated use of Append to AppendSubMenu Fixes #9395 diff -r 587f8b0d752f -r 9fb5b8995942 chirp/wxui/main.py --- a/chirp/wxui/main.py Sun Sep 26 15:56:43 2021 -0700 +++ b/chirp/wxui/main.py Sun Sep 26 16:30:23 2021 -0700 @@ -209,7 +209,7 @@ EMPTY_MENU_LABEL) submenu_item.Enable(False) self.Bind(wx.EVT_MENU, self._menu_open_recent, submenu_item) - file_menu.Append(wx.ID_ANY, 'Open Recent', self.OPEN_RECENT_MENU) + file_menu.AppendSubMenu(self.OPEN_RECENT_MENU, 'Open Recent') save_item = file_menu.Append(wx.ID_SAVE) self.Bind(wx.EVT_MENU, self._menu_save, save_item)

1 0

[chirp_devel] [PATCH] [wxui] Make "Open" in "File" menu work with last_dir in chirp.config PY3 #9379
by Joseph.P.Scanlan＠n7xsd.us 26 Sep '21

26 Sep '21

# HG changeset patch # User <Joseph.P.Scanlan(a)n7xsd.us> # Date 1632697003 25200 # Sun Sep 26 15:56:43 2021 -0700 # Branch py3 # Node ID 587f8b0d752f180bb0991c702bc921224e800bd2 # Parent 767a2b7ea346019d66869b61caafab5fe666b932 [wxui] Make "Open" in "File" menu work with last_dir in chirp.config PY3 #9379 diff -r 767a2b7ea346 -r 587f8b0d752f chirp/wxui/main.py --- a/chirp/wxui/main.py Tue Sep 14 13:50:11 2021 -0700 +++ b/chirp/wxui/main.py Sun Sep 26 15:56:43 2021 -0700 @@ -9,6 +9,7 @@ import wx.lib.newevent from chirp import directory +from chirp import platform from chirp.ui import config from chirp.wxui import common from chirp.wxui import clone @@ -142,6 +143,10 @@ self.SetSize(int(CONF.get('window_w', 'state') or 1024), int(CONF.get('window_h', 'state') or 768)) + d = CONF.get('last_dir', 'state') + if d and os.path.isdir(d): + platform.get_platform().set_last_dir(d) + self.SetMenuBar(self.make_menubar()) # Stock items look good on linux, terrible on others, @@ -433,11 +438,17 @@ wildcard = '|'.join(['Chirp Image Files (*.img)|*.img', 'CSV Files (*.csv)|*.csv', 'All Files (*.*)|*.*']) - with wx.FileDialog(self, 'Open a file', wildcard=wildcard, + with wx.FileDialog(self, 'Open a file', + platform.get_platform().get_last_dir(), + wildcard=wildcard, style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST) as fd: if fd.ShowModal() == wx.ID_CANCEL: return filename = fd.GetPath() + d = fd.GetDirectory() + platform.get_platform().set_last_dir(d) + CONF.set('last_dir', d, 'state') + config._CONFIG.save() self.open_file(str(filename)) def _menu_open_recent(self, event):

1 0