March 2015 - Developers - lists.chirpmyradio.com

[chirp_devel] [PATCH] [ft2900] Adds support for odd splits. Fixes #2423
by Chris Fosnight 14 Mar '15

14 Mar '15

# HG changeset patch # User Chris Fosnight <chris.fosnight(a)gmail.com> # Date 1426378382 25200 # Node ID ca02f98b35e5c597d017e78843c6ac3987523692 # Parent c9c9128ca29ea21f54249788a9c0e47c9d5fbdc4 [ft2900] Adds support for odd splits. Fixes #2423 This patch adds support for odd splits. I have used it to download odd splits from a Yaesu 1900R, add another odd split via UI, and upload to radio. Passes tests. Adjusted memory map for offset to 3 bytes and added odd split components. Used chirp_common.fix_rounded_step when getting offset memory. Adjusted unknown bytes in memory map and references in code. #2423 diff -r c9c9128ca29e -r ca02f98b35e5 chirp/drivers/ft2900.py --- a/chirp/drivers/ft2900.py Thu Mar 12 09:49:32 2015 +0100 +++ b/chirp/drivers/ft2900.py Sat Mar 14 17:13:02 2015 -0700 @@ -204,11 +204,10 @@ unknown4:3, tmode:3; u8 name[6]; - u8 unknown5; - bbcd offset[2]; + bbcd offset[3]; u8 tone; u8 dtcs; - u8 unknown6; + u8 unknown5; u8 tone2; u8 dtcs2; } memory[200]; @@ -217,7 +216,7 @@ MODES = ["FM", "NFM"] TMODES = ["", "Tone", "TSQL", "DTCS", "TSQL-R"] -DUPLEX = ["", "-", "+", ""] +DUPLEX = ["", "-", "+", "split"] POWER_LEVELS = [chirp_common.PowerLevel("Hi", watts=75), chirp_common.PowerLevel("Low3", watts=30), chirp_common.PowerLevel("Low2", watts=10), @@ -275,6 +274,7 @@ rf.memory_bounds = (0, 199) + rf.can_odd_split = True rf.has_ctone = False rf.has_dtcs_polarity = False rf.has_bank = False @@ -346,7 +346,7 @@ if (lastdigit == 2 or lastdigit == 7): mem.freq += 500 - mem.offset = int(_mem.offset) * 1000 + mem.offset = chirp_common.fix_rounded_step(int(_mem.offset) * 1000) mem.duplex = DUPLEX[_mem.duplex] mem.tmode = TMODES[_mem.tmode] mem.rtone = chirp_common.TONES[_mem.tone] @@ -409,7 +409,6 @@ _mem.unknown3 = 0 _mem.unknown4 = 0 _mem.unknown5 = 0 - _mem.unknown6 = 0 LOG.debug("encoded mem\n%s\n" % (util.hexprint(_mem.get_raw()[0:20])))

1 0

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

13 Mar '15

Tested changes: [Marco Filippi <iz3gme.marco(a)gmail.com>] [TH-F6A] Implementing settings Most of the settings have been implemented supports #2383 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 256ccb5acf2491df0b76ae7767fb62951d8392a1 [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 256ccb5acf2491df0b76ae7767fb62951d8392a1 No emails were triggered. [workspace] $ /bin/sh -xe /tmp/hudson1614870881224198777.sh + ./run_all_tests.sh test_bit_array (tests.unit.test_bitwise.TestBitType) ... ok test_bit_array_fail (tests.unit.test_bitwise.TestBitType) ... ok test_bitfield_u16 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_u24 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_u8 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_ul16 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_ul24 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bbcd (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_bbcd_array (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_lbcd (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_lbcd_array (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_int_array (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u16 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u24 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u32 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u8 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul16 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul24 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul32 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_char (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string_invalid_chars (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string_wrong_length (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_comment_cppstyle (tests.unit.test_bitwise.TestBitwiseComments) ... ok test_comment_inline_cppstyle (tests.unit.test_bitwise.TestBitwiseComments) ... ok test_missing_semicolon (tests.unit.test_bitwise.TestBitwiseErrors) ... ok test_seek (tests.unit.test_bitwise.TestBitwiseSeek) ... ok test_seekto (tests.unit.test_bitwise.TestBitwiseSeek) ... ok test_struct_one_element (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok test_struct_two_elements (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok test_struct_writes (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok split_tone_encode_test_cross_dtcs_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_none_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_none_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_tone_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_tone_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_none (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_tsql (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_dtcs_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_dtcs_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_none_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_none_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_tone_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_tone_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_none (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_tsql (tests.unit.test_chirp_common.TestSplitTone) ... ok test_fix_rounded_step_250 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_fix_rounded_step_500 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_fix_rounded_step_750 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_12_5 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_2_5 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_5_0 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_6_25 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_fractional_step (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_required_step (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_required_step_fail (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_format_freq (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_bad (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_decimal (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_whitespace (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_whole (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_ensure_has_calls_almost_full (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_empty (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_partial (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_rptcall_full1 (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_rptcall_full2 (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_urcall_full (tests.unit.test_import_logic.DstarTests) ... ok test_import_bank (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_dtcs_diffA_dtcs (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_dtcs_diffB_dtcs (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_negative (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_too_big_vhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_uhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_vhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem_with_errors (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem_with_warnings (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_invalid (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_valid_am (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_valid_fm (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_name (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_closest (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_no_dst (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_no_src (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_same (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_tone_diffA_tsql (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_tone_diffB_tsql (tests.unit.test_import_logic.ImportFieldTests) ... ok test_mapping (tests.unit.test_mappingmodel.TestBaseBank) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestBaseBank) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseBankModel) ... ok test_get_name (tests.unit.test_mappingmodel.TestBaseBankModel) ... ok test_mapping (tests.unit.test_mappingmodel.TestBaseMapping) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestBaseMapping) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseMappingModel) ... ok test_get_name (tests.unit.test_mappingmodel.TestBaseMappingModel) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseMappingModelIndexInterface) ... ok test_add_memory_to_mapping (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_mapping_memories (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_memory_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_num_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping_no_bank (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping_wrong_bank (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_icom_bank (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_mapping (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_add_memory_to_mapping (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_index_bounds (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_mapping_memories (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_memory_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_memory_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_next_mapping_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_num_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping_no_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping_wrong_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index_bad_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index_bad_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_auto_tone_mode_cross (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs_pol (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs_rx (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_tone (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_tsql (tests.unit.test_memedit_edits.TestEdits) ... ok test_init (tests.unit.test_platform.Win32PlatformTest) ... ok test_serial_ports_bad_portnames (tests.unit.test_platform.Win32PlatformTest) ... ok test_serial_ports_sorted (tests.unit.test_platform.Win32PlatformTest) ... ok test_apply_callback (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting_group (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting_multi (tests.unit.test_settings.TestSettingContainers) ... ok test_changed (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_boolean (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_float (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_integer (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_list (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_string (tests.unit.test_settings.TestSettingValues) ... ok test_validate_callback (tests.unit.test_settings.TestSettingValues) ... ok test_delete_hole_with_all (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_with_all_full (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_with_hole (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_without_hole (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_insert_hole_with_space (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_insert_hole_without_space (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok ---------------------------------------------------------------------- Ran 151 tests in 0.127s OK Patch 'tip' is OK Checking for PEP8 regressions... real 0m12.331s user 0m9.953s sys 0m0.190s ================================================ Tests OK Email was triggered for: Success Sending email for trigger: Success

