- Developers - lists.chirpmyradio.com

[chirp_devel] [PATCH] [wxui] Add "Open Stock Config" submenu to "File" menu #9403
by Joseph.P.Scanlan＠n7xsd.us 29 Sep '21

29 Sep '21

# HG changeset patch # User <Joseph.P.Scanlan(a)n7xsd.us> # Date 1632944620 25200 # Wed Sep 29 12:43:40 2021 -0700 # Branch py3 # Node ID 065286ef952577c1e629c745b58a0d3798dbee4b # Parent 9fb5b8995942e5d2d19090967aa2d591c37eb796 [wxui] Add "Open Stock Config" submenu to "File" menu #9403 The "Open Stock Config" submenu lists the CSV files in ~/.chirp/stock_configs. Selecting a file opens it. This patch does not create the stock_configs directory or any files in it. Stock configs are not added to the "Open Recent" submenu when opened. diff -r 9fb5b8995942 -r 065286ef9525 chirp/wxui/main.py --- a/chirp/wxui/main.py Sun Sep 26 16:30:23 2021 -0700 +++ b/chirp/wxui/main.py Wed Sep 29 12:43:40 2021 -0700 @@ -18,6 +18,8 @@ from chirp.wxui import settingsedit from chirp import CHIRP_VERSION +from fnmatch import fnmatch + EditorSetChanged, EVT_EDITORSET_CHANGED = wx.lib.newevent.NewCommandEvent() CONF = config.get() LOG = logging.getLogger(__name__) @@ -25,6 +27,7 @@ EMPTY_MENU_LABEL = '(none)' KEEP_RECENT = 8 OPEN_RECENT_MENU = None +OPEN_STOCK_CONFIG_MENU = None class ChirpEditorSet(wx.Panel): def __init__(self, radio, filename, *a, **k): @@ -194,6 +197,24 @@ open_item = file_menu.Append(wx.ID_OPEN) self.Bind(wx.EVT_MENU, self._menu_open, open_item) + stock_dir = platform.get_platform().config_file("stock_configs") + sconfigs = [] + if os.path.isdir(stock_dir): + for fn in os.listdir(stock_dir): + if fnmatch(fn, "*.csv"): + config, ext = os.path.splitext(fn) + sconfigs.append(config) + sconfigs.sort() + if len(sconfigs): + self.OPEN_STOCK_CONFIG_MENU = wx.Menu() + for fn in sconfigs: + submenu_item = self.OPEN_STOCK_CONFIG_MENU.Append( + wx.ID_ANY, fn) + self.Bind(wx.EVT_MENU, + self._menu_open_stock_config, submenu_item) + file_menu.AppendSubMenu(self.OPEN_STOCK_CONFIG_MENU, + "Open Stock Config") + self.OPEN_RECENT_MENU = wx.Menu() i = 0 fn = CONF.get("recent%i" % i, "state") @@ -326,6 +347,13 @@ tb.Realize() def adj_menu_open_recent(self, filename): + ### Don't add stock config files to the recent files list + stock_dir = platform.get_platform().config_file("stock_configs") + this_dir = os.path.dirname(filename) + if (stock_dir and os.path.exists(stock_dir) and + this_dir and os.path.samefile(stock_dir, this_dir)): + return + ### Travel the Open Recent menu looking for filename found_mi = None empty_mi = None @@ -451,6 +479,13 @@ config._CONFIG.save() self.open_file(str(filename)) + def _menu_open_stock_config(self, event): + stock_dir = platform.get_platform().config_file("stock_configs") + fn = self.OPEN_STOCK_CONFIG_MENU.FindItemById(event.GetId()).GetLabel() + fn += ".csv" + filename = os.path.join(stock_dir, fn) + self.open_file(filename) + def _menu_open_recent(self, event): filename = self.OPEN_RECENT_MENU.FindItemById(event.GetId()).GetLabel() self.open_file(filename)

1 0

[chirp_devel] [PATCH] Supress console spew from python-future warning in non-debug builds
by Kosta A. 29 Sep '21

