April 2012 - Developers - lists.chirpmyradio.com

[chirp_devel] [PATCH 0 of 1] [ft8x7] Radio rename
by Marco Filippi IZ3GME 10 Apr '12

10 Apr '12

With this patch ft8x7 radios are renamed using a better and shorter name schema.

2 2

[chirp_devel] [PATCH 0 of 3] [RFC] Generic Settings API
by Dan Smith 06 Apr '12

06 Apr '12

Hi all, Here is my proposed generic settings API implementation. The first patch adds chirp/settings.py and a method for a driver to declare a set of settings and constraints. The second patch implements most of the settings for the UV-5R. The third implements a very minimal UI. This is very much not complete, but it works and I want to get it out there for comments. I envision the UI tolerating multiple levels of setting groups, which it would display to the user as labeled tabular sets (or something). Could also be a settings dialog with tabs or a tree. The "string" setting type hasn't been tested since the UV-5R doesn't have any string settings. If this looks good, I think I'll move on to adding support for editing some of the APRS settings in the VX-8R, which will really push the limit. Anyway, comments on this? Would this apply suitably to other radios? Thanks! --Dan

1 3

[chirp_devel] Build failed in Jenkins: chirp-test #42
by Build System 06 Apr '12

06 Apr '12

See <http://eagle:8080/job/chirp-test/42/changes> Changes: [Tom Hayward <tom(a)tomh.us>] Add example .hmk file to test images. #102 [Tom Hayward <tom(a)tomh.us>] Add import support for Kenwood *.hmk files. Feature #102 [Tom Hayward <tom(a)tomh.us>] Make CSVRadio::__grow() accessible from inherited classes, such as HMKRadio. #102 [Tom Hayward <tom(a)tomh.us>] Make CSVRadio::match_model() more generic so it works with HMKRadio. #102 [Dan Smith <dsmith(a)danplanet.com>] Add a new FileBackedRadio subclass between CloneModeRadio and Radio This helps to distinguish between purely file-based drivers (such as CSV and XML) and a file-backed radio that can be uploaded (such as all the current clone-type radios). This also changes the logic in chirpui/clone.py that filters out drivers that can't be connected to an actual device. Related to Bug #102 ------------------------------------------ [...truncated 42 lines...] Registered Yaesu_FT-817ND_Intl_versions = FT817NDRadio Registered Yaesu_FT-817ND_US_Version = FT817ND_US_Radio Registered Yaesu_FT-857 = FT857Radio Registered Yaesu_FT-857_US_Version = FT857_US_Radio Registered Generic_CSV = CSVRadio Registered Icom_IC-2100H = IC2100Radio Registered Icom_IC-2200H = IC2200Radio Registered Icom_IC-2720H = IC2720Radio Registered Icom_IC-2820H = IC2820Radio Registered Icom_IC-91_92AD = IC9xRadio Registered Icom_IC-91_92AD_ICF_File = IC9xICFRadio Registered Icom_IC-Q7A = ICQ7Radio Registered Icom_IC-T70 = ICT70Radio Registered Icom_IC-W32A = ICW32ARadio Registered Icom_IC-V82_U82 = ICx8xRadio Registered Icom_ID-800H_v2 = ID800v2Radio Registered Icom_ID-880H = ID880Radio Registered Yaesu_VX-3 = VX3Radio Registered Yaesu_VX-5 = VX5Radio Registered Yaesu_VX-6 = VX6Radio Registered Yaesu_VX-7 = VX7Radio Registered Yaesu_VX-8_R = VX8Radio Registered Yaesu_VX-8_DR = VX8DRadio Registered Wouxun_KG-UVD1P = KGUVD1PRadio Registered Puxing_PX-777 = Puxing777Radio Registered Puxing_PX-2R = Puxing2RRadio Registered Baofeng_UV-3R = UV3RRadio Registered Generic_XML = XMLRadio Registered Icom_ID-31A = ID31Radio Registered Baofeng_UV-5R = BaofengUV5R Registered Kenwood_HMK = HMKRadio Alinco DJ596 Detect FAILED: Failed to detect Alinco DJ596 CopyAll PASSED: All tests Alinco DJ596 Clone PASSED: All tests Alinco DJ596 BruteForce PASSED: All tests Alinco DJ596 Edges PASSED: All tests Alinco DJ596 Banks SKIPPED: Banks not supported Alinco DR235T Detect PASSED: All tests Alinco DR235T CopyAll PASSED: All tests Alinco DR235T Clone PASSED: All tests Alinco DR235T BruteForce PASSED: All tests Alinco DR235T Edges PASSED: All tests Alinco DR235T Banks SKIPPED: Banks not supported Baofeng UV-3R Detect PASSED: All tests Baofeng UV-3R CopyAll PASSED: All tests Baofeng UV-3R Clone PASSED: All tests Baofeng UV-3R BruteForce PASSED: All tests Baofeng UV-3R Edges PASSED: All tests Baofeng UV-3R Banks SKIPPED: Banks not supported Baofeng UV-5R Detect PASSED: All tests Baofeng UV-5R CopyAll PASSED: All tests Baofeng UV-5R Clone PASSED: All tests Baofeng UV-5R BruteForce PASSED: All tests Baofeng UV-5R Edges PASSED: All tests Baofeng UV-5R Banks SKIPPED: Banks not supported Icom IC-2100H Detect FAILED: Failed to detect Icom IC-2100H CopyAll PASSED: All tests Icom IC-2100H Clone PASSED: All tests Icom IC-2100H BruteForce PASSED: All tests Icom IC-2100H Edges PASSED: All tests Icom IC-2100H Banks SKIPPED: Banks not supported Icom IC-2200H Detect FAILED: Failed to detect Icom IC-2200H CopyAll PASSED: All tests Icom IC-2200H Clone PASSED: All tests Icom IC-2200H BruteForce PASSED: All tests Icom IC-2200H Edges PASSED: All tests Icom IC-2200H Banks PASSED: All tests Icom IC-2720H Detect FAILED: Failed to detect Icom IC-2720H CopyAll PASSED: All tests Icom IC-2720H Clone PASSED: All tests Icom IC-2720H BruteForce PASSED: All tests Icom IC-2720H Edges PASSED: All tests Icom IC-2720H Banks PASSED: All tests Icom IC-2820H Detect PASSED: All tests Icom IC-2820H CopyAll PASSED: All tests Icom IC-2820H Clone PASSED: All tests Icom IC-2820H BruteForce PASSED: All tests Icom IC-2820H Edges PASSED: All tests Icom IC-2820H Banks PASSED: All tests Icom IC-Q7A Detect FAILED: Failed to detect Icom IC-Q7A CopyAll PASSED: All tests Icom IC-Q7A Clone PASSED: All tests Icom IC-Q7A BruteForce PASSED: All tests Icom IC-Q7A Edges PASSED: All tests Icom IC-Q7A Banks SKIPPED: Banks not supported Icom IC-T70 Detect FAILED: Failed to detect Icom IC-T70 CopyAll PASSED: All tests Icom IC-T70 Clone PASSED: All tests Icom IC-T70 BruteForce PASSED: All tests Icom IC-T70 Edges PASSED: All tests Icom IC-T70 Banks PASSED: All tests Icom IC-V82/U82 Detect PASSED: All tests Icom IC-V82/U82 CopyAll PASSED: All tests Icom IC-V82/U82 Clone PASSED: All tests Icom IC-V82/U82 BruteForce PASSED: All tests Icom IC-V82/U82 Edges PASSED: All tests Icom IC-V82/U82 Banks PASSED: All tests Icom IC-W32A VHF Detect FAILED: Failed to detect Icom IC-W32A VHF CopyAll PASSED: All tests Icom IC-W32A VHF Clone PASSED: All tests Icom IC-W32A VHF BruteForce PASSED: All tests Icom IC-W32A VHF Edges PASSED: All tests Icom IC-W32A VHF Banks SKIPPED: Banks not supported Icom IC-W32A UHF Detect FAILED: Failed to detect Icom IC-W32A UHF CopyAll PASSED: All tests Icom IC-W32A UHF Clone PASSED: All tests Icom IC-W32A UHF BruteForce PASSED: All tests Icom IC-W32A UHF Edges PASSED: All tests Icom IC-W32A UHF Banks SKIPPED: Banks not supported Icom ID-800H v2 Detect PASSED: All tests Icom ID-800H v2 CopyAll PASSED: All tests Icom ID-800H v2 Clone PASSED: All tests Icom ID-800H v2 BruteForce PASSED: All tests Icom ID-800H v2 Edges PASSED: All tests Icom ID-800H v2 Banks PASSED: All tests Icom ID-880H Detect FAILED: Failed to detect Icom ID-880H CopyAll PASSED: All tests Icom ID-880H Clone PASSED: All tests Icom ID-880H BruteForce PASSED: All tests Icom ID-880H Edges PASSED: All tests Icom ID-880H Banks PASSED: All tests Jetstream JT220M Detect FAILED: Failed to detect Jetstream JT220M CopyAll PASSED: All tests Jetstream JT220M Clone PASSED: All tests Jetstream JT220M BruteForce PASSED: All tests Jetstream JT220M Edges PASSED: All tests Jetstream JT220M Banks SKIPPED: Banks not supported Puxing PX-2R Detect FAILED: Failed to detect Puxing PX-2R CopyAll PASSED: All tests Puxing PX-2R Clone PASSED: All tests Puxing PX-2R BruteForce PASSED: All tests Puxing PX-2R Edges PASSED: All tests Puxing PX-2R Banks SKIPPED: Banks not supported Puxing PX-777 Detect FAILED: Failed to detect Puxing PX-777 CopyAll PASSED: All tests Puxing PX-777 Clone PASSED: All tests Puxing PX-777 BruteForce PASSED: All tests Puxing PX-777 Edges PASSED: All tests Puxing PX-777 Banks SKIPPED: Banks not supported Wouxun KG-UVD1P Detect FAILED: Failed to detect Wouxun KG-UVD1P CopyAll PASSED: All tests Wouxun KG-UVD1P Clone PASSED: All tests Wouxun KG-UVD1P BruteForce PASSED: All tests Wouxun KG-UVD1P Edges PASSED: All tests Wouxun KG-UVD1P Banks SKIPPED: Banks not supported Yaesu FT-2800M Detect PASSED: All tests Yaesu FT-2800M CopyAll PASSED: All tests Yaesu FT-2800M Clone PASSED: All tests Yaesu FT-2800M BruteForce PASSED: All tests Yaesu FT-2800M Edges PASSED: All tests Yaesu FT-2800M Banks SKIPPED: Banks not supported Yaesu FT-60 Detect PASSED: All tests Yaesu FT-60 CopyAll PASSED: All tests Yaesu FT-60 Clone PASSED: All tests Yaesu FT-60 BruteForce PASSED: All tests Yaesu FT-60 Edges PASSED: All tests Yaesu FT-60 Banks SKIPPED: Banks not supported Yaesu FT-7800 Detect PASSED: All tests Yaesu FT-7800 CopyAll PASSED: All tests Yaesu FT-7800 Clone PASSED: All tests Yaesu FT-7800 BruteForce PASSED: All tests Yaesu FT-7800 Edges PASSED: All tests Yaesu FT-7800 Banks PASSED: All tests Yaesu FT-817 Detect FAILED: Failed to detect Yaesu FT-817 CopyAll PASSED: All tests Yaesu FT-817 Clone PASSED: All tests Yaesu FT-817 BruteForce PASSED: All tests Yaesu FT-817 Edges PASSED: All tests Yaesu FT-817 Banks SKIPPED: Banks not supported Yaesu FT-817ND (Int Detect PASSED: All tests Yaesu FT-817ND (Int CopyAll PASSED: All tests Yaesu FT-817ND (Int Clone PASSED: All tests Yaesu FT-817ND (Int BruteForce PASSED: All tests Yaesu FT-817ND (Int Edges PASSED: All tests Yaesu FT-817ND (Int Banks SKIPPED: Banks not supported Yaesu FT-817ND (US Detect PASSED: All tests Yaesu FT-817ND (US CopyAll PASSED: All tests Yaesu FT-817ND (US Clone PASSED: All tests Yaesu FT-817ND (US BruteForce PASSED: All tests Yaesu FT-817ND (US Edges PASSED: All tests Yaesu FT-817ND (US Banks SKIPPED: Banks not supported Yaesu FT-857 Detect FAILED: Failed to detect Yaesu FT-857 CopyAll PASSED: All tests Yaesu FT-857 Clone PASSED: All tests Yaesu FT-857 BruteForce PASSED: All tests Yaesu FT-857 Edges PASSED: All tests Yaesu FT-857 Banks SKIPPED: Banks not supported Yaesu FT-857 (US Ve Detect PASSED: All tests Yaesu FT-857 (US Ve CopyAll PASSED: All tests Yaesu FT-857 (US Ve Clone PASSED: All tests Yaesu FT-857 (US Ve BruteForce PASSED: All tests Yaesu FT-857 (US Ve Edges PASSED: All tests Yaesu FT-857 (US Ve Banks SKIPPED: Banks not supported Yaesu FT-8800 Left Detect PASSED: All tests Yaesu FT-8800 Left CopyAll PASSED: All tests Yaesu FT-8800 Left Clone PASSED: All tests Yaesu FT-8800 Left BruteForce PASSED: All tests Yaesu FT-8800 Left Edges PASSED: All tests Yaesu FT-8800 Left Banks SKIPPED: Banks not supported Yaesu FT-8800 Right Detect PASSED: All tests Yaesu FT-8800 Right CopyAll PASSED: All tests Yaesu FT-8800 Right Clone PASSED: All tests Yaesu FT-8800 Right BruteForce PASSED: All tests Yaesu FT-8800 Right Edges PASSED: All tests Yaesu FT-8800 Right Banks SKIPPED: Banks not supported Yaesu FT-8900 Detect PASSED: All tests Yaesu FT-8900 CopyAll PASSED: All tests Yaesu FT-8900 Clone PASSED: All tests Yaesu FT-8900 BruteForce PASSED: All tests Yaesu FT-8900 Edges PASSED: All tests Yaesu FT-8900 Banks SKIPPED: Banks not supported Yaesu VX-3 Detect PASSED: All tests Yaesu VX-3 CopyAll PASSED: All tests Yaesu VX-3 Clone PASSED: All tests Yaesu VX-3 BruteForce PASSED: All tests Yaesu VX-3 Edges PASSED: All tests Yaesu VX-3 Banks SKIPPED: Banks not supported Yaesu VX-5 Detect PASSED: All tests Yaesu VX-5 CopyAll PASSED: All tests Yaesu VX-5 Clone PASSED: All tests Yaesu VX-5 BruteForce PASSED: All tests Yaesu VX-5 Edges PASSED: All tests Yaesu VX-5 Banks SKIPPED: Banks not supported Yaesu VX-6 Detect PASSED: All tests Yaesu VX-6 CopyAll PASSED: All tests Yaesu VX-6 Clone PASSED: All tests Yaesu VX-6 BruteForce PASSED: All tests Yaesu VX-6 Edges PASSED: All tests Yaesu VX-6 Banks SKIPPED: Banks not supported Yaesu VX-7 Detect PASSED: All tests Yaesu VX-7 CopyAll PASSED: All tests Yaesu VX-7 Clone PASSED: All tests Yaesu VX-7 BruteForce PASSED: All tests Yaesu VX-7 Edges PASSED: All tests Yaesu VX-7 Banks PASSED: All tests Yaesu VX-8 R Detect PASSED: All tests Yaesu VX-8 R CopyAll PASSED: All tests Yaesu VX-8 R Clone PASSED: All tests Yaesu VX-8 R BruteForce PASSED: All tests Yaesu VX-8 R Edges PASSED: All tests Yaesu VX-8 R Banks PASSED: All tests ---------------------------------------------------------------------- Results: TOTAL : 210 FAILED : 15 SKIPPED: 25 PASSED : 170 CRASHED: 0 Build step 'Execute shell' marked build as failure

