March 2017 - Developers - lists.chirpmyradio.com

[chirp_devel] [PATCH] Support pySerial 3+. Fixes #3167 #3209 #3521 #3671 #3703
by Tom Hayward 03 Feb '18

03 Feb '18

# HG changeset patch # User Tom Hayward <tom(a)tomh.us> # Date 1465361362 25200 # Tue Jun 07 21:49:22 2016 -0700 # Node ID d1bc2c9177858ff87c86e08447513f53794c2868 # Parent 333a280ca0c4e856258ebf9dfdb7c547fa9ec90c Support pySerial 3+. Fixes #3167 #3209 #3521 #3671 #3703 diff -r 333a280ca0c4 -r d1bc2c917785 chirp/detect.py --- a/chirp/detect.py Wed Jun 01 17:30:31 2016 -0700 +++ b/chirp/detect.py Tue Jun 07 21:49:22 2016 -0700 @@ -39,7 +39,7 @@ # ICOM VHF/UHF Clone-type radios @ 9600 baud try: - ser.setBaudrate(9600) + ser.baudrate = 9600 md = icf.get_model_data(ser) return _icom_model_data_to_rclass(md) except errors.RadioError, e: @@ -47,7 +47,7 @@ # ICOM IC-91/92 Live-mode radios @ 4800/38400 baud - ser.setBaudrate(4800) + ser.baudrate = 4800 try: ic9x_ll.send_magic(ser) return _icom_model_data_to_rclass("ic9x") @@ -58,7 +58,7 @@ for rate in [9600, 4800, 19200]: try: - ser.setBaudrate(rate) + ser.baudrate = rate return icomciv.probe_model(ser) except errors.RadioError: pass diff -r 333a280ca0c4 -r d1bc2c917785 chirp/drivers/btech.py --- a/chirp/drivers/btech.py Wed Jun 01 17:30:31 2016 -0700 +++ b/chirp/drivers/btech.py Tue Jun 07 21:49:22 2016 -0700 @@ -332,7 +332,7 @@ # touching the serial timeout to optimize the flushing # restored at the end to the default value - radio.pipe.setTimeout(0.1) + radio.pipe.timeout = 0.1 dump = "1" datacount = 0 @@ -347,7 +347,7 @@ raise errors.RadioError(seriale) # restore the default serial timeout - radio.pipe.setTimeout(STIMEOUT) + radio.pipe.timeout = STIMEOUT except Exception: raise errors.RadioError("Unknown error cleaning the serial buffer") @@ -477,8 +477,8 @@ def _do_ident(radio, status, upload=False): """Put the radio in PROGRAM mode & identify it""" # set the serial discipline - radio.pipe.setBaudrate(9600) - radio.pipe.setParity("N") + radio.pipe.baudrate = 9600 + radio.pipe.parity = "N" # open the radio into program mode if _start_clone_mode(radio, status) is False: @@ -516,7 +516,7 @@ # has the check value in the _id2 var, others simply False if radio._id2 is not False: # lower the timeout here as this radios are reseting due to timeout - radio.pipe.setTimeout(0.05) + radio.pipe.timeout = 0.05 # query & receive the extra ID _send(radio, _make_frame("S", 0x3DF0, 16)) @@ -561,7 +561,7 @@ raise errors.RadioError("Radio didn't ACK the upload") # restore the default serial timeout - radio.pipe.setTimeout(STIMEOUT) + radio.pipe.timeout = STIMEOUT # DEBUG LOG.info("Positive ident, this is a %s %s" % (radio.VENDOR, radio.MODEL)) diff -r 333a280ca0c4 -r d1bc2c917785 chirp/drivers/ft2800.py --- a/chirp/drivers/ft2800.py Wed Jun 01 17:30:31 2016 -0700 +++ b/chirp/drivers/ft2800.py Tue Jun 07 21:49:22 2016 -0700 @@ -195,7 +195,7 @@ return rf def sync_in(self): - self.pipe.setParity("E") + self.pipe.parity = "E" start = time.time() try: self._mmap = _download(self) @@ -208,7 +208,7 @@ def sync_out(self): self.pipe.timeout = 1 - self.pipe.setParity("E") + self.pipe.parity = "E" start = time.time() try: _upload(self) diff -r 333a280ca0c4 -r d1bc2c917785 chirp/drivers/ic9x_ll.py --- a/chirp/drivers/ic9x_ll.py Wed Jun 01 17:30:31 2016 -0700 +++ b/chirp/drivers/ic9x_ll.py Tue Jun 07 21:49:22 2016 -0700 @@ -439,31 +439,31 @@ def send_magic(pipe): """Send the magic incantation to wake up an ic9x radio""" - if pipe.getBaudrate() == 38400: + if pipe.baudrate == 38400: resp = _send_magic_38400(pipe) if resp: return LOG.info("Switching from 38400 to 4800") - pipe.setBaudrate(4800) + pipe.baudrate = 4800 resp = _send_magic_4800(pipe) - pipe.setBaudrate(38400) + pipe.baudrate = 38400 if resp: return raise errors.RadioError("Radio not responding") - elif pipe.getBaudrate() == 4800: + elif pipe.baudrate == 4800: resp = _send_magic_4800(pipe) if resp: return LOG.info("Switching from 4800 to 38400") - pipe.setBaudrate(38400) + pipe.baudrate = 38400 resp = _send_magic_38400(pipe) if resp: return - pipe.setBaudrate(4800) + pipe.baudrate = 4800 raise errors.RadioError("Radio not responding") else: raise errors.InvalidDataError("Radio in unknown state (%i)" % - pipe.getBaudrate()) + pipe.baudrate) def get_memory_frame(pipe, vfo, number): diff -r 333a280ca0c4 -r d1bc2c917785 chirp/drivers/icf.py --- a/chirp/drivers/icf.py Wed Jun 01 17:30:31 2016 -0700 +++ b/chirp/drivers/icf.py Tue Jun 07 21:49:22 2016 -0700 @@ -251,7 +251,7 @@ LOG.debug("Response:\n%s" % util.hexprint(resp)) LOG.info("Switching to 38400 baud") - radio.pipe.setBaudrate(38400) + radio.pipe.baudrate = 38400 buf = ("\xFE" * 14) + \ "\xEE\xEF" + \ diff -r 333a280ca0c4 -r d1bc2c917785 chirp/drivers/kenwood_live.py --- a/chirp/drivers/kenwood_live.py Wed Jun 01 17:30:31 2016 -0700 +++ b/chirp/drivers/kenwood_live.py Tue Jun 07 21:49:22 2016 -0700 @@ -103,7 +103,7 @@ LAST_DELIMITER = delimiter LOG.info("Trying ID at baud %i with delimiter \"%s\"" % (i, repr(delimiter))) - ser.setBaudrate(i) + ser.baudrate = i ser.write(LAST_DELIMITER[0]) ser.read(25) resp = command(ser, "ID") diff -r 333a280ca0c4 -r d1bc2c917785 chirp/drivers/thd72.py --- a/chirp/drivers/thd72.py Wed Jun 01 17:30:31 2016 -0700 +++ b/chirp/drivers/thd72.py Tue Jun 07 21:49:22 2016 -0700 @@ -231,7 +231,7 @@ def _detect_baud(self): for baud in [9600, 19200, 38400, 57600]: - self.pipe.setBaudrate(baud) + self.pipe.baudrate = baud try: self.pipe.write("\r\r") except: @@ -422,9 +422,11 @@ raise errors.RadioError("No response from self") allblocks = range(self._memsize/256) - self.pipe.setBaudrate(57600) - self.pipe.getCTS() - self.pipe.setRTS() + self.pipe.baudrate = 57600 + try: + self.pipe.setRTS() + except AttributeError: + self.pipe.rts = True self.pipe.read(1) data = "" LOG.debug("reading blocks %d..%d" % (blocks[0], blocks[-1])) @@ -458,9 +460,11 @@ if self.command("0M PROGRAM") != "0M": raise errors.RadioError("No response from self") - self.pipe.setBaudrate(57600) - self.pipe.getCTS() - self.pipe.setRTS() + self.pipe.baudrate = 57600 + try: + self.pipe.setRTS() + except AttributeError: + self.pipe.rts = True self.pipe.read(1) LOG.debug("writing blocks %d..%d" % (blocks[0], blocks[-1])) total = len(blocks) diff -r 333a280ca0c4 -r d1bc2c917785 chirp/drivers/tk270.py --- a/chirp/drivers/tk270.py Wed Jun 01 17:30:31 2016 -0700 +++ b/chirp/drivers/tk270.py Tue Jun 07 21:49:22 2016 -0700 @@ -194,10 +194,9 @@ """Open the radio into program mode and check if it's the correct model""" # Set serial discipline try: - radio.pipe.setParity("N") - radio.pipe.setTimeout(TIMEOUT) - radio.pipe.flushOutput() - radio.pipe.flushInput() + radio.pipe.parity = "N" + radio.pipe.timeout = TIMEOUT + radio.pipe.flush() except: msg = "Serial error: Can't set serial line discipline" raise errors.RadioError(msg) diff -r 333a280ca0c4 -r d1bc2c917785 chirp/drivers/tk760.py --- a/chirp/drivers/tk760.py Wed Jun 01 17:30:31 2016 -0700 +++ b/chirp/drivers/tk760.py Tue Jun 07 21:49:22 2016 -0700 @@ -188,10 +188,9 @@ """Open the radio into program mode and check if it's the correct model""" # Set serial discipline try: - radio.pipe.setParity("N") - radio.pipe.setTimeout(TIMEOUT) - radio.pipe.flushOutput() - radio.pipe.flushInput() + radio.pipe.parity = "N" + radio.pipe.timeout = TIMEOUT + radio.pipe.flush() LOG.debug("Serial port open successful") except: msg = "Serial error: Can't set serial line discipline" diff -r 333a280ca0c4 -r d1bc2c917785 chirp/drivers/tk760g.py --- a/chirp/drivers/tk760g.py Wed Jun 01 17:30:31 2016 -0700 +++ b/chirp/drivers/tk760g.py Tue Jun 07 21:49:22 2016 -0700 @@ -441,8 +441,8 @@ def _open_radio(radio, status): """Open the radio into program mode and check if it's the correct model""" # linux min is 0.13, win min is 0.25; set to bigger to be safe - radio.pipe.setTimeout(0.25) - radio.pipe.setParity("E") + radio.pipe.timeout = 0.25 + radio.pipe.parity = "E" # DEBUG LOG.debug("Entering program mode.") @@ -525,17 +525,17 @@ # set the timeout and if windows keep it bigger if sys.platform in ["win32", "cygwin"]: # bigger timeout - radio.pipe.setTimeout(0.55) + radio.pipe.timeout = 0.55 else: # Linux can keep up, MAC? - radio.pipe.setTimeout(0.05) + radio.pipe.timeout = 0.05 # DEBUG LOG.debug("Starting the download from radio") for addr in MEM_BLOCKS: # send request, but before flush the rx buffer - radio.pipe.flushInput() + radio.pipe.flush() _send(radio, _make_frame("R", addr)) # now we get the data @@ -574,7 +574,7 @@ radio.status_fn(status) # the default for the original soft as measured - radio.pipe.setTimeout(0.5) + radio.pipe.timeout = 0.5 # DEBUG LOG.debug("Starting the upload to the radio") diff -r 333a280ca0c4 -r d1bc2c917785 chirp/drivers/tk8102.py --- a/chirp/drivers/tk8102.py Wed Jun 01 17:30:31 2016 -0700 +++ b/chirp/drivers/tk8102.py Tue Jun 07 21:49:22 2016 -0700 @@ -99,7 +99,7 @@ def do_download(radio): - radio.pipe.setParity("E") + radio.pipe.parity = "E" radio.pipe.timeout = 1 do_ident(radio) @@ -129,7 +129,7 @@ def do_upload(radio): - radio.pipe.setParity("E") + radio.pipe.parity = "E" radio.pipe.timeout = 1 do_ident(radio) diff -r 333a280ca0c4 -r d1bc2c917785 chirp/drivers/tmv71.py --- a/chirp/drivers/tmv71.py Wed Jun 01 17:30:31 2016 -0700 +++ b/chirp/drivers/tmv71.py Tue Jun 07 21:49:22 2016 -0700 @@ -36,7 +36,7 @@ def _detect_baud(self): for baud in [9600, 19200, 38400, 57600]: - self.pipe.setBaudrate(baud) + self.pipe.baudrate = baud self.pipe.write("\r\r") self.pipe.read(32) try:

2 4

[chirp_devel] [PATCH] [UV-25X2] Add Support for new BTech Color Display Mobile Radios
by Jim Unroe 05 Jul '17

05 Jul '17

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1489785081 14400 # Node ID 6a37192481c837ea49a60d121dde3de3ec8fc521 # Parent e1113c7da2f3eb00a5b1585ea92a8d164df0d60b [UV-25X2] Add Support for new BTech Color Display Mobile Radios This patch modifies the btech.py driver to support additional mobile radios that have an OLED color display. Additional radio models supported: BTech UV-25X4 (quad band) BTech UV-25X2 (dual band) BTech UV-50X2 (dual band) New Model #4269 diff -r e1113c7da2f3 -r 6a37192481c8 chirp/drivers/btech.py --- a/chirp/drivers/btech.py Wed Mar 08 15:05:23 2017 -0800 +++ b/chirp/drivers/btech.py Fri Mar 17 17:11:21 2017 -0400 @@ -167,6 +167,15 @@ # B-TECH UV-5001 third generation (3G) UV5001G3_fp = "BTG304" +# B-TECH UV-25X2 +UV25X2_fp = "UC2012" + +# B-TECH UV-25X4 +UV25X4_fp = "UC4014" + +# B-TECH UV-50X2 +UV50X2_fp = "UC2M12" + # special var to know when we found a BTECH Gen 3 BTECH3 = [UV2501G3_fp, UV2501_220G3_fp, UV5001G3_fp] @@ -226,6 +235,10 @@ MSTRING = "\x55\x20\x15\x09\x20\x45\x4d\x02" # for the QYT KT7900D & KT8900D MSTRING_KT8900D = "\x55\x20\x16\x08\x01\xFF\xDC\x02" +# for the BTECH UV-25X2 and UV-50X2 +MSTRING_UV25X2 = "\x55\x20\x16\x12\x28\xFF\xDC\x02" +# for the BTECH UV-25X4 +MSTRING_UV25X4 = "\x55\x20\x16\x11\x18\xFF\xDC\x02" def _clean_buffer(radio): @@ -852,10 +865,12 @@ # Extra mem.extra = RadioSettingGroup("extra", "Extra") - scramble = RadioSetting("scramble", "Scramble", - RadioSettingValueBoolean(bool( - _mem.scramble))) - mem.extra.append(scramble) + if not self.COLOR_LCD or \ + (self.COLOR_LCD and not self.VENDOR == "BTECH"): + scramble = RadioSetting("scramble", "Scramble", + RadioSettingValueBoolean(bool( + _mem.scramble))) + mem.extra.append(scramble) bcl = RadioSetting("bcl", "Busy channel lockout", RadioSettingValueBoolean(bool(_mem.bcl))) @@ -1061,11 +1076,18 @@ _mem.settings.pttlt)) basic.append(pttlt) - emctp = RadioSetting("settings.emctp", "Alarm mode", - RadioSettingValueList( - LIST_EMCTP, - LIST_EMCTP[_mem.settings.emctp])) - basic.append(emctp) + if self.VENDOR == "BTECH" and self.COLOR_LCD: + emctp = RadioSetting("settings.emctp", "Alarm mode", + RadioSettingValueList( + LIST_EMCTPX, + LIST_EMCTPX[_mem.settings.emctp])) + basic.append(emctp) + else: + emctp = RadioSetting("settings.emctp", "Alarm mode", + RadioSettingValueList( + LIST_EMCTP, + LIST_EMCTP[_mem.settings.emctp])) + basic.append(emctp) emcch = RadioSetting("settings.emcch", "Alarm channel", RadioSettingValueInteger(0, 199, @@ -1119,10 +1141,17 @@ basic.append(langua) if self.VENDOR == "BTECH": - sync = RadioSetting("settings.sync", "A/B channel sync", - RadioSettingValueBoolean( - _mem.settings.sync)) - basic.append(sync) + if self.COLOR_LCD: + sync = RadioSetting("settings.sync", "Channel display sync", + RadioSettingValueList( + LIST_SYNC, + LIST_SYNC[_mem.settings.sync])) + basic.append(sync) + else: + sync = RadioSetting("settings.sync", "A/B channel sync", + RadioSettingValueBoolean( + _mem.settings.sync)) + basic.append(sync) else: autolk = RadioSetting("settings.sync", "Auto keylock", RadioSettingValueBoolean( @@ -1289,6 +1318,24 @@ _mem.settings.dtmfg)) basic.append(dtmfg) + if self.VENDOR == "BTECH" and self.COLOR_LCD: + mgain = RadioSetting("settings.mgain", "Mic gain", + RadioSettingValueInteger(0, 120, + _mem.settings.mgain)) + basic.append(mgain) + + skiptx = RadioSetting("settings.skiptx", "Skip TX", + RadioSettingValueList( + LIST_SKIPTX, + LIST_SKIPTX[_mem.settings.skiptx])) + basic.append(skiptx) + + scmode = RadioSetting("settings.scmode", "Scan mode", + RadioSettingValueList( + LIST_SCMODE, + LIST_SCMODE[_mem.settings.scmode])) + basic.append(scmode) + # Advanced def _filter(name): filtered = "" @@ -1802,17 +1849,19 @@ SPMUTE_LIST[_mem.vfo.d.spmute])) work.append(vfodspmute) - vfoascr = RadioSetting("vfo.a.scramble", "VFO A scramble", - RadioSettingValueBoolean( - _mem.vfo.a.scramble)) - work.append(vfoascr) - - vfobscr = RadioSetting("vfo.b.scramble", "VFO B scramble", - RadioSettingValueBoolean( - _mem.vfo.b.scramble)) - work.append(vfobscr) - - if self.COLOR_LCD: + if not self.COLOR_LCD or \ + (self.COLOR_LCD and not self.VENDOR == "BTECH"): + vfoascr = RadioSetting("vfo.a.scramble", "VFO A scramble", + RadioSettingValueBoolean( + _mem.vfo.a.scramble)) + work.append(vfoascr) + + vfobscr = RadioSetting("vfo.b.scramble", "VFO B scramble", + RadioSettingValueBoolean( + _mem.vfo.b.scramble)) + work.append(vfobscr) + + if self.COLOR_LCD and not self.VENDOR == "BTECH": vfocscr = RadioSetting("vfo.c.scramble", "VFO C scramble", RadioSettingValueBoolean( _mem.vfo.c.scramble)) @@ -3537,7 +3586,7 @@ LOG.info("Radio ranges: UHF %d to %d" % uhf) # the additional bands - if self.MODEL in ["KT7900D", ]: + if self.MODEL in ["UV-25X4", "KT7900D"]: # 200Mhz band vhf2 = _decode_ranges(ranges.vhf2_low, ranges.vhf2_high) LOG.info("Radio ranges: VHF(220) %d to %d" % vhf2) @@ -3554,6 +3603,43 @@ @directory.register +class UV25X2(BTechColor): + """Baofeng Tech UV25X2""" + MODEL = "UV-25X2" + BANDS = 2 + _vhf_range = (130000000, 180000000) + _uhf_range = (400000000, 521000000) + _magic = MSTRING_UV25X2 + _fileid = [UV25X2_fp, ] + + +(a)directory.register +class UV25X4(BTechColor): + """Baofeng Tech UV25X4""" + MODEL = "UV-25X4" + BANDS = 4 + _vhf_range = (130000000, 180000000) + _220_range = (200000000, 271000000) + _uhf_range = (400000000, 521000000) + _350_range = (350000000, 391000000) + _magic = MSTRING_UV25X4 + _fileid = [UV25X4_fp, ] + + +(a)directory.register +class UV50X2(BTechColor): + """Baofeng Tech UV50X2""" + MODEL = "UV-50X2" + BANDS = 2 + _vhf_range = (130000000, 180000000) + _uhf_range = (400000000, 521000000) + _magic = MSTRING_UV25X2 + _fileid = [UV50X2_fp, ] + _power_levels = [chirp_common.PowerLevel("High", watts=50), + chirp_common.PowerLevel("Low", watts=10)] + + +(a)directory.register class KT7900D(BTechColor): """QYT KT7900D""" VENDOR = "QYT"

