Hand-fix some settings list indexes with variables

This commit is contained in:
Dan Smith 2024-09-08 17:53:08 -07:00 committed by Dan Smith
parent 9853c3fa43
commit 8c84bf8b9e
2 changed files with 7 additions and 10 deletions

View File

@ -483,14 +483,12 @@ class RadioddityGA510Radio(chirp_common.CloneModeRadio):
# 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

View File

@ -872,12 +872,8 @@ class UVK5RadioBase(chirp_common.CloneModeRadio):
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 @@ class UVK5RadioBase(chirp_common.CloneModeRadio):
_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