Hand-fix some settings list indexes with variables

kk7ds · Sep 9, 2024 · 674744c · 674744c
1 parent 5221692
commit 674744c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/chirp/drivers/ga510.py b/chirp/drivers/ga510.py
@@ -483,14 +483,12 @@ def _get_extra(self, _mem):
 
         # pttid, signal
 
-        cur = PTTID[int(_mem.pttid)]
         s = RadioSetting('pttid', 'PTTID',
-                         RadioSettingValueList(PTTID, cur))
+                         RadioSettingValueList(PTTID, int(_mem.pttid)))
         group.append(s)
 
-        cur = SIGNAL[int(_mem.signal)]
         s = RadioSetting('signal', 'Signal',
-                         RadioSettingValueList(SIGNAL, cur))
+                         RadioSettingValueList(SIGNAL, int(_mem.signal)))
         group.append(s)
 
         return group

diff --git a/chirp/drivers/uvk5.py b/chirp/drivers/uvk5.py
@@ -872,12 +872,8 @@ def _get_mem_extra(self, mem, _mem):
         mem.extra.append(rs)
 
         # PTTID
-        try:
-            pttid = self._pttid_list[_mem.dtmf_pttid]
-        except IndexError:
-            pttid = 0
         rs = RadioSetting("pttid", "PTTID", RadioSettingValueList(
-            self._pttid_list, pttid))
+            self._pttid_list, current_index=_mem.dtmf_pttid))
         mem.extra.append(rs)
 
         # DTMF DECODE
@@ -2009,7 +2005,10 @@ def set_memory(self, mem):
                 _mem.bclo = svalue and 1 or 0
 
             if sname == "pttid":
-                _mem.dtmf_pttid = self._pttid_list.index(svalue)
+                try:
+                    _mem.dtmf_pttid = self._pttid_list.index(svalue)
+                except ValueError:
+                    _mem.dtmf_pttid = 0
 
             if sname == "frev":
                 _mem.freq_reverse = svalue and 1 or 0