1 2

[chirp_devel] Build test results: Failure
by Build System 31 Mar '17

31 Mar '17

Tested changes: [Tom Hayward <tom(a)tomh.us>] [THD72] Fix buggy memory initialization. #1611 Allows channels added by Chirp to transmit. [Tom Hayward <tom(a)tomh.us>] [id880] Fix typo in charset definition. #281 [Tom Hayward <tom(a)tomh.us>] [thf6a] Support full charset (ASCII). Fixes #141 [Tom Hayward <tom(a)tomh.us>] [id880] Support full charset. Fixes #281 [Tom Hayward <tom(a)tomh.us>] [vx5] Support full charset (ASCII). Fixes #292 [Tom Hayward <tom(a)tomh.us>] [id31a] set used bit when creating new memory, clear when deleting. Fixes #269 [Tom Hayward <tom(a)tomh.us>] Support PyGTK < 2.22 in bank edit. Fixes #231 [Tom Hayward <tom(a)tomh.us>] [d710] [v71] [d72] Fix tone list (not all tones are supported). Fixes #212 [Dan Smith <dsmith(a)danplanet.com>] [vx7] Fix setting memory power levels on 220MHz band Fixes #214 [Dan Smith <dsmith(a)danplanet.com>] fips: Pennsylvania FIPS code was wrong. #117 [Marco Filippi <iz3gme.marco(a)gmail.com>] Consider lower bound frequency of each valid_band as valid Fix bug #181 [Tom Hayward <tom(a)tomh.us>] tmd700: allow 8-char names. Fixes #176 [Dan Smith <dsmith(a)danplanet.com>] Fix the "blind deletion" problem, as well as properly direct copy/paste Fixes #172 [David Griffith <dave(a)661.org>] Bug #155 fix: VX-7 1.25m power levels [David Griffith <dave(a)661.org>] New INSTALL and README files Fixes #122 [Tom Hayward <tom(a)tomh.us>] thd72: only use hardware flow on OS X. Fixes #166 [Marco Filippi <iz3gme.marco(a)gmail.com>] [FT817] Tone freq not set correctly Same as #88 for FT857, to avoid code duplication fix code have been moved from ft857 to its ancestor class Fix bug #163 [Tom Hayward <tom(a)tomh.us>] Fix Mac .app so paths with spaces work. Fixes Bug #145 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 04f81d3034852d9337aa5bb819a474fa299c3d9c [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 04f81d3034852d9337aa5bb819a474fa299c3d9c No emails were triggered. [workspace] $ /bin/sh -xe /tmp/hudson8154135758606828546.sh [workspace] $ /bin/sh -xe /tmp/hudson4733848679573123159.sh + PATH=/usr/bin:/bin:/usr/local/bin ./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.050s OK Patch 'tip' is OK Checking for PEP8 regressions... ./chirp/drivers/thd72.py:204:1: E302 expected 2 blank lines, found 1 ./chirp/platform.py:255:80: E501 line too long (82 > 79 characters) ./chirp/ui/mainapp.py:1909:80: E501 line too long (82 > 79 characters) ./chirp/ui/mainapp.py:1965:80: E501 line too long (82 > 79 characters) real 0m7.696s user 0m7.580s sys 0m0.040s ================================================ Tests FAILED: driver tests Build step 'Execute shell' marked build as failure Email was triggered for: Failure Sending email for trigger: Failure

