December 2016 - 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] Updated UI? Port to WxPython?
by Aaron Traas 29 Dec '16

29 Dec '16

I'm a new user to CHIRP and a newly minted Ham (KD2MMN) who just used this fantastic software to program my new Baofeng UV-5R variant. I'm also a software developer with a lot of experience writing front-end code. I've noticed the Mac version of CHIRP has a dated UI and very non-native feel, much like other GTK apps on the Mac. If the powers that be are open to the idea, I could reimplement the chirp.ui package in WxPython, which is much nicer on macOS and Windows than GTK, as it's an abstraction layer for the native UI components for all platforms, and will render as GTK on Linux. If this is welcome, I'll start tinkering around with the port. If you're unlikely to wish to move to a different UI toolkit, I could try to find other ways to be useful. -- Aaron Traas | https://traas.org/ | @aarontraas <http://twitter.com/AaronTraas>

6 9

[chirp_devel] Build test results: Failure
by Build System 22 Dec '16

22 Dec '16

Tested changes: [Jim Unroe <rock.unroe(a)gmail.com>] PEP8 cleanup for Alinco driver This patch resolves the issues that are causing the Alinco driver to be flagged as needing a bit of PEP8 cleanup. #4315 [Jim Unroe <rock.unroe(a)gmail.com>] [NC-630A] Driver Cleanup This cleans up some pep8 errors that I must have missed when testing. There are otherwise no changes to the driver. Related to #4235 [Jim Unroe <rock.unroe(a)gmail.com>] [RT1] Add Support for Retevis RT1 This patch adds CHIRP support for programming both the VHF and UHF models of the Retevis RT1 handheld radios. #4313 [Jim Unroe <rock.unroe(a)gmail.com>] [RT21] Add PF1 Function Key Setting This patch adds the ability to set the PF1 key function of the Retevis RT21. #4139 [Jim Unroe <rock.unroe(a)gmail.com>] [RT22] Add Support for Luiton LT-316 This patch adds support for the Luiton LT-316 variant to the retevis_rt22.py driver. Related to #4145 [Jim Unroe <rock.unroe(a)gmail.com>] [RT22] Add Retries When Initializing Cloning Cloning does not always begin on the initial request. This patch adds the ability to retry up to five times (similar to how the factory software does it). Related to #4145 [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 5 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 b6d25de71e0feb5aed26105b5d5d8edddfcb8b66 [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 b6d25de71e0feb5aed26105b5d5d8edddfcb8b66 No emails were triggered. [workspace] $ /bin/sh -xe /tmp/hudson1782236536931155665.sh [workspace] $ /bin/sh -xe /tmp/hudson1109123365650242956.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.052s OK Patch 'tip' is OK Checking for PEP8 regressions... real 0m7.644s user 0m7.564s sys 0m0.016s ================================================ Tests FAILED: make supported Build step 'Execute shell' marked build as failure Email was triggered for: Failure Sending email for trigger: Failure

4 10

[chirp_devel] [PATCH] [RT1] Add Support for Retevis RT1(fix for build failures)
by Jim Unroe 19 Dec '16

19 Dec '16

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1482188283 18000 # Node ID 49fed5b04540b874846bd1c246882ef9fb6ab529 # Parent 18381e84f72a0d19d767ea1cf88802e8991fca70 [RT1] Add Support for Retevis RT1(fix for build failures) This patch addresses the build failures of the previously submitted patch. #4313 diff -r 18381e84f72a -r 49fed5b04540 chirp/drivers/retevis_rt1.py --- a/chirp/drivers/retevis_rt1.py Mon Dec 19 17:51:33 2016 -0500 +++ b/chirp/drivers/retevis_rt1.py Mon Dec 19 17:58:03 2016 -0500 @@ -369,13 +369,12 @@ rf.valid_duplexes = ["", "-", "+", "split", "off"] rf.valid_modes = ["NFM", "FM"] # 12.5 KHz, 25 kHz. rf.memory_bounds = (1, 16) - if self._my_band() == RT1_VHF_fp: + if self._mmap is None: + rf.valid_bands = [self._vhf_range, self._uhf_range] + elif self._my_band() == RT1_VHF_fp: rf.valid_bands = [self._vhf_range] elif self._my_band() == RT1_UHF_fp: rf.valid_bands = [self._uhf_range] - else: - rf.valid_bands = [self._vhf_range, - self._uhf_range] return rf

1 0

[chirp_devel] [PATCH] PEP8 cleanup for Alinco driver
by Jim Unroe 18 Dec '16