1 1

[chirp_devel] [PATCH 0 of 1] Add a new FileBackedRadio subclass between CloneModeRadio and Radio
by Tom Hayward 06 Apr '12

06 Apr '12

Dan, Your patch almost worked. There were two little bugs where CloneModeRadio needed to be replaced with FileBackedRadio. Tom KD7LXL

2 3

[chirp_devel] [PATCH] Add a new FileBackedRadio subclass between CloneModeRadio and Radio
by Dan Smith 06 Apr '12

06 Apr '12

# HG changeset patch # User Dan Smith <dsmith(a)danplanet.com> # Date 1333721605 25200 # Node ID f7942039927ba8cafc1ebeead03e7dfbce14f993 # Parent 0cb945b5cf54eebf4573871bef8fd9923286863a Add a new FileBackedRadio subclass between CloneModeRadio and Radio This helps to distinguish between purely file-based drivers (such as CSV and XML) and a file-backed radio that can be uploaded (such as all the current clone-type radios). This also changes the logic in chirpui/clone.py that filters out drivers that can't be connected to an actual device. Related to Bug #102 diff -r 0cb945b5cf54 -r f7942039927b chirp/chirp_common.py --- a/chirp/chirp_common.py Thu Apr 05 21:27:41 2012 -0700 +++ b/chirp/chirp_common.py Fri Apr 06 07:13:25 2012 -0700 @@ -904,28 +904,10 @@ return msgs -class CloneModeRadio(Radio): - """A clone-mode radio does a full memory dump in and out and we store - an image of the radio into an image file""" - - _memsize = 0 - +class FileBackedRadio(Radio): + """A file-backed radio stores its data in a file""" FILE_EXTENSION = "img" - def __init__(self, pipe): - self.errors = [] - self._mmap = None - - if isinstance(pipe, str): - self.pipe = None - self.load_mmap(pipe) - elif isinstance(pipe, memmap.MemoryMap): - self.pipe = None - self._mmap = pipe - self.process_mmap() - else: - Radio.__init__(self, pipe) - def save(self, filename): self.save_mmap(filename) @@ -953,20 +935,12 @@ except IOError,e: raise Exception("File Access Error") - def sync_in(self): - "Initiate a radio-to-PC clone operation" - pass - - def sync_out(self): - "Initiate a PC-to-radio clone operation" - pass + def get_mmap(self): + return self._mmap def get_memsize(self): return self._memsize - def get_mmap(self): - return self._mmap - @classmethod def match_model(cls, filedata, filename): """Given contents of a stored file (@filedata), return True if @@ -979,6 +953,35 @@ # memories of the same size. return len(filedata) == cls._memsize + +class CloneModeRadio(FileBackedRadio): + """A clone-mode radio does a full memory dump in and out and we store + an image of the radio into an image file""" + + _memsize = 0 + + def __init__(self, pipe): + self.errors = [] + self._mmap = None + + if isinstance(pipe, str): + self.pipe = None + self.load_mmap(pipe) + elif isinstance(pipe, memmap.MemoryMap): + self.pipe = None + self._mmap = pipe + self.process_mmap() + else: + Radio.__init__(self, pipe) + + def sync_in(self): + "Initiate a radio-to-PC clone operation" + pass + + def sync_out(self): + "Initiate a PC-to-radio clone operation" + pass + class LiveRadio(Radio): pass diff -r 0cb945b5cf54 -r f7942039927b chirp/generic_csv.py --- a/chirp/generic_csv.py Thu Apr 05 21:27:41 2012 -0700 +++ b/chirp/generic_csv.py Fri Apr 06 07:13:25 2012 -0700 @@ -22,7 +22,7 @@ pass @directory.register -class CSVRadio(chirp_common.CloneModeRadio, chirp_common.IcomDstarSupport): +class CSVRadio(chirp_common.FileBackedRadio, chirp_common.IcomDstarSupport): VENDOR = "Generic" MODEL = "CSV" FILE_EXTENSION = "csv" diff -r 0cb945b5cf54 -r f7942039927b chirp/xml.py --- a/chirp/xml.py Thu Apr 05 21:27:41 2012 -0700 +++ b/chirp/xml.py Fri Apr 06 07:13:25 2012 -0700 @@ -62,7 +62,7 @@ return banks @directory.register -class XMLRadio(chirp_common.CloneModeRadio, chirp_common.IcomDstarSupport): +class XMLRadio(chirp_common.FileBackedRadio, chirp_common.IcomDstarSupport): VENDOR = "Generic" MODEL = "XML" FILE_EXTENSION = "chirp" diff -r 0cb945b5cf54 -r f7942039927b chirpui/clone.py --- a/chirpui/clone.py Thu Apr 05 21:27:41 2012 -0700 +++ b/chirpui/clone.py Fri Apr 06 07:13:25 2012 -0700 @@ -65,7 +65,8 @@ def __make_vendor(self, model): vendors = {} for rclass in sorted(directory.DRV_TO_RADIO.values()): - if rclass.VENDOR == "Generic": + if not issubclass(rclass, chirp_common.CloneModeRadio) and \ + not issubclass(rclass, chirp_common.LiveRadio): continue if not vendors.has_key(rclass.VENDOR):