1 4

[chirp_devel] [PATCH] Fix radio drivers with invalid tuning step lists. #4689
by Tom Hayward 30 Mar '17

30 Mar '17

# HG changeset patch # User Tom Hayward <tom(a)tomh.us> # Date 1490903263 25200 # Thu Mar 30 12:47:43 2017 -0700 # Node ID 4cc11bb72c0726facfe0e95abdc0a618e62f2aeb # Parent 38e99fa3fda076acd3c5989071aa048eb9d91a52 Fix radio drivers with invalid tuning step lists. #4689 New step list sources: IC-V82/U82: manual VX-5: radio menu VX-7: manual diff -r 38e99fa3fda0 -r 4cc11bb72c07 chirp/drivers/icx8x.py --- a/chirp/drivers/icx8x.py Thu Mar 30 12:14:02 2017 -0700 +++ b/chirp/drivers/icx8x.py Thu Mar 30 12:47:43 2017 -0700 @@ -75,8 +75,7 @@ rf.valid_modes = ["FM", "NFM", "DV"] rf.valid_tmodes = ["", "Tone", "TSQL", "DTCS"] rf.valid_duplexes = ["", "-", "+"] - rf.valid_tuning_steps = [x for x in chirp_common.TUNING_STEPS - if x != 6.25] + rf.valid_tuning_steps = [5., 10., 12.5, 15., 20., 25., 30., 50.] if self._isuhf: rf.valid_bands = [(420000000, 470000000)] else: diff -r 38e99fa3fda0 -r 4cc11bb72c07 chirp/drivers/vx5.py --- a/chirp/drivers/vx5.py Thu Mar 30 12:14:02 2017 -0700 +++ b/chirp/drivers/vx5.py Thu Mar 30 12:47:43 2017 -0700 @@ -70,12 +70,7 @@ TMODES = ["", "Tone", "TSQL", "DTCS"] DUPLEX = ["", "-", "+", "split"] MODES = ["FM", "AM", "WFM"] -STEPS = list(chirp_common.TUNING_STEPS) -STEPS.remove(6.25) -STEPS.remove(30.0) -STEPS.append(100.0) -STEPS.append(9.0) - +STEPS = [5.0, 10.0, 12.5, 15.0, 20.0, 25.0, 50.0, 100.0] POWER_LEVELS = [chirp_common.PowerLevel("Hi", watts=5.00), chirp_common.PowerLevel("L3", watts=2.50), chirp_common.PowerLevel("L2", watts=1.00), @@ -177,6 +172,7 @@ rf.has_dtcs_polarity = False rf.valid_modes = MODES + ["NFM"] rf.valid_tmodes = TMODES + rf.valid_tuning_steps = STEPS rf.valid_duplexes = DUPLEX rf.memory_bounds = (1, 220) rf.valid_bands = [(500000, 16000000), diff -r 38e99fa3fda0 -r 4cc11bb72c07 chirp/drivers/vx7.py --- a/chirp/drivers/vx7.py Thu Mar 30 12:14:02 2017 -0700 +++ b/chirp/drivers/vx7.py Thu Mar 30 12:47:43 2017 -0700 @@ -81,11 +81,7 @@ MODES = ["FM", "AM", "WFM", "Auto"] TMODES = ["", "Tone", "TSQL", "DTCS", "Cross"] CROSS_MODES = ["DTCS->", "Tone->DTCS", "DTCS->Tone"] -STEPS = list(chirp_common.TUNING_STEPS) -STEPS.remove(6.25) -STEPS.remove(30.0) -STEPS.append(100.0) -STEPS.append(9.0) +STEPS = [5.0, 10.0, 12.5, 15.0, 20.0, 25.0, 50.0, 100.0, 9.0] CHARSET = ["%i" % int(x) for x in range(0, 10)] + \ [" "] + \

