January 2015 - Developers - lists.chirpmyradio.com

[chirp_devel] channel extra settings list not populated sometimes
by Jens Jensen 29 Jan '15

29 Jan '15

I have observed that mem.extra is empty list when called from normal edit view (table).It is only populated with expected extended settings when called via the edit panel of the channel. Is this intended behavior? -Jens

2 1

[chirp_devel] chirp code auto documentation
by Jens Jensen 27 Jan '15

27 Jan '15

Not sure if this has been discussed before, but one of the biggest challenges I think to new developers working with Chirp, e.g., radio drivers, is understanding some of the class structure (bitwise, chirp_common, settings, etc). I see alot of docstrings, etc in many common parts of the codebase, but I dont see anywhere this is rendered out to something a little more visually friendly. I'm wondering if there is any advantage to adopting something like this, e.g., rtfm, doxygen, readthedocs, etc? example of nice readthedocs:http://docs.locust.io/en/latest/api.html

2 1

[chirp_devel] [PATCH] Dismissing save confirmation dialog was closing tab
by Kosta Arvanitis 26 Jan '15

26 Jan '15

# HG changeset patch # User K. Arvanitis <kosta(a)alumni.uvic.ca> # Date 1422250708 28800 # Sun Jan 25 21:38:28 2015 -0800 # Node ID ed3c35ee774f2d76cf6443ff604574c19e0c3686 # Parent b25606106a9c0cd78f3cc5f602475da64cde081d [PATCH] Dismissing save confirmation dialog was closing tab A typical gtk Dialog will return a response of RESPONSE_DELETE_EVENT when the dialog window is dismissed. As a result dismissing the save confirmation dialog was performing similarly to the user selecting the NO button (RESPONSE_NO) This created a situation where a person could possibly loose their changes should they dismiss the save confirmation dialog without using the cancel button. The fix essentially handles both the CANCEL and DELETE_EVENT responses as the same. Bug #2255 diff -r b25606106a9c -r ed3c35ee774f chirpui/mainapp.py --- a/chirpui/mainapp.py Wed Jan 21 23:30:19 2015 -0800 +++ b/chirpui/mainapp.py Sun Jan 25 21:38:28 2015 -0800 @@ -731,9 +731,10 @@ dlg.set_text(_("File is modified, save changes before closing?")) res = dlg.run() dlg.destroy() + if res == gtk.RESPONSE_YES: self.do_save(eset) - elif res == gtk.RESPONSE_CANCEL: + elif res != gtk.RESPONSE_NO: raise ModifiedError() eset.rthread.stop()

1 0

[chirp_devel] [PATCH] FT-60 Adding Memory Bank Link Scan
by Kosta Arvanitis 26 Jan '15

26 Jan '15