29 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632713960 25200 # Sun Sep 26 20:39:20 2021 -0700 # Node ID 5aa2294d78ea241c6573dcf1929475b072e73685 # Parent 3a40534ccc6e58d9818224eb8182bb62499fac80 Supress console spew from python-future warning in non-debug builds. diff --git a/chirp/drivers/anytone778uv.py b/chirp/drivers/anytone778uv.py --- a/chirp/drivers/anytone778uv.py +++ b/chirp/drivers/anytone778uv.py @@ -60,7 +60,7 @@ has_future = True except ImportError: has_future = False - LOG.warning('python-future package is not ' + LOG.debug('python-future package is not ' 'available; %s requires it' % __name__) diff --git a/chirp/drivers/ga510.py b/chirp/drivers/ga510.py --- a/chirp/drivers/ga510.py +++ b/chirp/drivers/ga510.py @@ -17,7 +17,7 @@ has_future = True except ImportError: has_future = False - LOG.warning('python-future package is not available; ' + LOG.debug('python-future package is not available; ' '%s requires it' % __name__) # GA510 also has DTCS code 645 diff --git a/chirp/drivers/ic2730.py b/chirp/drivers/ic2730.py --- a/chirp/drivers/ic2730.py +++ b/chirp/drivers/ic2730.py @@ -35,7 +35,7 @@ from builtins import bytes except ImportError: HAS_FUTURE = False - LOG.warning('python-future package is not ' + LOG.debug('python-future package is not ' 'available; %s requires it' % __name__) MEM_FORMAT = """ diff --git a/chirp/drivers/tk8180.py b/chirp/drivers/tk8180.py --- a/chirp/drivers/tk8180.py +++ b/chirp/drivers/tk8180.py @@ -36,7 +36,7 @@ has_future = True except ImportError: has_future = False - LOG.warning('python-future package is not ' + LOG.debug('python-future package is not ' 'available; %s requires it' % __name__) diff --git a/chirp/drivers/tmd710.py b/chirp/drivers/tmd710.py --- a/chirp/drivers/tmd710.py +++ b/chirp/drivers/tmd710.py @@ -36,7 +36,7 @@ from builtins import bytes except ImportError: HAS_FUTURE = False - LOG.warning('python-future package is not ' + LOG.debug('python-future package is not ' 'available; %s requires it' % __name__) BAUD = 0

4 3

[chirp_devel] [PATCH] Prevent memory editor from always loading last memory in memory range twice. Fixes #9401
by Kosta A. 29 Sep '21

29 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632898724 25200 # Tue Sep 28 23:58:44 2021 -0700 # Branch misc # Node ID b63e73d64098798c1bcbb17ea98a5c11c962a20a # Parent d156d3a46b7e6cbce985dc14186f0e07b5d3016b Prevent memory editor from always loading last memory in memory range twice. Fixes #9401 diff --git a/chirp/ui/memedit.py b/chirp/ui/memedit.py --- a/chirp/ui/memedit.py +++ b/chirp/ui/memedit.py @@ -1390,7 +1390,7 @@ # Run low priority jobs to get the rest of the memories hi = int(self.hi_limit_adj.get_value()) - for i in range(hi, max+1): + for i in range(hi+1, max+1): job = common.RadioJob(None, "get_memory", i) job.set_desc(_("Getting memory {number}").format(number=i)) self.rthread.submit(job, 10)

1 0

[chirp_devel] [PATCH] Prevent re-entrant calls to 'update_recent_files' when opening a file from the 'Recent Files' menu action. Fixes #9399
by Kosta A. 29 Sep '21