1 0

[chirp_devel] [PATCH] [TH-F6A] Implementing settings
by Marco Filippi IZ3GME 12 Mar '15

12 Mar '15

# HG changeset patch # User Marco Filippi <iz3gme.marco(a)gmail.com> # Date 1426150172 -3600 # Thu Mar 12 09:49:32 2015 +0100 # Node ID c9c9128ca29ea21f54249788a9c0e47c9d5fbdc4 # Parent 256ccb5acf2491df0b76ae7767fb62951d8392a1 [TH-F6A] Implementing settings Most of the settings have been implemented supports #2383 diff --git a/chirp/drivers/kenwood_live.py b/chirp/drivers/kenwood_live.py --- a/chirp/drivers/kenwood_live.py +++ b/chirp/drivers/kenwood_live.py @@ -57,7 +57,7 @@ LOG.error("Timeout waiting for data") break - LOG.debug("D7->PC: %s" % result.strip()) + LOG.debug("RADIO->PC: %s" % result.strip()) LOCK.release() @@ -243,32 +243,60 @@ raise errors.RadioError("Radio refused delete of %i" % number) del self.__memcache[number] -TH_D7_SETTINGS = { - "BAL": ["4:0", "3:1", "2:2", "1:3", "0:4"], - "BEP": ["Off", "Key", "Key+Data", "All"], - "BEPT": ["Off", "Mine", "All New"], # D700 has fourth "All" - "DS": ["Data Band", "Both Bands"], - "DTB": ["A", "B"], - "DTBA": ["A", "B", "A:TX/B:RX"], # D700 has fourth A:RX/B:TX - "DTX": ["Manual", "PTT", "Auto"], - "ICO": ["Kenwood", "Runner", "House", "Tent", "Boat", "SSTV", - "Plane", "Speedboat", "Car", "Bicycle"], - "MNF": ["Name", "Frequency"], - "PKSA": ["1200", "9600"], - "POSC": ["Off Duty", "Enroute", "In Service", "Returning", - "Committed", "Special", "Priority", "Emergency"], - "PT": ["100ms", "200ms", "500ms", "750ms", - "1000ms", "1500ms", "2000ms"], - "SCR": ["Time", "Carrier", "Seek"], - "SV": ["Off", "0.2s", "0.4s", "0.6s", "0.8s", "1.0s", - "2s", "3s", "4s", "5s"], - "TEMP": ["F", "C"], - "TXI": ["30sec", "1min", "2min", "3min", "4min", "5min", - "10min", "20min", "30min"], - "UNIT": ["English", "Metric"], - "WAY": ["Off", "6 digit NMEA", "7 digit NMEA", "8 digit NMEA", - "9 digit NMEA", "6 digit Magellan", "DGPS"], -} + def _kenwood_get(self, cmd): + resp = command(self.pipe, cmd) + if " " in resp: + return resp.split(" ", 1) + else: + if resp == cmd: + return [resp, ""] + else: + raise errors.RadioError("Radio refused to return %s" % cmd) + + def _kenwood_set(self, cmd, value): + resp = command(self.pipe, cmd, value) + if resp[:len(cmd)] == cmd: + return + raise errors.RadioError("Radio refused to set %s" % cmd) + + def _kenwood_get_bool(self, cmd): + _cmd, result = self._kenwood_get(cmd) + return result == "1" + + def _kenwood_set_bool(self, cmd, value): + return self._kenwood_set(cmd, str(int(value))) + + def _kenwood_get_int(self, cmd): + _cmd, result = self._kenwood_get(cmd) + return int(result) + + def _kenwood_set_int(self, cmd, value, digits=1): + return self._kenwood_set(cmd, ("%%0%ii" % digits) % value) + + def set_settings(self, settings): + for element in settings: + if not isinstance(element, RadioSetting): + self.set_settings(element) + continue + if not element.changed(): + continue + if isinstance(element.value, RadioSettingValueBoolean): + self._kenwood_set_bool(element.get_name(), element.value) + elif isinstance(element.value, RadioSettingValueList): + options = self._SETTINGS_OPTIONS[element.get_name()] + self._kenwood_set_int(element.get_name(), + options.index(str(element.value))) + elif isinstance(element.value, RadioSettingValueInteger): + if element.value.get_max() > 9: + digits = 2 + else: + digits = 1 + self._kenwood_set_int(element.get_name(), + element.value, digits) + elif isinstance(element.value, RadioSettingValueString): + self._kenwood_set(element.get_name(), str(element.value)) + else: + LOG.error("Unknown type %s" % element.value) class KenwoodOldLiveRadio(KenwoodLiveRadio): @@ -294,6 +322,33 @@ _kenwood_split = True + _SETTINGS_OPTIONS = { + "BAL": ["4:0", "3:1", "2:2", "1:3", "0:4"], + "BEP": ["Off", "Key", "Key+Data", "All"], + "BEPT": ["Off", "Mine", "All New"], # D700 has fourth "All" + "DS": ["Data Band", "Both Bands"], + "DTB": ["A", "B"], + "DTBA": ["A", "B", "A:TX/B:RX"], # D700 has fourth A:RX/B:TX + "DTX": ["Manual", "PTT", "Auto"], + "ICO": ["Kenwood", "Runner", "House", "Tent", "Boat", "SSTV", + "Plane", "Speedboat", "Car", "Bicycle"], + "MNF": ["Name", "Frequency"], + "PKSA": ["1200", "9600"], + "POSC": ["Off Duty", "Enroute", "In Service", "Returning", + "Committed", "Special", "Priority", "Emergency"], + "PT": ["100ms", "200ms", "500ms", "750ms", + "1000ms", "1500ms", "2000ms"], + "SCR": ["Time", "Carrier", "Seek"], + "SV": ["Off", "0.2s", "0.4s", "0.6s", "0.8s", "1.0s", + "2s", "3s", "4s", "5s"], + "TEMP": ["F", "C"], + "TXI": ["30sec", "1min", "2min", "3min", "4min", "5min", + "10min", "20min", "30min"], + "UNIT": ["English", "Metric"], + "WAY": ["Off", "6 digit NMEA", "7 digit NMEA", "8 digit NMEA", + "9 digit NMEA", "6 digit Magellan", "DGPS"], + } + def get_features(self): rf = chirp_common.RadioFeatures() rf.has_settings = True @@ -360,33 +415,6 @@ return mem - def _kenwood_get(self, cmd): - resp = command(self.pipe, cmd) - if " " in resp: - return resp.split(" ", 1) - else: - raise errors.RadioError("Radio refused to return %s" % cmd) - - def _kenwood_set(self, cmd, value): - resp = command(self.pipe, cmd, value) - if " " in resp: - return - raise errors.RadioError("Radio refused to set %s" % cmd) - - def _kenwood_get_bool(self, cmd): - _cmd, result = self._kenwood_get(cmd) - return result == "1" - - def _kenwood_set_bool(self, cmd, value): - return self._kenwood_set(cmd, str(int(value))) - - def _kenwood_get_int(self, cmd): - _cmd, result = self._kenwood_get(cmd) - return int(result) - - def _kenwood_set_int(self, cmd, value, digits=1): - return self._kenwood_set(cmd, ("%%0%ii" % digits) % value) - def get_settings(self): main = RadioSettingGroup("main", "Main") aux = RadioSettingGroup("aux", "Aux") @@ -441,7 +469,7 @@ for setting, group, name in lists: value = self._kenwood_get_int(setting) - options = TH_D7_SETTINGS[setting] + options = self._SETTINGS_OPTIONS[setting] rs = RadioSetting(setting, name, RadioSettingValueList(options, options[value])) @@ -470,28 +498,6 @@ return top - def set_settings(self, settings): - for element in settings: - if not element.changed(): - continue - if isinstance(element.value, RadioSettingValueBoolean): - self._kenwood_set_bool(element.get_name(), element.value) - elif isinstance(element.value, RadioSettingValueList): - options = TH_D7_SETTINGS[element.get_name()] - self._kenwood_set_int(element.get_name(), - options.index(str(element.value))) - elif isinstance(element.value, RadioSettingValueInteger): - if element.value.get_max() > 9: - digits = 2 - else: - digits = 1 - self._kenwood_set_int(element.get_name(), - element.value, digits) - elif isinstance(element.value, RadioSettingValueString): - self._kenwood_set(element.get_name(), str(element.value)) - else: - LOG.error("Unknown type %s" % element.value) - @directory.register class THD7GRadio(THD7Radio): @@ -777,6 +783,7 @@ rf.valid_characters = chirp_common.CHARSET_ASCII rf.valid_name_length = 8 rf.memory_bounds = (0, self._upper) + rf.has_settings = True return rf def _cmd_set_memory(self, number, spec): @@ -849,6 +856,98 @@ return spec + _SETTINGS_OPTIONS = { + "APO": ["Off", "30min", "60min"], + "BAL": ["100%:0%", "75%:25%", "50%:50%", "25%:75%", "%0:100%"], + "BAT": ["Lithium", "Alkaline"], + "CKEY": ["Call", "1750Hz"], + "DATP": ["1200bps", "9600bps"], + "LAN": ["English", "Japanese"], + "MNF": ["Name", "Frequency"], + "MRM": ["All Band", "Current Band"], + "PT": ["100ms", "250ms", "500ms", "750ms", + "1000ms", "1500ms", "2000ms"], + "SCR": ["Time", "Carrier", "Seek"], + "SV": ["Off", "0.2s", "0.4s", "0.6s", "0.8s", "1.0s", + "2s", "3s", "4s", "5s"], + "VXD": ["250ms", "500ms", "750ms", "1s", "1.5s", "2s", "3s"], + } + + def get_settings(self): + main = RadioSettingGroup("main", "Main") + aux = RadioSettingGroup("aux", "Aux") + save = RadioSettingGroup("save", "Save") + display = RadioSettingGroup("display", "Display") + dtmf = RadioSettingGroup("dtmf", "DTMF") + top = RadioSettings(main, aux, save, display, dtmf) + + lists = [("APO", save, "Automatic Power Off"), + ("BAL", main, "Balance"), + ("BAT", save, "Battery Type"), + ("CKEY", aux, "CALL Key Set Up"), + ("DATP", aux, "Data Packet Speed"), + ("LAN", display, "Language"), + ("MNF", main, "Memory Display Mode"), + ("MRM", main, "Memory Recall Method"), + ("PT", dtmf, "DTMF Speed"), + ("SCR", main, "Scan Resume"), + ("SV", save, "Battery Save"), + ("VXD", aux, "VOX Drop Delay"), + ] + + bools = [("ANT", aux, "Bar Antenna"), + ("ATT", main, "Attenuator Enabled"), + ("ARO", main, "Automatic Repeater Offset"), + ("BEP", aux, "Beep for keypad"), + ("DL", main, "Dual"), + ("DLK", dtmf, "DTMF Lockout On Transmit"), + ("ELK", aux, "Enable Locked Tuning"), + ("LK", main, "Lock"), + ("LMP", display, "Lamp"), + ("NSFT", aux, "Noise Shift"), + ("TH", aux, "Tx Hold for 1750"), + ("TSP", dtmf, "DTMF Fast Transmission"), + ("TXH", dtmf, "TX Hold DTMF"), + ("TXS", main, "Transmit Inhibit"), + ("VOX", aux, "VOX Enable"), + ("VXB", aux, "VOX On Busy"), + ] + + ints = [("CNT", display, "Contrast", 1, 16), + ("VXG", aux, "VOX Gain", 0, 9), + ] + + strings = [("MES", display, "Power-on Message", 8), + ] + + for setting, group, name in bools: + value = self._kenwood_get_bool(setting) + rs = RadioSetting(setting, name, + RadioSettingValueBoolean(value)) + group.append(rs) + + for setting, group, name in lists: + value = self._kenwood_get_int(setting) + options = self._SETTINGS_OPTIONS[setting] + rs = RadioSetting(setting, name, + RadioSettingValueList(options, + options[value])) + group.append(rs) + + for setting, group, name, minv, maxv in ints: + value = self._kenwood_get_int(setting) + rs = RadioSetting(setting, name, + RadioSettingValueInteger(minv, maxv, value)) + group.append(rs) + + for setting, group, name, length in strings: + _cmd, value = self._kenwood_get(setting) + rs = RadioSetting(setting, name, + RadioSettingValueString(0, length, value)) + group.append(rs) + + return top + @directory.register class THF7ERadio(THF6ARadio):