1 0

[chirp_devel] [PATCH] [THD72] Fix PEP8 regression from #1611
by Tom Hayward 30 Mar '17

30 Mar '17

# HG changeset patch # User Tom Hayward <tom(a)tomh.us> # Date 1490901758 25200 # Thu Mar 30 12:22:38 2017 -0700 # Node ID 661b88a024d105b651b2513120f2bfac311a67e4 # Parent 99251f2b49ec2d21a73442768594f1fca3931e9a [THD72] Fix PEP8 regression from #1611. diff -r 99251f2b49ec -r 661b88a024d1 chirp/drivers/thd72.py --- a/chirp/drivers/thd72.py Thu Mar 30 12:14:05 2017 -0700 +++ b/chirp/drivers/thd72.py Thu Mar 30 12:22:38 2017 -0700 @@ -201,6 +201,7 @@ # see http://chirp.danplanet.com/issues/1611#note-9 UNKNOWN_LOOKUP = (0, 7, 4, 0, 4, 7) + def get_prog_vfo(frequency): for i, (start, end) in enumerate(DEFAULT_PROG_VFO): if start <= frequency < end:

1 0

[chirp_devel] [PATCH 1 of 2] For radios without tuning steps, test 10 KHz down from the edge. #4689
by Tom Hayward 30 Mar '17

30 Mar '17

# HG changeset patch # User Tom Hayward <tom(a)tomh.us> # Date 1490901242 25200 # Thu Mar 30 12:14:02 2017 -0700 # Node ID 38e99fa3fda076acd3c5989071aa048eb9d91a52 # Parent e2386f04138cf4d91b26d704c6dc58f80fe49ec3 For radios without tuning steps, test 10 KHz down from the edge. #4689 This should be compatible with virtually any radio. diff -r e2386f04138c -r 38e99fa3fda0 tests/run_tests --- a/tests/run_tests Wed Mar 29 21:55:48 2017 -0700 +++ b/tests/run_tests Thu Mar 30 12:14:02 2017 -0700 @@ -535,7 +535,7 @@ def do_bandedges(self, rf): m = self._mem(rf) - min_step = min(rf.valid_tuning_steps or chirp_common.TUNING_STEPS) + min_step = min(rf.has_tuning_step and rf.valid_tuning_steps or [10]) for low, high in rf.valid_bands: for freq in (low, high - int(min_step * 1000)):

1 1

[chirp_devel] [PATCH] Add IC-P7 support. This is Japanese model of IC-P7A, ticket New Model #1947
by SASANO Takayoshi 30 Mar '17

30 Mar '17