29 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632716707 25200 # Sun Sep 26 21:25:07 2021 -0700 # Branch update-recent # Node ID a7f62387fcaa2bacbaabfce740bce6bb20e98156 # Parent 5aa2294d78ea241c6573dcf1929475b072e73685 Prevent re-entrant calls to 'update_recent_files' when opening a file from the 'Recent Files' menu action. Fixes #9399. Gtk was failing on this and was sending an error message to the console. diff --git a/chirp/ui/mainapp.py b/chirp/ui/mainapp.py --- a/chirp/ui/mainapp.py +++ b/chirp/ui/mainapp.py @@ -540,9 +540,13 @@ CONF.set(key, fn, "state") else: CONF.remove_option(key, "state") + self.recent_files = None def update_recent_files(self): - recent_files = self._get_recent_list() + if (not self.recent_files == None): + return + + self.recent_files = self._get_recent_list() for index in range(0, KEEP_RECENT): action_name = "recent%i" % index path = "/MenuBar/file/recent" @@ -552,8 +556,8 @@ old_action.set_visible(False) self.menu_ag.remove_action(old_action) - if (index < len(recent_files)): - fname = recent_files[index] + if (index < len(self.recent_files)): + fname = self.recent_files[index] widget_label = os.path.basename(fname).replace("_", "__") widget_tip = _("Open recent file") + (" {name}").format( name=fname) @@ -583,11 +587,9 @@ recent_files.append(fname) self._set_recent_list(recent_files) - self.update_recent_files() def clear_recent_files(self): self._set_recent_list([]) - self.update_recent_files() def import_stock_config(self, action, config): eset = self.get_current_editorset() @@ -2092,6 +2094,9 @@ self.add_accel_group(self.menu_uim.get_accel_group()) + self.recentmenu = self.menu_uim.get_widget( + "/MenuBar/file/recent") + self.infomenu = self.menu_uim.get_widget( "/MenuBar/help/clone_information") @@ -2100,6 +2105,7 @@ # Initialize self.do_toggle_developer(self.menu_ag.get_action("developer")) + self.recentmenu.connect("activate", lambda a: self.update_recent_files()) return self.menu_uim.get_widget("/MenuBar") @@ -2325,6 +2331,7 @@ d.destroy() CONF.set_bool("warned_about_reporting", True) + self.recent_files = None self.update_recent_files() try: self.update_stock_configs()

1 0

[chirp_devel] [PATCH] Prevent memory for last memory being twice
by Kosta A. 29 Sep '21

29 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632714516 25200 # Sun Sep 26 20:48:36 2021 -0700 # Node ID d3727332f2854d76d0e863c150ac36a5e776c9af # Parent 5aa2294d78ea241c6573dcf1929475b072e73685 Prevent memory for last memory being twice. diff --git a/chirp/ui/memedit.py b/chirp/ui/memedit.py --- a/chirp/ui/memedit.py +++ b/chirp/ui/memedit.py @@ -1394,7 +1394,7 @@ # Run low priority jobs to get the rest of the memories hi = int(self.hi_limit_adj.get_value()) - for i in range(hi, max+1): + for i in range(hi+1, max+1): job = common.RadioJob(None, "get_memory", i) job.set_desc(_("Getting memory {number}").format(number=i)) self.rthread.submit(job, 10)

3 2

[chirp_devel] [PATCH] Minor UI tweak, do not show empty header in tree view column
by Kosta A. 29 Sep '21

29 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632859901 25200 # Tue Sep 28 13:11:41 2021 -0700 # Branch ui-fix # Node ID 2c38f278e2de7e1954225c030963df5789202718 # Parent 5aa2294d78ea241c6573dcf1929475b072e73685 Minor UI tweak, do not show empty header in tree view column. diff --git a/chirp/ui/settingsedit.py b/chirp/ui/settingsedit.py --- a/chirp/ui/settingsedit.py +++ b/chirp/ui/settingsedit.py @@ -48,8 +48,9 @@ self._store = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_INT) self._view = gtk.TreeView(self._store) self._view.get_selection().connect("changed", self._view_changed_cb) - self._view.append_column( - gtk.TreeViewColumn("", gtk.CellRendererText(), text=0)) + column = gtk.TreeViewColumn("", gtk.CellRendererText(), text=0) + column.set_widget(gtk.Label()) + self._view.append_column(column) self._view.show() scrolled_window = gtk.ScrolledWindow() scrolled_window.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)

2 1

[chirp_devel] [PATCH] Prevent re-entrant calls to 'update_recent_files' when opening a file from the 'Recent Files' menu action
by Kosta A. 29 Sep '21