18 Dec '16

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1482101562 18000 # Node ID 7f4f84adc8b918844ee42953955501b253db1ea4 # Parent d676300e640f1b86d655ddf143fcd4797f38f22c PEP8 cleanup for Alinco driver This patch resolves the issues that are causing the Alinco driver to be flagged as needing a bit of PEP8 cleanup. #4315 diff -r d676300e640f -r 7f4f84adc8b9 chirp/drivers/alinco.py --- a/chirp/drivers/alinco.py Sun Dec 18 16:41:02 2016 -0500 +++ b/chirp/drivers/alinco.py Sun Dec 18 17:52:42 2016 -0500 @@ -592,6 +592,7 @@ } memory[1000]; """ + @directory.register class AlincoDJG7EG(AlincoStyleRadio): """Alinco DJ-G7EG""" @@ -600,12 +601,14 @@ BAUD_RATE = 57600 # Those are different from the other Alinco radios. - STEPS = [5.0, 6.25, 8.33, 10.0, 12.5, 15.0, 20.0, 25.0, 30.0, 50.0, 100.0, 125.0, 150.0, 200.0, 500.0, 1000.0] + STEPS = [5.0, 6.25, 8.33, 10.0, 12.5, 15.0, 20.0, 25.0, 30.0, 50.0, + 100.0, 125.0, 150.0, 200.0, 500.0, 1000.0] DUPLEX = ["", "+", "-"] MODES = ["NFM", "FM", "AM", "WFM"] TMODES = ["", "??1", "Tone", "TSQL", "TSQL-R", "DTCS"] - _model = "AL~DJ-G7EG" # This is a bit of a hack to avoid overwriting _identify() + # This is a bit of a hack to avoid overwriting _identify() + _model = "AL~DJ-G7EG" _memsize = 0x1a7c0 _range = [(500000, 1300000000)] @@ -613,7 +616,7 @@ rf = chirp_common.RadioFeatures() rf.has_dtcs_polarity = False rf.has_bank = False - rf.has_settings = False + rf.has_settings = False rf.valid_modes = self.MODES rf.valid_tmodes = ["", "Tone", "TSQL", "Cross", "TSQL-R", "DTCS"] @@ -715,7 +718,8 @@ mem.tuning_step = self.STEPS[_mem.step] mem.offset = int(_mem.offset) mem.duplex = self.DUPLEX[_mem.duplex] - if self.TMODES[_mem.squelch_type] == "TSQL" and _mem.tx_tone != _mem.rx_tone: + if self.TMODES[_mem.squelch_type] == "TSQL" and \ + _mem.tx_tone != _mem.rx_tone: mem.tmode = "Cross" mem.cross_mode = "Tone->Tone" else: @@ -733,7 +737,7 @@ # Get a low-level memory object mapped to the image _mem = self._memobj.memory[mem.number] if mem.empty: - _mem.unknown = 0x00 # Maybe 0 is empty, 2 is used? + _mem.unknown = 0x00 # Maybe 0 is empty, 2 is used? else: _mem.unknown = 0x02 _mem.freq = mem.freq @@ -746,34 +750,35 @@ try: _mem.tx_tone = ALINCO_TONES.index(mem.rtone)+1 except ValueError: - raise errors.UnsupportedToneError("This radio does not support " + - "tone %.1fHz" % mem.rtone) + raise errors.UnsupportedToneError( + "This radio does not support tone %.1fHz" % mem.rtone) try: _mem.rx_tone = ALINCO_TONES.index(mem.ctone)+1 except ValueError: - raise errors.UnsupportedToneError("This radio does not support " + - "tone %.1fHz" % mem.ctone) + raise errors.UnsupportedToneError( + "This radio does not support tone %.1fHz" % mem.ctone) elif mem.tmode == "TSQL": _mem.squelch_type = self.TMODES.index("TSQL") - # Note how the same TSQL tone is copied to both memory locaations + # Note how the same TSQL tone is copied to both memory + # locaations try: _mem.tx_tone = ALINCO_TONES.index(mem.ctone)+1 _mem.rx_tone = ALINCO_TONES.index(mem.ctone)+1 except ValueError: - raise errors.UnsupportedToneError("This radio does not support " + - "tone %.1fHz" % mem.ctone) + raise errors.UnsupportedToneError( + "This radio does not support tone %.1fHz" % mem.ctone) else: _mem.squelch_type = self.TMODES.index(mem.tmode) try: _mem.tx_tone = ALINCO_TONES.index(mem.rtone)+1 except ValueError: - raise errors.UnsupportedToneError("This radio does not support " + - "tone %.1fHz" % mem.rtone) + raise errors.UnsupportedToneError( + "This radio does not support tone %.1fHz" % mem.rtone) try: _mem.rx_tone = ALINCO_TONES.index(mem.ctone)+1 except ValueError: - raise errors.UnsupportedToneError("This radio does not support " + - "tone %.1fHz" % mem.ctone) + raise errors.UnsupportedToneError( + "This radio does not support tone %.1fHz" % mem.ctone) _mem.dcs = DCS_CODES[self.VENDOR].index(mem.dtcs) _mem.skip = (mem.skip == "S") - _mem.name = "\x00".join(mem.name).ljust(32,"\x00") + _mem.name = "\x00".join(mem.name).ljust(32, "\x00")

1 0

[chirp_devel] [PATCH] [NC-630A] Driver Cleanup
by Jim Unroe 18 Dec '16

