[chirp_devel] [PATCH 2 of 4] [IC-7200] Fix radio properties
Marco Filippi IZ3GME
Tue Jan 19 13:02:35 PST 2016
# HG changeset patch
# User Marco Filippi <iz3gme.marco at gmail.com>
# Date 1453226835 -3600
# Tue Jan 19 19:07:15 2016 +0100
# Node ID 2be0404f89847c86e229cdb63d7b4593c12acad3
# Parent 8b30f8921b6006272f1ffd2aaa027e89a940fe14
[IC-7200] Fix radio properties
Radio have a whider receiver, 201 memories (where last two are scan edges) and
supports reverse CW and RTTY
Discovered while working on #3185
diff -r 8b30f8921b60 -r 2be0404f8984 chirp/chirp_common.py
--- a/chirp/chirp_common.py Tue Jan 19 17:20:51 2016 +0100
+++ b/chirp/chirp_common.py Tue Jan 19 19:07:15 2016 +0100
@@ -68,7 +68,7 @@
]
MODES = ["WFM", "FM", "NFM", "AM", "NAM", "DV", "USB", "LSB", "CW", "RTTY",
- "DIG", "PKT", "NCW", "NCWR", "CWR", "P25", "Auto"]
+ "DIG", "PKT", "NCW", "NCWR", "CWR", "P25", "Auto", "RTTYR"]
TONE_MODES = [
"",
diff -r 8b30f8921b60 -r 2be0404f8984 chirp/drivers/icomciv.py
--- a/chirp/drivers/icomciv.py Tue Jan 19 17:20:51 2016 +0100
+++ b/chirp/drivers/icomciv.py Tue Jan 19 19:07:15 2016 +0100
@@ -191,6 +191,12 @@
_model = "\x00"
_template = 0
+ # complete list of modes from CI-V documentation
+ # each radio supports a subset
+ # WARNING: "S-AM" and "PSK" are not valid (yet) for chirp
+ _MODES = ["LSB", "USB", "AM", "CW", "RTTY",
+ "FM", "WFM", "CWR", "RTTYR", "S-AM", "PSK"]
+
def mem_to_ch_bnk(self, mem):
l, h = self._bank_index_bounds
bank_no = (mem // (h - l + 1)) + l
@@ -316,7 +322,7 @@
pass
mem.freq = int(memobj.freq)
- mem.mode = self._rf.valid_modes[memobj.mode]
+ mem.mode = self._MODES[memobj.mode]
if self._rf.has_name:
mem.name = str(memobj.name).rstrip()
@@ -395,7 +401,7 @@
except KeyError:
pass
memobj.freq = int(mem.freq)
- memobj.mode = self._rf.valid_modes.index(mem.mode)
+ memobj.mode = self._MODES.index(mem.mode)
if self._rf.has_name:
memobj.name = mem.name.ljust(9)[:9]
@@ -454,13 +460,15 @@
self._rf.has_ctone = False
self._rf.has_offset = False
self._rf.has_name = False
- self._rf.valid_modes = ["LSB", "USB", "AM", "CW", "RTTY"]
+ self._rf.has_nostep_tuning = True
+ self._rf.valid_modes = ["LSB", "USB", "AM", "CW", "RTTY",
+ "CWR", "RTTYR"]
self._rf.valid_tmodes = []
self._rf.valid_duplexes = []
- self._rf.valid_bands = [(1800000, 59000000)]
+ self._rf.valid_bands = [(30000, 60000000)]
self._rf.valid_tuning_steps = []
self._rf.valid_skips = []
- self._rf.memory_bounds = (1, 200)
+ self._rf.memory_bounds = (1, 201)
@directory.register
More information about the chirp_devel
mailing list