29 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632716707 25200 # Sun Sep 26 21:25:07 2021 -0700 # Branch update-recent # Node ID 261a9ac27d14a2e285bd492ffff67a98af56540c # Parent 5aa2294d78ea241c6573dcf1929475b072e73685 Prevent re-entrant calls to 'update_recent_files' when opening a file from the 'Recent Files' menu action. Gtk was failing on this and was sending an error message to the console. diff --git a/chirp/ui/mainapp.py b/chirp/ui/mainapp.py --- a/chirp/ui/mainapp.py +++ b/chirp/ui/mainapp.py @@ -540,9 +540,13 @@ CONF.set(key, fn, "state") else: CONF.remove_option(key, "state") + self.recent_files = None def update_recent_files(self): - recent_files = self._get_recent_list() + if (not self.recent_files == None): + return + + self.recent_files = self._get_recent_list() for index in range(0, KEEP_RECENT): action_name = "recent%i" % index path = "/MenuBar/file/recent" @@ -552,8 +556,8 @@ old_action.set_visible(False) self.menu_ag.remove_action(old_action) - if (index < len(recent_files)): - fname = recent_files[index] + if (index < len(self.recent_files)): + fname = self.recent_files[index] widget_label = os.path.basename(fname).replace("_", "__") widget_tip = _("Open recent file") + (" {name}").format( name=fname) @@ -583,11 +587,9 @@ recent_files.append(fname) self._set_recent_list(recent_files) - self.update_recent_files() def clear_recent_files(self): self._set_recent_list([]) - self.update_recent_files() def import_stock_config(self, action, config): eset = self.get_current_editorset() @@ -2092,6 +2094,9 @@ self.add_accel_group(self.menu_uim.get_accel_group()) + self.recentmenu = self.menu_uim.get_widget( + "/MenuBar/file/recent") + self.infomenu = self.menu_uim.get_widget( "/MenuBar/help/clone_information") @@ -2100,6 +2105,7 @@ # Initialize self.do_toggle_developer(self.menu_ag.get_action("developer")) + self.recentmenu.connect("activate", lambda a: self.update_recent_files()) return self.menu_uim.get_widget("/MenuBar") @@ -2325,6 +2331,7 @@ d.destroy() CONF.set_bool("warned_about_reporting", True) + self.recent_files = None self.update_recent_files() try: self.update_stock_configs()

2 1

[chirp_devel] Version of wxPython for py3
by Martin Cooper 29 Sep '21

29 Sep '21

Bringing up the py3 branch to have a look at where the UI is, one of the first things I tried was File -> New. This immediately died. It seems that the recently added code for maintaining a recently-opened list relies on a function that was present in old versions of wxPython (e.g. 2.8.x) but has been supplanted by a more flexible set of functions in the latest version (i.e. Phoenix). This raises the question of what the target version of wxPython is intended to be. There is a comment in the recently added developer module related to Phoenix, so I'd assume that it's intended to work under Phoenix. The question is whether that's what we should be working with, or if support for an older version is also required. The particular issue I encountered is easily fixed for 2.8.6.0 and later, but I think it would be worth putting a stake in the ground in specifying a minimum version of wxPython as a target, so that people know what they should develop with. Thoughts? Martin. KD6YAM

4 5

[chirp_devel] [PATCH] Settings support added to IC-V85 driver. Fixes #276
by Kosta A. 28 Sep '21