18 Dec '16

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1482097262 18000 # Node ID d676300e640f1b86d655ddf143fcd4797f38f22c # Parent cf61dc3ea521895628254b7017225d5657e28adb [NC-630A] Driver Cleanup This cleans up some pep8 errors that I must have missed when testing. There are otherwise no changes to the driver. Related to #4235 diff -r cf61dc3ea521 -r d676300e640f chirp/drivers/kyd.py --- a/chirp/drivers/kyd.py Sun Dec 18 16:02:59 2016 -0500 +++ b/chirp/drivers/kyd.py Sun Dec 18 16:41:02 2016 -0500 @@ -209,6 +209,7 @@ VENDOR = "Plant-Tours" MODEL = "MT-700" + @directory.register class NC630aRadio(chirp_common.CloneModeRadio): """KYD NC-630A""" @@ -509,7 +510,7 @@ # testing model fingerprint if filedata[0x01B8:0x01BE] == cls._fileid: - match_model = True + match_model = True if match_size and match_model: return True

1 0

[chirp_devel] [PATCH] [RT1] Add Support for Retevis RT1
by Jim Unroe 18 Dec '16

18 Dec '16

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1482094979 18000 # Node ID cf61dc3ea521895628254b7017225d5657e28adb # Parent 19790fa1d51a5183b7dd6758c9fbb6c5d5a0bd4b [RT1] Add Support for Retevis RT1 This patch adds CHIRP support for programming both the VHF and UHF models of the Retevis RT1 handheld radios. #4313 diff -r 19790fa1d51a -r cf61dc3ea521 chirp/drivers/retevis_rt1.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/chirp/drivers/retevis_rt1.py Sun Dec 18 16:02:59 2016 -0500 @@ -0,0 +1,748 @@ +# Copyright 2016 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 2 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 time +import os +import struct +import logging + +from chirp import chirp_common, directory, memmap +from chirp import bitwise, errors, util +from chirp.settings import RadioSetting, RadioSettingGroup, \ + RadioSettingValueInteger, RadioSettingValueList, \ + RadioSettingValueBoolean, RadioSettingValueString, \ + InvalidValueError, RadioSettings + +LOG = logging.getLogger(__name__) + +MEM_FORMAT = """ +#seekto 0x0010; +struct { + lbcd rxfreq[4]; + lbcd txfreq[4]; + lbcd rxtone[2]; + lbcd txtone[2]; + u8 bcl:1, // Busy Lock + epilogue:1, // Epilogue (STE) + scramble:1, // Scramble + compander:1, // Compander + skip:1, // Scan Add + wide:1, // Bandwidth + unknown1:1, + highpower:1; // Power Level + u8 unknown2[3]; +} memory[16]; + +#seekto 0x0120; +struct { + u8 hivoltnotx:1, // TX Inhibit when voltage too high + lovoltnotx:1, // TX Inhibit when voltage too low + unknown1:1, + alarm:1, // Incept Alarm + scan:1, // Scan + tone:1, // Tone + voice:2; // Voice + u8 unknown2:1, + ssave:3, // Super Battery Save + unknown3:1, + save:3; // Battery Save + u8 squelch; // Squelch + u8 tot; // Time Out Timer + u8 voxi:1, // VOX Inhibit on Receive + voxd:2, // VOX Delay + voxc:1, // VOX Control + voxg:4; // VOX Gain + u8 unknown4:4, + scanspeed:4; // Scan Speed + u8 unknown5:3, + scandelay:5; // Scan Delay + u8 unknown6:3, + prioritych:5; // Priority Channel + u8 k1shortp; // Key 1 Short Press + u8 k2shortp; // Key 2 Short Press + u8 k1longp; // Key 1 Long Press + u8 k2longp; // Key 2 Long Press + u8 lpt; // Long Press Time +} settings; + +#seekto 0x0170; +struct { + char fp[8]; +} fingerprint; +""" + +CMD_ACK = "\x06" + +RT1_POWER_LEVELS = [chirp_common.PowerLevel("Low", watts=5.00), + chirp_common.PowerLevel("High", watts=9.00)] + +RT1_DTCS = sorted(chirp_common.DTCS_CODES + [645]) + +LIST_LPT = ["0.5", "1.0", "1.5", "2.0", "2.5"] +LIST_SHORT_PRESS = ["Off", "Monitor On/Off", "Power High/Low", "Alarm", "Volt"] +LIST_LONG_PRESS = ["Off", "Monitor On/Off", "Monitor(momentary)", + "Power High/Low", "Alarm", "Volt", "TX 1750 Hz"] +LIST_VOXDELAY = ["0.5", "1.0", "2.0", "3.0"] +LIST_VOICE = ["Off", "English", "Chinese"] +LIST_TIMEOUTTIMER = ["Off"] + ["%s" % x for x in range(30, 330, 30)] +LIST_SAVE = ["Off", "1:1", "1:2", "1:3", "1:4"] +LIST_SSAVE = ["Off"] + ["%s" % x for x in range(1, 7)] +LIST_PRIORITYCH = ["Off"] + ["%s" % x for x in range(1, 17)] +LIST_SCANSPEED = ["%s" % x for x in range(100, 550, 50)] +LIST_SCANDELAY = ["%s" % x for x in range(3, 31)] + +SETTING_LISTS = { + "lpt": LIST_LPT, + "k1shortp": LIST_SHORT_PRESS, + "k1longp": LIST_LONG_PRESS, + "k2shortp": LIST_SHORT_PRESS, + "k2longp": LIST_LONG_PRESS, + "voxd": LIST_VOXDELAY, + "voice": LIST_VOICE, + "tot": LIST_TIMEOUTTIMER, + "save": LIST_SAVE, + "ssave": LIST_SSAVE, + "prioritych": LIST_PRIORITYCH, + "scanspeed": LIST_SCANSPEED, + "scandelay": LIST_SCANDELAY, + } + +# Retevis RT1 fingerprints +RT1_VHF_fp = "PXT8K" + "\xF0\x00\x00" # RT1 VHF model +RT1_UHF_fp = "PXT8K" + "\xF3\x00\x00" # RT1 UHF model + +MODELS = [RT1_VHF_fp, RT1_UHF_fp] + + +def _model_from_data(data): + return data[0x0170:0x0178] + + +def _model_from_image(radio): + return _model_from_data(radio.get_mmap()) + + +def _get_radio_model(radio): + block = _rt1_read_block(radio, 0x0170, 0x10) + version = block[0:8] + return version + + +def _rt1_enter_programming_mode(radio): + serial = radio.pipe + + magic = ["PROGRAMa", "PROGRAMb"] + for i in range(0, 2): + + try: + LOG.debug("sending " + magic[i]) + serial.write(magic[i]) + ack = serial.read(1) + except: + _rt1_exit_programming_mode(radio) + raise errors.RadioError("Error communicating with radio") + + if not ack: + _rt1_exit_programming_mode(radio) + raise errors.RadioError("No response from radio") + elif ack != CMD_ACK: + LOG.debug("Incorrect response, got this:\n\n" + util.hexprint(ack)) + _rt1_exit_programming_mode(radio) + raise errors.RadioError("Radio refused to enter programming mode") + + try: + LOG.debug("sending " + util.hexprint("\x02")) + serial.write("\x02") + ident = serial.read(16) + except: + _rt1_exit_programming_mode(radio) + raise errors.RadioError("Error communicating with radio") + + if not ident.startswith("PXT8K"): + LOG.debug("Incorrect response, got this:\n\n" + util.hexprint(ident)) + _rt1_exit_programming_mode(radio) + LOG.debug(util.hexprint(ident)) + raise errors.RadioError("Radio returned unknown identification string") + + try: + LOG.debug("sending " + util.hexprint("MXT8KCUMHS1X7BN/")) + serial.write("MXT8KCUMHS1X7BN/") + ack = serial.read(1) + except: + _rt1_exit_programming_mode(radio) + raise errors.RadioError("Error communicating with radio") + + if ack != "\xB2": + LOG.debug("Incorrect response, got this:\n\n" + util.hexprint(ack)) + _rt1_exit_programming_mode(radio) + raise errors.RadioError("Radio refused to enter programming mode") + + try: + LOG.debug("sending " + util.hexprint(CMD_ACK)) + serial.write(CMD_ACK) + ack = serial.read(1) + except: + _rt1_exit_programming_mode(radio) + raise errors.RadioError("Error communicating with radio") + + if ack != CMD_ACK: + LOG.debug("Incorrect response, got this:\n\n" + util.hexprint(ack)) + _rt1_exit_programming_mode(radio) + raise errors.RadioError("Radio refused to enter programming mode") + + # DEBUG + LOG.info("Positive ident, this is a %s %s" % (radio.VENDOR, radio.MODEL)) + + +def _rt1_exit_programming_mode(radio): + serial = radio.pipe + try: + serial.write("E") + except: + raise errors.RadioError("Radio refused to exit programming mode") + + +def _rt1_read_block(radio, block_addr, block_size): + serial = radio.pipe + + cmd = struct.pack(">cHb", 'R', block_addr, block_size) + expectedresponse = "W" + cmd[1:] + LOG.debug("Reading block %04x..." % (block_addr)) + + try: + serial.write(cmd) + + response = serial.read(4 + block_size) + if response[:4] != expectedresponse: + _rt1_exit_programming_mode(radio) + raise Exception("Error reading block %04x." % (block_addr)) + + block_data = response[4:] + + serial.write(CMD_ACK) + ack = serial.read(1) + except: + _rt1_exit_programming_mode(radio) + raise errors.RadioError("Failed to read block at %04x" % block_addr) + + if ack != CMD_ACK: + _rt1_exit_programming_mode(radio) + raise Exception("No ACK reading block %04x." % (block_addr)) + + return block_data + + +def _rt1_write_block(radio, block_addr, block_size): + serial = radio.pipe + + cmd = struct.pack(">cHb", 'W', block_addr, block_size) + data = radio.get_mmap()[block_addr:block_addr + block_size] + + LOG.debug("Writing Data:") + LOG.debug(util.hexprint(cmd + data)) + + try: + serial.write(cmd + data) + if serial.read(1) != CMD_ACK: + raise Exception("No ACK") + except: + _rt1_exit_programming_mode(radio) + raise errors.RadioError("Failed to send block " + "to radio at %04x" % block_addr) + + +def do_download(radio): + LOG.debug("download") + _rt1_enter_programming_mode(radio) + + data = "" + + status = chirp_common.Status() + status.msg = "Cloning from radio" + + status.cur = 0 + status.max = radio._memsize + + for addr in range(0, radio._memsize, radio._block_size): + status.cur = addr + radio._block_size + radio.status_fn(status) + + block = _rt1_read_block(radio, addr, radio._block_size) + data += block + + LOG.debug("Address: %04x" % addr) + LOG.debug(util.hexprint(block)) + + _rt1_exit_programming_mode(radio) + + return memmap.MemoryMap(data) + + +def do_upload(radio): + status = chirp_common.Status() + status.msg = "Uploading to radio" + + _rt1_enter_programming_mode(radio) + + image_model = _model_from_image(radio) + LOG.info("Image Version is %s" % repr(image_model)) + + radio_model = _get_radio_model(radio) + LOG.info("Radio Version is %s" % repr(radio_model)) + + bands = ["VHF", "UHF"] + image_band = radio_band = "unknown" + for i in range(0,2): + if image_model == MODELS[i]: + image_band = bands[i] + if radio_model == MODELS[i]: + radio_band = bands[i] + + if image_model != radio_model: + _rt1_exit_programming_mode(radio) + msg = ("The upload was stopped because the band supported by " + "the image (%s) does not match the band supported by " + "the radio (%s).") + raise errors.RadioError(msg % (image_band, radio_band)) + + status.cur = 0 + status.max = 0x0190 + + for start_addr, end_addr, block_size in radio._ranges: + for addr in range(start_addr, end_addr, block_size): + status.cur = addr + block_size + radio.status_fn(status) + _rt1_write_block(radio, addr, block_size) + + _rt1_exit_programming_mode(radio) + + +def model_match(cls, data): + """Match the opened/downloaded image to the correct version""" + rid = data[0x0170:0x0176] + + return rid.startswith("PXT8K") + + +(a)directory.register +class RT1Radio(chirp_common.CloneModeRadio): + """Retevis RT1""" + VENDOR = "Retevis" + MODEL = "RT1" + BAUD_RATE = 2400 + + _ranges = [ + (0x0000, 0x0190, 0x10), + ] + _memsize = 0x0400 + _block_size = 0x10 + _vhf_range = (134000000, 175000000) + _uhf_range = (400000000, 521000000) + + def get_features(self): + rf = chirp_common.RadioFeatures() + rf.has_settings = True + rf.has_bank = False + rf.has_ctone = True + rf.has_cross = True + rf.has_rx_dtcs = True + rf.has_tuning_step = False + rf.can_odd_split = True + rf.has_name = False + rf.valid_skips = ["", "S"] + rf.valid_tmodes = ["", "Tone", "TSQL", "DTCS", "Cross"] + rf.valid_cross_modes = ["Tone->Tone", "Tone->DTCS", "DTCS->Tone", + "->Tone", "->DTCS", "DTCS->", "DTCS->DTCS"] + rf.valid_power_levels = RT1_POWER_LEVELS + rf.valid_duplexes = ["", "-", "+", "split", "off"] + rf.valid_modes = ["NFM", "FM"] # 12.5 KHz, 25 kHz. + rf.memory_bounds = (1, 16) + if self._my_band() == RT1_VHF_fp: + rf.valid_bands = [self._vhf_range] + elif self._my_band() == RT1_UHF_fp: + rf.valid_bands = [self._uhf_range] + else: + rf.valid_bands = [self._vhf_range, + self._uhf_range] + + return rf + + def process_mmap(self): + self._memobj = bitwise.parse(MEM_FORMAT, self._mmap) + + def sync_in(self): + self._mmap = do_download(self) + self.process_mmap() + + def sync_out(self): + do_upload(self) + + def get_raw_memory(self, number): + return repr(self._memobj.memory[number - 1]) + + def decode_tone(self, val): + """Parse the tone data to decode from mem, it returns: + Mode (''|DTCS|Tone), Value (None|###), Polarity (None,N,R)""" + if val.get_raw() == "\xFF\xFF": + return '', None, None + + val = int(val) + if val >= 12000: + a = val - 12000 + return 'DTCS', a, 'R' + elif val >= 8000: + a = val - 8000 + return 'DTCS', a, 'N' + else: + a = val / 10.0 + return 'Tone', a, None + + def encode_tone(self, memval, mode, value, pol): + """Parse the tone data to encode from UI to mem""" + if mode == '': + memval[0].set_raw(0xFF) + memval[1].set_raw(0xFF) + elif mode == 'Tone': + memval.set_value(int(value * 10)) + elif mode == 'DTCS': + flag = 0x80 if pol == 'N' else 0xC0 + memval.set_value(value) + memval[1].set_bits(flag) + else: + raise Exception("Internal error: invalid mode `%s'" % mode) + + def _my_band(self): + model_tag = _model_from_image(self) + return model_tag + + def get_memory(self, number): + _mem = self._memobj.memory[number - 1] + + mem = chirp_common.Memory() + + mem.number = number + mem.freq = int(_mem.rxfreq) * 10 + + # We'll consider any blank (i.e. 0MHz frequency) to be empty + if mem.freq == 0: + mem.empty = True + return mem + + if _mem.rxfreq.get_raw() == "\xFF\xFF\xFF\xFF": + mem.freq = 0 + mem.empty = True + return mem + + if int(_mem.rxfreq) == int(_mem.txfreq): + mem.duplex = "" + mem.offset = 0 + else: + mem.duplex = int(_mem.rxfreq) > int(_mem.txfreq) and "-" or "+" + mem.offset = abs(int(_mem.rxfreq) - int(_mem.txfreq)) * 10 + + mem.mode = _mem.wide and "FM" or "NFM" + + rxtone = txtone = None + txtone = self.decode_tone(_mem.txtone) + rxtone = self.decode_tone(_mem.rxtone) + chirp_common.split_tone_decode(mem, txtone, rxtone) + + mem.power = RT1_POWER_LEVELS[_mem.highpower] + + if _mem.skip: + mem.skip = "S" + + mem.extra = RadioSettingGroup("Extra", "extra") + + rs = RadioSetting("bcl", "BCL", + RadioSettingValueBoolean(not _mem.bcl)) + mem.extra.append(rs) + + rs = RadioSetting("epilogue", "Epilogue(STE)", + RadioSettingValueBoolean(not _mem.epilogue)) + mem.extra.append(rs) + + rs = RadioSetting("compander", "Compander", + RadioSettingValueBoolean(not _mem.compander)) + mem.extra.append(rs) + + rs = RadioSetting("scramble", "Scramble", + RadioSettingValueBoolean(not _mem.scramble)) + mem.extra.append(rs) + + return mem + + def set_memory(self, mem): + _mem = self._memobj.memory[mem.number - 1] + + if mem.empty: + _mem.set_raw("\xFF" * (_mem.size() / 8)) + return + + _mem.rxfreq = mem.freq / 10 + + if mem.duplex == "off": + for i in range(0, 4): + _mem.txfreq[i].set_raw("\xFF") + elif mem.duplex == "split": + _mem.txfreq = mem.offset / 10 + elif mem.duplex == "+": + _mem.txfreq = (mem.freq + mem.offset) / 10 + elif mem.duplex == "-": + _mem.txfreq = (mem.freq - mem.offset) / 10 + else: + _mem.txfreq = mem.freq / 10 + + _mem.wide = mem.mode == "FM" + + ((txmode, txtone, txpol), (rxmode, rxtone, rxpol)) = \ + chirp_common.split_tone_encode(mem) + self.encode_tone(_mem.txtone, txmode, txtone, txpol) + self.encode_tone(_mem.rxtone, rxmode, rxtone, rxpol) + + _mem.highpower = mem.power == RT1_POWER_LEVELS[1] + + _mem.skip = mem.skip == "S" + + for setting in mem.extra: + setattr(_mem, setting.get_name(), not int(setting.value)) + + def get_settings(self): + _settings = self._memobj.settings + basic = RadioSettingGroup("basic", "Basic Settings") + top = RadioSettings(basic) + + rs = RadioSetting("lpt", "Long Press Time[s]", + RadioSettingValueList( + LIST_LPT, + LIST_LPT[_settings.lpt])) + basic.append(rs) + + if _settings.k1shortp > 4: + val = 1 + else: + val = _settings.k1shortp + rs = RadioSetting("k1shortp", "Key 1 Short Press", + RadioSettingValueList( + LIST_SHORT_PRESS, + LIST_SHORT_PRESS[val])) + basic.append(rs) + + if _settings.k1longp > 6: + val = 3 + else: + val = _settings.k1longp + rs = RadioSetting("k1longp", "Key 1 Long Press", + RadioSettingValueList( + LIST_LONG_PRESS, + LIST_LONG_PRESS[val])) + basic.append(rs) + + if _settings.k2shortp > 4: + val = 4 + else: + val = _settings.k2shortp + rs = RadioSetting("k2shortp", "Key 2 Short Press", + RadioSettingValueList( + LIST_SHORT_PRESS, + LIST_SHORT_PRESS[val])) + basic.append(rs) + + if _settings.k2longp > 6: + val = 4 + else: + val = _settings.k2longp + rs = RadioSetting("k2longp", "Key 2 Long Press", + RadioSettingValueList( + LIST_LONG_PRESS, + LIST_LONG_PRESS[val])) + basic.append(rs) + + rs = RadioSetting("voxc", "VOX Control", + RadioSettingValueBoolean(not _settings.voxc)) + basic.append(rs) + + if _settings.voxg > 8: + val = 4 + else: + val = _settings.voxg + 1 + rs = RadioSetting("voxg", "VOX Gain", + RadioSettingValueInteger(1, 9, val)) + basic.append(rs) + + rs = RadioSetting("voxd", "VOX Delay Time", + RadioSettingValueList( + LIST_VOXDELAY, + LIST_VOXDELAY[_settings.voxd])) + basic.append(rs) + + rs = RadioSetting("voxi", "VOX Inhibit on Receive", + RadioSettingValueBoolean(not _settings.voxi)) + basic.append(rs) + + if _settings.squelch > 8: + val = 4 + else: + val = _settings.squelch + rs = RadioSetting("squelch", "Squelch Level", + RadioSettingValueInteger(0, 9, val)) + basic.append(rs) + + if _settings.voice == 3: + val = 1 + else: + val = _settings.voice + rs = RadioSetting("voice", "Voice Prompts", + RadioSettingValueList( + LIST_VOICE, + LIST_VOICE[val])) + basic.append(rs) + + rs = RadioSetting("tone", "Tone", + RadioSettingValueBoolean(_settings.tone)) + basic.append(rs) + + rs = RadioSetting("lovoltnotx", "TX Inhibit (when battery < 6 volts)", + RadioSettingValueBoolean(_settings.lovoltnotx)) + basic.append(rs) + + rs = RadioSetting("hivoltnotx", "TX Inhibit (when battery > 9 volts)", + RadioSettingValueBoolean(_settings.hivoltnotx)) + basic.append(rs) + + if _settings.tot > 10: + val = 6 + else: + val = _settings.tot + rs = RadioSetting("tot", "Time-out Timer[s]", + RadioSettingValueList( + LIST_TIMEOUTTIMER, + LIST_TIMEOUTTIMER[val])) + basic.append(rs) + + if _settings.save < 3: + val = 0 + else: + val = _settings.save - 3 + rs = RadioSetting("save", "Battery Saver", + RadioSettingValueList( + LIST_SAVE, + LIST_SAVE[val])) + basic.append(rs) + + rs = RadioSetting("ssave", "Super Battery Saver[s]", + RadioSettingValueList( + LIST_SSAVE, + LIST_SSAVE[_settings.ssave])) + basic.append(rs) + + rs = RadioSetting("alarm", "Incept Alarm", + RadioSettingValueBoolean(_settings.alarm)) + basic.append(rs) + + rs = RadioSetting("scan", "Scan Function", + RadioSettingValueBoolean(_settings.scan)) + basic.append(rs) + + if _settings.prioritych > 15: + val = 0 + else: + val = _settings.prioritych + 1 + rs = RadioSetting("prioritych", "Priority Channel", + RadioSettingValueList( + LIST_PRIORITYCH, + LIST_PRIORITYCH[val])) + basic.append(rs) + + if _settings.scanspeed > 8: + val = 4 + else: + val = _settings.scanspeed + rs = RadioSetting("scanspeed", "Scan Speed[ms]", + RadioSettingValueList( + LIST_SCANSPEED, + LIST_SCANSPEED[val])) + basic.append(rs) + + if _settings.scandelay > 27: + val = 12 + else: + val = _settings.scandelay + rs = RadioSetting("scandelay", "Scan Droupout Delay Time[s]", + RadioSettingValueList( + LIST_SCANDELAY, + LIST_SCANDELAY[val])) + basic.append(rs) + + return top + + def set_settings(self, settings): + for element in settings: + if not isinstance(element, RadioSetting): + self.set_settings(element) + continue + else: + try: + if "." in element.get_name(): + bits = element.get_name().split(".") + obj = self._memobj + for bit in bits[:-1]: + obj = getattr(obj, bit) + setting = bits[-1] + else: + obj = self._memobj.settings + setting = element.get_name() + + if setting == "voxc": + setattr(obj, setting, not int(element.value)) + elif setting == "voxg": + setattr(obj, setting, int(element.value) - 1) + elif setting == "voxi": + setattr(obj, setting, not int(element.value)) + elif setting == "voice": + if int(element.value) == 2: + setattr(obj, setting, int(element.value) + 1) + else: + setattr(obj, setting, int(element.value)) + elif setting == "save": + setattr(obj, setting, int(element.value) + 3) + elif setting == "prioritych": + if int(element.value) == 0: + setattr(obj, setting, int(element.value) + 31) + else: + setattr(obj, setting, int(element.value) - 1) + elif element.value.get_mutable(): + 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): + match_size = False + match_model = False + + # testing the file data size + if len(filedata) in [0x0400, ]: + match_size = True + + # testing the model fingerprint + match_model = model_match(cls, filedata) + + if match_size and match_model: + return True + else: + return False