# HG changeset patch # User K. Arvanitis <kosta(a)alumni.uvic.ca> # Date 1422243928 28800 # Sun Jan 25 19:45:28 2015 -0800 # Node ID 1e842859ec126d1e7bb336d13ee9c3d68ff1d3b0 # Parent b25606106a9c0cd78f3cc5f602475da64cde081d [FT-60] Memory Bank Link Scan Added settings support for memory bank link scan. Extended bitwise int data element to support xor operator. Note: The mbs settings are stored in the 16 bits located at memory location 0x09E in the high order bits. Note: A bank can be linked even if it contains no memories. In this case the radio ignores it during the mbl scan. Bug #675 Bug #1945 diff -r b25606106a9c -r 1e842859ec12 chirp/bitwise.py --- a/chirp/bitwise.py Wed Jan 21 23:30:19 2015 -0800 +++ b/chirp/bitwise.py Sun Jan 25 19:45:28 2015 -0800 @@ -304,6 +304,9 @@ def __or__(self, val): return self.get_value() | val + def __xor__(self, val): + return self.get_value() ^ val + def __and__(self, val): return self.get_value() & val @@ -325,6 +328,9 @@ def __ror__(self, val): return val | self.get_value() + def __rxor__(self, val): + return val ^ self.get_value() + def __rmod__(self, val): return val % self.get_value() @@ -362,6 +368,10 @@ self.set_value(self.get_value() | val) return self + def __ixor__(self, val): + self.set_value(self.get_value() ^ val) + return self + def __index__(self): return abs(self) diff -r b25606106a9c -r 1e842859ec12 chirp/ft60.py --- a/chirp/ft60.py Wed Jan 21 23:30:19 2015 -0800 +++ b/chirp/ft60.py Sun Jan 25 19:45:28 2015 -0800 @@ -274,10 +274,6 @@ bank = chirp_common.Bank(self, "%i" % (i + 1), "Bank %i" % (i + 1)) bank.index = i banks.append(bank) - - #mbs = (self._radio._memobj.mbs >> i) & 1 - #print "Bank %i: mbs: %i " % (i, mbs) - return banks def add_memory_to_mapping(self, memory, bank): @@ -402,9 +398,10 @@ eai = RadioSettingGroup("eai", "EAI/EPCS Settings") switch = RadioSettingGroup("switch", "Switch/Knob Settings") misc = RadioSettingGroup("misc", "Miscellaneous Settings") + mbls = RadioSettingGroup("banks", "Memory Bank Link Scan") setmode = RadioSettingGroup("top", "Set Mode", - repeater, ctcss, arts, scan, power, wires, eai, switch, misc) + repeater, ctcss, arts, scan, power, wires, eai, switch, misc, mbls) # APO opts = [ "OFF" ] + [ "%0.1f" % (x * 0.5) for x in range(1, 24+1) ] @@ -585,6 +582,20 @@ scan.append( RadioSetting("wx_alt", "Weather Alert Scan", RadioSettingValueList(opts, opts[_settings.wx_alt]))) + # MBS + for i in range(0, 10): + opts = [ "OFF" ] + [ "ON" ] + mbs = (self._memobj.mbs >> i) & 1 + rs = RadioSetting("mbs%i" % i, "Bank %s Scan" % (i + 1), + RadioSettingValueList(opts, opts[mbs])) + def apply_mbs(s, index): + if int(s.value): + self._memobj.mbs |= (1 << index) + else: + self._memobj.mbs &= ~(1 << index); + rs.set_apply_callback(apply_mbs, i); + mbls.append(rs) + return setmode def set_settings(self, uisettings): @@ -599,16 +610,16 @@ try: name = element.get_name() value = element.value - obj = getattr(_settings, name) if element.has_apply_callback(): print "Using apply callback" element.run_apply_callback() else: + obj = getattr(_settings, name) setattr(_settings, name, value) if os.getenv("CHIRP_DEBUG"): - print "Setting %s: %s <= %s" % (name, obj, element.value) + print "Setting %s: %s" % (name, value) except Exception, e: print element.get_name() raise

1 0

[chirp_devel] [PATCH] [VV-898] Add Settings to Leixen VV-898 Module - Part 10
by Jim Unroe 25 Jan '15

25 Jan '15

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1422216784 18000 # Node ID 41494ef344301f609685291ecc1d665e2862ff63 # Parent 0d6ae97ab5ae1c1ba1677885a95d3b5a4a12bd3c [VV-898] Add Settings to Leixen VV-898 Module - Part 10 Add the following settings: - Squelch Base Value (UHF) - Squelch Base Value (VHF) related to #2149 diff -r 0d6ae97ab5ae -r 41494ef34430 chirp/leixen.py --- a/chirp/leixen.py Sun Jan 25 14:01:49 2015 -0500 +++ b/chirp/leixen.py Sun Jan 25 15:13:04 2015 -0500 @@ -108,6 +108,13 @@ unknown:4; } settings; +#seekto 0x01cd; +struct { + u8 rssi136; // squelch base level (vhf) + u8 unknown0x01ce; + u8 rssi400; // squelch base level (uhf) +} service; + #seekto 0x0900; struct { char user1[7]; // user message 1 @@ -519,6 +526,7 @@ def _get_settings(self): _settings = self._memobj.settings + _service = self._memobj.service _msg = self._memobj.messages cfg_grp = RadioSettingGroup("cfg_grp", "Basic Settings") adv_grp = RadioSettingGroup("adv_grp", "Advanced Settings") @@ -700,6 +708,13 @@ RadioSettingValueBoolean(_settings.dtmfst)) adv_grp.append(rs) + rs = RadioSetting("service.rssi400", "Squelch Base Level (UHF)", + RadioSettingValueInteger(0, 255,_service.rssi400)) + adv_grp.append(rs) + rs = RadioSetting("service.rssi136", "Squelch Base Level (VHF)", + RadioSettingValueInteger(0, 255,_service.rssi136)) + adv_grp.append(rs) + # # Key Settings #