# HG changeset patch # User SASANO Takayoshi <uaa(a)mx5.nisiq.net> # Date 1490881919 -32400 # Thu Mar 30 22:51:59 2017 +0900 # Node ID 6796675564baf42a3c07696501735ccfb24e7181 # Parent 89658834b8aca6fd6b6ffb6ff72b2620935f1fc9 Add IC-P7 support. This is Japanese model of IC-P7A, ticket New Model #1947. I hope IC-P7A/IC-E7 will work. Supported features * Regular Memory (CH 0 to 999) editing - Bank settings (Bank, Bank Index, Bank Name) - DTCS settings (DTCS code, DTCS polarity) - Frequency (0.495000-999.990000MHz), Mode, Offset, Tuning step settings - Memory Name setting - CTCSS tone setting (Tone, TSQL) Not supported features: * Train SQL setting in memory * Common radio settings (Beep, Display, Bank Link, RF power, etc...) * Scan Edge CH, Auto Write CH, TV CH, CALL CH editing diff -r 89658834b8ac -r 6796675564ba chirp/drivers/icp7.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/chirp/drivers/icp7.py Thu Mar 30 22:51:59 2017 +0900 @@ -0,0 +1,243 @@ +# Copyright 2017 SASANO Takayoshi (JG1UAA) <uaa(a)uaa.org.uk> +# +# 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/>. + +from chirp.drivers import icf +from chirp import chirp_common, directory, bitwise + +# memory nuber: +# 000 - 999 regular memory channels (supported, others not) +# 1000 - 1049 scan edges +# 1050 - 1249 auto write channels +# 1250 call channel (C0) +# 1251 call channel (C1) + + +MEM_FORMAT = """ +struct { + ul32 freq; + ul32 offset; + ul16 train_sql:2, + tmode:3, + duplex:2, + train_tone:9; + ul16 tuning_step:4, + rtone:6, + ctone:6; + ul16 unknown0:6, + mode:3, + dtcs:7; + u8 unknown1:6, + dtcs_polarity:2; + char name[6]; +} memory[1251]; + +#seekto 0x6b1e; +struct { + u8 bank; + u8 index; +} banks[1050]; + +#seekto 0x689e; +u8 used[132]; + +#seekto 0x6922; +u8 skips[132]; + +#seekto 0x69a6; +u8 pskips[132]; + +#seekto 0x7352; +struct { + char name[6]; +} bank_names[18]; + +""" + +MODES = ["FM", "WFM", "AM", "Auto"] +TMODES = ["", "Tone", "TSQL", "", "DTCS"] +DUPLEX = ["", "-", "+"] +DTCS_POLARITY = ["NN", "NR", "RN", "RR"] +TUNING_STEPS = [5.0, 6.25, 8.33, 9.0, 10.0, 12.5, 15.0, 20.0, + 25.0, 30.0, 50.0, 100.0, 200.0, 0.0] # 0.0 as "Auto" + + +class ICP7Bank(icf.IcomBank): + """ICP7 bank""" + def get_name(self): + _bank = self._model._radio._memobj.bank_names[self.index] + return str(_bank.name).rstrip() + + def set_name(self, name): + _bank = self._model._radio._memobj.bank_names[self.index] + _bank.name = name.ljust(6)[:6] + + +(a)directory.register +class ICP7Radio(icf.IcomCloneModeRadio): + """Icom IC-P7""" + VENDOR = "Icom" + MODEL = "IC-P7" + + _model = "\x28\x69\x00\x01" + _memsize = 0x7500 + _endframe = "Icom Inc\x2e\x41\x38" + + _ranges = [(0x0000, 0x7500, 32)] + + _num_banks = 18 + _bank_class = ICP7Bank + + def _get_bank(self, loc): + _bank = self._memobj.banks[loc] + if _bank.bank != 0xff: + return _bank.bank + else: + return None + + def _set_bank(self, loc, bank): + _bank = self._memobj.banks[loc] + if bank is None: + _bank.bank = 0xff + else: + _bank.bank = bank + + def _get_bank_index(self, loc): + _bank = self._memobj.banks[loc] + return _bank.index + + def _set_bank_index(self, loc, index): + _bank = self._memobj.banks[loc] + _bank.index = index + + def get_features(self): + rf = chirp_common.RadioFeatures() + rf.memory_bounds = (0, 999) + rf.valid_tmodes = TMODES + rf.valid_duplexes = DUPLEX + rf.valid_modes = MODES + rf.valid_bands = [(495000, 999990000)] + rf.valid_skips = ["", "S", "P"] + rf.valid_tuning_steps = TUNING_STEPS + rf.valid_name_length = 6 + rf.has_ctone = True + rf.has_bank = True + rf.has_bank_index = True + rf.has_bank_names = True + return rf + + def process_mmap(self): + self._memobj = bitwise.parse(MEM_FORMAT, self._mmap) + + def get_raw_memory(self, number): + return repr(self._memobj.memory[number]) + + def get_memory(self, number): + bit = 1 << (number % 8) + byte = int(number / 8) + + _mem = self._memobj.memory[number] + _usd = self._memobj.used[byte] + _skp = self._memobj.skips[byte] + _psk = self._memobj.pskips[byte] + + mem = chirp_common.Memory() + mem.number = number + + if _usd & bit: + mem.empty = True + return mem + + mem.freq = _mem.freq / 3 + mem.offset = _mem.offset / 3 + mem.tmode = TMODES[_mem.tmode] + mem.duplex = DUPLEX[_mem.duplex] + mem.tuning_step = TUNING_STEPS[_mem.tuning_step] + mem.rtone = chirp_common.TONES[_mem.rtone] + mem.ctone = chirp_common.TONES[_mem.ctone] + mem.mode = MODES[_mem.mode] + mem.dtcs = chirp_common.DTCS_CODES[_mem.dtcs] + mem.dtcs_polarity = DTCS_POLARITY[_mem.dtcs_polarity] + mem.name = str(_mem.name).rstrip() + + if _skp & bit: + mem.skip = "P" if _psk & bit else "S" + else: + mem.skip = "" + + return mem + + def set_memory(self, mem): + bit = 1 << (mem.number % 8) + byte = int(mem.number / 8) + + _mem = self._memobj.memory[mem.number] + _usd = self._memobj.used[byte] + _skp = self._memobj.skips[byte] + _psk = self._memobj.pskips[byte] + + _mem.set_raw("\x00" * (_mem.size() / 8)) + + if mem.empty: + _usd |= bit + + # We use default value instead of zero-fill + # to avoid unexpected behavior. + _mem.freq = 15000 + _mem.offset = 479985000 + _mem.train_sql = ~0 + _mem.tmode = ~0 + _mem.duplex = ~0 + _mem.train_tone = ~0 + _mem.tuning_step = ~0 + _mem.rtone = ~0 + _mem.ctone = ~0 + _mem.unknown0 = 0 + _mem.mode = ~0 + _mem.dtcs = ~0 + _mem.unknown1 = ~0 + _mem.dtcs_polarity = ~0 + _mem.name = " " + + _skp |= bit + _psk |= bit + + else: + _usd &= ~bit + + _mem.freq = mem.freq * 3 + _mem.offset = mem.offset * 3 + _mem.train_sql = 0 # Train SQL mode (0:off 1:Tone 2:MSK) + _mem.tmode = TMODES.index(mem.tmode) + _mem.duplex = DUPLEX.index(mem.duplex) + _mem.train_tone = 228 # Train SQL Tone (x10Hz) + _mem.tuning_step = TUNING_STEPS.index(mem.tuning_step) + _mem.rtone = chirp_common.TONES.index(mem.rtone) + _mem.ctone = chirp_common.TONES.index(mem.ctone) + _mem.unknown0 = 0 # unknown (always zero) + _mem.mode = MODES.index(mem.mode) + _mem.dtcs = chirp_common.DTCS_CODES.index(mem.dtcs) + _mem.unknown1 = ~0 # unknown (always one) + _mem.dtcs_polarity = DTCS_POLARITY.index(mem.dtcs_polarity) + _mem.name = mem.name.ljust(6)[:6] + + if mem.skip == "S": + _skp |= bit + _psk &= ~bit + elif mem.skip == "P": + _skp |= bit + _psk |= bit + else: + _skp &= ~bit + _psk &= ~bit