1 0

[chirp_devel] [PATCH] [RT21] Add PF1 Function Key Setting
by Jim Unroe 18 Dec '16

18 Dec '16

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1482027538 18000 # Node ID 19790fa1d51a5183b7dd6758c9fbb6c5d5a0bd4b # Parent 65d5776cef31d2f06101ff2e5463fadbd705eab1 [RT21] Add PF1 Function Key Setting This patch adds the ability to set the PF1 key function of the Retevis RT21. #4139 diff -r 65d5776cef31 -r 19790fa1d51a chirp/drivers/retevis_rt21.py --- a/chirp/drivers/retevis_rt21.py Sat Dec 17 21:10:10 2016 -0500 +++ b/chirp/drivers/retevis_rt21.py Sat Dec 17 21:18:58 2016 -0500 @@ -46,6 +46,12 @@ scramble_type2:4; } memory[16]; +#seekto 0x011D; +struct { + u8 unused:4, + pf1:4; // Programmable Function Key 1 +} keys; + #seekto 0x012C; struct { u8 use_scramble; // Scramble Enable @@ -82,6 +88,8 @@ TOTALERT_LIST = ["Off"] + ["%s seconds" % x for x in range(1, 11)] VOICE_LIST = ["Off", "Chinese", "English"] VOX_LIST = ["OFF"] + ["%s" % x for x in range(1, 17)] +PF1_CHOICES = ["None", "Monitor", "Scan", "Scramble", "Alarm"] +PF1_VALUES = [0x0F, 0x04, 0x06, 0x08, 0x0C] SETTING_LISTS = { "bcl": BCL_LIST, @@ -455,6 +463,7 @@ setattr(_mem, setting.get_name(), setting.value) def get_settings(self): + _keys = self._memobj.keys _settings = self._memobj.settings basic = RadioSettingGroup("basic", "Basic Settings") top = RadioSettings(basic) @@ -497,6 +506,23 @@ VOX_LIST, VOX_LIST[_settings.vox])) basic.append(rs) + def apply_pf1_listvalue(setting, obj): + LOG.debug("Setting value: "+ str(setting.value) + " from list") + val = str(setting.value) + index = PF1_CHOICES.index(val) + val = PF1_VALUES[index] + obj.set_value(val) + + if _keys.pf1 in PF1_VALUES: + idx = PF1_VALUES.index(_keys.pf1) + else: + idx = LIST_DTMF_SPECIAL_VALUES.index(0x04) + rs = RadioSetting("keys.pf1", "PF1 Key Function", + RadioSettingValueList(PF1_CHOICES, + PF1_CHOICES[idx])) + rs.set_apply_callback(apply_pf1_listvalue, _keys.pf1) + basic.append(rs) + return top def set_settings(self, settings): @@ -516,7 +542,10 @@ obj = self._memobj.settings setting = element.get_name() - if setting == "tot": + if element.has_apply_callback(): + LOG.debug("Using apply callback") + element.run_apply_callback() + elif setting == "tot": setattr(obj, setting, int(element.value) + 1) elif element.value.get_mutable(): LOG.debug("Setting %s = %s" % (setting, element.value))

