# HG changeset patch # User Joseph.P.Scanlan@n7xsd.us # Date 1450809147 28800 # Tue Dec 22 10:32:27 2015 -0800 # Node ID 670f2aedaf51bdf1eddc7b10e99502939a7b77ac # Parent ad91e0acb395551590cd2d9e0e308102fbbeff73 [IC-7000] Add Scan Skip Memory fixes #3085

diff -r ad91e0acb395 -r 670f2aedaf51 chirp/drivers/icomciv.py --- a/chirp/drivers/icomciv.py Sat Dec 19 13:31:26 2015 -0800 +++ b/chirp/drivers/icomciv.py Tue Dec 22 10:32:27 2015 -0800 @@ -17,7 +17,7 @@ MEM_IC7000_FORMAT = """ u8 bank; bbcd number[2]; -u8 unknown1; +u8 skip; lbcd freq[5]; u8 unknown2:5, mode:3; @@ -288,6 +288,10 @@ memobj = f.get_obj() LOG.debug(repr(memobj))

+ if memobj.skip == 1: + mem.skip = "" + else: + mem.skip = "S" mem.freq = int(memobj.freq) mem.mode = self._rf.valid_modes[memobj.mode]

@@ -353,6 +357,10 @@ memobj.number = ch else: memobj.number = mem.number + if mem.skip == "S": + memobj.skip = 0 + else: + memobj.skip = 1 memobj.freq = int(mem.freq) memobj.mode = self._rf.valid_modes.index(mem.mode) if self._rf.has_name: @@ -438,7 +446,7 @@ self._rf.valid_duplexes = ["", "-", "+"] self._rf.valid_bands = [(30000, 199999999), (400000000, 470000000)] self._rf.valid_tuning_steps = [] - self._rf.valid_skips = [] + self._rf.valid_skips = ["S", ""] self._rf.valid_name_length = 9 self._rf.valid_characters = chirp_common.CHARSET_ASCII self._rf.memory_bounds = (0, 99 * self._num_banks - 1)