1 0

[chirp_devel] [PATCH] add IC-P7 support
by SASANO Takayoshi 30 Mar '17

30 Mar '17

# HG changeset patch # User SASANO Takayoshi <uaa(a)mx5.nisiq.net> # Date 1490625865 -32400 # Mon Mar 27 23:44:25 2017 +0900 # Node ID 48c912c15c5663bafded2f7b310b74aad495aa30 # Parent 0f6968a11cacd0f3208f5351cd215a9ca768f229 add IC-P7 support. - only memory ch.0~999 supported. others are not yet. - Train SQL(Japanese model only) is not supported. diff -r 0f6968a11cac -r 48c912c15c56 chirp/drivers/icp7.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/chirp/drivers/icp7.py Mon Mar 27 23:44:25 2017 +0900 @@ -0,0 +1,243 @@ +# Copyright 2017 SASANO Takayoshi (JG1UAA) <uaa(a)uaa.org.uk> +# +# 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/>. + +from chirp.drivers import icf +from chirp import chirp_common, directory, bitwise + +# memory nuber: +# 000 - 999 regular memory channels (supported, others not) +# 1000 - 1049 scan edges +# 1050 - 1249 auto write channels +# 1250 call channel (C0) +# 1251 call channel (C1) + + +MEM_FORMAT = """ +struct { + ul32 freq; + ul32 offset; + ul16 train_sql:2, + tmode:3, + duplex:2, + train_tone:9; + ul16 tuning_step:4, + rtone:6, + ctone:6; + ul16 unknown0:6, + mode:3, + dtcs:7; + u8 unknown1:6, + dtcs_polarity:2; + char name[6]; +} memory[1251]; + +#seekto 0x6b1e; +struct { + u8 bank; + u8 index; +} banks[1050]; + +#seekto 0x689e; +u8 used[132]; + +#seekto 0x6922; +u8 skips[132]; + +#seekto 0x69a6; +u8 pskips[132]; + +#seekto 0x7352; +struct { + char name[6]; +} bank_names[18]; + +""" + +MODES = ["FM", "WFM", "AM", "Auto"] +TMODES = ["", "Tone", "TSQL", "", "DTCS"] +DUPLEX = ["", "-", "+"] +DTCS_POLARITY = ["NN", "NR", "RN", "RR"] +TUNING_STEPS = [5.0, 6.25, 8.33, 9.0, 10.0, 12.5, 15.0, 20.0, + 25.0, 30.0, 50.0, 100.0, 200.0, 0.0] # 0.0 as "Auto" + + +class ICP7Bank(icf.IcomBank): + """ICP7 bank""" + def get_name(self): + _bank = self._model._radio._memobj.bank_names[self.index] + return str(_bank.name).rstrip() + + def set_name(self, name): + _bank = self._model._radio._memobj.bank_names[self.index] + _bank.name = name.ljust(6)[:6] + + +(a)directory.register +class ICP7Radio(icf.IcomCloneModeRadio): + """Icom IC-P7""" + VENDOR = "Icom" + MODEL = "IC-P7" + + _model = "\x28\x69\x00\x01" + _memsize = 0x7500 + _endframe = "Icom Inc\x2e\x41\x38" + + _ranges = [(0x0000, 0x7500, 32)] + + _num_banks = 18 + _bank_class = ICP7Bank + + def _get_bank(self, loc): + _bank = self._memobj.banks[loc] + if _bank.bank != 0xff: + return _bank.bank + else: + return None + + def _set_bank(self, loc, bank): + _bank = self._memobj.banks[loc] + if bank is None: + _bank.bank = 0xff + else: + _bank.bank = bank + + def _get_bank_index(self, loc): + _bank = self._memobj.banks[loc] + return _bank.index + + def _set_bank_index(self, loc, index): + _bank = self._memobj.banks[loc] + _bank.index = index + + def get_features(self): + rf = chirp_common.RadioFeatures() + rf.memory_bounds = (0, 999) + rf.valid_tmodes = TMODES + rf.valid_duplexes = DUPLEX + rf.valid_modes = MODES + rf.valid_bands = [(495000, 999990000)] + rf.valid_skips = ["", "S", "P"] + rf.valid_tuning_steps = TUNING_STEPS + rf.valid_name_length = 6 + rf.has_ctone = True + rf.has_bank = True + rf.has_bank_index = True + rf.has_bank_names = True + return rf + + def process_mmap(self): + self._memobj = bitwise.parse(MEM_FORMAT, self._mmap) + + def get_raw_memory(self, number): + return repr(self._memobj.memory[number]) + + def get_memory(self, number): + bit = 1 << (number % 8) + byte = int(number / 8) + + _mem = self._memobj.memory[number] + _usd = self._memobj.used[byte] + _skp = self._memobj.skips[byte] + _psk = self._memobj.pskips[byte] + + mem = chirp_common.Memory() + mem.number = number + + if _usd & bit: + mem.empty = True + return mem + + mem.freq = _mem.freq / 3 + mem.offset = _mem.offset / 3 + mem.tmode = TMODES[_mem.tmode] + mem.duplex = DUPLEX[_mem.duplex] + mem.tuning_step = TUNING_STEPS[_mem.tuning_step] + mem.rtone = chirp_common.TONES[_mem.rtone] + mem.ctone = chirp_common.TONES[_mem.ctone] + mem.mode = MODES[_mem.mode] + mem.dtcs = chirp_common.DTCS_CODES[_mem.dtcs] + mem.dtcs_polarity = DTCS_POLARITY[_mem.dtcs_polarity] + mem.name = str(_mem.name).rstrip() + + if _skp & bit: + mem.skip = "P" if _psk & bit else "S" + else: + mem.skip = "" + + return mem + + def set_memory(self, mem): + bit = 1 << (mem.number % 8) + byte = int(mem.number / 8) + + _mem = self._memobj.memory[mem.number] + _usd = self._memobj.used[byte] + _skp = self._memobj.skips[byte] + _psk = self._memobj.pskips[byte] + + _mem.set_raw("\x00" * (_mem.size() / 8)) + + if mem.empty: + _usd |= bit + + # We use default value instead of zero-fill + # to avoid unexpected behavior. + _mem.freq = 15000 + _mem.offset = 479985000 + _mem.train_sql = ~0 + _mem.tmode = ~0 + _mem.duplex = ~0 + _mem.train_tone = ~0 + _mem.tuning_step = ~0 + _mem.rtone = ~0 + _mem.ctone = ~0 + _mem.unknown0 = 0 + _mem.mode = ~0 + _mem.dtcs = ~0 + _mem.unknown1 = ~0 + _mem.dtcs_polarity = ~0 + _mem.name = " " + + _skp |= bit + _psk |= bit + + else: + _usd &= ~bit + + _mem.freq = mem.freq * 3 + _mem.offset = mem.offset * 3 + _mem.train_sql = 0 # Train SQL mode (0:off 1:Tone 2:MSK) + _mem.tmode = TMODES.index(mem.tmode) + _mem.duplex = DUPLEX.index(mem.duplex) + _mem.train_tone = 228 # Train SQL Tone (x10Hz) + _mem.tuning_step = TUNING_STEPS.index(mem.tuning_step) + _mem.rtone = chirp_common.TONES.index(mem.rtone) + _mem.ctone = chirp_common.TONES.index(mem.ctone) + _mem.unknown0 = 0 # unknown (always zero) + _mem.mode = MODES.index(mem.mode) + _mem.dtcs = chirp_common.DTCS_CODES.index(mem.dtcs) + _mem.unknown1 = ~0 # unknown (always one) + _mem.dtcs_polarity = DTCS_POLARITY.index(mem.dtcs_polarity) + _mem.name = mem.name.ljust(6)[:6] + + if mem.skip == "S": + _skp |= bit + _psk &= ~bit + elif mem.skip == "P": + _skp |= bit + _psk |= bit + else: + _skp &= ~bit + _psk &= ~bit