1 0

[chirp_devel] [PATCH 0 of 1] Align ft8x7 family with masked memory support
by Marco Filippi IZ3GME 05 Apr '12

05 Apr '12

This patch align the behavior of ft8x7 with the new VX-* support for masked memories

2 2

[chirp_devel] [PATCH 0 of 4] Add import support for Kenwood *.hmk files. Feature #102
by Tom Hayward 05 Apr '12

05 Apr '12

Here is, hopefully, a final version of the hmk file import patch. The first two patches are changes to CSVRadio that make it easier to inherit. HMKRadio has been modified so it no longer relies on the broken set_tx_freq() scheme. Because Chirp expects the transmit frequency for odd-split channels to be in the offset field, HMKRadio::load() copies the Tx. Freq field to the Offset field when needed before parsing each field. Finally, I've included an example hmk file as an independent patch. You can use this for testing and then choose whether you not you'd like to keep it. Tom KD7LXL

1 4

[chirp_devel] [PATCH 0 of 1] Add import support for Kenwood *.hmk files. Feature #102
by Tom Hayward 04 Apr '12

04 Apr '12

This is significantly cleaned up since the first version. It now inherits from CSVRadio. The Dstar features are not a problem during import. I've included an example hmk file for you to test with. Tom KD7LXL

2 2