1 0

[chirp_devel] [PATCH] [RT22] Add Support for Luiton LT-316
by Jim Unroe 18 Dec '16

18 Dec '16

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1482019338 18000 # Node ID d7b9756a8083b9e77317865fbd1c0527b33e587d # Parent 670eebb40b785a1537d66a61067d80107d9363bf [RT22] Add Support for Luiton LT-316 This patch adds support for the Luiton LT-316 variant to the retevis_rt22.py driver. Related to #4145 diff -r 670eebb40b78 -r d7b9756a8083 chirp/drivers/retevis_rt22.py --- a/chirp/drivers/retevis_rt22.py Sat Dec 17 18:52:28 2016 -0500 +++ b/chirp/drivers/retevis_rt22.py Sat Dec 17 19:02:18 2016 -0500 @@ -624,3 +624,9 @@ """Zastone ZT-X6""" VENDOR = "Zastone" MODEL = "ZT-X6" + +(a)directory.register +class LT316(RT22Radio): + """Luiton LT-316""" + VENDOR = "LUITON" + MODEL = "LT-316"

1 0

[chirp_devel] [PATCH] [RT22] Add Retries When Initializing Cloning
by Jim Unroe 17 Dec '16

17 Dec '16

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1482018748 18000 # Node ID 670eebb40b785a1537d66a61067d80107d9363bf # Parent b6d25de71e0feb5aed26105b5d5d8edddfcb8b66 [RT22] Add Retries When Initializing Cloning Cloning does not always begin on the initial request. This patch adds the ability to retry up to five times (similar to how the factory software does it). Related to #4145 diff -r b6d25de71e0f -r 670eebb40b78 chirp/drivers/retevis_rt22.py --- a/chirp/drivers/retevis_rt22.py Wed Dec 07 08:51:18 2016 -0500 +++ b/chirp/drivers/retevis_rt22.py Sat Dec 17 18:52:28 2016 -0500 @@ -97,21 +97,26 @@ serial = radio.pipe magic = "PROGRGS" - try: + exito = False + for i in range(0, 5): for j in range(0, len(magic)): time.sleep(0.005) serial.write(magic[j]) ack = serial.read(1) - except: - _rt22_exit_programming_mode(radio) - raise errors.RadioError("Error communicating with radio") - if not ack: - _rt22_exit_programming_mode(radio) - raise errors.RadioError("No response from radio") - elif ack != CMD_ACK: - _rt22_exit_programming_mode(radio) - raise errors.RadioError("Radio refused to enter programming mode") + try: + if ack == CMD_ACK: + exito = True + break + except: + LOG.debug("Attempt #%s, failed, trying again" % i) + pass + + # check if we had EXITO + if exito is False: + msg = "The radio did not accept program mode after five tries.\n" + msg += "Check you interface cable and power cycle your radio." + raise errors.RadioError(msg) try: serial.write("\x02") @@ -311,11 +316,31 @@ self._memobj = bitwise.parse(MEM_FORMAT, self._mmap) def sync_in(self): - self._mmap = do_download(self) + """Download from radio""" + try: + data = do_download(self) + except errors.RadioError: + # Pass through any real errors we raise + raise + except: + # If anything unexpected happens, make sure we raise + # a RadioError and log the problem + LOG.exception('Unexpected error during download') + raise errors.RadioError('Unexpected error communicating ' + 'with the radio') + self._mmap = data self.process_mmap() def sync_out(self): - do_upload(self) + """Upload to radio""" + try: + do_upload(self) + except: + # If anything unexpected happens, make sure we raise + # a RadioError and log the problem + LOG.exception('Unexpected error during upload') + raise errors.RadioError('Unexpected error communicating ' + 'with the radio') def get_raw_memory(self, number): return repr(self._memobj.memory[number - 1])

1 0