From 9853c3fa43ba275ae18eaf099e0a97c843b8ca85 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Sun, 8 Sep 2024 17:28:58 -0700 Subject: [PATCH] Mass convert self.LIST settings indexes --- chirp/drivers/baofeng_common.py | 4 +- chirp/drivers/baofeng_uv17Pro.py | 27 ++++---- chirp/drivers/bjuv55.py | 16 ++--- chirp/drivers/btech.py | 2 +- chirp/drivers/ft1d.py | 110 +++++++++++++++---------------- chirp/drivers/ft450d.py | 8 +-- chirp/drivers/ft70.py | 77 +++++++++++----------- chirp/drivers/ft857.py | 27 ++++---- chirp/drivers/gmrsuv1.py | 4 +- chirp/drivers/gmrsv2.py | 4 +- chirp/drivers/h777.py | 10 +-- chirp/drivers/hf90.py | 4 +- chirp/drivers/kguv9dplus.py | 4 +- chirp/drivers/mursv1.py | 4 +- chirp/drivers/retevis_rb28.py | 4 +- chirp/drivers/thd72.py | 14 ++-- chirp/drivers/vx6.py | 70 ++++++++++---------- chirp/drivers/vx8.py | 96 +++++++++++++-------------- 18 files changed, 238 insertions(+), 247 deletions(-) diff --git a/chirp/drivers/baofeng_common.py b/chirp/drivers/baofeng_common.py index 445364c1..0b478d04 100644 --- a/chirp/drivers/baofeng_common.py +++ b/chirp/drivers/baofeng_common.py @@ -660,12 +660,12 @@ class BaofengCommonHT(chirp_common.CloneModeRadio, rs = RadioSetting("pttid", "PTT ID", RadioSettingValueList(self.PTTID_LIST, - self.PTTID_LIST[_mem.pttid])) + current_index=_mem.pttid)) mem.extra.append(rs) rs = RadioSetting("scode", "S-CODE", RadioSettingValueList(self.SCODE_LIST, - self.SCODE_LIST[_mem.scode])) + current_index=_mem.scode)) mem.extra.append(rs) immutable = [] diff --git a/chirp/drivers/baofeng_uv17Pro.py b/chirp/drivers/baofeng_uv17Pro.py index c71e57cd..777f489a 100644 --- a/chirp/drivers/baofeng_uv17Pro.py +++ b/chirp/drivers/baofeng_uv17Pro.py @@ -527,7 +527,7 @@ class UV17Pro(bfc.BaofengCommonHT): val = _mem.settings.squelch rs = RadioSetting("settings.squelch", "Squelch", RadioSettingValueList( - self.SQUELCH_LIST, self.SQUELCH_LIST[val])) + self.SQUELCH_LIST, current_index=val)) basic.append(rs) if _mem.settings.tot >= len(self.LIST_TIMEOUT): @@ -536,7 +536,7 @@ class UV17Pro(bfc.BaofengCommonHT): val = _mem.settings.tot rs = RadioSetting("settings.tot", "Timeout Timer", RadioSettingValueList( - self.LIST_TIMEOUT, self.LIST_TIMEOUT[val])) + self.LIST_TIMEOUT, current_index=val)) basic.append(rs) rs = RadioSetting("settings.dualstandby", "Dual Watch", @@ -550,8 +550,7 @@ class UV17Pro(bfc.BaofengCommonHT): "Power On Display Type", RadioSettingValueList( self.LIST_POWERON_DISPLAY_TYPE, - self.LIST_POWERON_DISPLAY_TYPE[ - _mem.settings.powerondistype])) + current_index=_mem.settings.powerondistype)) basic.append(rs) if _mem.settings.voice >= len(self.LIST_VOICE): @@ -560,7 +559,7 @@ class UV17Pro(bfc.BaofengCommonHT): val = _mem.settings.voice rs = RadioSetting("settings.voice", "Voice Prompt", RadioSettingValueList( - self.LIST_VOICE, self.LIST_VOICE[val])) + self.LIST_VOICE, current_index=val)) basic.append(rs) rs = RadioSetting("settings.voicesw", "Enable Voice", @@ -574,7 +573,7 @@ class UV17Pro(bfc.BaofengCommonHT): rs = RadioSetting("settings.backlight", "Backlight Timer", RadioSettingValueList( self.LIST_BACKLIGHT_TIMER, - self.LIST_BACKLIGHT_TIMER[val])) + current_index=val)) basic.append(rs) rs = RadioSetting("settings.autolock", "Key Auto Lock", @@ -593,13 +592,13 @@ class UV17Pro(bfc.BaofengCommonHT): rs = RadioSetting("settings.chadistype", "Channel A display type", RadioSettingValueList( self.LIST_MODE, - self.LIST_MODE[_mem.settings.chadistype])) + current_index=_mem.settings.chadistype)) basic.append(rs) rs = RadioSetting("settings.chbdistype", "Channel B display type", RadioSettingValueList( self.LIST_MODE, - self.LIST_MODE[_mem.settings.chbdistype])) + current_index=_mem.settings.chbdistype)) basic.append(rs) def get_settings_pro_basic(self, basic, _mem): @@ -610,7 +609,7 @@ class UV17Pro(bfc.BaofengCommonHT): val = _mem.settings.savemode rs = RadioSetting("settings.savemode", "Save Mode", RadioSettingValueList(self.LIST_PW_SAVEMODE, - self.LIST_PW_SAVEMODE[val])) + current_index=val)) basic.append(rs) rs = RadioSetting("settings.totalarm", "Timeout Timer Alarm", @@ -892,7 +891,7 @@ class UV17Pro(bfc.BaofengCommonHT): val = _mem.vfo.a.scode rs = RadioSetting("vfo.a.scode", "Signal Code", RadioSettingValueList(self.SCODE_LIST, - self.SCODE_LIST[val])) + current_index=val)) vfoA.append(rs) if _mem.vfo.b.scode >= len(self.SCODE_LIST): @@ -901,7 +900,7 @@ class UV17Pro(bfc.BaofengCommonHT): val = _mem.vfo.b.scode rs = RadioSetting("vfo.b.scode", "Signal Code", RadioSettingValueList(self.SCODE_LIST, - self.SCODE_LIST[val])) + current_index=val)) vfoB.append(rs) if _mem.vfo.a.step >= len(STEPS): @@ -1176,15 +1175,13 @@ class UV17Pro(bfc.BaofengCommonHT): rs = RadioSetting("pttid", "PTT ID", RadioSettingValueList(self.PTTID_LIST, - self.PTTID_LIST[ - _mem.pttid])) + current_index=_mem.pttid)) mem.extra.append(rs) scode = (_mem.scode - self._scode_offset) % len(self.SCODE_LIST) rs = RadioSetting("scode", "S-CODE", RadioSettingValueList(self.SCODE_LIST, - self.SCODE_LIST[ - scode])) + current_index=scode)) mem.extra.append(rs) mem.name = str(name).replace('\xFF', ' ').replace('\x00', ' ').rstrip() diff --git a/chirp/drivers/bjuv55.py b/chirp/drivers/bjuv55.py index 87cacb88..ee702493 100644 --- a/chirp/drivers/bjuv55.py +++ b/chirp/drivers/bjuv55.py @@ -286,7 +286,7 @@ class BaojieBJUV55Radio(uv5r.BaofengUV5R): rs = RadioSetting("tdrab", "Dual Watch TX Priority", RadioSettingValueList( uv5r.TDRAB_LIST, - uv5r.TDRAB_LIST[_settings.tdrab])) + current_index=_settings.tdrab)) advanced.append(rs) rs = RadioSetting("alarm", "Alarm", @@ -300,23 +300,23 @@ class BaojieBJUV55Radio(uv5r.BaofengUV5R): rs = RadioSetting("timeout", "Timeout Timer", RadioSettingValueList( uv5r.TIMEOUT_LIST, - uv5r.TIMEOUT_LIST[_settings.timeout])) + current_index=_settings.timeout)) basic.append(rs) rs = RadioSetting("screv", "Scan Resume", RadioSettingValueList( uv5r.RESUME_LIST, - uv5r.RESUME_LIST[_settings.screv])) + current_index=_settings.screv)) advanced.append(rs) rs = RadioSetting("mdfa", "Display Mode (A)", RadioSettingValueList( - uv5r.MODE_LIST, uv5r.MODE_LIST[_settings.mdfa])) + uv5r.MODE_LIST, current_index=_settings.mdfa)) basic.append(rs) rs = RadioSetting("mdfb", "Display Mode (B)", RadioSettingValueList( - uv5r.MODE_LIST, uv5r.MODE_LIST[_settings.mdfb])) + uv5r.MODE_LIST, current_index=_settings.mdfb)) basic.append(rs) rs = RadioSetting("bcl", "Busy Channel Lockout", @@ -620,19 +620,19 @@ class BaojieBJUV55Radio(uv5r.BaofengUV5R): rs = RadioSetting("dtmfst", "DTMF Sidetone", RadioSettingValueList( uv5r.DTMFST_LIST, - uv5r.DTMFST_LIST[_settings.dtmfst])) + current_index=_settings.dtmfst)) dtmf.append(rs) rs = RadioSetting("ani.dtmfon", "DTMF Speed (on)", RadioSettingValueList( uv5r.DTMFSPEED_LIST, - uv5r.DTMFSPEED_LIST[self._memobj.ani.dtmfon])) + current_index=self._memobj.ani.dtmfon)) dtmf.append(rs) rs = RadioSetting("ani.dtmfoff", "DTMF Speed (off)", RadioSettingValueList( uv5r.DTMFSPEED_LIST, - uv5r.DTMFSPEED_LIST[self._memobj.ani.dtmfoff])) + current_index=self._memobj.ani.dtmfoff)) dtmf.append(rs) return group diff --git a/chirp/drivers/btech.py b/chirp/drivers/btech.py index b932d22d..55324f8b 100644 --- a/chirp/drivers/btech.py +++ b/chirp/drivers/btech.py @@ -1118,7 +1118,7 @@ class BTechMobileCommon(chirp_common.CloneModeRadio, # Basic if self.COLOR_LCD: val = min(_mem.settings.tmr, len(self.LIST_TMR) - 1) - rs = RadioSettingValueList(self.LIST_TMR, self.LIST_TMR[val]) + rs = RadioSettingValueList(self.LIST_TMR, current_index=val) tmr = RadioSetting("settings.tmr", "Transceiver multi-receive", rs) basic.append(tmr) else: diff --git a/chirp/drivers/ft1d.py b/chirp/drivers/ft1d.py index 6d1836a0..c0b5ad44 100644 --- a/chirp/drivers/ft1d.py +++ b/chirp/drivers/ft1d.py @@ -1315,12 +1315,12 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( chirp_common.APRS_SSID, - chirp_common.APRS_SSID[aprs.my_callsign.ssid]) + current_index=aprs.my_callsign.ssid) rs = RadioSetting("aprs.my_callsign.ssid", "My SSID", val) menu.append(rs) val = RadioSettingValueList(self._MY_SYMBOL, - self._MY_SYMBOL[aprs.selected_my_symbol]) + current_index=aprs.selected_my_symbol) rs = RadioSetting("aprs.selected_my_symbol", "My Symbol", val) menu.append(rs) @@ -1337,7 +1337,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( chirp_common.APRS_POSITION_COMMENT, - chirp_common.APRS_POSITION_COMMENT[aprs.selected_position_comment]) + current_index=aprs.selected_position_comment) rs = RadioSetting("aprs.selected_position_comment", "Position Comment", val) menu.append(rs) @@ -1375,67 +1375,67 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): menu.append(rs) val = RadioSettingValueList( - self._TIME_SOURCE, self._TIME_SOURCE[aprs.set_time_manually]) + self._TIME_SOURCE, current_index=aprs.set_time_manually) rs = RadioSetting("aprs.set_time_manually", "Time Source", val) menu.append(rs) - val = RadioSettingValueList(self._TZ, self._TZ[aprs.timezone]) + val = RadioSettingValueList(self._TZ, current_index=aprs.timezone) rs = RadioSetting("aprs.timezone", "Timezone", val) menu.append(rs) val = RadioSettingValueList(self._SPEED_UNITS, - self._SPEED_UNITS[aprs.aprs_units_speed]) + current_index=aprs.aprs_units_speed) rs = RadioSetting("aprs.aprs_units_speed", "APRS Speed Units", val) menu.append(rs) val = RadioSettingValueList(self._SPEED_UNITS, - self._SPEED_UNITS[aprs.gps_units_speed]) + current_index=aprs.gps_units_speed) rs = RadioSetting("aprs.gps_units_speed", "GPS Speed Units", val) menu.append(rs) val = RadioSettingValueList( - self._ALT_UNITS, self._ALT_UNITS[aprs.aprs_units_altitude_ft]) + self._ALT_UNITS, current_index=aprs.aprs_units_altitude_ft) rs = RadioSetting("aprs.aprs_units_altitude_ft", "APRS Altitude Units", val) menu.append(rs) val = RadioSettingValueList( - self._ALT_UNITS, self._ALT_UNITS[aprs.gps_units_altitude_ft]) + self._ALT_UNITS, current_index=aprs.gps_units_altitude_ft) rs = RadioSetting("aprs.gps_units_altitude_ft", "GPS Altitude Units", val) menu.append(rs) val = RadioSettingValueList( - self._POS_UNITS, self._POS_UNITS[aprs.aprs_units_position_mmss]) + self._POS_UNITS, current_index=aprs.aprs_units_position_mmss) rs = RadioSetting("aprs.aprs_units_position_mmss", "APRS Position Format", val) menu.append(rs) val = RadioSettingValueList( - self._POS_UNITS, self._POS_UNITS[aprs.gps_units_position_sss]) + self._POS_UNITS, current_index=aprs.gps_units_position_sss) rs = RadioSetting("aprs.gps_units_position_sss", "GPS Position Format", val) menu.append(rs) val = RadioSettingValueList( - self._DIST_UNITS, self._DIST_UNITS[aprs.aprs_units_distance_m]) + self._DIST_UNITS, current_index=aprs.aprs_units_distance_m) rs = RadioSetting("aprs.aprs_units_distance_m", "APRS Distance Units", val) menu.append(rs) val = RadioSettingValueList(self._WIND_UNITS, - self._WIND_UNITS[aprs.aprs_units_wind_mph]) + current_index=aprs.aprs_units_wind_mph) rs = RadioSetting("aprs.aprs_units_wind_mph", "APRS Wind Speed Units", val) menu.append(rs) val = RadioSettingValueList( - self._RAIN_UNITS, self._RAIN_UNITS[aprs.aprs_units_rain_inch]) + self._RAIN_UNITS, current_index=aprs.aprs_units_rain_inch) rs = RadioSetting("aprs.aprs_units_rain_inch", "APRS Rain Units", val) menu.append(rs) val = RadioSettingValueList( - self._TEMP_UNITS, self._TEMP_UNITS[aprs.aprs_units_temperature_f]) + self._TEMP_UNITS, current_index=aprs.aprs_units_temperature_f) rs = RadioSetting("aprs.aprs_units_temperature_f", "APRS Temperature Units", val) menu.append(rs) @@ -1547,7 +1547,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): menu = RadioSettingGroup("aprs_rx", "APRS Receive") aprs = self._memobj.aprs - val = RadioSettingValueList(self._RX_BAUD, self._RX_BAUD[aprs.rx_baud]) + val = RadioSettingValueList(self._RX_BAUD, current_index=aprs.rx_baud) rs = RadioSetting("aprs.rx_baud", "Modem RX", val) menu.append(rs) @@ -1569,37 +1569,37 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): menu.append(rs) val = RadioSettingValueList(self._FLASH, - self._FLASH[aprs.flash_msg]) + current_index=aprs.flash_msg) rs = RadioSetting("aprs.flash_msg", "Flash on personal message", val) menu.append(rs) if self._has_vibrate: val = RadioSettingValueList(self._FLASH, - self._FLASH[aprs.vibrate_msg]) + current_index=aprs.vibrate_msg) rs = RadioSetting("aprs.vibrate_msg", "Vibrate on personal message", val) menu.append(rs) val = RadioSettingValueList(self._FLASH[:10], - self._FLASH[aprs.flash_bln]) + current_index=aprs.flash_bln) rs = RadioSetting("aprs.flash_bln", "Flash on bulletin message", val) menu.append(rs) if self._has_vibrate: val = RadioSettingValueList(self._FLASH[:10], - self._FLASH[aprs.vibrate_bln]) + current_index=aprs.vibrate_bln) rs = RadioSetting("aprs.vibrate_bln", "Vibrate on bulletin message", val) menu.append(rs) val = RadioSettingValueList(self._FLASH[:10], - self._FLASH[aprs.flash_grp]) + current_index=aprs.flash_grp) rs = RadioSetting("aprs.flash_grp", "Flash on group message", val) menu.append(rs) if self._has_vibrate: val = RadioSettingValueList(self._FLASH[:10], - self._FLASH[aprs.vibrate_grp]) + current_index=aprs.vibrate_grp) rs = RadioSetting("aprs.vibrate_grp", "Vibrate on group message", val) menu.append(rs) @@ -1616,7 +1616,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): # TODO: Use filter_val as the list entries and update it on edit. val = RadioSettingValueList( self._MSG_GROUP_NAMES, - self._MSG_GROUP_NAMES[aprs.selected_msg_group]) + current_index=aprs.selected_msg_group) rs = RadioSetting("aprs.selected_msg_group", "Selected Message Group", val) menu.append(rs) @@ -1659,18 +1659,18 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): beacon_type = (aprs.tx_smartbeacon << 1) | aprs.tx_interval_beacon val = RadioSettingValueList(self._BEACON_TYPE, - self._BEACON_TYPE[beacon_type]) + current_index=beacon_type) rs = RadioSetting("aprs.transmit", "TX Beacons", val) rs.set_apply_callback(self.apply_beacon_type, aprs) menu.append(rs) val = RadioSettingValueList(self._TX_DELAY, - self._TX_DELAY[aprs.tx_delay]) + current_index=aprs.tx_delay) rs = RadioSetting("aprs.tx_delay", "TX Delay", val) menu.append(rs) val = RadioSettingValueList(self._BEACON_INT, - self._BEACON_INT[aprs.beacon_interval]) + current_index=aprs.beacon_interval) rs = RadioSetting("aprs.beacon_interval", "Beacon Interval", val) menu.append(rs) @@ -1757,7 +1757,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._SMARTBEACON_PROFILE, - self._SMARTBEACON_PROFILE[aprs.active_smartbeaconing]) + current_index=aprs.active_smartbeaconing) rs = RadioSetting("aprs.active_smartbeaconing", "SmartBeacon profile", val) menu.append(rs) @@ -1830,7 +1830,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): digital_settings = self._memobj.digital_settings val = RadioSettingValueList( self._AMS_TX_MODE, - self._AMS_TX_MODE[digital_settings.ams_tx_mode]) + current_index=digital_settings.ams_tx_mode) rs = RadioSetting("digital_settings.ams_tx_mode", "AMS TX Mode", val) menu.append(rs) @@ -1838,14 +1838,14 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): # 16 DIG VW Turn the VW mode selection ON or OFF. val = RadioSettingValueList( self._VW_MODE, - self._VW_MODE[digital_settings.vw_mode]) + current_index=digital_settings.vw_mode) rs = RadioSetting("digital_settings.vw_mode", "VW Mode", val) menu.append(rs) # TX DG-ID Long Press Mode Key, Dial val = RadioSettingValueList( self._DG_ID, - self._DG_ID[digital_settings.tx_dg_id]) + current_index=digital_settings.tx_dg_id) rs = RadioSetting("digital_settings.tx_dg_id", "TX DG-ID", val) menu.append(rs) @@ -1853,7 +1853,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): # RX DG-ID Long Press Mode Key, Mode Key to select, Dial val = RadioSettingValueList( self._DG_ID, - self._DG_ID[digital_settings.rx_dg_id]) + current_index=digital_settings.rx_dg_id) rs = RadioSetting("digital_settings.rx_dg_id", "RX DG-ID", val) menu.append(rs) @@ -1863,9 +1863,9 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._DIG_POP_UP, - self._DIG_POP_UP[ + current_index=( 0 if digital_settings_more.digital_popup == 0 - else digital_settings_more.digital_popup - 9]) + else digital_settings_more.digital_popup - 9)) rs = RadioSetting("digital_settings_more.digital_popup", "Digital Popup", val) @@ -1876,7 +1876,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): # 07 BEP.STB Standby Beep in the digital C4FM mode. On/Off val = RadioSettingValueList( self._STANDBY_BEEP, - self._STANDBY_BEEP[digital_settings.standby_beep]) + current_index=digital_settings.standby_beep) rs = RadioSetting("digital_settings.standby_beep", "Standby Beep", val) menu.append(rs) @@ -1886,7 +1886,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): first_settings = self._memobj.first_settings val = RadioSettingValueList( self._GM_RING, - self._GM_RING[first_settings.gm_ring]) + current_index=first_settings.gm_ring) rs = RadioSetting("first_settings.gm_ring", "GM Ring", val) GMmenu.append(rs) @@ -1894,7 +1894,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): scan_settings = self._memobj.scan_settings val = RadioSettingValueList( self._GM_INTERVAL, - self._GM_INTERVAL[scan_settings.gm_interval]) + current_index=scan_settings.gm_interval) rs = RadioSetting("scan_settings.gm_interval", "GM Interval", val) GMmenu.append(rs) @@ -1976,20 +1976,20 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._DTMF_MODE, - self._DTMF_MODE[dtmf.dtmf_mode]) + current_index=dtmf.dtmf_mode) rs = RadioSetting("scan_settings.dtmf_mode", "DTMF Mode", val) menu.append(rs) val = RadioSettingValueList( self._DTMF_SPEED, - self._DTMF_SPEED[dtmf.dtmf_speed]) + current_index=dtmf.dtmf_speed) rs = RadioSetting( "scan_settings.dtmf_speed", "DTMF AutoDial Speed", val) menu.append(rs) val = RadioSettingValueList( self._DTMF_DELAY, - self._DTMF_DELAY[dtmf.dtmf_delay]) + current_index=dtmf.dtmf_delay) rs = RadioSetting( "scan_settings.dtmf_delay", "DTMF AutoDial Delay", val) menu.append(rs) @@ -2017,13 +2017,13 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._LCD_DIMMER, - self._LCD_DIMMER[scan_settings.lcd_dimmer]) + current_index=scan_settings.lcd_dimmer) rs = RadioSetting("scan_settings.lcd_dimmer", "LCD Dimmer", val) menu.append(rs) val = RadioSettingValueList( self._LCD_CONTRAST, - self._LCD_CONTRAST[scan_settings.lcd_contrast - 1]) + current_index=scan_settings.lcd_contrast - 1) rs = RadioSetting("scan_settings.lcd_contrast", "LCD Contrast", val) rs.set_apply_callback(self.apply_lcd_contrast, scan_settings) @@ -2031,7 +2031,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._LAMP_KEY, - self._LAMP_KEY[scan_settings.lamp]) + current_index=scan_settings.lamp) rs = RadioSetting("scan_settings.lamp", "Lamp", val) menu.append(rs) @@ -2039,7 +2039,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._BEEP_SELECT, - self._BEEP_SELECT[beep_select.beep]) + current_index=beep_select.beep) rs = RadioSetting("beep_select.beep", "Beep Select", val) menu.append(rs) @@ -2047,7 +2047,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._OPENING_MESSAGE, - self._OPENING_MESSAGE[opening_message.flag]) + current_index=opening_message.flag) rs = RadioSetting("opening_message.flag", "Opening Msg Mode", val) menu.append(rs) @@ -2104,7 +2104,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._BACKTRACK_STATUS, - self._BACKTRACK_STATUS[0 if bt.status == 1 else 1]) + current_index=0 if bt.status == 1 else 1) rs = RadioSetting( "%s.status" % bt_idx, prefix + "status", val) @@ -2253,14 +2253,14 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._VOL_MODE, - self._VOL_MODE[scan_settings.vol_mode]) + current_index=scan_settings.vol_mode) rs = RadioSetting("scan_settings.vol_mode", "Volume Mode", val) menu.append(rs) vfoa = self._memobj.vfo_info[0] val = RadioSettingValueList( self._VOLUME, - self._VOLUME[vfoa.volume]) + current_index=vfoa.volume) rs = RadioSetting("vfo_info[0].volume", "VFO A Volume", val) rs.set_apply_callback(self.apply_volume, 0) menu.append(rs) @@ -2268,7 +2268,7 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): vfob = self._memobj.vfo_info[1] val = RadioSettingValueList( self._VOLUME, - self._VOLUME[vfob.volume]) + current_index=vfob.volume) rs = RadioSetting("vfo_info[1].volume", "VFO B Volume", val) rs.set_apply_callback(self.apply_volume, 1) menu.append(rs) @@ -2276,43 +2276,43 @@ class FT1Radio(yaesu_clone.YaesuCloneModeRadio): squelch = self._memobj.squelch val = RadioSettingValueList( self._SQUELCH, - self._SQUELCH[squelch.vfo_a]) + current_index=squelch.vfo_a) rs = RadioSetting("squelch.vfo_a", "VFO A Squelch", val) menu.append(rs) val = RadioSettingValueList( self._SQUELCH, - self._SQUELCH[squelch.vfo_b]) + current_index=squelch.vfo_b) rs = RadioSetting("squelch.vfo_b", "VFO B Squelch", val) menu.append(rs) val = RadioSettingValueList( self._SCAN_RESTART, - self._SCAN_RESTART[scan_settings.scan_restart]) + current_index=scan_settings.scan_restart) rs = RadioSetting("scan_settings.scan_restart", "Scan Restart", val) menu.append(rs) val = RadioSettingValueList( self._SCAN_RESUME, - self._SCAN_RESUME[scan_settings.scan_resume]) + current_index=scan_settings.scan_resume) rs = RadioSetting("scan_settings.scan_resume", "Scan Resume", val) menu.append(rs) val = RadioSettingValueList( self._OFF_ON, - self._OFF_ON[scan_settings.busy_led]) + current_index=scan_settings.busy_led) rs = RadioSetting("scan_settings.busy_led", "Busy LED", val) menu.append(rs) val = RadioSettingValueList( self._OFF_ON, - self._OFF_ON[scan_settings.scan_lamp]) + current_index=scan_settings.scan_lamp) rs = RadioSetting("scan_settings.scan_lamp", "Scan Lamp", val) menu.append(rs) val = RadioSettingValueList( self._TOT_TIME, - self._TOT_TIME[scan_settings.tot]) + current_index=scan_settings.tot) rs = RadioSetting("scan_settings.tot", "Transmit Timeout (TOT)", val) menu.append(rs) diff --git a/chirp/drivers/ft450d.py b/chirp/drivers/ft450d.py index ace1cc5e..6d9661b1 100644 --- a/chirp/drivers/ft450d.py +++ b/chirp/drivers/ft450d.py @@ -1456,7 +1456,7 @@ class FT450DRadio(yaesu_clone.YaesuCloneModeRadio): rs = RadioSetting("pnl_cs", "C.S. Function", RadioSettingValueList(self.FUNC_LIST, - self.FUNC_LIST[_settings.pnl_cs])) + current_index=_settings.pnl_cs)) pnlcfg.append(rs) rs = RadioSetting("nb", "Noise blanker", @@ -1565,17 +1565,17 @@ class FT450DRadio(yaesu_clone.YaesuCloneModeRadio): rs = RadioSetting("pm_dwn", "Mic Down button function", RadioSettingValueList(self.FUNC_LIST, - self.FUNC_LIST[_settings.pm_dwn])) + current_index=_settings.pm_dwn)) mic.append(rs) rs = RadioSetting("pm_fst", "Mic Fast button function", RadioSettingValueList(self.FUNC_LIST, - self.FUNC_LIST[_settings.pm_fst])) + current_index=_settings.pm_fst)) mic.append(rs) rs = RadioSetting("pm_up", "Mic Up button function", RadioSettingValueList(self.FUNC_LIST, - self.FUNC_LIST[_settings.pm_up])) + current_index=_settings.pm_up)) mic.append(rs) # End _do_mic_settings diff --git a/chirp/drivers/ft70.py b/chirp/drivers/ft70.py index 45adf6a1..b1b54d0a 100644 --- a/chirp/drivers/ft70.py +++ b/chirp/drivers/ft70.py @@ -730,20 +730,20 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._DTMF_MODE, - self._DTMF_MODE[dtmf.dtmf_mode]) + current_index=dtmf.dtmf_mode) rs = RadioSetting("scan_settings.dtmf_mode", "DTMF Mode", val) menu.append(rs) val = RadioSettingValueList( self._DTMF_DELAY, - self._DTMF_DELAY[dtmf.dtmf_delay]) + current_index=dtmf.dtmf_delay) rs = RadioSetting( "scan_settings.dtmf_delay", "DTMF Delay", val) menu.append(rs) val = RadioSettingValueList( self._DTMF_SPEED, - self._DTMF_SPEED[dtmf.dtmf_speed]) + current_index=dtmf.dtmf_speed) rs = RadioSetting( "scan_settings.dtmf_speed", "DTMF Speed", val) menu.append(rs) @@ -776,20 +776,20 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._LAMP_KEY, - self._LAMP_KEY[scan_settings.lamp]) + current_index=scan_settings.lamp) rs = RadioSetting("scan_settings.lamp", "Lamp", val) menu.append(rs) val = RadioSettingValueList( self._LCD_DIMMER, - self._LCD_DIMMER[scan_settings.lcd_dimmer]) + current_index=scan_settings.lcd_dimmer) rs = RadioSetting("scan_settings.lcd_dimmer", "LCD Dimmer", val) menu.append(rs) opening_message = self._memobj.opening_message val = RadioSettingValueList( self._OPENING_MESSAGE, - self._OPENING_MESSAGE[opening_message.flag]) + current_index=opening_message.flag) rs = RadioSetting("opening_message.flag", "Opening Msg Mode", val) menu.append(rs) @@ -804,7 +804,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): first_settings = self._memobj.first_settings val = RadioSettingValueList( self._APO_SELECT, - self._APO_SELECT[first_settings.apo]) + current_index=first_settings.apo) rs = RadioSetting("first_settings.apo", "APO", val) menu.append(rs) @@ -812,7 +812,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._OFF_ON, - self._OFF_ON[scan_settings.bclo]) + current_index=scan_settings.bclo) rs = RadioSetting("scan_settings.bclo", "Busy Channel Lockout", val) menu.append(rs) @@ -821,7 +821,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): beep_settings = self._memobj.beep_settings val = RadioSettingValueList( self._BEEP_SELECT, - self._BEEP_SELECT[beep_settings.beep_select]) + current_index=beep_settings.beep_select) rs = RadioSetting("beep_settings.beep_select", "Beep", val) menu.append(rs) @@ -829,7 +829,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._BEEP_LEVEL, - self._BEEP_LEVEL[beep_settings.beep_level]) + current_index=beep_settings.beep_level) rs = RadioSetting("beep_settings", "Beep Level", val) menu.append(rs) @@ -837,7 +837,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._OFF_ON, - self._OFF_ON[scan_settings.beep_edge]) + current_index=scan_settings.beep_edge) rs = RadioSetting("scan_settings.beep_edge", "Beep Band Edge", val) menu.append(rs) @@ -845,7 +845,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._ON_OFF, - self._ON_OFF[scan_settings.busy_led]) + current_index=scan_settings.busy_led) rs = RadioSetting("scan_settings.busy_led", "Busy LED", val) menu.append(rs) @@ -853,7 +853,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._HOME_REV, - self._HOME_REV[scan_settings.home_rev]) + current_index=scan_settings.home_rev) rs = RadioSetting("scan_settings.home_rev", "HOME/REV", val) menu.append(rs) @@ -861,7 +861,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._OFF_ON, - self._OFF_ON[scan_settings.home_vfo]) + current_index=scan_settings.home_vfo) rs = RadioSetting("scan_settings.home_vfo", "Home->VFO", val) menu.append(rs) @@ -869,7 +869,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._LOCK, - self._LOCK[scan_settings.lock]) + current_index=scan_settings.lock) rs = RadioSetting("scan_settings.lock", "Lock Mode", val) menu.append(rs) @@ -877,7 +877,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._MONI_TCALL, - self._MONI_TCALL[scan_settings.moni]) + current_index=scan_settings.moni) rs = RadioSetting("scan_settings.moni", "MONI/T-CALL", val) menu.append(rs) @@ -885,7 +885,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._PTT_DELAY, - self._PTT_DELAY[scan_settings.ptt_delay]) + current_index=scan_settings.ptt_delay) rs = RadioSetting("scan_settings.ptt_delay", "PTT Delay", val) menu.append(rs) @@ -893,7 +893,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._OFF_ON, - self._OFF_ON[scan_settings.ars]) + current_index=scan_settings.ars) rs = RadioSetting("scan_settings.ars", "ARS", val) menu.append(rs) @@ -901,7 +901,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._RX_SAVE, - self._RX_SAVE[scan_settings.rx_save]) + current_index=scan_settings.rx_save) rs = RadioSetting("scan_settings.rx_save", "RX SAVE", val) menu.append(rs) @@ -909,7 +909,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._VFO_MODE, - self._VFO_MODE[scan_settings.vfo_mode]) + current_index=scan_settings.vfo_mode) rs = RadioSetting("scan_settings.vfo_mode", "VFO MODE", val) menu.append(rs) @@ -917,7 +917,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._TOT_TIME, - self._TOT_TIME[scan_settings.tot]) + current_index=scan_settings.tot) rs = RadioSetting("scan_settings.tot", "Transmit Timeout (TOT)", val) menu.append(rs) @@ -925,7 +925,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._MIC_GAIN, - self._MIC_GAIN[scan_settings.mic_gain]) + current_index=scan_settings.mic_gain) rs = RadioSetting("scan_settings.mic_gain", "Mic Gain", val) menu.append(rs) @@ -934,7 +934,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): scan_settings_2 = self._memobj.scan_settings_2 val = RadioSettingValueList( self._VOLUME, - self._VOLUME[scan_settings_2.volume]) + current_index=scan_settings_2.volume) rs = RadioSetting("scan_settings_2.volume", "Volume", val) menu.append(rs) @@ -943,7 +943,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): squelch_settings = self._memobj.squelch_settings val = RadioSettingValueList( self._SQUELCH, - self._SQUELCH[squelch_settings.squelch]) + current_index=squelch_settings.squelch) rs = RadioSetting("squelch_settings.squelch", "Squelch", val) menu.append(rs) @@ -966,7 +966,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): digital_settings = self._memobj.digital_settings val = RadioSettingValueList( self._AMS_TX_MODE, - self._AMS_TX_MODE[digital_settings.ams_tx_mode]) + current_index=digital_settings.ams_tx_mode) rs = RadioSetting("digital_settings.ams_tx_mode", "AMS TX Mode", val) menu.append(rs) @@ -974,7 +974,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._VW_MODE, - self._VW_MODE[digital_settings.vw_mode]) + current_index=digital_settings.vw_mode) rs = RadioSetting("digital_settings.vw_mode", "VW Mode", val) menu.append(rs) @@ -982,7 +982,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._DG_ID, - self._DG_ID[digital_settings.tx_dg_id]) + current_index=digital_settings.tx_dg_id) rs = RadioSetting("digital_settings.tx_dg_id", "TX DG-ID", val) menu.append(rs) @@ -990,7 +990,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._DG_ID, - self._DG_ID[digital_settings.rx_dg_id]) + current_index=digital_settings.rx_dg_id) rs = RadioSetting("digital_settings.rx_dg_id", "RX DG-ID", val) menu.append(rs) @@ -1011,8 +1011,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._DIG_POP_UP, - self._DIG_POP_UP[ - 0 if digital_settings_more.digital_popup == 0 else digital_settings_more.digital_popup - 9]) + current_index=0 if digital_settings_more.digital_popup == 0 else digital_settings_more.digital_popup - 9) rs = RadioSetting("digital_settings_more.digital_popup", "Digital Popup", val) rs.set_apply_callback(self.apply_digital_popup, digital_settings_more) @@ -1022,7 +1021,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._STANDBY_BEEP, - self._STANDBY_BEEP[digital_settings.standby_beep]) + current_index=digital_settings.standby_beep) rs = RadioSetting("digital_settings.standby_beep", "Standby Beep", val) menu.append(rs) @@ -1036,7 +1035,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): first_settings = self._memobj.first_settings val = RadioSettingValueList( self._GM_RING, - self._GM_RING[first_settings.gm_ring]) + current_index=first_settings.gm_ring) rs = RadioSetting("first_settings.gm_ring", "GM Ring", val) menu.append(rs) @@ -1045,7 +1044,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): scan_settings = self._memobj.scan_settings val = RadioSettingValueList( self._GM_INTERVAL, - self._GM_INTERVAL[scan_settings.gm_interval]) + current_index=scan_settings.gm_interval) rs = RadioSetting("scan_settings.gm_interval", "GM Interval", val) menu.append(rs) @@ -1059,7 +1058,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._OFF_ON, - self._OFF_ON[scan_settings.dw_rt]) + current_index=scan_settings.dw_rt) rs = RadioSetting("scan_settings.dw_rt", "Dual Watch Priority Channel Revert", val) menu.append(rs) @@ -1067,7 +1066,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._SCAN_RESTART, - self._SCAN_RESTART[scan_settings.dw_interval]) + current_index=scan_settings.dw_interval) rs = RadioSetting("scan_settings.dw_interval", "Dual Watch Interval", val) menu.append(rs) @@ -1076,7 +1075,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): first_settings = self._memobj.first_settings val = RadioSettingValueList( self._SCAN_RESUME, - self._SCAN_RESUME[first_settings.dw_resume_interval]) + current_index=first_settings.dw_resume_interval) rs = RadioSetting("first_settings.dw_resume_interval", "Dual Watch Resume Interval", val) menu.append(rs) @@ -1084,7 +1083,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._OFF_ON, - self._OFF_ON[scan_settings.scan_lamp]) + current_index=scan_settings.scan_lamp) rs = RadioSetting("scan_settings.scan_lamp", "Scan Lamp", val) menu.append(rs) @@ -1092,7 +1091,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._SCAN_RESTART, - self._SCAN_RESTART[scan_settings.scan_restart]) + current_index=scan_settings.scan_restart) rs = RadioSetting("scan_settings.scan_restart", "Scan Restart", val) menu.append(rs) @@ -1107,7 +1106,7 @@ class FT70Radio(yaesu_clone.YaesuCloneModeRadio): first_settings = self._memobj.first_settings val = RadioSettingValueList( self._SCAN_RESUME, - self._SCAN_RESUME[first_settings.scan_resume]) + current_index=first_settings.scan_resume) rs = RadioSetting("first_settings.scan_resume", "Scan Resume", val) menu.append(rs) diff --git a/chirp/drivers/ft857.py b/chirp/drivers/ft857.py index 811fd7dd..e85bbf3a 100644 --- a/chirp/drivers/ft857.py +++ b/chirp/drivers/ft857.py @@ -890,33 +890,28 @@ class FT857Radio(ft817.FT817Radio): extended.append(rs) rs = RadioSetting("pg_a", "Programmable key MFq:A", RadioSettingValueList(self.PROGRAMMABLEOPTIONS, - self.PROGRAMMABLEOPTIONS[ - _settings.pg_a])) + current_index=_settings.pg_a)) extended.append(rs) rs = RadioSetting("pg_b", "Programmable key MFq:B", RadioSettingValueList(self.PROGRAMMABLEOPTIONS, - self.PROGRAMMABLEOPTIONS[ - _settings.pg_b])) + current_index=_settings.pg_b)) extended.append(rs) rs = RadioSetting("pg_c", "Programmable key MFq:C", RadioSettingValueList(self.PROGRAMMABLEOPTIONS, - self.PROGRAMMABLEOPTIONS[ - _settings.pg_c])) + current_index=_settings.pg_c)) extended.append(rs) rs = RadioSetting("pg_acc", "Programmable mic key ACC", - RadioSettingValueList(self.PROGRAMMABLEOPTIONS, - self.PROGRAMMABLEOPTIONS[ - _settings.pg_acc])) + RadioSettingValueList( + self.PROGRAMMABLEOPTIONS, + current_index=_settings.pg_acc)) extended.append(rs) rs = RadioSetting("pg_p1", "Programmable mic key P1", RadioSettingValueList(self.PROGRAMMABLEOPTIONS, - self.PROGRAMMABLEOPTIONS[ - _settings.pg_p1])) + current_index=_settings.pg_p1)) extended.append(rs) rs = RadioSetting("pg_p2", "Programmable mic key P2", RadioSettingValueList(self.PROGRAMMABLEOPTIONS, - self.PROGRAMMABLEOPTIONS[ - _settings.pg_p2])) + current_index=_settings.pg_p2)) extended.append(rs) rs = RadioSetting("pkt1200", "Packet 1200 gain level", RadioSettingValueInteger(0, 100, @@ -986,9 +981,9 @@ class FT857Radio(ft817.FT817Radio): options, current_index=_settings.tuner_atas)) extended.append(rs) rs = RadioSetting("tx_if_filter", "Transmit IF filter", - RadioSettingValueList(self.FILTERS, - self.FILTERS[ - _settings.tx_if_filter])) + RadioSettingValueList( + self.FILTERS, + current_index=_settings.tx_if_filter)) basic.append(rs) rs = RadioSetting("vox_delay", "VOX delay (*100 ms)", RadioSettingValueInteger(1, 30, _settings.vox_delay)) diff --git a/chirp/drivers/gmrsuv1.py b/chirp/drivers/gmrsuv1.py index b5f99429..20f3f473 100644 --- a/chirp/drivers/gmrsuv1.py +++ b/chirp/drivers/gmrsuv1.py @@ -501,12 +501,12 @@ class GMRSV1(bfc.BaofengCommonHT): rs = RadioSetting("pttid", "PTT ID", RadioSettingValueList(self.PTTID_LIST, - self.PTTID_LIST[_mem.pttid])) + current_index=_mem.pttid)) mem.extra.append(rs) rs = RadioSetting("scode", "S-CODE", RadioSettingValueList(self.SCODE_LIST, - self.SCODE_LIST[_mem.scode])) + current_index=_mem.scode)) mem.extra.append(rs) immutable = [] diff --git a/chirp/drivers/gmrsv2.py b/chirp/drivers/gmrsv2.py index dca2dc98..0e7b4863 100644 --- a/chirp/drivers/gmrsv2.py +++ b/chirp/drivers/gmrsv2.py @@ -478,12 +478,12 @@ class GMRSV2base(bfc.BaofengCommonHT): rs = RadioSetting("pttid", "PTT ID", RadioSettingValueList(self.PTTID_LIST, - self.PTTID_LIST[_mem.pttid])) + current_index=_mem.pttid)) mem.extra.append(rs) rs = RadioSetting("scode", "S-CODE", RadioSettingValueList(self.SCODE_LIST, - self.SCODE_LIST[_mem.scode])) + current_index=_mem.scode)) mem.extra.append(rs) immutable = [] diff --git a/chirp/drivers/h777.py b/chirp/drivers/h777.py index 6dac954b..c5ef8771 100644 --- a/chirp/drivers/h777.py +++ b/chirp/drivers/h777.py @@ -510,8 +510,8 @@ class H777Radio(chirp_common.CloneModeRadio): rs = RadioSetting("settings2.scanmode", "Scan mode", RadioSettingValueList( self.SCANMODE_LIST, - self.SCANMODE_LIST[ - self._memobj.settings2.scanmode])) + current_index=( + self._memobj.settings2.scanmode))) basic.append(rs) rs = RadioSetting("vox", "VOX", @@ -539,7 +539,7 @@ class H777Radio(chirp_common.CloneModeRadio): rs = RadioSetting("alarm", "Alarm", RadioSettingValueList( self.ALARM_LIST, - self.ALARM_LIST[_settings.alarm])) + current_index=_settings.alarm)) else: rs = RadioSetting("alarm", "Alarm", RadioSettingValueBoolean(_settings.alarm)) @@ -571,8 +571,8 @@ class H777Radio(chirp_common.CloneModeRadio): rs = RadioSetting("settings2.sidekeyfunction", "Side key function", RadioSettingValueList( self.SIDEKEYFUNCTION_LIST, - self.SIDEKEYFUNCTION_LIST[ - self._memobj.settings2.sidekeyfunction])) + current_index=( + self._memobj.settings2.sidekeyfunction))) basic.append(rs) rs = RadioSetting( diff --git a/chirp/drivers/hf90.py b/chirp/drivers/hf90.py index c25bc2d9..c2c37a2c 100644 --- a/chirp/drivers/hf90.py +++ b/chirp/drivers/hf90.py @@ -347,7 +347,7 @@ class HF90StyleRadio(chirp_common.CloneModeRadio, rs = RadioSetting("type", "Type", RadioSettingValueList( self.HF90_TYPES, - self.HF90_TYPES[_settings.type])) + current_index=_settings.type)) rs.set_apply_callback(self.apply_type, _settings) grp.append(rs) @@ -381,7 +381,7 @@ class HF90StyleRadio(chirp_common.CloneModeRadio, hp = int(_settings.tx_power == 3) rs = RadioSetting("tx_power", "Tx Power", RadioSettingValueList(self.HF90_POWER_LEVELS, - self.HF90_POWER_LEVELS[hp])) + current_index=hp)) rs.set_apply_callback(self.apply_txpower, _settings) grp.append(rs) diff --git a/chirp/drivers/kguv9dplus.py b/chirp/drivers/kguv9dplus.py index 4b29bbc8..ff888692 100644 --- a/chirp/drivers/kguv9dplus.py +++ b/chirp/drivers/kguv9dplus.py @@ -2181,7 +2181,7 @@ class KGUV9DPlusRadio(chirp_common.CloneModeRadio, RadioSetting(prefix + ".step", "Frequency Step (Menu 3)", RadioSettingValueList( - self._step_list, self._step_list[c.step]))) + self._step_list, current_index=c.step))) af.append( RadioSetting(prefix + ".scan_mode", "Scan Mode (Menu 20)", @@ -2634,7 +2634,7 @@ class KGUV9PXRadio(KGUV9DPlusRadio): RadioSetting(prefix + ".step", "Frequency Step (Menu 3)", RadioSettingValueList( - self._step_list, self._step_list[c.step]))) + self._step_list, current_index=c.step))) af.append( RadioSetting(prefix + ".scan_mode", "Scan Mode (Menu 20)", diff --git a/chirp/drivers/mursv1.py b/chirp/drivers/mursv1.py index d89f175b..9fc8d433 100644 --- a/chirp/drivers/mursv1.py +++ b/chirp/drivers/mursv1.py @@ -451,12 +451,12 @@ class MURSV1(baofeng_common.BaofengCommonHT): rs = RadioSetting("pttid", "PTT ID", RadioSettingValueList(self.PTTID_LIST, - self.PTTID_LIST[_mem.pttid])) + current_index=_mem.pttid)) mem.extra.append(rs) rs = RadioSetting("scode", "S-CODE", RadioSettingValueList(self.SCODE_LIST, - self.SCODE_LIST[_mem.scode])) + current_index=_mem.scode)) mem.extra.append(rs) immutable = [] diff --git a/chirp/drivers/retevis_rb28.py b/chirp/drivers/retevis_rb28.py index 55bbe7bc..d9cb7607 100644 --- a/chirp/drivers/retevis_rb28.py +++ b/chirp/drivers/retevis_rb28.py @@ -664,12 +664,12 @@ class RB28Radio(chirp_common.CloneModeRadio): basic.append(rset) rs = RadioSettingValueList(self.PFKEY_LIST, - self.PFKEY_LIST[_settings.pfkey_lt]) + current_index=_settings.pfkey_lt) rset = RadioSetting("pfkey_lt", "Key Set < Long", rs) basic.append(rset) rs = RadioSettingValueList(self.PFKEY_LIST, - self.PFKEY_LIST[_settings.pfkey_gt]) + current_index=_settings.pfkey_gt) rset = RadioSetting("pfkey_gt", "Key Set > Long", rs) basic.append(rset) diff --git a/chirp/drivers/thd72.py b/chirp/drivers/thd72.py index 0c85f134..65f06280 100644 --- a/chirp/drivers/thd72.py +++ b/chirp/drivers/thd72.py @@ -644,7 +644,7 @@ class THD72Radio(chirp_common.CloneModeRadio): val = RadioSettingValueList( self._LCD_CONTRAST, - self._LCD_CONTRAST[display_settings.contrast - 1]) + current_index=display_settings.contrast - 1) rs = RadioSetting("display.contrast", "LCD Contrast", val) rs.set_apply_callback(self.apply_lcd_contrast, display_settings) @@ -652,7 +652,7 @@ class THD72Radio(chirp_common.CloneModeRadio): val = RadioSettingValueList( self._LAMP_CONTROL, - self._LAMP_CONTROL[display_settings.lamp_control]) + current_index=display_settings.lamp_control) rs = RadioSetting("display.lamp_control", "Lamp Control", val) rs.set_apply_callback(self.apply_lamp_control, display_settings) @@ -660,7 +660,7 @@ class THD72Radio(chirp_common.CloneModeRadio): val = RadioSettingValueList( self._LAMP_TIMER, - self._LAMP_TIMER[display_settings.lamp_timer - 2]) + current_index=display_settings.lamp_timer - 2) rs = RadioSetting("display.lamp_timer", "Lamp Timer", val) rs.set_apply_callback(self.apply_lamp_timer, display_settings) @@ -684,7 +684,7 @@ class THD72Radio(chirp_common.CloneModeRadio): val = RadioSettingValueList( self._BATTERY_SAVER, - self._BATTERY_SAVER[battery_settings.battery_saver]) + current_index=battery_settings.battery_saver) rs = RadioSetting("battery.battery_saver", "Battery Saver", val) rs.set_apply_callback(self.apply_battery_saver, battery_settings) @@ -692,7 +692,7 @@ class THD72Radio(chirp_common.CloneModeRadio): val = RadioSettingValueList( self._APO, - self._APO[battery_settings.APO]) + current_index=battery_settings.APO) rs = RadioSetting("battery.APO", "Auto Power Off", val) rs.set_apply_callback(self.apply_APO, battery_settings) @@ -716,7 +716,7 @@ class THD72Radio(chirp_common.CloneModeRadio): val = RadioSettingValueList( self._AUDIO_BALANCE, - self._AUDIO_BALANCE[audio_settings.balance]) + current_index=audio_settings.balance) rs = RadioSetting("audio.balance", "Balance", val) rs.set_apply_callback(self.apply_balance, audio_settings) @@ -724,7 +724,7 @@ class THD72Radio(chirp_common.CloneModeRadio): val = RadioSettingValueList( self._KEY_BEEP, - self._KEY_BEEP[audio_settings.key_beep]) + current_index=audio_settings.key_beep) rs = RadioSetting("audio.key_beep", "Key Beep", val) rs.set_apply_callback(self.apply_key_beep, audio_settings) diff --git a/chirp/drivers/vx6.py b/chirp/drivers/vx6.py index 1d644ed9..af0ea03c 100644 --- a/chirp/drivers/vx6.py +++ b/chirp/drivers/vx6.py @@ -572,37 +572,37 @@ class VX6Radio(yaesu_clone.YaesuCloneModeRadio): # BASIC val = RadioSettingValueList( - self._APO, self._APO[_settings.auto_power_off]) + self._APO, current_index=_settings.auto_power_off) rs = RadioSetting("auto_power_off", "Auto Power Off", val) basic.append(rs) val = RadioSettingValueList( - self._BEEP_LEVEL, self._BEEP_LEVEL[_settings.beep_level]) + self._BEEP_LEVEL, current_index=_settings.beep_level) rs = RadioSetting("beep_level", "Beep Level", val) basic.append(rs) val = RadioSettingValueList( - self._DIM_LEVEL, self._DIM_LEVEL[_settings.lcd_dimmer]) + self._DIM_LEVEL, current_index=_settings.lcd_dimmer) rs = RadioSetting("lcd_dimmer", "Dimmer Level", val) basic.append(rs) val = RadioSettingValueList( - self._LAMP, self._LAMP[_settings.lamp]) + self._LAMP, current_index=_settings.lamp) rs = RadioSetting("lamp", "Keypad Lamp", val) basic.append(rs) val = RadioSettingValueList( - self._LOCK, self._LOCK[_settings.lock]) + self._LOCK, current_index=_settings.lock) rs = RadioSetting("lock", "Lock", val) basic.append(rs) val = RadioSettingValueList( - self._NUM_1_9, self._NUM_1_9[_settings.mic_gain]) + self._NUM_1_9, current_index=_settings.mic_gain) rs = RadioSetting("mic_gain", "Mic Gain", val) basic.append(rs) val = RadioSettingValueList( - self._OPEN_MSG, self._OPEN_MSG[_settings.open_message_mode]) + self._OPEN_MSG, current_index=_settings.open_message_mode) rs = RadioSetting("open_message_mode", "Open Message Mode", val) basic.append(rs) @@ -624,12 +624,12 @@ class VX6Radio(yaesu_clone.YaesuCloneModeRadio): basic.append(rs) val = RadioSettingValueList( - self._RESUME, self._RESUME[_settings.resume]) + self._RESUME, current_index=_settings.resume) rs = RadioSetting("resume", "Scan Resume", val) basic.append(rs) val = RadioSettingValueList( - self._MONI_TCALL, self._MONI_TCALL[_settings.moni_tcall]) + self._MONI_TCALL, current_index=_settings.moni_tcall) rs = RadioSetting("moni_tcall", "MONI/T-CALL switch", val) basic.append(rs) @@ -660,12 +660,12 @@ class VX6Radio(yaesu_clone.YaesuCloneModeRadio): # ARTS val = RadioSettingValueList( - self._ARTS_INT, self._ARTS_INT[_settings.arts_interval]) + self._ARTS_INT, current_index=_settings.arts_interval) rs = RadioSetting("arts_interval", "ARTS Interval", val) arts.append(rs) val = RadioSettingValueList( - self._ARTSBEEP, self._ARTSBEEP[_settings.arts_beep]) + self._ARTSBEEP, current_index=_settings.arts_beep) rs = RadioSetting("arts_beep", "ARTS Beep", val) arts.append(rs) @@ -683,12 +683,12 @@ class VX6Radio(yaesu_clone.YaesuCloneModeRadio): # DTMF val = RadioSettingValueList( - self._MAN_AUTO, self._MAN_AUTO[_settings.dtmf_autodial]) + self._MAN_AUTO, current_index=_settings.dtmf_autodial) rs = RadioSetting("dtmf_autodial", "DTMF Autodial", val) dtmf.append(rs) val = RadioSettingValueList( - self._NUM_0_9, self._NUM_0_9[_settings.last_dtmf]) + self._NUM_0_9, current_index=_settings.last_dtmf) rs = RadioSetting("last_dtmf", "Last DTMF Memory Set", val) dtmf.append(rs) @@ -706,23 +706,23 @@ class VX6Radio(yaesu_clone.YaesuCloneModeRadio): # WIRES val = RadioSettingValueList( - self._INT_CD, self._INT_CD[_settings.internet_code]) + self._INT_CD, current_index=_settings.internet_code) rs = RadioSetting("internet_code", "Internet Code", val) wires.append(rs) val = RadioSettingValueList( - self._INT_MD, self._INT_MD[_settings.internet_mode]) + self._INT_MD, current_index=_settings.internet_mode) rs = RadioSetting("internet_mode", "Internet Link Connection mode", val) wires.append(rs) val = RadioSettingValueList( - self._MAN_AUTO, self._MAN_AUTO[_settings.int_autodial]) + self._MAN_AUTO, current_index=_settings.int_autodial) rs = RadioSetting("int_autodial", "Internet Autodial", val) wires.append(rs) val = RadioSettingValueList( - self._NUM_0_63, self._NUM_0_63[_settings.last_internet_dtmf]) + self._NUM_0_63, current_index=_settings.last_internet_dtmf) rs = RadioSetting("last_internet_dtmf", "Last Internet DTMF Memory Set", val) wires.append(rs) @@ -741,23 +741,23 @@ class VX6Radio(yaesu_clone.YaesuCloneModeRadio): # MISC val = RadioSettingValueList( - self._BELL, self._BELL[_settings.bell]) + self._BELL, current_index=_settings.bell) rs = RadioSetting("bell", "CTCSS/DCS Bell", val) misc.append(rs) val = RadioSettingValueList( - self._CH_CNT, self._CH_CNT[_settings.channel_counter_width]) + self._CH_CNT, current_index=_settings.channel_counter_width) rs = RadioSetting("channel_counter_width", "Channel Counter Search Width", val) misc.append(rs) val = RadioSettingValueList( - self._EMERGENCY, self._EMERGENCY[_settings.emergency]) + self._EMERGENCY, current_index=_settings.emergency) rs = RadioSetting("emergency", "Emergency alarm", val) misc.append(rs) val = RadioSettingValueList( - self._ON_TIMER, self._ON_TIMER[_settings.on_timer]) + self._ON_TIMER, current_index=_settings.on_timer) rs = RadioSetting("on_timer", "On Timer", val) misc.append(rs) @@ -767,47 +767,47 @@ class VX6Radio(yaesu_clone.YaesuCloneModeRadio): misc.append(rs) val = RadioSettingValueList( - self._NUM_1_50, self._NUM_1_50[_settings.pager_rx_tone1]) + self._NUM_1_50, current_index=_settings.pager_rx_tone1) rs = RadioSetting("pager_rx_tone1", "Pager RX Tone 1", val) misc.append(rs) val = RadioSettingValueList( - self._NUM_1_50, self._NUM_1_50[_settings.pager_rx_tone2]) + self._NUM_1_50, current_index=_settings.pager_rx_tone2) rs = RadioSetting("pager_rx_tone2", "Pager RX Tone 2", val) misc.append(rs) val = RadioSettingValueList( - self._NUM_1_50, self._NUM_1_50[_settings.pager_tx_tone1]) + self._NUM_1_50, current_index=_settings.pager_tx_tone1) rs = RadioSetting("pager_tx_tone1", "Pager TX Tone 1", val) misc.append(rs) val = RadioSettingValueList( - self._NUM_1_50, self._NUM_1_50[_settings.pager_tx_tone2]) + self._NUM_1_50, current_index=_settings.pager_tx_tone2) rs = RadioSetting("pager_tx_tone2", "Pager TX Tone 2", val) misc.append(rs) val = RadioSettingValueList( - self._PTT_DELAY, self._PTT_DELAY[_settings.ptt_delay]) + self._PTT_DELAY, current_index=_settings.ptt_delay) rs = RadioSetting("ptt_delay", "PTT Delay", val) misc.append(rs) val = RadioSettingValueList( - self._RF_SQL, self._RF_SQL[_settings.rf_squelch]) + self._RF_SQL, current_index=_settings.rf_squelch) rs = RadioSetting("rf_squelch", "RF Squelch", val) misc.append(rs) val = RadioSettingValueList( - self._RX_SAVE, self._RX_SAVE[_settings.rx_save]) + self._RX_SAVE, current_index=_settings.rx_save) rs = RadioSetting("rx_save", "RX Save", val) misc.append(rs) val = RadioSettingValueList( - self._TOT, self._TOT[_settings.tx_timeout]) + self._TOT, current_index=_settings.tx_timeout) rs = RadioSetting("tx_timeout", "TOT", val) misc.append(rs) val = RadioSettingValueList( - self._WAKEUP, self._WAKEUP[_settings.wakeup]) + self._WAKEUP, current_index=_settings.wakeup) rs = RadioSetting("wakeup", "Wakeup", val) misc.append(rs) @@ -816,7 +816,7 @@ class VX6Radio(yaesu_clone.YaesuCloneModeRadio): misc.append(rs) val = RadioSettingValueList( - self._VFO_MODE, self._VFO_MODE[_settings.vfo_mode]) + self._VFO_MODE, current_index=_settings.vfo_mode) rs = RadioSetting("vfo_mode", "VFO Band Edge Limiting", val) misc.append(rs) @@ -825,7 +825,7 @@ class VX6Radio(yaesu_clone.YaesuCloneModeRadio): misc.append(rs) val = RadioSettingValueList( - self._TS_SPEED, self._TS_SPEED[_settings.ts_speed]) + self._TS_SPEED, current_index=_settings.ts_speed) rs = RadioSetting("ts_speed", "Tone Search Speed", val) misc.append(rs) @@ -838,17 +838,17 @@ class VX6Radio(yaesu_clone.YaesuCloneModeRadio): misc.append(rs) val = RadioSettingValueList( - self._SMART_SEARCH, self._SMART_SEARCH[_settings.smart_search]) + self._SMART_SEARCH, current_index=_settings.smart_search) rs = RadioSetting("smart_search", "Smart Search", val) misc.append(rs) val = RadioSettingValueList( - self._HOME_REV, self._HOME_REV[_settings.home_rev]) + self._HOME_REV, current_index=_settings.home_rev) rs = RadioSetting("home_rev", "HM/RV(EMG)R/H key", val) misc.append(rs) val = RadioSettingValueList( - self._MEM_W_MD, self._MEM_W_MD[_settings.memory_method]) + self._MEM_W_MD, current_index=_settings.memory_method) rs = RadioSetting("memory_method", "Memory Write Method", val) misc.append(rs) diff --git a/chirp/drivers/vx8.py b/chirp/drivers/vx8.py index 55a4aefc..b3e03063 100644 --- a/chirp/drivers/vx8.py +++ b/chirp/drivers/vx8.py @@ -813,12 +813,12 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( chirp_common.APRS_SSID, - chirp_common.APRS_SSID[aprs.my_callsign.ssid]) + current_index=aprs.my_callsign.ssid) rs = RadioSetting("aprs.my_callsign.ssid", "My SSID", val) menu.append(rs) val = RadioSettingValueList(self._MY_SYMBOL, - self._MY_SYMBOL[aprs2.selected_my_symbol]) + current_index=aprs2.selected_my_symbol) rs = RadioSetting("aprs2.selected_my_symbol", "My Symbol", val) menu.append(rs) @@ -835,7 +835,7 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( chirp_common.APRS_POSITION_COMMENT, - chirp_common.APRS_POSITION_COMMENT[aprs.selected_position_comment]) + current_index=aprs.selected_position_comment) rs = RadioSetting("aprs.selected_position_comment", "Position Comment", val) menu.append(rs) @@ -873,70 +873,70 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): menu.append(rs) val = RadioSettingValueList( - self._TIME_SOURCE, self._TIME_SOURCE[aprs.set_time_manually]) + self._TIME_SOURCE, current_index=aprs.set_time_manually) rs = RadioSetting("aprs.set_time_manually", "Time Source", val) menu.append(rs) - val = RadioSettingValueList(self._TZ, self._TZ[aprs.timezone]) + val = RadioSettingValueList(self._TZ, current_index=aprs.timezone) rs = RadioSetting("aprs.timezone", "Timezone", val) menu.append(rs) val = RadioSettingValueList( - self._SPEED_UNITS, self._SPEED_UNITS[aprs.aprs_units_speed]) + self._SPEED_UNITS, current_index=aprs.aprs_units_speed) rs = RadioSetting("aprs.aprs_units_speed", "APRS Speed Units", val) menu.append(rs) val = RadioSettingValueList( - self._SPEED_UNITS, self._SPEED_UNITS[aprs.gps_units_speed]) + self._SPEED_UNITS, current_index=aprs.gps_units_speed) rs = RadioSetting("aprs.gps_units_speed", "GPS Speed Units", val) menu.append(rs) val = RadioSettingValueList( - self._ALT_UNITS, self._ALT_UNITS[aprs.aprs_units_altitude_ft]) + self._ALT_UNITS, current_index=aprs.aprs_units_altitude_ft) rs = RadioSetting("aprs.aprs_units_altitude_ft", "APRS Altitude Units", val) menu.append(rs) val = RadioSettingValueList( - self._ALT_UNITS, self._ALT_UNITS[aprs.gps_units_altitude_ft]) + self._ALT_UNITS, current_index=aprs.gps_units_altitude_ft) rs = RadioSetting("aprs.gps_units_altitude_ft", "GPS Altitude Units", val) menu.append(rs) val = RadioSettingValueList( self._POS_UNITS, - self._POS_UNITS[aprs.aprs_units_position_mmss]) + current_index=aprs.aprs_units_position_mmss) rs = RadioSetting("aprs.aprs_units_position_mmss", "APRS Position Format", val) menu.append(rs) val = RadioSettingValueList( - self._POS_UNITS, self._POS_UNITS[aprs.gps_units_position_sss]) + self._POS_UNITS, current_index=aprs.gps_units_position_sss) rs = RadioSetting("aprs.gps_units_position_sss", "GPS Position Format", val) menu.append(rs) val = RadioSettingValueList( self._DIST_UNITS, - self._DIST_UNITS[aprs.aprs_units_distance_m]) + current_index=aprs.aprs_units_distance_m) rs = RadioSetting("aprs.aprs_units_distance_m", "APRS Distance Units", val) menu.append(rs) val = RadioSettingValueList( - self._WIND_UNITS, self._WIND_UNITS[aprs.aprs_units_wind_mph]) + self._WIND_UNITS, current_index=aprs.aprs_units_wind_mph) rs = RadioSetting("aprs.aprs_units_wind_mph", "APRS Wind Speed Units", val) menu.append(rs) val = RadioSettingValueList( - self._RAIN_UNITS, self._RAIN_UNITS[aprs.aprs_units_rain_inch]) + self._RAIN_UNITS, current_index=aprs.aprs_units_rain_inch) rs = RadioSetting("aprs.aprs_units_rain_inch", "APRS Rain Units", val) menu.append(rs) val = RadioSettingValueList( self._TEMP_UNITS, - self._TEMP_UNITS[aprs.aprs_units_temperature_f]) + current_index=aprs.aprs_units_temperature_f) rs = RadioSetting("aprs.aprs_units_temperature_f", "APRS Temperature Units", val) menu.append(rs) @@ -948,7 +948,7 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): aprs = self._memobj.aprs aprs2 = self._memobj.aprs2 - val = RadioSettingValueList(self._RX_BAUD, self._RX_BAUD[aprs.rx_baud]) + val = RadioSettingValueList(self._RX_BAUD, current_index=aprs.rx_baud) rs = RadioSetting("aprs.rx_baud", "Modem RX", val) menu.append(rs) @@ -970,37 +970,37 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): menu.append(rs) val = RadioSettingValueList(self._FLASH, - self._FLASH[aprs2.flash_msg]) + current_index=aprs2.flash_msg) rs = RadioSetting("aprs2.flash_msg", "Flash on personal message", val) menu.append(rs) if self._has_vibrate: val = RadioSettingValueList(self._FLASH, - self._FLASH[aprs2.vibrate_msg]) + current_index=aprs2.vibrate_msg) rs = RadioSetting("aprs2.vibrate_msg", "Vibrate on personal message", val) menu.append(rs) val = RadioSettingValueList(self._FLASH[:10], - self._FLASH[aprs2.flash_bln]) + current_index=aprs2.flash_bln) rs = RadioSetting("aprs2.flash_bln", "Flash on bulletin message", val) menu.append(rs) if self._has_vibrate: val = RadioSettingValueList(self._FLASH[:10], - self._FLASH[aprs2.vibrate_bln]) + current_index=aprs2.vibrate_bln) rs = RadioSetting("aprs2.vibrate_bln", "Vibrate on bulletin message", val) menu.append(rs) val = RadioSettingValueList(self._FLASH[:10], - self._FLASH[aprs2.flash_grp]) + current_index=aprs2.flash_grp) rs = RadioSetting("aprs2.flash_grp", "Flash on group message", val) menu.append(rs) if self._has_vibrate: val = RadioSettingValueList(self._FLASH[:10], - self._FLASH[aprs2.vibrate_grp]) + current_index=aprs2.vibrate_grp) rs = RadioSetting("aprs2.vibrate_grp", "Vibrate on group message", val) menu.append(rs) @@ -1017,7 +1017,7 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): # TODO: Use filter_val as the list entries and update it on edit. val = RadioSettingValueList( self._MSG_GROUP_NAMES, - self._MSG_GROUP_NAMES[aprs2.selected_msg_group]) + current_index=aprs2.selected_msg_group) rs = RadioSetting("aprs2.selected_msg_group", "Selected Message Group", val) menu.append(rs) @@ -1061,18 +1061,18 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): beacon_type = (aprs.tx_smartbeacon << 1) | aprs.tx_interval_beacon val = RadioSettingValueList( - self._BEACON_TYPE, self._BEACON_TYPE[beacon_type]) + self._BEACON_TYPE, current_index=beacon_type) rs = RadioSetting("aprs.transmit", "TX Beacons", val) rs.set_apply_callback(self.apply_beacon_type, aprs) menu.append(rs) val = RadioSettingValueList( - self._TX_DELAY, self._TX_DELAY[aprs.tx_delay]) + self._TX_DELAY, current_index=aprs.tx_delay) rs = RadioSetting("aprs.tx_delay", "TX Delay", val) menu.append(rs) val = RadioSettingValueList( - self._BEACON_INT, self._BEACON_INT[aprs.beacon_interval]) + self._BEACON_INT, current_index=aprs.beacon_interval) rs = RadioSetting("aprs.beacon_interval", "Beacon Interval", val) menu.append(rs) @@ -1134,20 +1134,20 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._DTMF_MODE, - self._DTMF_MODE[dtmf.dtmf_mode]) + current_index=dtmf.dtmf_mode) rs = RadioSetting("scan_settings.dtmf_mode", "DTMF Mode", val) menu.append(rs) val = RadioSettingValueList( self._DTMF_SPEED, - self._DTMF_SPEED[dtmf.dtmf_speed]) + current_index=dtmf.dtmf_speed) rs = RadioSetting("scan_settings.dtmf_speed", "DTMF AutoDial Speed", val) menu.append(rs) val = RadioSettingValueList( self._DTMF_DELAY, - self._DTMF_DELAY[dtmf.dtmf_delay]) + current_index=dtmf.dtmf_delay) rs = RadioSetting("scan_settings.dtmf_delay", "DTMF AutoDial Delay", val) menu.append(rs) @@ -1175,13 +1175,13 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._LCD_DIMMER, - self._LCD_DIMMER[scan_settings.lcd_dimmer]) + current_index=scan_settings.lcd_dimmer) rs = RadioSetting("scan_settings.lcd_dimmer", "LCD Dimmer", val) menu.append(rs) val = RadioSettingValueList( self._LCD_CONTRAST, - self._LCD_CONTRAST[scan_settings.lcd_contrast - 1]) + current_index=scan_settings.lcd_contrast - 1) rs = RadioSetting("scan_settings.lcd_contrast", "LCD Contrast", val) rs.set_apply_callback(self.apply_lcd_contrast, scan_settings) @@ -1189,7 +1189,7 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._LAMP_KEY, - self._LAMP_KEY[scan_settings.lamp]) + current_index=scan_settings.lamp) rs = RadioSetting("scan_settings.lamp", "Lamp", val) menu.append(rs) @@ -1197,7 +1197,7 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._BEEP_SELECT, - self._BEEP_SELECT[beep_select.beep]) + current_index=beep_select.beep) rs = RadioSetting("beep_select.beep", "Beep Select", val) menu.append(rs) @@ -1205,7 +1205,7 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._OPENING_MESSAGE, - self._OPENING_MESSAGE[opening_message.flag]) + current_index=opening_message.flag) rs = RadioSetting("opening_message.flag", "Opening Msg Mode", val) menu.append(rs) @@ -1230,14 +1230,14 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): val = RadioSettingValueList( self._VOL_MODE, - self._VOL_MODE[scan_settings.vol_mode]) + current_index=scan_settings.vol_mode) rs = RadioSetting("scan_settings.vol_mode", "Volume Mode", val) menu.append(rs) vfoa = self._memobj.vfo_info[0] val = RadioSettingValueList( self._VOLUME, - self._VOLUME[vfoa.volume]) + current_index=vfoa.volume) rs = RadioSetting("vfo_info[0].volume", "VFO A Volume", val) rs.set_apply_callback(self.apply_volume, 0) menu.append(rs) @@ -1245,7 +1245,7 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): vfob = self._memobj.vfo_info[1] val = RadioSettingValueList( self._VOLUME, - self._VOLUME[vfob.volume]) + current_index=vfob.volume) rs = RadioSetting("vfo_info[1].volume", "VFO B Volume", val) rs.set_apply_callback(self.apply_volume, 1) menu.append(rs) @@ -1253,43 +1253,43 @@ class VX8Radio(yaesu_clone.YaesuCloneModeRadio): squelch = self._memobj.squelch val = RadioSettingValueList( self._SQUELCH, - self._SQUELCH[squelch.vfo_a]) + current_index=squelch.vfo_a) rs = RadioSetting("squelch.vfo_a", "VFO A Squelch", val) menu.append(rs) val = RadioSettingValueList( self._SQUELCH, - self._SQUELCH[squelch.vfo_b]) + current_index=squelch.vfo_b) rs = RadioSetting("squelch.vfo_b", "VFO B Squelch", val) menu.append(rs) val = RadioSettingValueList( self._SCAN_RESTART, - self._SCAN_RESTART[scan_settings.scan_restart]) + current_index=scan_settings.scan_restart) rs = RadioSetting("scan_settings.scan_restart", "Scan Restart", val) menu.append(rs) val = RadioSettingValueList( self._SCAN_RESUME, - self._SCAN_RESUME[scan_settings.scan_resume]) + current_index=scan_settings.scan_resume) rs = RadioSetting("scan_settings.scan_resume", "Scan Resume", val) menu.append(rs) val = RadioSettingValueList( self._OFF_ON, - self._OFF_ON[scan_settings.busy_led]) + current_index=scan_settings.busy_led) rs = RadioSetting("scan_settings.busy_led", "Busy LED", val) menu.append(rs) val = RadioSettingValueList( self._OFF_ON, - self._OFF_ON[scan_settings.scan_lamp]) + current_index=scan_settings.scan_lamp) rs = RadioSetting("scan_settings.scan_lamp", "Scan Lamp", val) menu.append(rs) val = RadioSettingValueList( self._TOT_TIME, - self._TOT_TIME[scan_settings.tot]) + current_index=scan_settings.tot) rs = RadioSetting("scan_settings.tot", "Transmit Timeout (TOT)", val) menu.append(rs) @@ -1499,18 +1499,18 @@ class VX8DRadio(VX8Radio): beacon_type = (aprs.tx_smartbeacon << 1) | aprs.tx_interval_beacon val = RadioSettingValueList( - self._BEACON_TYPE, self._BEACON_TYPE[beacon_type]) + self._BEACON_TYPE, current_index=beacon_type) rs = RadioSetting("aprs.transmit", "TX Beacons", val) rs.set_apply_callback(self.apply_beacon_type, aprs) menu.append(rs) val = RadioSettingValueList( - self._TX_DELAY, self._TX_DELAY[aprs.tx_delay]) + self._TX_DELAY, current_index=aprs.tx_delay) rs = RadioSetting("aprs.tx_delay", "TX Delay", val) menu.append(rs) val = RadioSettingValueList( - self._BEACON_INT, self._BEACON_INT[aprs.beacon_interval]) + self._BEACON_INT, current_index=aprs.beacon_interval) rs = RadioSetting("aprs.beacon_interval", "Beacon Interval", val) menu.append(rs) @@ -1598,7 +1598,7 @@ class VX8DRadio(VX8Radio): val = RadioSettingValueList( self._SMARTBEACON_PROFILE, - self._SMARTBEACON_PROFILE[aprs2.active_smartbeaconing]) + current_index=aprs2.active_smartbeaconing) rs = RadioSetting("aprs2.active_smartbeaconing", "SmartBeacon profile", val) menu.append(rs)