1 0

[chirp_devel] [PATCH] [VV-898] Add Settings to Leixen VV-898 Module - Part 9
by Jim Unroe 25 Jan '15

25 Jan '15

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1422212509 18000 # Node ID 0d6ae97ab5ae1c1ba1677885a95d3b5a4a12bd3c # Parent af367aa71ddccf415110aeac62b96db3a7a2f73f [VV-898] Add Settings to Leixen VV-898 Module - Part 9 Add the following settings: - DTMF Digit Time - DTMF Digit Space Time - DTMF First Digit Delay - DTMF Pretime - DTMF * and # Digit Delay - DTMF ACK Decode - DTMF Side Tone Corrected spelling error in Part 7 related to #2149 diff -r af367aa71ddc -r 0d6ae97ab5ae chirp/leixen.py --- a/chirp/leixen.py Sun Jan 25 09:21:26 2015 -0500 +++ b/chirp/leixen.py Sun Jan 25 14:01:49 2015 -0500 @@ -83,7 +83,9 @@ absel:1, // a/b select unknown:2 keymshort:4; // m key short press - u8 unknown:6, + u8 unknown:4, + dtmfst:1, // dtmf sidetone + ackdecode:1, // ack decode monitor:2; // monitor u8 unknown1:3, reset:1, // reset enable @@ -91,11 +93,16 @@ keypadmic_off:1, // keypad mic (inverted) unknown3:2; u8 unknown0x0198; - u8 unknown0x0199; - u8 unknown0x019A; - u8 unknown0x019B; - u8 unknown0x019C; - u8 unknown0x019D; + u8 unknown1:3, + dtmftime:5; // dtmf digit time + u8 unknown1:3, + dtmfspace:5; // dtmf digit space time + u8 unknown1:2, + dtmfdelay:6; // dtmf first digit delay + u8 unknown1:1, + dtmfpretime:7; // dtmf pretime + u8 unknown1:2, + dtmfdelay2:6; // dtmf * and # digit delay u8 unknown1:3, smfont_off:1, // small font (inverted) unknown:4; @@ -168,8 +175,12 @@ ABSEL_LIST = ["B Channel", "A Channel"] VOXGAIN_LIST = ["%s" % x for x in range(1, 9)] VOXDT_LIST = ["%s seconds" % x for x in range(1, 5)] +DTMFTIME_LIST = ["%i milliseconds" % x for x in range(50, 210, 10)] +DTMFDELAY_LIST = ["%i milliseconds" % x for x in range(0, 550, 50)] +DTMFPRETIME_LIST = ["%i milliseconds" % x for x in range(100, 1100, 100)] +DTMFDELAY2_LIST = ["%i milliseconds" % x for x in range(0, 450, 50)] -LPTIME_LIST = ["%i miliseconds" % x for x in range(500, 2600, 100)] +LPTIME_LIST = ["%i milliseconds" % x for x in range(500, 2600, 100)] PFKEYLONG_LIST = ["OFF", "FM", "Monitor Momentary", @@ -510,9 +521,10 @@ _settings = self._memobj.settings _msg = self._memobj.messages cfg_grp = RadioSettingGroup("cfg_grp", "Basic Settings") + adv_grp = RadioSettingGroup("adv_grp", "Advanced Settings") key_grp = RadioSettingGroup("key_grp", "Key Assignment") group = RadioSettingGroup("top", "All Settings", cfg_grp, - key_grp) + adv_grp, key_grp) # # Basic Settings @@ -654,6 +666,41 @@ cfg_grp.append(rs) # + # Advanced Settings + # + val = (_settings.dtmftime) - 5 + rs = RadioSetting("dtmftime", "DTMF Digit Time", + RadioSettingValueList(DTMFTIME_LIST, + DTMFTIME_LIST[val])) + adv_grp.append(rs) + val = (_settings.dtmfspace) - 5 + rs = RadioSetting("dtmfspace", "DTMF Digit Space Time", + RadioSettingValueList(DTMFTIME_LIST, + DTMFTIME_LIST[val])) + adv_grp.append(rs) + val = (_settings.dtmfdelay) / 5 + rs = RadioSetting("dtmfdelay", "DTMF 1st Digit Delay", + RadioSettingValueList(DTMFDELAY_LIST, + DTMFDELAY_LIST[val])) + adv_grp.append(rs) + val = (_settings.dtmfpretime) / 10 - 1 + rs = RadioSetting("dtmfpretime", "DTMF Pretime", + RadioSettingValueList(DTMFPRETIME_LIST, + DTMFPRETIME_LIST[val])) + adv_grp.append(rs) + val = (_settings.dtmfdelay2) / 5 + rs = RadioSetting("dtmfdelay2", "DTMF * and # Digit Delay", + RadioSettingValueList(DTMFDELAY2_LIST, + DTMFDELAY2_LIST[val])) + adv_grp.append(rs) + rs = RadioSetting("ackdecode", "ACK Decode", + RadioSettingValueBoolean(_settings.ackdecode)) + adv_grp.append(rs) + rs = RadioSetting("dtmfst", "DTMF Sidetone", + RadioSettingValueBoolean(_settings.dtmfst)) + adv_grp.append(rs) + + # # Key Settings # val = (_settings.lptime) - 5 @@ -749,6 +796,16 @@ setattr(obj, setting, not int(element.value)) elif setting == "keypadmic_off": setattr(obj, setting, not int(element.value)) + elif setting == "dtmftime": + setattr(obj, setting, int(element.value) + 5) + elif setting == "dtmfspace": + setattr(obj, setting, int(element.value) + 5) + elif setting == "dtmfdelay": + setattr(obj, setting, int(element.value) * 5) + elif setting == "dtmfpretime": + setattr(obj, setting, (int(element.value) + 1) * 10) + elif setting == "dtmfdelay2": + setattr(obj, setting, int(element.value) * 5) elif setting == "lptime": setattr(obj, setting, int(element.value) + 5) else:

1 0

[chirp_devel] [PATCH] [VV-898] Add Settings to Leixen VV-898 Module - Part 8
by Jim Unroe 25 Jan '15

25 Jan '15

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1422153076 18000 # Node ID 277376153d0f0fb7c564140cb46648a86fedaf67 # Parent a90469e7944d1d8788458f50f1c9f49f66a83f58 [VV-898] Add Settings to Leixen VV-898 Module - Part 8 Add the following settings: - VOX Gain Level - VOX Delay Time - VOX Inhibit on Receive related to #2149 diff -r a90469e7944d -r 277376153d0f chirp/leixen.py --- a/chirp/leixen.py Sat Jan 24 19:31:46 2015 -0500 +++ b/chirp/leixen.py Sat Jan 24 21:31:16 2015 -0500 @@ -66,7 +66,8 @@ u8 apo:4, // auto power off tot:4; // time out timer u8 unknown0x018C; - u8 unknown0x018D; + u8 voxdt:4, // vox delay time + voxgain:4; // vox gain u8 unknown0x018E; u8 unknown0x018F; u8 unknown:3, @@ -165,6 +166,8 @@ LAMP_LIST = ["OFF", "KEY", "CONT"] KEYLOCKM_LIST = ["K+S", "PTT", "KEY", "ALL"] ABSEL_LIST = ["B Channel", "A Channel"] +VOXGAIN_LIST = ["%s" % x for x in range(1, 9)] +VOXDT_LIST = ["%s seconds" % x for x in range(1, 5)] LPTIME_LIST = ["%i miliseconds" % x for x in range(500, 2600, 100)] PFKEYLONG_LIST = ["OFF", @@ -638,6 +641,17 @@ rs = RadioSetting("keypadmic_off", "Keypad MIC", RadioSettingValueBoolean(not _settings.keypadmic_off)) cfg_grp.append(rs) + rs = RadioSetting("voxgain", "VOX Gain", + RadioSettingValueList(VOXGAIN_LIST, + VOXGAIN_LIST[_settings.voxgain])) + cfg_grp.append(rs) + rs = RadioSetting("voxdt", "VOX Delay Time", + RadioSettingValueList(VOXDT_LIST, + VOXDT_LIST[_settings.voxdt])) + cfg_grp.append(rs) + rs = RadioSetting("vir", "VOX Inhibit on Receive", + RadioSettingValueBoolean(_settings.vir)) + cfg_grp.append(rs) # # Key Settings

