diff -Nru chirp-daily-20140428~quantal~1/chirp/ft60.py chirp-daily-20140601~quantal~1/chirp/ft60.py --- chirp-daily-20140428~quantal~1/chirp/ft60.py 2014-04-28 07:03:59.000000000 +0000 +++ chirp-daily-20140601~quantal~1/chirp/ft60.py 2014-06-01 07:08:11.000000000 +0000 @@ -155,8 +155,8 @@ DUPLEX = ["", "", "-", "+", "split"] TMODES = ["", "Tone", "TSQL", "TSQL-R", "DTCS"] POWER_LEVELS = [chirp_common.PowerLevel("High", watts=5.0), - chirp_common.PowerLevel("Mid", watts=2.5), - chirp_common.PowerLevel("Low", watts=1.0)] + chirp_common.PowerLevel("Mid", watts=2.0), + chirp_common.PowerLevel("Low", watts=0.5)] STEPS = [5.0, 10.0, 12.5, 15.0, 20.0, 25.0, 50.0, 100.0] SKIPS = ["", "S", "P"] CHARSET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ [?]^__|`?$%&-()*+,-,/|;/=>?@" diff -Nru chirp-daily-20140428~quantal~1/chirp/generic_csv.py chirp-daily-20140601~quantal~1/chirp/generic_csv.py --- chirp-daily-20140428~quantal~1/chirp/generic_csv.py 2014-01-11 08:04:29.000000000 +0000 +++ chirp-daily-20140601~quantal~1/chirp/generic_csv.py 2014-04-29 07:03:57.000000000 +0000 @@ -78,6 +78,8 @@ def __init__(self, pipe): chirp_common.FileBackedRadio.__init__(self, None) self.memories = [] + self.file_has_rTone = None # Set in load(), used in _clean_tmode() + self.file_has_cTone = None self._filename = pipe if self._filename and os.path.exists(self._filename): @@ -119,6 +121,17 @@ return mem + def _clean_tmode(self, headers, line, mem): + """ If there is exactly one of [rToneFreq, cToneFreq] columns in the + csv file, use it for both rtone & ctone. Makes TSQL use friendlier.""" + + if self.file_has_rTone and not self.file_has_cTone: + mem.ctone = mem.rtone + elif self.file_has_cTone and not self.file_has_rTone: + mem.rtone = mem.ctone + + return mem + def _parse_csv_data_line(self, headers, line): mem = chirp_common.Memory() try: @@ -168,6 +181,8 @@ lineno += 1 if lineno == 1: header = line + self.file_has_rTone = "rToneFreq" in header + self.file_has_cTone = "cToneFreq" in header continue if len(header) > len(line): diff -Nru chirp-daily-20140428~quantal~1/chirp/ic9x_icf.py chirp-daily-20140601~quantal~1/chirp/ic9x_icf.py --- chirp-daily-20140428~quantal~1/chirp/ic9x_icf.py 2012-05-03 07:03:54.000000000 +0000 +++ chirp-daily-20140601~quantal~1/chirp/ic9x_icf.py 2014-06-01 07:08:11.000000000 +0000 @@ -15,7 +15,8 @@ from chirp import chirp_common, icf, ic9x_icf_ll, util, directory, errors -@directory.register +# Don't register as this module is used to load icf file from File-Open menu +# see do_open in mainapp.py class IC9xICFRadio(chirp_common.CloneModeRadio): VENDOR = "Icom" MODEL = "IC-91/92AD" diff -Nru chirp-daily-20140428~quantal~1/chirp/__init__.py chirp-daily-20140601~quantal~1/chirp/__init__.py --- chirp-daily-20140428~quantal~1/chirp/__init__.py 2014-04-28 07:04:16.000000000 +0000 +++ chirp-daily-20140601~quantal~1/chirp/__init__.py 2014-06-01 07:08:30.000000000 +0000 @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -CHIRP_VERSION="daily-20140428" +CHIRP_VERSION="daily-20140601" import os import sys diff -Nru chirp-daily-20140428~quantal~1/chirp/uv5r.py chirp-daily-20140601~quantal~1/chirp/uv5r.py --- chirp-daily-20140428~quantal~1/chirp/uv5r.py 2014-04-07 07:04:27.000000000 +0000 +++ chirp-daily-20140601~quantal~1/chirp/uv5r.py 2014-06-01 07:08:11.000000000 +0000 @@ -43,8 +43,8 @@ u8 unknown1:7, txtoneicon:1; u8 mailicon:3, - unknown2:4, - lowpower:1; + unknown2:3, + lowpower:2; u8 unknown3:1, wide:1, unknown4:2, @@ -134,7 +134,9 @@ unknown2:1, reset:1, menu:1; - u8 vfomrlock; + u8 unknown1:6, + singleptt:1, + vfomrlock:1; u8 workmode; u8 keylock; } settings; @@ -167,7 +169,8 @@ unused4:4; u8 txpower:1, widenarr:1, - unknown5:6; + unknown5:4, + txpower3:2; } vfoa; #seekto 0x0F30; @@ -190,7 +193,8 @@ unused4:4; u8 txpower:1, widenarr:1, - unknown5:6; + unknown5:4, + txpower3:2; } vfob; #seekto 0x0F56; @@ -250,7 +254,7 @@ BASETYPE_UV5R = ["BFS", "BFB"] BASETYPE_F11 = ["USA"] -BASETYPE_UV82 = ["B82S", "BF82"] +BASETYPE_UV82 = ["US2S", "B82S", "BF82"] BASETYPE_BJ55 = ["BJ55"] # needed for for the Baojie UV-55 in bjuv55.py BASETYPE_UV6 = ["BF1"] BASETYPE_KT980HP = ["BFP3"] @@ -312,6 +316,7 @@ "timeout" : TIMEOUT_LIST, "txled" : COLOR_LIST, "txpower" : TXPOWER_LIST, + "txpower3" : TXPOWER3_LIST, "voice" : VOICE_LIST, "vox" : VOX_LIST, "widenarr" : BANDWIDTH_LIST, @@ -512,6 +517,10 @@ UV5R_POWER_LEVELS = [chirp_common.PowerLevel("High", watts=4.00), chirp_common.PowerLevel("Low", watts=1.00)] +UV5R_POWER_LEVELS3 = [chirp_common.PowerLevel("High", watts=8.00), + chirp_common.PowerLevel("Med", watts=4.00), + chirp_common.PowerLevel("Low", watts=1.00)] + UV5R_DTCS = sorted(chirp_common.DTCS_CODES + [645]) UV5R_CHARSET = chirp_common.CHARSET_UPPER_NUMERIC + \ @@ -724,7 +733,17 @@ if not _mem.scan: mem.skip = "S" - mem.power = UV5R_POWER_LEVELS[_mem.lowpower] + if self.MODEL == "KT-980HP": + levels = UV5R_POWER_LEVELS3 + else: + levels = UV5R_POWER_LEVELS + try: + mem.power = levels[_mem.lowpower] + except IndexError: + print "Radio reported invalid power level %s (in %s)" % ( + _mem.power, levels) + mem.power = levels[0] + mem.mode = _mem.wide and "FM" or "NFM" mem.extra = RadioSettingGroup("Extra", "extra") @@ -818,7 +837,15 @@ _mem.scan = mem.skip != "S" _mem.wide = mem.mode == "FM" - _mem.lowpower = mem.power == UV5R_POWER_LEVELS[1] + + if mem.power: + if self.MODEL == "KT-980HP": + levels = [str(l) for l in UV5R_POWER_LEVELS3] + _mem.lowpower = levels.index(str(mem.power)) + else: + _mem.lowpower = UV5R_POWER_LEVELS.index(mem.power) + else: + _mem.lowpower = 0 for setting in mem.extra: setattr(_mem, setting.get_name(), setting.value) @@ -852,6 +879,9 @@ elif 'B82S' in version_tag: idx = version_tag.index("B82S") + 4 return int(version_tag[idx:idx + 2]) + 8200 + elif 'US2S' in version_tag: + idx = version_tag.index("US2S") + 4 + return int(version_tag[idx:idx + 2]) + 8200 elif 'USA' in version_tag: idx = version_tag.index("USA") + 3 return int(version_tag[idx:idx + 3]) + 11000 @@ -1051,6 +1081,18 @@ RadioSettingValueBoolean(_settings.vfomrlock)) advanced.append(rs) + if self.MODEL == "UV-82": + # this is a UV-82C only feature + rs = RadioSetting("vfomrlock", "VFO/MR Switching (UV-82C only)", + RadioSettingValueBoolean(_settings.vfomrlock)) + advanced.append(rs) + + if self.MODEL == "UV-82": + # this is an UV-82C only feature + rs = RadioSetting("singleptt", "Single PTT (UV-82C only)", + RadioSettingValueBoolean(_settings.singleptt)) + advanced.append(rs) + if len(self._mmap.get_packed()) == 0x1808: # Old image, without aux block return group @@ -1251,16 +1293,16 @@ _vfob.txpower])) workmode.append(rs) else: - rs = RadioSetting("vfoa.txpower", "VFO A Power", + rs = RadioSetting("vfoa.txpower3", "VFO A Power", RadioSettingValueList(TXPOWER3_LIST, TXPOWER3_LIST[ - _vfoa.txpower])) + _vfoa.txpower3])) workmode.append(rs) - rs = RadioSetting("vfob.txpower", "VFO B Power", + rs = RadioSetting("vfob.txpower3", "VFO B Power", RadioSettingValueList(TXPOWER3_LIST, TXPOWER3_LIST[ - _vfob.txpower])) + _vfob.txpower3])) workmode.append(rs) @@ -1470,6 +1512,11 @@ _basetype = BASETYPE_UV82 _idents = [UV5R_MODEL_UV82] + def get_features(self): + rf = BaofengUV5R.get_features(self) + rf.valid_bands = [(130000000, 176000000), (400000000, 521000000)] + return rf + def _is_orig(self): # Override this for UV82 to always return False return False @@ -1512,9 +1559,7 @@ def get_features(self): rf = BaofengUV5R.get_features(self) - rf.valid_power_levels = [chirp_common.PowerLevel("High", watts=8.00), - chirp_common.PowerLevel("Med", watts=4.00), - chirp_common.PowerLevel("Low", watts=1.00)] + rf.valid_power_levels = UV5R_POWER_LEVELS3 rf.valid_bands = [(130000000, 180000000), (400000000, 521000000)] return rf diff -Nru chirp-daily-20140428~quantal~1/debian/changelog chirp-daily-20140601~quantal~1/debian/changelog --- chirp-daily-20140428~quantal~1/debian/changelog 2014-04-28 07:04:17.000000000 +0000 +++ chirp-daily-20140601~quantal~1/debian/changelog 2014-06-01 07:08:31.000000000 +0000 @@ -1,6 +1,6 @@ -chirp-daily (20140428~quantal~1) quantal; urgency=low +chirp-daily (20140601~quantal~1) quantal; urgency=low * Latest daily snapshot from upstream - -- Dan Smith Mon, 28 Apr 2014 07:04:17 +0000 + -- Dan Smith Sun, 01 Jun 2014 07:08:31 +0000 diff -Nru chirp-daily-20140428~quantal~1/debian/patches/debian-changes-20140428~quantal~1 chirp-daily-20140601~quantal~1/debian/patches/debian-changes-20140428~quantal~1 --- chirp-daily-20140428~quantal~1/debian/patches/debian-changes-20140428~quantal~1 2014-04-28 07:04:19.000000000 +0000 +++ chirp-daily-20140601~quantal~1/debian/patches/debian-changes-20140428~quantal~1 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -Description: Upstream changes introduced in version 20140428~quantal~1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - chirp-daily (20140428~quantal~1) quantal; urgency=low - . - * Latest daily snapshot from upstream - . - The person named in the Author field signed this changelog entry. -Author: Dan Smith - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- /dev/null -+++ chirp-daily-20140428~quantal~1/MANIFEST.in -@@ -0,0 +1,6 @@ -+include *.xsd -+include share/*.desktop -+include share/chirp.png -+include share/*.1 -+include stock_configs/* -+include COPYING diff -Nru chirp-daily-20140428~quantal~1/debian/patches/debian-changes-20140601~quantal~1 chirp-daily-20140601~quantal~1/debian/patches/debian-changes-20140601~quantal~1 --- chirp-daily-20140428~quantal~1/debian/patches/debian-changes-20140601~quantal~1 1970-01-01 00:00:00.000000000 +0000 +++ chirp-daily-20140601~quantal~1/debian/patches/debian-changes-20140601~quantal~1 2014-06-01 07:08:33.000000000 +0000 @@ -0,0 +1,34 @@ +Description: Upstream changes introduced in version 20140601~quantal~1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + chirp-daily (20140601~quantal~1) quantal; urgency=low + . + * Latest daily snapshot from upstream + . + The person named in the Author field signed this changelog entry. +Author: Dan Smith + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- /dev/null ++++ chirp-daily-20140601~quantal~1/MANIFEST.in +@@ -0,0 +1,6 @@ ++include *.xsd ++include share/*.desktop ++include share/chirp.png ++include share/*.1 ++include stock_configs/* ++include COPYING diff -Nru chirp-daily-20140428~quantal~1/debian/patches/series chirp-daily-20140601~quantal~1/debian/patches/series --- chirp-daily-20140428~quantal~1/debian/patches/series 2014-04-28 07:04:19.000000000 +0000 +++ chirp-daily-20140601~quantal~1/debian/patches/series 2014-06-01 07:08:33.000000000 +0000 @@ -1 +1 @@ -debian-changes-20140428~quantal~1 +debian-changes-20140601~quantal~1 diff -Nru chirp-daily-20140428~quantal~1/PKG-INFO chirp-daily-20140601~quantal~1/PKG-INFO --- chirp-daily-20140428~quantal~1/PKG-INFO 2014-04-28 07:04:16.000000000 +0000 +++ chirp-daily-20140601~quantal~1/PKG-INFO 2014-06-01 07:08:31.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: chirp -Version: daily-20140428 +Version: daily-20140601 Summary: UNKNOWN Home-page: UNKNOWN Author: UNKNOWN