1 0

[chirp_devel] [PATCH 00/11] fix pylint issues
by Zachary T Welch 11 Mar '15

11 Mar '15

This series adds pylint support to the cpep8 scripts, then it starts fixing the issues that are revealed. By far, the majority of the changes involve adding docstrings. Like the push to become pep8 compliant, the cpep8.py script checks a blacklist to avoid forcing immediate compliance of the entire tree. The virtualenv setup in cpep8.sh has been updated to install the extra pacakges needed (pylint, pyserial, and pygtk to start); however, I changed it such that the packages are install only when the VENV directory is first created. The performance penalty of checking before every run is too much to bear. I have an idea for fixing that, but one step at a time. I am continuing to tweak the pylintrc file in order to minimize the amount of useless churn while still maximizing coverage, so current results from checking the entire tree may look worse than what actually needs to be fixed. Zachary T Welch (11): Rename .pylintc as tools/cpep8.pylintc (#159) Update pylintrc file (#159) Add pylint support to cpep8 scripts (#159) Fix pylint issues in cpep8.py (#159) Fix pylint issues in logger.py (#159) Fix pylint issues in __init__.py files (#159) Fix pylint issues in settings.py (#159) Fix pylint issues in radioreference.py (#159) Fix pylint issues with chirp/ files (#159) Fix pyinit issues for bitwise_grammar.py (#159) Fix pylint issues in bitwise.py (#159) .hgignore | 1 + .pylintrc | 308 -------------------------------- chirp/__init__.py | 6 + chirp/bandplan.py | 7 + chirp/bandplan_au.py | 3 + chirp/bandplan_iaru_r1.py | 4 + chirp/bandplan_iaru_r2.py | 4 + chirp/bandplan_iaru_r3.py | 4 + chirp/bandplan_na.py | 4 + chirp/bitwise.py | 104 ++++++++--- chirp/bitwise_grammar.py | 32 +++- chirp/detect.py | 7 +- chirp/drivers/__init__.py | 20 +++ chirp/errors.py | 4 + chirp/logger.py | 46 +++-- chirp/memmap.py | 8 +- chirp/radioreference.py | 16 +- chirp/settings.py | 26 ++- chirp/ui/__init__.py | 4 + chirp/util.py | 4 + csvdump/__init__.py | 4 + tests/__init__.py | 18 ++ tests/unit/__init__.py | 18 ++ tools/{cpep8.manifest => cpep8.lintful} | 25 +-- tools/cpep8.py | 123 +++++++++++-- pylintrc => tools/cpep8.pylintrc | 305 ++++++++++++++++++++++--------- tools/cpep8.sh | 12 +- 27 files changed, 640 insertions(+), 477 deletions(-) delete mode 100644 .pylintrc copy tools/{cpep8.manifest => cpep8.lintful} (86%) copy pylintrc => tools/cpep8.pylintrc (51%) -- 1.9.1

5 18

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

11 Mar '15

Tested changes: [Zachary T Welch <zach(a)mandolincreekfarm.com>] Add newline at end of console status (#2343) When downloading/uploading on the console, a pretty status bar is printed on a single line. At the end of the transfer, a newline needs to be added, or subsequent output will appear on the same line as the status bar. [Richard Cochran <ag6qr(a)sonic.net>] [ft2900] Fix issues entering channels via UI #2385 This patch fixes problems when entering memories to the FT-2900 via the CHIRP UI. The set_memory function was leaving "unknown" areas of the memory unset, which caused intermittent problems, depending on what had been in those fields before. Fix is to initialize all unknown fields to 0, mimicing what the radio would do if creating new channel via the radio's front panel. Also, we re-order the power levels to make the default "Hi", again to mimic the radio's front panel behavior. 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 2 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 4fe527771a5b2ca49bbf1ecb2915e4f58990084a [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 4fe527771a5b2ca49bbf1ecb2915e4f58990084a No emails were triggered. [workspace] $ /bin/sh -xe /tmp/hudson5160835480928068861.sh + ./run_all_tests.sh test_bit_array (tests.unit.test_bitwise.TestBitType) ... ok test_bit_array_fail (tests.unit.test_bitwise.TestBitType) ... ok test_bitfield_u16 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_u24 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_u8 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_ul16 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_ul24 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bbcd (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_bbcd_array (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_lbcd (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_lbcd_array (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_int_array (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u16 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u24 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u32 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u8 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul16 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul24 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul32 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_char (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string_invalid_chars (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string_wrong_length (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_comment_cppstyle (tests.unit.test_bitwise.TestBitwiseComments) ... ok test_comment_inline_cppstyle (tests.unit.test_bitwise.TestBitwiseComments) ... ok test_missing_semicolon (tests.unit.test_bitwise.TestBitwiseErrors) ... ok test_seek (tests.unit.test_bitwise.TestBitwiseSeek) ... ok test_seekto (tests.unit.test_bitwise.TestBitwiseSeek) ... ok test_struct_one_element (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok test_struct_two_elements (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok test_struct_writes (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok split_tone_encode_test_cross_dtcs_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_none_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_none_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_tone_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_tone_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_none (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_tsql (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_dtcs_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_dtcs_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_none_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_none_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_tone_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_tone_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_none (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_tsql (tests.unit.test_chirp_common.TestSplitTone) ... ok test_fix_rounded_step_250 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_fix_rounded_step_500 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_fix_rounded_step_750 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_12_5 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_2_5 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_5_0 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_6_25 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_fractional_step (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_required_step (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_required_step_fail (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_format_freq (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_bad (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_decimal (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_whitespace (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_whole (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_ensure_has_calls_almost_full (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_empty (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_partial (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_rptcall_full1 (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_rptcall_full2 (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_urcall_full (tests.unit.test_import_logic.DstarTests) ... ok test_import_bank (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_dtcs_diffA_dtcs (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_dtcs_diffB_dtcs (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_negative (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_too_big_vhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_uhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_vhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem_with_errors (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem_with_warnings (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_invalid (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_valid_am (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_valid_fm (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_name (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_closest (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_no_dst (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_no_src (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_same (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_tone_diffA_tsql (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_tone_diffB_tsql (tests.unit.test_import_logic.ImportFieldTests) ... ok test_mapping (tests.unit.test_mappingmodel.TestBaseBank) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestBaseBank) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseBankModel) ... ok test_get_name (tests.unit.test_mappingmodel.TestBaseBankModel) ... ok test_mapping (tests.unit.test_mappingmodel.TestBaseMapping) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestBaseMapping) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseMappingModel) ... ok test_get_name (tests.unit.test_mappingmodel.TestBaseMappingModel) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseMappingModelIndexInterface) ... ok test_add_memory_to_mapping (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_mapping_memories (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_memory_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_num_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping_no_bank (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping_wrong_bank (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_icom_bank (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_mapping (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_add_memory_to_mapping (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_index_bounds (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_mapping_memories (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_memory_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_memory_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_next_mapping_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_num_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping_no_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping_wrong_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index_bad_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index_bad_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_auto_tone_mode_cross (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs_pol (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs_rx (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_tone (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_tsql (tests.unit.test_memedit_edits.TestEdits) ... ok test_init (tests.unit.test_platform.Win32PlatformTest) ... ok test_serial_ports_bad_portnames (tests.unit.test_platform.Win32PlatformTest) ... ok test_serial_ports_sorted (tests.unit.test_platform.Win32PlatformTest) ... ok test_apply_callback (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting_group (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting_multi (tests.unit.test_settings.TestSettingContainers) ... ok test_changed (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_boolean (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_float (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_integer (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_list (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_string (tests.unit.test_settings.TestSettingValues) ... ok test_validate_callback (tests.unit.test_settings.TestSettingValues) ... ok test_delete_hole_with_all (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_with_all_full (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_with_hole (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_without_hole (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_insert_hole_with_space (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_insert_hole_without_space (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok ---------------------------------------------------------------------- Ran 151 tests in 0.134s OK Patch 'tip' is OK Checking for PEP8 regressions... real 0m13.185s user 0m9.918s sys 0m0.209s ================================================ Tests OK Email was triggered for: Success Sending email for trigger: Success

1 0

[chirp_devel] [PATCH] [ft2900] Fix issues entering channels via UI #2385
by Richard Cochran 10 Mar '15

10 Mar '15

# HG changeset patch # User Richard Cochran <ag6qr(a)sonic.net> # Date 1426047156 25200 # Tue Mar 10 21:12:36 2015 -0700 # Node ID c3fc5e82afa38f5958c18c8ccb44f2e3bd318933 # Parent 4fe527771a5b2ca49bbf1ecb2915e4f58990084a [ft2900] Fix issues entering channels via UI #2385 This patch fixes problems when entering memories to the FT-2900 via the CHIRP UI. The set_memory function was leaving "unknown" areas of the memory unset, which caused intermittent problems, depending on what had been in those fields before. Fix is to initialize all unknown fields to 0, mimicing what the radio would do if creating new channel via the radio's front panel. Also, we re-order the power levels to make the default "Hi", again to mimic the radio's front panel behavior. diff -r 4fe527771a5b -r c3fc5e82afa3 chirp/drivers/ft2900.py --- a/chirp/drivers/ft2900.py Mon Mar 09 21:03:29 2015 +0100 +++ b/chirp/drivers/ft2900.py Tue Mar 10 21:12:36 2015 -0700 @@ -218,10 +218,10 @@ MODES = ["FM", "NFM"] TMODES = ["", "Tone", "TSQL", "DTCS", "TSQL-R"] DUPLEX = ["", "-", "+", ""] -POWER_LEVELS = [chirp_common.PowerLevel("Low1", watts=5), +POWER_LEVELS = [chirp_common.PowerLevel("Hi", watts=75), + chirp_common.PowerLevel("Low3", watts=30), chirp_common.PowerLevel("Low2", watts=10), - chirp_common.PowerLevel("Low3", watts=30), - chirp_common.PowerLevel("Hi", watts=75), + chirp_common.PowerLevel("Low1", watts=5), ] CHARSET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ +-/?C[] _" @@ -242,8 +242,8 @@ def _encode_name(mem): - if(mem == " " or mem == ""): - return [0x7f, 0xff, 0xff, 0xff, 0xff, 0xff] + if(mem.strip() == ""): + return [0xff]*6 name = [None]*6 for i in range(0, 6): @@ -356,7 +356,7 @@ mem.mode = _mem.isnarrow and "NFM" or "FM" mem.skip = pskip and "P" or skip and "S" or "" - mem.power = POWER_LEVELS[_mem.power] + mem.power = POWER_LEVELS[3 - _mem.power] return mem @@ -396,12 +396,21 @@ _flag["%s_pskip" % nibble] = mem.skip == "P" _flag["%s_skip" % nibble] = mem.skip == "S" if mem.power: - _mem.power = POWER_LEVELS.index(mem.power) + _mem.power = 3 - POWER_LEVELS.index(mem.power) else: _mem.power = 3 _mem.name = _encode_name(mem.name) + # set all unknown areas of the memory map to 0 + _mem.unknown0 = 0 + _mem.unknown1 = 0 + _mem.unknown2 = 0 + _mem.unknown3 = 0 + _mem.unknown4 = 0 + _mem.unknown5 = 0 + _mem.unknown6 = 0 + LOG.debug("encoded mem\n%s\n" % (util.hexprint(_mem.get_raw()[0:20]))) @classmethod

1 0

[chirp_devel] [PATCH 00/10] chirpc improvements
by Zachary T Welch 10 Mar '15

10 Mar '15

This series continues my efforts to improve the CLI. It starts with new versions of the two problematic patches from my last series. It then adds an option for listing the radio's settings. The next four patches clean up and extends the memory channel options, adding several new abilities: list all channels, clear a channel, and copy a channel. Finally, I have included a new README.chirpc file to provide some guidance on using this newly refurbished tool. Zachary T Welch (9): Improve CLI download/upload (#2343) Add newline at end of console status (#2343) chirpc: add memory option group (#2343) Improve settings strigification (#2343) chirpc: add --list-settings (#2343) chirpc: add --list-mem (#2343) chirpc: make mem options more robust (#2343) chirpc: add --clear-mem option (#2343) chirpc: add --copy-mem option (#2343) README.chirpc: new file (#2343) README.chirpc | 104 +++++++++++++++++++++++++++ chirp/chirp_common.py | 3 + chirp/settings.py | 10 ++- chirpc | 196 ++++++++++++++++++++++++++++++++++---------------- 4 files changed, 249 insertions(+), 64 deletions(-) create mode 100644 README.chirpc -- 1.9.1

2 11

[chirp_devel] Fwd: Fix downloading/uploading issue for UV-5R. Fixes #2317
by Mathieu Rozon 10 Mar '15

10 Mar '15

-- <---- Mathieu Rozon ----> mathrozon(a)gmail.com <mathrozon(a)gmail.som> (514)475-5010

3 5

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

09 Mar '15

Tested changes: [Marco Filippi <iz3gme.marco(a)gmail.com>] [THD7] Fix settings support - some more In the ui all settings must be inside a group, I moved all settings that I put in top with last patch to a new group named Main Fix #2401 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 0ad336b0d0073f439066eb8e4469457acaa0d19b [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 0ad336b0d0073f439066eb8e4469457acaa0d19b No emails were triggered. [workspace] $ /bin/sh -xe /tmp/hudson7616008674621632572.sh + ./run_all_tests.sh test_bit_array (tests.unit.test_bitwise.TestBitType) ... ok test_bit_array_fail (tests.unit.test_bitwise.TestBitType) ... ok test_bitfield_u16 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_u24 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_u8 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_ul16 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bitfield_ul24 (tests.unit.test_bitwise.TestBitfieldTypes) ... ok test_bbcd (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_bbcd_array (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_lbcd (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_lbcd_array (tests.unit.test_bitwise.TestBitwiseBCDTypes) ... ok test_int_array (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u16 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u24 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u32 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_u8 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul16 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul24 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_type_ul32 (tests.unit.test_bitwise.TestBitwiseBaseIntTypes) ... ok test_char (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string_invalid_chars (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_string_wrong_length (tests.unit.test_bitwise.TestBitwiseCharTypes) ... ok test_comment_cppstyle (tests.unit.test_bitwise.TestBitwiseComments) ... ok test_comment_inline_cppstyle (tests.unit.test_bitwise.TestBitwiseComments) ... ok test_missing_semicolon (tests.unit.test_bitwise.TestBitwiseErrors) ... ok test_seek (tests.unit.test_bitwise.TestBitwiseSeek) ... ok test_seekto (tests.unit.test_bitwise.TestBitwiseSeek) ... ok test_struct_one_element (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok test_struct_two_elements (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok test_struct_writes (tests.unit.test_bitwise.TestBitwiseStructTypes) ... ok split_tone_encode_test_cross_dtcs_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_none_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_none_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_tone_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_cross_tone_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_none (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok split_tone_encode_test_tsql (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_dtcs_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_dtcs_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_none_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_none_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_tone_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_cross_tone_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_dtcs (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_none (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_tone (tests.unit.test_chirp_common.TestSplitTone) ... ok test_split_tone_decode_tsql (tests.unit.test_chirp_common.TestSplitTone) ... ok test_fix_rounded_step_250 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_fix_rounded_step_500 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_fix_rounded_step_750 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_12_5 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_2_5 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_5_0 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_6_25 (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_is_fractional_step (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_required_step (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_required_step_fail (tests.unit.test_chirp_common.TestStepFunctions) ... ok test_format_freq (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_bad (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_decimal (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_whitespace (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_parse_freq_whole (tests.unit.test_chirp_common.TestUtilityFunctions) ... ok test_ensure_has_calls_almost_full (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_empty (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_partial (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_rptcall_full1 (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_rptcall_full2 (tests.unit.test_import_logic.DstarTests) ... ok test_ensure_has_calls_urcall_full (tests.unit.test_import_logic.DstarTests) ... ok test_import_bank (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_dtcs_diffA_dtcs (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_dtcs_diffB_dtcs (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_negative (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_too_big_vhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_uhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_duplex_vhf (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem_with_errors (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mem_with_warnings (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_invalid (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_valid_am (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_mode_valid_fm (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_name (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_closest (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_no_dst (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_no_src (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_power_same (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_tone_diffA_tsql (tests.unit.test_import_logic.ImportFieldTests) ... ok test_import_tone_diffB_tsql (tests.unit.test_import_logic.ImportFieldTests) ... ok test_mapping (tests.unit.test_mappingmodel.TestBaseBank) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestBaseBank) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseBankModel) ... ok test_get_name (tests.unit.test_mappingmodel.TestBaseBankModel) ... ok test_mapping (tests.unit.test_mappingmodel.TestBaseMapping) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestBaseMapping) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseMappingModel) ... ok test_get_name (tests.unit.test_mappingmodel.TestBaseMappingModel) ... ok test_base_class (tests.unit.test_mappingmodel.TestBaseMappingModelIndexInterface) ... ok test_add_memory_to_mapping (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_mapping_memories (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_memory_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_get_num_mappings (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping_no_bank (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_remove_memory_from_mapping_wrong_bank (tests.unit.test_mappingmodel.TestIcomBankModel) ... ok test_icom_bank (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_mapping (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_mapping_eq (tests.unit.test_mappingmodel.TestIcomBanks) ... ok test_add_memory_to_mapping (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_index_bounds (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_mapping_memories (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_memory_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_memory_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_next_mapping_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_get_num_mappings (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping_no_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_remove_memory_from_mapping_wrong_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index_bad_bank (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_set_memory_index_bad_index (tests.unit.test_mappingmodel.TestIcomIndexedBankModel) ... ok test_auto_tone_mode_cross (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs_pol (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_dtcs_rx (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_tone (tests.unit.test_memedit_edits.TestEdits) ... ok test_auto_tone_mode_tsql (tests.unit.test_memedit_edits.TestEdits) ... ok test_init (tests.unit.test_platform.Win32PlatformTest) ... ok test_serial_ports_bad_portnames (tests.unit.test_platform.Win32PlatformTest) ... ok test_serial_ports_sorted (tests.unit.test_platform.Win32PlatformTest) ... ok test_apply_callback (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting_group (tests.unit.test_settings.TestSettingContainers) ... ok test_radio_setting_multi (tests.unit.test_settings.TestSettingContainers) ... ok test_changed (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_boolean (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_float (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_integer (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_list (tests.unit.test_settings.TestSettingValues) ... ok test_radio_setting_value_string (tests.unit.test_settings.TestSettingValues) ... ok test_validate_callback (tests.unit.test_settings.TestSettingValues) ... ok test_delete_hole_with_all (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_with_all_full (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_with_hole (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_delete_hole_without_hole (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_insert_hole_with_space (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok test_insert_hole_without_space (tests.unit.test_shiftdialog.ShiftDialogTest) ... ok ---------------------------------------------------------------------- Ran 151 tests in 0.058s OK Patch 'tip' is OK Checking for PEP8 regressions... real 0m9.822s user 0m9.462s sys 0m0.122s ================================================ Tests OK Email was triggered for: Success Sending email for trigger: Success

1 0

[chirp_devel] [PATCH] [THD7] Fix settings support - some more
by Marco Filippi IZ3GME 09 Mar '15

09 Mar '15

# HG changeset patch # User Marco Filippi <iz3gme.marco(a)gmail.com> # Date 1425931409 -3600 # lun mar 09 21:03:29 2015 +0100 # Node ID 4fe527771a5b2ca49bbf1ecb2915e4f58990084a # Parent 0ad336b0d0073f439066eb8e4469457acaa0d19b [THD7] Fix settings support - some more In the ui all settings must be inside a group, I moved all settings that I put in top with last patch to a new group named Main Fix #2401 diff --git a/chirp/drivers/kenwood_live.py b/chirp/drivers/kenwood_live.py --- a/chirp/drivers/kenwood_live.py +++ b/chirp/drivers/kenwood_live.py @@ -388,6 +388,7 @@ return self._kenwood_set(cmd, ("%%0%ii" % digits) % value) def get_settings(self): + main = RadioSettingGroup("main", "Main") aux = RadioSettingGroup("aux", "Aux") tnc = RadioSettingGroup("tnc", "TNC") save = RadioSettingGroup("save", "Save") @@ -398,7 +399,7 @@ sky = RadioSettingGroup("sky", "SkyCommand") aprs = RadioSettingGroup("aprs", "APRS") - top = RadioSettings(radio, aprs, sky) + top = RadioSettings(main, radio, aprs, sky) bools = [("AMR", aprs, "APRS Message Auto-Reply"), ("AIP", aux, "Advanced Intercept Point"), @@ -406,9 +407,9 @@ ("BCN", aprs, "Beacon"), ("CH", radio, "Channel Mode Display"), # ("DIG", aprs, "APRS Digipeater"), - ("DL", top, "Dual"), - ("LK", top, "Lock"), - ("LMP", top, "Lamp"), + ("DL", main, "Dual"), + ("LK", main, "Lock"), + ("LMP", main, "Lamp"), ("TSP", dtmf, "DTMF Fast Transmission"), ("TXH", dtmf, "TX Hold"), ] @@ -419,7 +420,7 @@ RadioSettingValueBoolean(value)) group.append(rs) - lists = [("BAL", top, "Balance"), + lists = [("BAL", main, "Balance"), ("BEP", aux, "Beep"), ("BEPT", aprs, "APRS Beep"), ("DS", tnc, "Data Sense"), @@ -427,7 +428,7 @@ ("DTBA", aprs, "APRS Data Band"), ("DTX", aprs, "APRS Data TX"), # ("ICO", aprs, "APRS Icon"), - ("MNF", top, "Memory Display Mode"), + ("MNF", main, "Memory Display Mode"), ("PKSA", aprs, "APRS Packet Speed"), ("POSC", aprs, "APRS Position Comment"), ("PT", dtmf, "DTMF Speed"),

1 0