1 0

[chirp_devel] [PATCH] [VV-898] Add Settings to Leixen VV-898 Module - Part 7
by Jim Unroe 25 Jan '15

25 Jan '15

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1422145906 18000 # Node ID a90469e7944d1d8788458f50f1c9f49f66a83f58 # Parent b25606106a9c0cd78f3cc5f602475da64cde081d [VV-898] Add Settings to Leixen VV-898 Module - Part 7 Add the following Key Assignment settings: - Long Press Time - P1 Long - P1 Short - P2 Long - P2 Short - P3 Long - P3 Short - M Short - Menu Enable related to #2149 diff -r b25606106a9c -r a90469e7944d chirp/leixen.py --- a/chirp/leixen.py Wed Jan 21 23:30:19 2015 -0800 +++ b/chirp/leixen.py Sat Jan 24 19:31:46 2015 -0500 @@ -69,10 +69,14 @@ u8 unknown0x018D; u8 unknown0x018E; u8 unknown0x018F; - u8 unknown0x0190; - u8 unknown0x0191; - u8 unknown0x0192; - u8 unknown0x0193; + u8 unknown:3, + lptime:5; // long press time + u8 keyp2long:4, // p2 key long press + keyp2short:4; // p2 key short press + u8 keyp1long:4, // p1 key long press + keyp1short:4; // p1 key short press + u8 keyp3long:4, // p3 key long press + keyp3short:4; // p3 key short press u8 unknown0x0194; u8 menuen:1, // menu enable absel:1, // a/b select @@ -162,6 +166,43 @@ KEYLOCKM_LIST = ["K+S", "PTT", "KEY", "ALL"] ABSEL_LIST = ["B Channel", "A Channel"] +LPTIME_LIST = ["%i miliseconds" % x for x in range(500, 2600, 100)] +PFKEYLONG_LIST = ["OFF", + "FM", + "Monitor Momentary", + "Monitor Lock", + "SQ Off Momentary", + "Mute", + "SCAN", + "TX Power", + "EMG", + "VFO/MR", + "DTMF", + "CALL", + "Transmit 1750Hz", + "A/B", + "Talk Around", + "Reverse" + ] + +PFKEYSHORT_LIST = ["OFF", + "FM", + "BandChange", + "Time", + "Monitor Lock", + "Mute", + "SCAN", + "TX Power", + "EMG", + "VFO/MR", + "DTMF", + "CALL", + "Transmit 1750Hz", + "A/B", + "Talk Around", + "Reverse" + ] + POWER_LEVELS = [chirp_common.PowerLevel("Low", watts=4), chirp_common.PowerLevel("High", watts=10)] MODES = ["NFM", "FM"] @@ -466,8 +507,9 @@ _settings = self._memobj.settings _msg = self._memobj.messages cfg_grp = RadioSettingGroup("cfg_grp", "Basic Settings") - group = RadioSettingGroup("top", "All Settings", cfg_grp) - + key_grp = RadioSettingGroup("key_grp", "Key Assignment") + group = RadioSettingGroup("top", "All Settings", cfg_grp, + key_grp) # # Basic Settings @@ -597,6 +639,48 @@ RadioSettingValueBoolean(not _settings.keypadmic_off)) cfg_grp.append(rs) + # + # Key Settings + # + val = (_settings.lptime) - 5 + rs = RadioSetting("lptime", "Long Press Time", + RadioSettingValueList(LPTIME_LIST, + LPTIME_LIST[val])) + key_grp.append(rs) + rs = RadioSetting("keyp1long", "P1 Long Key", + RadioSettingValueList(PFKEYLONG_LIST, + PFKEYLONG_LIST[_settings.keyp1long])) + key_grp.append(rs) + rs = RadioSetting("keyp1short", "P1 Short Key", + RadioSettingValueList(PFKEYSHORT_LIST, + PFKEYSHORT_LIST[_settings.keyp1short])) + key_grp.append(rs) + rs = RadioSetting("keyp2long", "P2 Long Key", + RadioSettingValueList(PFKEYLONG_LIST, + PFKEYLONG_LIST[_settings.keyp2long])) + key_grp.append(rs) + rs = RadioSetting("keyp2short", "P2 Short Key", + RadioSettingValueList(PFKEYSHORT_LIST, + PFKEYSHORT_LIST[_settings.keyp2short])) + key_grp.append(rs) + rs = RadioSetting("keyp3long", "P3 Long Key", + RadioSettingValueList(PFKEYLONG_LIST, + PFKEYLONG_LIST[_settings.keyp3long])) + key_grp.append(rs) + rs = RadioSetting("keyp3short", "P3 Short Key", + RadioSettingValueList(PFKEYSHORT_LIST, + PFKEYSHORT_LIST[_settings.keyp3short])) + key_grp.append(rs) + + val = RadioSettingValueList(PFKEYSHORT_LIST, + PFKEYSHORT_LIST[_settings.keymshort]) + val.set_mutable(_settings.menuen == 0) + rs = RadioSetting("keymshort", "M Short Key", val) + key_grp.append(rs) + val = RadioSettingValueBoolean(_settings.menuen) + rs = RadioSetting("menuen", "Menu Enable", val) + key_grp.append(rs) + return group def get_settings(self): @@ -651,6 +735,8 @@ setattr(obj, setting, not int(element.value)) elif setting == "keypadmic_off": setattr(obj, setting, not int(element.value)) + elif setting == "lptime": + setattr(obj, setting, int(element.value) + 5) else: print "Setting %s = %s" % (setting, element.value) setattr(obj, setting, element.value)

