[chirp_devel] [PATCH 2 of 2] Fix radio drivers with invalid tuning step lists. #4689

Tom Hayward
Thu Mar 30 12:16:20 PDT 2017


# HG changeset patch
# User Tom Hayward <tom at tomh.us>
# Date 1490901245 25200
#      Thu Mar 30 12:14:05 2017 -0700
# Node ID 99251f2b49ec2d21a73442768594f1fca3931e9a
# Parent  38e99fa3fda076acd3c5989071aa048eb9d91a52
Fix radio drivers with invalid tuning step lists. #4689

New step list sources:
IC-V82/U82: manual
VX-5: radio menu
VX-5: manual

diff -r 38e99fa3fda0 -r 99251f2b49ec chirp/drivers/icx8x.py
--- a/chirp/drivers/icx8x.py	Thu Mar 30 12:14:02 2017 -0700
+++ b/chirp/drivers/icx8x.py	Thu Mar 30 12:14:05 2017 -0700
@@ -75,8 +75,7 @@
         rf.valid_modes = ["FM", "NFM", "DV"]
         rf.valid_tmodes = ["", "Tone", "TSQL", "DTCS"]
         rf.valid_duplexes = ["", "-", "+"]
-        rf.valid_tuning_steps = [x for x in chirp_common.TUNING_STEPS
-                                 if x != 6.25]
+        rf.valid_tuning_steps = [5., 10., 12.5, 15., 20., 25., 30., 50.]
         if self._isuhf:
             rf.valid_bands = [(420000000, 470000000)]
         else:
diff -r 38e99fa3fda0 -r 99251f2b49ec chirp/drivers/vx5.py
--- a/chirp/drivers/vx5.py	Thu Mar 30 12:14:02 2017 -0700
+++ b/chirp/drivers/vx5.py	Thu Mar 30 12:14:05 2017 -0700
@@ -70,12 +70,7 @@
 TMODES = ["", "Tone", "TSQL", "DTCS"]
 DUPLEX = ["", "-", "+", "split"]
 MODES = ["FM", "AM", "WFM"]
-STEPS = list(chirp_common.TUNING_STEPS)
-STEPS.remove(6.25)
-STEPS.remove(30.0)
-STEPS.append(100.0)
-STEPS.append(9.0)
-
+STEPS = [5.0, 10.0, 12.5, 15.0, 20.0, 25.0, 50.0, 100.0]
 POWER_LEVELS = [chirp_common.PowerLevel("Hi", watts=5.00),
                 chirp_common.PowerLevel("L3", watts=2.50),
                 chirp_common.PowerLevel("L2", watts=1.00),
@@ -177,6 +172,7 @@
         rf.has_dtcs_polarity = False
         rf.valid_modes = MODES + ["NFM"]
         rf.valid_tmodes = TMODES
+        rf.valid_tuning_steps = STEPS
         rf.valid_duplexes = DUPLEX
         rf.memory_bounds = (1, 220)
         rf.valid_bands = [(500000,    16000000),
diff -r 38e99fa3fda0 -r 99251f2b49ec chirp/drivers/vx7.py
--- a/chirp/drivers/vx7.py	Thu Mar 30 12:14:02 2017 -0700
+++ b/chirp/drivers/vx7.py	Thu Mar 30 12:14:05 2017 -0700
@@ -81,11 +81,7 @@
 MODES = ["FM", "AM", "WFM", "Auto"]
 TMODES = ["", "Tone", "TSQL", "DTCS", "Cross"]
 CROSS_MODES = ["DTCS->", "Tone->DTCS", "DTCS->Tone"]
-STEPS = list(chirp_common.TUNING_STEPS)
-STEPS.remove(6.25)
-STEPS.remove(30.0)
-STEPS.append(100.0)
-STEPS.append(9.0)
+STEPS = [5.0, 10.0, 12.5, 15.0, 20.0, 25.0, 50.0, 100.0, 9.0]
 
 CHARSET = ["%i" % int(x) for x in range(0, 10)] + \
     [" "] + \



More information about the chirp_devel mailing list