[chirp_devel] [PATCH] Add import support for Kenwood *.hmk files
by Tom Hayward 04 Apr '12

04 Apr '12

# HG changeset patch # User Tom Hayward <tom(a)tomh.us> # Date 1333491695 21600 # Node ID 1bb3df3d624fa4ee7dfc959b1dc6bd42a5e019f0 # Parent 91be43cc7ac4063d921b0d8eb0bdd73fdb9aa9fa Add import support for Kenwood *.hmk files. diff -r 91be43cc7ac4 -r 1bb3df3d624f chirp/directory.py --- a/chirp/directory.py Tue Apr 03 11:19:10 2012 -0700 +++ b/chirp/directory.py Tue Apr 03 16:21:35 2012 -0600 @@ -91,6 +91,9 @@ if image_file.lower().endswith(".csv"): return get_radio("Generic_CSV")(image_file) + if image_file.lower().endswith(".hmk"): + return get_radio("Kenwood_HMK")(image_file) + if icf.is_9x_icf(image_file): return get_radio("Icom_IC91_92AD_ICF")(image_file) diff -r 91be43cc7ac4 -r 1bb3df3d624f chirp/kenwood_hmk.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/chirp/kenwood_hmk.py Tue Apr 03 16:21:35 2012 -0600 @@ -0,0 +1,227 @@ +# Copyright 2008 Dan Smith <dsmith(a)danplanet.com> +# Copyright 2012 Tom Haywward <tom(a)tomh.us> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import os +import csv + +from chirp import chirp_common, errors, directory + +class OmittedHeaderError(Exception): + pass + +(a)directory.register +class HMKRadio(chirp_common.CloneModeRadio): + VENDOR = "Kenwood" + MODEL = "HMK" + FILE_EXTENSION = "hmk" + + ATTR_MAP = { + "!!Ch" : (int, "number"), + "M.Name" : (str, "name"), + "Rx Freq." : (chirp_common.parse_freq, "freq"), + "Shift/Split" : (str, "duplex"), + "Offset" : (chirp_common.parse_freq, "offset"), + "T/CT/DCS" : (str, "tmode"), + "TO Freq." : (float, "rtone"), + "CT Freq." : (float, "ctone"), + "DCS Code" : (int, "dtcs"), + "Mode" : (str, "mode"), + "Tx Freq." : (chirp_common.parse_freq, "txfreq"), + "Rx Step" : (float, "tuning_step"), + "L.Out" : (str, "skip"), + } + + TMODE_MAP = { + "Off": "", + "T": "Tone", + "CT": "TSQL", + "DCS": "DTCS", + "": "Cross", + } + + SKIP_MAP = { + "Off": "", + "On": "S", + } + + DUPLEX_MAP = { + " ": "", + "S": "split", + "+": "+", + "-": "-", + } + + def _blank(self): + self.errors = [] + self.memories = [] + for i in range(0, 1000): + m = chirp_common.Memory() + m.number = i + m.empty = True + self.memories.append(m) + + def __init__(self, pipe): + chirp_common.CloneModeRadio.__init__(self, None) + + self._filename = pipe + if self._filename and os.path.exists(self._filename): + self.load() + else: + self._blank() + + def get_features(self): + rf = chirp_common.RadioFeatures() + rf.has_bank = False + rf.has_dtcs_polarity = False + rf.memory_bounds = (0, len(self.memories)) + rf.has_infinite_number = True + + rf.valid_modes = list(chirp_common.MODES) + rf.valid_tmodes = list(chirp_common.TONE_MODES) + rf.valid_duplexes = ["", "-", "+", "split"] + rf.valid_tuning_steps = list(chirp_common.TUNING_STEPS) + rf.valid_bands = [(1, 10000000000)] + rf.valid_skips = ["", "S"] + rf.valid_characters = chirp_common.CHARSET_ASCII + rf.valid_name_length = 999 + + return rf + + def _parse_quoted_line(self, line): + line = line.replace("\n", "") + line = line.replace("\r", "") + line = line.replace('"', "") + + return line.split(",") + + def _get_datum_by_header(self, headers, data, header): + if header not in headers: + raise OmittedHeaderError("Header %s not provided" % header) + + try: + return data[headers.index(header)] + except IndexError: + raise OmittedHeaderError("Header %s not provided on this line" %\ + header) + + def _parse_csv_data_line(self, headers, line): + mem = chirp_common.Memory() + odd_split = False + + for header, (typ, attr) in self.ATTR_MAP.items(): + try: + val = self._get_datum_by_header(headers, line, header) + if not val and typ == int: + val = None + elif attr == "duplex": + val = typ(self.DUPLEX_MAP[val]) + if val == "split": + odd_split = True + elif attr == "skip": + val = typ(self.SKIP_MAP[val]) + elif attr == "tmode": + val = typ(self.TMODE_MAP[val]) + elif attr == 'txfreq': + tx_freq = typ(val) + else: + val = typ(val) + if hasattr(mem, attr): + setattr(mem, attr, val) + except OmittedHeaderError, e: + pass + except Exception, e: + raise Exception("[%s] %s" % (attr, e)) + + if odd_split: + mem.offset = tx_freq + + return mem + + def load(self, filename=None): + if filename is None and self._filename is None: + raise errors.RadioError("Need a location to load from") + + if filename: + self._filename = filename + + self._blank() + + f = file(self._filename, "r") + for i in range(0, 10): + f.readline().strip() + + #f.seek(0, 0) + reader = csv.reader(f, delimiter=chirp_common.SEPCHAR, quotechar='"') + + good = 0 + lineno = 0 + for line in reader: + lineno += 1 + if lineno == 1: + header = line + continue + + if len(header) > len(line): + print "Line %i has %i columns, expected %i" % (lineno, + len(line), + len(header)) + self.errors.append("Column number mismatch on line %i" % lineno) + continue + + try: + mem = self._parse_csv_data_line(header, line) + if mem.number is None: + raise Exception("Invalid Location field" % lineno) + except Exception, e: + print "Line %i: %s" % (lineno, e) + self.errors.append("Line %i: %s" % (lineno, e)) + continue + + self.__grow(mem.number) + self.memories[mem.number] = mem + good += 1 + + if not good: + print self.errors + raise errors.InvalidDataError("No channels found") + + def load_mmap(self, filename): + return self.load(filename) + + def get_memories(self, lo=0, hi=999): + return [x for x in self.memories if x.number >= lo and x.number <= hi] + + def get_memory(self, number): + try: + return self.memories[number] + except: + raise errors.InvalidMemoryLocation("No such memory %s" % number) + + def __grow(self, target): + delta = target - len(self.memories) + if delta < 0: + return + + delta += 1 + + for i in range(len(self.memories), len(self.memories) + delta + 1): + m = chirp_common.Memory() + m.empty = True + m.number = i + self.memories.append(m) + + def get_raw_memory(self, number): + return ",".join(self.memories[number].to_csv()) diff -r 91be43cc7ac4 -r 1bb3df3d624f chirpui/mainapp.py --- a/chirpui/mainapp.py Tue Apr 03 11:19:10 2012 -0700 +++ b/chirpui/mainapp.py Tue Apr 03 16:21:35 2012 -0600 @@ -667,6 +667,7 @@ (_("CSV Files") + " (*.csv)", "*.csv"), (_("EVE Files (VX5)") + " (*.eve)", "*.eve"), (_("ICF Files") + " (*.icf)", "*.icf"), + (_("Kenwood HMK Files") + " (*.hmk)", "*.hmk"), (_("VX5 Commander Files") + " (*.vx5)", "*.vx5"), (_("VX7 Commander Files") + " (*.vx7)", "*.vx7")] filen = platform.get_platform().gui_open_file(types=types)