1 0

[chirp_devel] settings tooltips only working in extended channel edit panel
by Jens Jensen 24 Jan '15

24 Jan '15

Not sure if anyone else encountered this...I tried using .set_doc() on a general setting, but it doesnt show anything on mouse hover..set_doc works great on the extended (mem.extra) settings panel of the channels. Bug #2251: settings tooltips not showing - CHIRP | | | | | | | | | Bug #2251: settings tooltips not showing - CHIRPRedmine | | | | View on chirp.danplanet.com | Preview by Yahoo | | | | |

1 0

[chirp_devel] [PATCH] [th9800] fix skip scan/priority issues #2247
by Jens Jensen 24 Jan '15

24 Jan '15

# HG changeset patch # User Jens Jensen <af5mi(a)yahoo.com> # Date 1422131048 21600 # Sat Jan 24 14:24:08 2015 -0600 # Node ID 4d094ce0a504d719fe4cd84ae3baef5ba48dd92e # Parent b533ae13e0a964d48851e1148d88ad8564e4538f [th9800] fix skip scan/priority issues #2247 Skip/priority settings were not taking effect. Channel fields were for display only. There are special channel banks controlling scan enable and priority. This fix manipulates both channel fields and bank flags. diff -r b533ae13e0a9 -r 4d094ce0a504 chirp/th9800.py --- a/chirp/th9800.py Sat Jan 24 12:28:25 2015 -0600 +++ b/chirp/th9800.py Sat Jan 24 14:24:08 2015 -0600 @@ -126,8 +126,9 @@ } settings; #seekto 0x%04X; -u8 chan_active_a[128]; -u8 chan_active_b[128]; +u8 chan_active[128]; +u8 scan_enable[128]; +u8 priority[128]; #seekto 0x%04X; struct { @@ -201,35 +202,28 @@ (self._mmap_offset, self._scanlimits_offset, self._settings_offset, self._chan_active_offset, self._info_offset), self._mmap) - def get_chan_active(self, num): + def get_active(self, banktype, num): + """get active flag for channel active, scan enable, or priority banks""" + bank = getattr(self._memobj, banktype) index = (num - 1) / 8 bitpos = (num - 1) % 8 mask = 2**bitpos - enabled = self._memobj.chan_active_a[index] & mask - if CHIRP_DEBUG: - print "gca:", num, index, bitpos, self._memobj.chan_active_a[index], - enabled + enabled = bank[index] & mask if enabled: return True else: return False - def set_chan_active(self, num, enable): + def set_active(self, banktype, num, enable = True): + """set active flag for channel active, scan enable, or priority banks""" + bank = getattr(self._memobj, banktype) index = (num - 1) / 8 bitpos = (num - 1) % 8 mask = 2**bitpos - if CHIRP_DEBUG: - print "setting to:", enable, mask - print "before:", self._memobj.chan_active_a[index] if enable: - self._memobj.chan_active_a[index] |= mask - self._memobj.chan_active_b[index] |= mask + bank[index] |= mask else: - self._memobj.chan_active_a[index] &= ~mask - self._memobj.chan_active_b[index] &= ~mask - if CHIRP_DEBUG: - print "sca:", num, index, bitpos - print "after:", self._memobj.chan_active_a[index] + bank[index] &= ~mask def get_raw_memory(self, number): return repr(self._memobj.memory[number - 1]) @@ -239,11 +233,7 @@ mem = chirp_common.Memory() mem.number = number - #if not _mem.get_raw().startswith("\xFF\xFF\xFF\xFF"): - # mem.empty = True - # return mem - - mem.empty = not self.get_chan_active(number) + mem.empty = not self.get_active("chan_active", number) if mem.empty: return mem @@ -274,7 +264,13 @@ mem.name = str(_mem.name) mem.name = mem.name.rstrip("\xFF") - mem.skip = SCAN_MODES[int(_mem.scan)] + if not self.get_active("scan_enable", number): + mem.skip = "S" + elif self.get_active("priority", number): + mem.skip = "P" + else: + mem.skip = "" + mem.mode = _mem.am and "AM" or MODES[int(_mem.fmdev)] mem.power = POWER_LEVELS[_mem.power] @@ -329,13 +325,13 @@ def set_memory(self, mem): _mem = self._memobj.memory[mem.number - 1] - _prev_active = self.get_chan_active(mem.number) - self.set_chan_active(mem.number, not mem.empty) + _prev_active = self.get_active("chan_active", mem.number) + self.set_active("chan_active", mem.number, not mem.empty) if mem.empty or not _prev_active: if CHIRP_DEBUG: print "initializing memory channel %d" % mem.number _mem.set_raw(BLANK_MEMORY) - + if mem.empty: return @@ -375,6 +371,15 @@ display.value = "Frequency" _mem.scan = SCAN_MODES.index(mem.skip) + if mem.skip == "P": + self.set_active("priority", mem.number, True) + self.set_active("scan_enable", mem.number, True) + elif mem.skip == "S": + self.set_active("priority", mem.number, False) + self.set_active("scan_enable", mem.number, False) + elif mem.skip == "": + self.set_active("priority", mem.number, False) + self.set_active("scan_enable", mem.number, True) if mem.mode == "AM": _mem.am = True @@ -444,8 +449,11 @@ basic.append( RadioSetting("mute_mode", "Mute Mode", RadioSettingValueList(opts, opts[_settings.mute_mode]))) opts = ["MEM", "MSM"] - basic.append( RadioSetting("scan_mode", "Scan Mode", - RadioSettingValueList(opts, opts[_settings.scan_mode]))) + scanmode = RadioSetting("scan_mode", "Scan Mode", + RadioSettingValueList(opts, opts[_settings.scan_mode])) + scanmode.set_doc("MEM = Normal scan, bypass channels marked skip. " \ + " MSM = Scan only channels marked priority.") + basic.append(scanmode) opts = ["TO", "CO"] basic.append( RadioSetting("scan_resume", "Scan Resume", RadioSettingValueList(opts, opts[_settings.scan_resume])))

1 0