3 7

[chirp_devel] [PATCH] Fix for Issue #4239 FT-857 exception caused by incorrect data type
by Eugene Dale Tyler 30 Mar '17

30 Mar '17

1 0

[chirp_devel] [PATCH] [UV-B5] Revert TX inhibit feature, because the trick only works on b-band. #837
by Tom Hayward 29 Mar '17

29 Mar '17

# HG changeset patch # User Tom Hayward <tom(a)tomh.us> # Date 1490824544 25200 # Wed Mar 29 14:55:44 2017 -0700 # Node ID 5a9a8e58950c3ab65ecb8ac94bfdac15816c3104 # Parent 647ca47384a3571596b28f95914a47d2019875e2 [UV-B5] Revert TX inhibit feature, because the trick only works on b-band. #837 On a-band, this TX inhibit trick casues the radio to transmit spurious emissions on multiple frequencies. diff -r 647ca47384a3 -r 5a9a8e58950c chirp/drivers/uvb5.py --- a/chirp/drivers/uvb5.py Wed Mar 29 14:51:30 2017 -0700 +++ b/chirp/drivers/uvb5.py Wed Mar 29 14:55:44 2017 -0700 @@ -250,7 +250,7 @@ LOG.debug("Radio ACK'd block at address 0x%04x" % i) do_status(radio, "to", i) -DUPLEX = ["", "-", "+", 'off', "split"] +DUPLEX = ["", "-", "+"] UVB5_STEPS = [5.00, 6.25, 10.0, 12.5, 20.0, 25.0] CHARSET = "0123456789- ABCDEFGHIJKLMNOPQRSTUVWXYZ/_+*" SPECIALS = { @@ -305,7 +305,7 @@ rf.valid_tmodes = ["", "Tone", "TSQL", "DTCS", "Cross"] rf.valid_cross_modes = ["Tone->Tone", "Tone->DTCS", "DTCS->Tone", "->Tone", "->DTCS", "DTCS->", "DTCS->DTCS"] - rf.valid_duplexes = DUPLEX + rf.valid_duplexes = DUPLEX + ["split"] rf.can_odd_split = True rf.valid_skips = ["", "S"] rf.valid_characters = CHARSET @@ -413,10 +413,6 @@ mem.skip = "" if _mem.scanadd else "S" mem.power = POWER_LEVELS[_mem.highpower] - if mem.freq == mem.offset and mem.duplex == "-": - mem.duplex = "off" - mem.offset = 0 - if _nam: for char in _nam: try: @@ -459,10 +455,7 @@ _mem.freq = mem.freq / 10 - if mem.duplex == "off": - _mem.duplex = DUPLEX.index("-") - _mem.offset = _mem.freq - elif mem.duplex == "split": + if mem.duplex == "split": diff = mem.offset - mem.freq _mem.duplex = DUPLEX.index("-") if diff < 0 else DUPLEX.index("+") _mem.offset = abs(diff) / 10

1 0