2 3

[chirp_devel] [PATCH] Change match_model() to receive the filename of the image in question
by Dan Smith 03 Apr '12

03 Apr '12

# HG changeset patch # User Dan Smith <dsmith(a)danplanet.com> # Date 1333499602 25200 # Node ID 742c736df8c6457ad91cec0c25c34b16c2d630de # Parent 20ad7776a3832c5b3d1d356c3cd432a96b1acffe Change match_model() to receive the filename of the image in question and move detection of file-extension-based types to their respective classes. The exception here is regular ICF files, which need to be driverized and then they can be done this way as well. Catch-all bug #93 diff -r 20ad7776a383 -r 742c736df8c6 chirp/alinco.py --- a/chirp/alinco.py Tue Apr 03 12:47:50 2012 -0700 +++ b/chirp/alinco.py Tue Apr 03 17:33:22 2012 -0700 @@ -298,7 +298,7 @@ _range = [(28000000, 29695000)] @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): return len(filedata) == cls._memsize and \ filedata[0x64] == chr(0x00) and filedata[0x65] == chr(0x28) @@ -312,7 +312,7 @@ _range = [(50000000, 53995000)] @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): return len(filedata) == cls._memsize and \ filedata[0x64] == chr(0x00) and filedata[0x65] == chr(0x50) @@ -326,7 +326,7 @@ _range = [(118000000, 173000000)] @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): return len(filedata) == cls._memsize and \ filedata[0x64] == chr(0x01) and filedata[0x65] == chr(0x44) @@ -340,7 +340,7 @@ _range = [(216000000, 280000000)] @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): return len(filedata) == cls._memsize and \ filedata[0x64] == chr(0x02) and filedata[0x65] == chr(0x22) @@ -354,7 +354,7 @@ _range = [(350000000, 511000000)] @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): return len(filedata) == cls._memsize and \ filedata[0x64] == chr(0x04) and filedata[0x65] == chr(0x00) @@ -384,7 +384,7 @@ _valid_tones = DJ596_TONES @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): return len(filedata) == cls._memsize and \ filedata[0x64] == chr(0x45) and filedata[0x65] == chr(0x01) @@ -398,6 +398,6 @@ _range = [(216000000, 280000000)] @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): return len(filedata) == cls._memsize and \ filedata[0x60:0x64] == "2009" diff -r 20ad7776a383 -r 742c736df8c6 chirp/chirp_common.py --- a/chirp/chirp_common.py Tue Apr 03 12:47:50 2012 -0700 +++ b/chirp/chirp_common.py Tue Apr 03 17:33:22 2012 -0700 @@ -968,7 +968,7 @@ return self._mmap @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): """Given contents of a stored file (@filedata), return True if this radio driver handles the represented model""" diff -r 20ad7776a383 -r 742c736df8c6 chirp/directory.py --- a/chirp/directory.py Tue Apr 03 12:47:50 2012 -0700 +++ b/chirp/directory.py Tue Apr 03 17:33:22 2012 -0700 @@ -85,15 +85,6 @@ rf.set_params(float(lat), float(lon), email, passwd) return rf - if image_file.lower().endswith(".chirp"): - return get_radio("Generic_XML")(image_file) - - if image_file.lower().endswith(".csv"): - return get_radio("Generic_CSV")(image_file) - - if icf.is_9x_icf(image_file): - return get_radio("Icom_IC91_92AD_ICF")(image_file) - if icf.is_icf_file(image_file): tempf = tempfile.mktemp() icf_to_image(image_file, tempf) @@ -107,7 +98,7 @@ for radio in DRV_TO_RADIO.values(): if not issubclass(radio, chirp_common.CloneModeRadio): continue - if radio.match_model(filedata): + if radio.match_model(filedata, image_file): return radio(image_file) raise errors.ImageDetectFailed("Unknown file format") diff -r 20ad7776a383 -r 742c736df8c6 chirp/ft2800.py --- a/chirp/ft2800.py Tue Apr 03 12:47:50 2012 -0700 +++ b/chirp/ft2800.py Tue Apr 03 17:33:22 2012 -0700 @@ -265,5 +265,5 @@ _nam.name = mem.name.ljust(6)[:6] @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): return len(filedata) == cls._memsize diff -r 20ad7776a383 -r 742c736df8c6 chirp/ft817.py --- a/chirp/ft817.py Tue Apr 03 12:47:50 2012 -0700 +++ b/chirp/ft817.py Tue Apr 03 17:33:22 2012 -0700 @@ -479,7 +479,7 @@ return msgs @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): return len(filedata) == cls._memsize @directory.register diff -r 20ad7776a383 -r 742c736df8c6 chirp/icw32.py --- a/chirp/icw32.py Tue Apr 03 12:47:50 2012 -0700 +++ b/chirp/icw32.py Tue Apr 03 17:33:22 2012 -0700 @@ -184,7 +184,7 @@ return [ICW32ARadioVHF(self._mmap), ICW32ARadioUHF(self._mmap)] @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): if not len(filedata) == cls._memsize: return False return filedata[-16:] == "IcomCloneFormat3" diff -r 20ad7776a383 -r 742c736df8c6 chirp/vx5.py --- a/chirp/vx5.py Tue Apr 03 12:47:50 2012 -0700 +++ b/chirp/vx5.py Tue Apr 03 17:33:22 2012 -0700 @@ -181,5 +181,5 @@ return chirp_common.name8(name) @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): return len(filedata) == cls._memsize diff -r 20ad7776a383 -r 742c736df8c6 chirp/vx7.py --- a/chirp/vx7.py Tue Apr 03 12:47:50 2012 -0700 +++ b/chirp/vx7.py Tue Apr 03 17:33:22 2012 -0700 @@ -290,7 +290,7 @@ return msgs @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): return len(filedata) == cls._memsize def get_bank_model(self): diff -r 20ad7776a383 -r 742c736df8c6 chirp/wouxun.py --- a/chirp/wouxun.py Tue Apr 03 12:47:50 2012 -0700 +++ b/chirp/wouxun.py Tue Apr 03 17:33:22 2012 -0700 @@ -349,7 +349,7 @@ raise Exception("Character `%s' not supported") @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): # New-style image (CHIRP 0.1.12) if len(filedata) == 8192 and filedata[0x60:0x64] != "2009": return True @@ -496,7 +496,7 @@ self._memobj = bitwise.parse(puxing_mem_format, self._mmap) @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): if len(filedata) > 0x080B and \ ord(filedata[0x080B]) != PUXING_MODELS[777]: return False @@ -711,7 +711,7 @@ return rf @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): return (len(filedata) == cls._memsize) and \ filedata[-16:] != "IcomCloneFormat3" @@ -1011,7 +1011,7 @@ self._set_memory(mem, _rmem) @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): return len(filedata) == 3648 def get_raw_memory(self, number): diff -r 20ad7776a383 -r 742c736df8c6 chirp/yaesu_clone.py --- a/chirp/yaesu_clone.py Tue Apr 03 12:47:50 2012 -0700 +++ b/chirp/yaesu_clone.py Tue Apr 03 17:33:22 2012 -0700 @@ -183,7 +183,7 @@ clone_out(self) @classmethod - def match_model(cls, filedata): + def match_model(cls, filedata, filename): return filedata[:5] == cls._model def _wipe_memory_banks(self, mem):

1 0