28 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632859668 25200 # Tue Sep 28 13:07:48 2021 -0700 # Branch icom # Node ID 0863be4a9a51b3f4d40604569814e7588125750d # Parent 8a801f6e14388614d4456466af77f847d52cac27 Settings support added to IC-V85 driver. Fixes #276 diff --git a/chirp/drivers/icv85.py b/chirp/drivers/icv85.py --- a/chirp/drivers/icv85.py +++ b/chirp/drivers/icv85.py @@ -60,6 +60,53 @@ bank:4; } flags[108]; +#seekto 0x0870; +struct { + u8 unknown1:6, + beep:2; + u8 unknown2:3, + tot:5; + u8 unknown3:6, + unknown4:2; + u8 unknown5:6, + auto_pwr_off:2; + u8 unknown6:6, + lockout:2; + u8 unknown7:7, + squelch_delay:1; + u8 unknown8[2]; + u8 unknown9:6, + mem_display:2; + u8 unknown10:7, + dial_func:1; + u8 unknown11:6, + lcd:2; + u8 unknown12:5, + pwr_save:3; + u8 unknown13:7, + monitor:1; + u8 unknown14:7, + sel_speed:1; + u8 unknown15:6, + mic_func:2; + u8 unknown16[4]; + u8 unknown17:7, + battery_save:1; + u8 unknown18; + u8 unknown19:6, + resume:2; + u8 unknown20:5, + func_mode:3; + u8 unknown21:6, + backlight:2; + u8 unknown22:6, + bank_link:2; + u8 unknown23[15]; + u8 unknown:6, + edge:2; + u8 unknown24[7]; +} settings; + """ @@ -119,7 +166,7 @@ rf.has_ctone = True rf.has_offset = True rf.has_bank = True - rf.has_settings = False + rf.has_settings = True return rf @@ -135,6 +182,157 @@ def process_mmap(self): self._memobj = bitwise.parse(ICV85_MEM_FORMAT, self._mmap) + def get_settings(self): + _settings = self._memobj.settings + + general = RadioSettingGroup("general", "General") + display = RadioSettingGroup("display", "Display") + timer = RadioSettingGroup("timer", "Timer") + scan = RadioSettingGroup("scan", "Scan") + settings = RadioSettings(general, display, timer, scan) + + # Backlight + opts = ["Off", "On", "Auto"] + display.append( + RadioSetting( + "backlight", "Backlight", + RadioSettingValueList(opts, opts[_settings.backlight]))) + + # LCD Contrast + opts = ["Low", "High", "Auto"] + display.append( + RadioSetting( + "lcd", "LCD Contrast", + RadioSettingValueList(opts, opts[_settings.lcd]))) + + # Beep + opts = ["Off", "1", "2", "3"] + display.append( + RadioSetting( + "beep", "Beep", + RadioSettingValueList(opts, opts[_settings.beep]))) + + # TOT + opts = ["Off"] + ["%d min" % t for t in range(1, 31)] + timer.append( + RadioSetting( + "tot", "Time out Timer", + RadioSettingValueList(opts, opts[_settings.tot]))) + + # Auto Power Off + opts = ["Off", "30 min", "1 hr", "2 hrs"] + timer.append( + RadioSetting( + "auto_pwr_off", "Auto Power Off", + RadioSettingValueList(opts, opts[_settings.auto_pwr_off]))) + + # Edge + opts = ["All", "P1", "P2", "P3"] + scan.append( + RadioSetting( + "edge", "Edge", + RadioSettingValueList(opts, opts[_settings.edge]))) + + # Resume + opts = ["T-5", "T-10", "T-15", "Pause"] + scan.append( + RadioSetting( + "resume", "Resume", + RadioSettingValueList(opts, opts[_settings.resume]))) + + # Lockout + opts = ["Off", "Rpt", "Busy"] + general.append( + RadioSetting( + "lockout", "Lockout", + RadioSettingValueList(opts, opts[_settings.lockout]))) + + # Squelch Delay + opts = ["Short", "Long"] + general.append( + RadioSetting( + "squelch_delay", "Squelch Delay", + RadioSettingValueList(opts, opts[_settings.squelch_delay]))) + + # Memory Display + opts = ["Frequency", "Channel", "Name"] + general.append( + RadioSetting( + "mem_display", "Memory Display", + RadioSettingValueList(opts, opts[_settings.mem_display]))) + + # Function Mode + opts = ["0 sec", "1 sec", "2 sec", "3 sec", "Manual"] + general.append( + RadioSetting( + "func_mode", "Function Mode", + RadioSettingValueList(opts, opts[_settings.func_mode]))) + + # Battery Save + opts = ["Off", "Li-Ion"] + general.append( + RadioSetting( + "battery_save", "Battery Save", + RadioSettingValueList(opts, opts[_settings.battery_save]))) + + # Power Save + opts = ["Off", "1:2", "1:8", "1:16", "Auto"] + general.append( + RadioSetting( + "pwr_save", "Power Save", + RadioSettingValueList(opts, opts[_settings.pwr_save]))) + + # Monitor + opts = ["Push", "Hold"] + general.append( + RadioSetting( + "monitor", "Monitor", + RadioSettingValueList(opts, opts[_settings.monitor]))) + + # Select Speed + opts = ["Manual", "Auto"] + general.append( + RadioSetting( + "sel_speed", "Select Speed", + RadioSettingValueList(opts, opts[_settings.sel_speed]))) + + # Mic Function + opts = ["Simple", "Normal 1", "Normal 2"] + general.append( + RadioSetting( + "mic_func", "Mic Function", + RadioSettingValueList(opts, opts[_settings.mic_func]))) + + # Dial Function + opts = ["Audio Volume", "Tuning Dial"] + general.append( + RadioSetting( + "dial_func", "Dial Function", + RadioSettingValueList(opts, opts[_settings.dial_func]))) + + return settings + + def set_settings(self, settings): + _settings = self._memobj.settings + for element in settings: + if not isinstance(element, RadioSetting): + self.set_settings(element) + continue + if not element.changed(): + continue + + try: + if element.has_apply_callback(): + LOG.debug("Using apply callback") + element.run_apply_callback() + else: + setting = element.get_name() + LOG.debug("Setting %s = %s" % (setting, element.value)) + setattr(_settings, setting, element.value) + except Exception, e: + LOG.debug(element.get_name()) + raise + def _get_bank(self, number): _flag = self._memobj.flags[number] if _flag.bank == 0x0a:

1 0

[chirp_devel] [PATCH] Settings support added to IC-V80 driver. Fixes #174
by Kosta A. 28 Sep '21

28 Sep '21

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1632859623 25200 # Tue Sep 28 13:07:03 2021 -0700 # Branch icom # Node ID 8a801f6e14388614d4456466af77f847d52cac27 # Parent 4b8bcf8e6e7e1f446b553847ca6679fb88937dbe Settings support added to IC-V80 driver. Fixes #174 diff --git a/chirp/drivers/icv80.py b/chirp/drivers/icv80.py --- a/chirp/drivers/icv80.py +++ b/chirp/drivers/icv80.py @@ -60,6 +60,61 @@ #seekto 0x0d10; u8 unused[32]; +#seekto 0x0e50; +struct { + u8 unknown1:6, + beep:2; + u8 unknown2:3, + tot:5; + u8 unknown3; + u8 unknown4:6, + auto_pwr_off:2; + u8 unknown5:6, + lockout:2; + u8 unknown6:7, + squelch_delay:1; + u8 unknown7[2]; + u8 unknown8:6, + mem_display:2; + u8 unknown9:7, + dial_func:1; + u8 unknown10:7, + lcd:1; + u8 unknown11:5, + pwr_save:3; + u8 unknown12:7, + sel_speed:1; + u8 unknown13:6, + mic_mode:2; + u8 unknown14:6, + battery_save:2; + u8 unknown15; + u8 unknown16:6, + resume:2; + u8 unknown17:5, + func_mode:3; + u8 unknown18:6, + backlight:2; + u8 unknown19; + u8 unknown:4, + vox_gain:4; + u8 unknown20:6, + mic_gain:2; + u8 unknown21:5 + vox_delay:3; + u8 unknown22:4, + vox_tot:4; + u8 unknown23[2]; + u8 unknown24:6, + edge:2; + u8 unknown25; + u8 unknown26:7, + auto_low_pwr:1; + u8 unknown27[3]; + +} settings; + + """ SPECIAL_CHANNELS = { @@ -118,7 +173,7 @@ rf.has_ctone = True rf.has_offset = True rf.has_bank = False - rf.has_settings = False + rf.has_settings = True return rf @@ -134,6 +189,185 @@ def process_mmap(self): self._memobj = bitwise.parse(ICV80_MEM_FORMAT, self._mmap) + def get_settings(self): + _settings = self._memobj.settings + + setmode = RadioSettingGroup("setmode", "Set Mode") + display = RadioSettingGroup("display", "Display") + sounds = RadioSettingGroup("display", "Sounds") + scan = RadioSettingGroup("scan", "Scan") + settings = RadioSettings(setmode, display, sounds, scan) + + # TOT + opts = ["Off"] + ["%d min" % t for t in range(1, 31)] + setmode.append( + RadioSetting( + "tot", "Time out Timer", + RadioSettingValueList(opts, opts[_settings.tot]))) + + # Lockout + opts = ["Off", "Rpt", "Busy"] + setmode.append( + RadioSetting( + "lockout", "Lockout", + RadioSettingValueList(opts, opts[_settings.lockout]))) + + # Auto Power Off + opts = ["Off", "30 min", "1 hr", "2 hrs"] + setmode.append( + RadioSetting( + "auto_pwr_off", "Auto Power Off", + RadioSettingValueList(opts, opts[_settings.auto_pwr_off]))) + + # Power Save + opts = ["Off", "1:2", "1:8", "1:16", "Auto"] + setmode.append( + RadioSetting( + "pwr_save", "Power Save", + RadioSettingValueList(opts, opts[_settings.pwr_save]))) + + # Battery Save + opts = ["Off", "Ni-MH", "Li-Ion"] + setmode.append( + RadioSetting( + "battery_save", "Battery Save", + RadioSettingValueList(opts, opts[_settings.battery_save]))) + + # Auto Low Power + opts = ["Off", "On"] + setmode.append( + RadioSetting( + "auto_low_pwr", "Auto Low Power", + RadioSettingValueList(opts, opts[_settings.auto_low_pwr]))) + + # Squelch Delay + opts = ["Short", "Long"] + setmode.append( + RadioSetting( + "squelch_delay", "Squelch Delay", + RadioSettingValueList(opts, opts[_settings.squelch_delay]))) + + # MIC Simple Mode + opts = ["Simple", "Normal 1", "Normal 2"] + setmode.append( + RadioSetting( + "mic_mode", "Mic Simple Mode", + RadioSettingValueList(opts, opts[_settings.mic_mode]))) + + # MIC Gain + opts = ["1", "2", "3", "4"] + setmode.append( + RadioSetting( + "mic_gain", "Mic Gain", + RadioSettingValueList(opts, opts[_settings.mic_gain]))) + + # VOX Gain + opts = ["Off"] + ["%d" % t for t in range(1, 11)] + setmode.append( + RadioSetting( + "vox_gain", "VOX Gain", + RadioSettingValueList(opts, opts[_settings.vox_gain]))) + + # VOX Delay + opts = ["0.5 sec", "1.0 sec", "1.5 sec", "2.0 sec", "2.5 sec", "3.0 sec"] + setmode.append( + RadioSetting( + "vox_delay", "VOX Delay", + RadioSettingValueList(opts, opts[_settings.vox_delay]))) + + # VOX Time out Timer + opts = ["Off", "1 min", "2 min", "3 min", "4 min", "5 min", "10 min", "15 min"] + setmode.append( + RadioSetting( + "vox_tot", "VOX Time-Out Timer", + RadioSettingValueList(opts, opts[_settings.vox_tot]))) + + # Select Speed + opts = ["Manual", "Auto"] + setmode.append( + RadioSetting( + "sel_speed", "Select Speed", + RadioSettingValueList(opts, opts[_settings.sel_speed]))) + + # Dial Function + opts = ["Audio Volume", "Tuning Dial"] + setmode.append( + RadioSetting( + "dial_func", "Dial Function", + RadioSettingValueList(opts, opts[_settings.dial_func]))) + + # Function Mode + opts = ["0 sec", "1 sec", "2 sec", "3 sec", "Manual"] + setmode.append( + RadioSetting( + "func_mode", "Function Mode", + RadioSettingValueList(opts, opts[_settings.func_mode]))) + + # Backlight + opts = ["Off", "On", "Auto"] + display.append( + RadioSetting( + "backlight", "Backlight", + RadioSettingValueList(opts, opts[_settings.backlight]))) + + # LCD Contrast + opts = ["Low", "Auto"] + display.append( + RadioSetting( + "lcd", "LCD Contrast", + RadioSettingValueList(opts, opts[_settings.lcd]))) + + # Memory Display + opts = ["Frequency", "Channel", "Name"] + display.append( + RadioSetting( + "mem_display", "Memory Display", + RadioSettingValueList(opts, opts[_settings.mem_display]))) + + # Beep + opts = ["Off", "1", "2", "3"] + sounds.append( + RadioSetting( + "beep", "Beep", + RadioSettingValueList(opts, opts[_settings.beep]))) + + # Edge + opts = ["All", "P1", "P2", "P3"] + scan.append( + RadioSetting( + "edge", "Edge", + RadioSettingValueList(opts, opts[_settings.edge]))) + + # Resume + opts = ["T-5", "T-10", "T-15", "P-2"] + scan.append( + RadioSetting( + "resume", "Resume", + RadioSettingValueList(opts, opts[_settings.resume]))) + + return settings + + def set_settings(self, settings): + _settings = self._memobj.settings + for element in settings: + if not isinstance(element, RadioSetting): + self.set_settings(element) + continue + if not element.changed(): + continue + + try: + if element.has_apply_callback(): + LOG.debug("Using apply callback") + element.run_apply_callback() + else: + setting = element.get_name() + LOG.debug("Setting %s = %s" % (setting, element.value)) + setattr(_settings, setting, element.value) + except Exception, e: + LOG.debug(element.get_name()) + raise + def _get_memory(self, number, extd_number = None): bit = 1 << (number % 8) byte = int(number / 8) @@ -229,7 +463,7 @@ _mem = self._memobj.memory[mem.number] _unused = self._memobj.unused[byte] - _skip = (mem.extd_number == "") and self._memobj.skip[byte] else None + _skip = (mem.extd_number == "") and self._memobj.skip[byte] or None assert(_mem) if mem.empty:

1 0