- Developers - lists.chirpmyradio.com

[chirp_devel] chirp-py3 status?
by Matthew Poletiek 09 Dec '20

09 Dec '20

Hi Everyone, Anyone know what the current status of the py3 branch is? Gentoo Linux has dropped this package from it's main repo due to lack of movement, but I cloned this branch, made a few adjustments ( https://chirp.danplanet.com/issues/8475) and everything seemed to work great! I'm assuming it's a few driver iterations behind the main branch, but it would be really nice to get py3 moving since Python2 is practically EOL'ed. If it helps others test a bit easier I created a fork of the py3 branch with my patch already applied on github. https://github.com/mpoletiek/py3-CHIRP The documentation on how to contribute to the main project using Mercurial was a bit out of date and went against recommendations being made to me in the #mercurial IRC channel on Freenode. I figured moving this to github might help get the ball moving again as more and more developers prefer git and aren't very interested in anything else. I was planning on testing this in a few different linux environments and windows 10 before New Years. I'll definitely be using CHIRP for years to come, it's a great tool and really helps lower the barrier to entry for HAMers who can't afford the more expensive radio's & software. However, it's only getting more and more difficult and frankly unwise to maintain a Python 2 environment on modern systems. I really appreciate all the work that's been put into this so far. I'd love to help speed things up if I can. Thanks, ------------------------------------------- Matthew Poletiek 303.810.9082 matthew.poletiek(a)gmail.com www.matthewpoletiek.com

3 4

[chirp_devel] TYT TH-8600 Programming Protocol Reverse Engineering
by Hisen Zhang 07 Dec '20

07 Dec '20

Hi, I wonder if anyone is working on (or interested in) deciphering TH8600 programming protocol. It looks rather weird to me. First of all, the downloaded bit stream for each request does not correspond to each channel. Modifying channel 2 for instance, may result in the fifth request response change. Second, even the same channel setting will result in different bit stream, despite the address and check sum. Third, I don’t really get the frequency representation. It’s neither lbcd nor uint (I think). I cannot assert here because I am still very confused about the two issues above. I am new to protocol reverse engineering so I would like to learn if I just made the problem complicated. If anyone is interested in I will share captured serial bit stream. Big thanks. Best regards, Hisen (Zhemin) Zhang

2 1

[chirp_devel] [senhaix_8800] New Model #7997
by Nicolas Pike 06 Dec '20

06 Dec '20

First version for SenHaix 8800 Please be gentle. Mercurial is struggle enough. Thanks! Nicolas

3 6

[chirp_devel] [PATCH] [rt22] patch radio ID for RT-622
by Dmitry Baryshkov 04 Dec '20

04 Dec '20

# HG changeset patch # User Dmitry Baryshkov <dbaryshkov(a)gmail.com> # Date 1603075401 -10800 # Mon Oct 19 05:43:21 2020 +0300 # Node ID 1552c486144d10aff7a63ff6d0a14b38c2c52544 # Parent de5d23f4a4235f42a3dee54e2054def2ac224572 [rt22] patch radio ID for RT-622 For RT-622 to update memory correctly, radio ID has to be written at the address 0x1b8. When reading this address reads as 0. So, patch the data during write operation to stop Chirp from overwriting radio ID on these radios. I don't know if this operation has to be performed for other radio IDs as well, so this patching is limited to RT-622. diff --git a/chirp/drivers/retevis_rt22.py b/chirp/drivers/retevis_rt22.py --- a/chirp/drivers/retevis_rt22.py +++ b/chirp/drivers/retevis_rt22.py @@ -205,7 +205,15 @@ serial = radio.pipe cmd = struct.pack(">cHb", 'W', block_addr, block_size) - data = radio.get_mmap()[block_addr:block_addr + block_size] + mmap = radio.get_mmap() + data = mmap[block_addr:block_addr + block_size] + + # For some radios (RT-622) memory at 0x1b8 reads as 0, but radio ID should + # be written instead + if block_addr == radio._patch_addr: + for fp in radio._patch_id: + if fp in mmap[0:radio._patch_len]: + data = mmap[0:radio._patch_len] + data[radio._patch_len:] LOG.debug("Writing Data:") LOG.debug(util.hexprint(cmd + data)) @@ -298,6 +306,9 @@ _memsize = 0x0400 _block_size = 0x40 _fileid = ["P32073", "P3" + "\x00\x00\x00" + "3", "P3207!"] + _patch_id = ["P3207!"] + _patch_len = 8 + _patch_addr = 0x1b8 def get_features(self): rf = chirp_common.RadioFeatures()

2 5

Re: [chirp_devel] [CHIRP - Feature #8503] Naming convention cleanup
by Brad & Cindy Schuler 03 Dec '20

03 Dec '20

Is there something unclear about the names? They are consistent with the other Anytone and BTech drivers written by Dan, Joe, Jim, and Pavel. Brad Schuler On Dec 3, 2020, at 2:19 PM, "donotreply(a)chirp.danplanet.com" <donotreply(a)chirp.danplanet.com> wrote: Issue #8503 has been updated by Tony Ling. "Download from radio" and "Upload to radio" should be renamed as "Read from radio" and "Write to radio" consecutively ________________________________ Feature #8503: Naming convention cleanup<https://chirp.danplanet.com/issues/8503#change-28721> * Author: Brad Schuler * Status: New * Priority: Normal * Assignee: Brad Schuler * Category: * Target version: chirp-daily * Chirp Version: daily * Model affected: anytone_iii Make variable and function names consistent with other Chirp drivers ________________________________ You have received this notification because you have either subscribed to it, or are involved in it. To change your notification preferences, please click here: http://chirp.danplanet.com/my/account

1 0

[chirp_devel] [PATCH] [KT-8R] Add New MCU Version
by Jim Unroe 03 Dec '20

03 Dec '20

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1607001407 18000 # Thu Dec 03 08:16:47 2020 -0500 # Node ID 85201b8b39fb8c4581f10a89e5edbf294d410f91 # Parent 8d906ccd00db039eee18a8af23c87ed4d2d6f127 [KT-8R] Add New MCU Version This patch adds an additional MCU Version to the support for the QYT KT-8R fixes #8513 diff -r 8d906ccd00db -r 85201b8b39fb chirp/drivers/btech.py --- a/chirp/drivers/btech.py Thu Nov 26 21:59:58 2020 -0500 +++ b/chirp/drivers/btech.py Thu Dec 03 08:16:47 2020 -0500 @@ -252,6 +252,7 @@ # QYT KT-8R (quad band ht) KT8R_fp = "MCB264" KT8R_fp1 = "MCB284" +KT8R_fp2 = "MC5264" # ### MAGICS @@ -4641,6 +4642,6 @@ _uhf_range = (400000000, 481000000) _350_range = (350000000, 391000000) _magic = MSTRING_KT8R - _fileid = [KT8R_fp1, KT8R_fp, ] + _fileid = [KT8R_fp2, KT8R_fp1, KT8R_fp, ] _power_levels = [chirp_common.PowerLevel("High", watts=5), chirp_common.PowerLevel("Low", watts=1)]

1 0

[chirp_devel] [PATCH] [anytone_iii] Naming convention cleanup (issue #8503)
by Brad & Cindy Schuler 02 Dec '20

02 Dec '20

Brad Schuler K0BAS

1 0

[chirp_devel] [PATCH] [UV-5R] Firmware Version Filled With Spaces
by Jim Unroe 26 Nov '20

26 Nov '20

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1606445998 18000 # Thu Nov 26 21:59:58 2020 -0500 # Node ID 8d906ccd00db039eee18a8af23c87ed4d2d6f127 # Parent 74735cbeedc0914868bd44fd0d97f17c50569afe [UV-5R] Firmware Version Filled With Spaces This patch accomodates models supported by the uv5r.py driver that have a firmware versoion populated with space characters. fixes #8473 diff -r 74735cbeedc0 -r 8d906ccd00db chirp/drivers/uv5r.py --- a/chirp/drivers/uv5r.py Thu Nov 26 21:48:23 2020 -0500 +++ b/chirp/drivers/uv5r.py Thu Nov 26 21:59:58 2020 -0500 @@ -556,6 +556,13 @@ # then append that model type to the end of the image so it can # be properly detected when loaded. append_model = True + elif "\x20" * 14 in radio_version: + # A radio UV-5R style radio that reports no firmware version has + # been detected. + # We are going to count on the user to make the right choice and + # then append that model type to the end of the image so it can + # be properly detected when loaded. + append_model = True elif not any(type in radio_version for type in radio._basetype): # This radio can't be properly detected by parsing its firmware # version.

1 0

[chirp_devel] [PATCH] [AT-778UV] Add DTMF Settings Tab to AnyTone AT-778UV [3 of 3]
by Jim Unroe 26 Nov '20

26 Nov '20

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1606445303 18000 # Thu Nov 26 21:48:23 2020 -0500 # Node ID 74735cbeedc0914868bd44fd0d97f17c50569afe # Parent 54be4e5ddd686b017ebdbe5379f5fde43ac10412 [AT-778UV] Add DTMF Settings Tab to AnyTone AT-778UV [3 of 3] This patch adds a DTMF settings tab that nearly mirrors the OEM software related to #8447 diff -r 54be4e5ddd68 -r 74735cbeedc0 chirp/drivers/anytone778uv.py --- a/chirp/drivers/anytone778uv.py Thu Nov 26 21:47:29 2020 -0500 +++ b/chirp/drivers/anytone778uv.py Thu Nov 26 21:48:23 2020 -0500 @@ -1,4 +1,5 @@ # Copyright 2020 Joe Milbourn <joe(a)milbourn.org.uk> +# Copyright 2020 Jim Unroe <rock.unroe(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -120,6 +121,31 @@ char line[7]; // starting display } starting_display; +#seekto 0x1990; +struct { + u8 code[16]; // DTMF Encode M1-M16 +} pttid[16]; + +#seekto 0x1A90; +struct { + u8 pttIdStart[16]; // 0x1A90 ptt id starting + u8 pttIdEnd[16]; // 0x1AA0 ptt id ending + u8 remoteStun[16]; // 0x1AB0 remotely stun + u8 remoteKill[16]; // 0x1AC0 remotely kill + u8 intervalChar; // 0x1AD0 dtmf interval character + u8 groupCode; // 0x1AD1 group code + u8 unk1ad2:6, // 0x1AD2 + decodingResponse:2; // decoding response + u8 pretime; // 0x1AD3 pretime + u8 firstDigitTime; // 0x1AD4 first digit time + u8 autoResetTime; // 0x1AD5 auto reset time + u8 selfID[3]; // 0x1AD6 dtmf self id + u8 unk1ad9:7, // 0x1AD9 + sideTone:1; // side tone + u8 timeLapse; // 0x1ADA time-lapse after encode + u8 pauseTime; // 0x1ADB ptt id pause time +} dtmf; + #seekto 0x3200; struct { u8 unk3200:5, // 0x3200 @@ -169,7 +195,8 @@ steType:3; // ste type u8 unk3219:6, // 0x3219 steFrequency:2; // ste frequency - u8 unk0x321A; + u8 unk321a:5, // 0x321A + dtmfTxTime:3; // dtmf transmitting time u8 unk_bit7_6:2, // 0x321B monKeyFunction:1, // mon key function channelLocked:1, // channel locked @@ -1036,6 +1063,7 @@ _radio_settings = self._memobj.radio_settings _password = self._memobj.password _pfkeys = self._memobj.pfkeys + _dtmf = self._memobj.dtmf # Function Setup function = RadioSettingGroup("function", "Function Setup") @@ -1381,6 +1409,199 @@ "Key PD", rs) pfkeys.append(rset) + # DTMF + dtmf = RadioSettingGroup("dtmf", "DTMF") + group.append(dtmf) + + # DTMF Transmitting Time + options = ["50 milliseconds", "100 milliseconds", "200 milliseconds", + "300 milliseconds", "500 milliseconds"] + rs = RadioSettingValueList(options, options[_settings.dtmfTxTime]) + rset = RadioSetting("settings.dtmfTxTime", + "DTMF transmitting time", rs) + dtmf.append(rset) + + # DTMF Self ID + + # DTMF Interval Character + IC_CHOICES = ["A", "B", "C", "D", "*", "#"] + IC_VALUES = [0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F] + + def apply_ic_listvalue(setting, obj): + LOG.debug("Setting value: " + str(setting.value) + " from list") + val = str(setting.value) + index = IC_CHOICES.index(val) + val = IC_VALUES[index] + obj.set_value(val) + + if _dtmf.intervalChar in IC_VALUES: + idx = IC_VALUES.index(_dtmf.intervalChar) + else: + idx = IC_VALUES.index(0x0E) + rs = RadioSetting("dtmf.intervalChar", "DTMF interval character", + RadioSettingValueList(IC_CHOICES, + IC_CHOICES[idx])) + rs.set_apply_callback(apply_ic_listvalue, _dtmf.intervalChar) + dtmf.append(rs) + + # Group Code + GC_CHOICES = ["Off", "A", "B", "C", "D", "*", "#"] + GC_VALUES = [0xFF, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F] + + def apply_gc_listvalue(setting, obj): + LOG.debug("Setting value: " + str(setting.value) + " from list") + val = str(setting.value) + index = GC_CHOICES.index(val) + val = GC_VALUES[index] + obj.set_value(val) + + if _dtmf.groupCode in GC_VALUES: + idx = GC_VALUES.index(_dtmf.groupCode) + else: + idx = GC_VALUES.index(0x0A) + rs = RadioSetting("dtmf.groupCode", "DTMF interval character", + RadioSettingValueList(GC_CHOICES, + GC_CHOICES[idx])) + rs.set_apply_callback(apply_gc_listvalue, _dtmf.groupCode) + dtmf.append(rs) + + # Decoding Response + options = ["None", "Beep tone", "Beep tone & respond"] + rs = RadioSettingValueList(options, options[_dtmf.decodingResponse]) + rset = RadioSetting("dtmf.decodingResponse", "Decoding response", rs) + dtmf.append(rset) + + # First Digit Time + options = ["%s" % x for x in range(0, 2510, 10)] + rs = RadioSettingValueList(options, options[_dtmf.firstDigitTime]) + rset = RadioSetting("dtmf.firstDigitTime", "First Digit Time(ms)", rs) + dtmf.append(rset) + + # First Digit Time + options = ["%s" % x for x in range(10, 2510, 10)] + rs = RadioSettingValueList(options, options[_dtmf.pretime - 1]) + rset = RadioSetting("dtmf.pretime", "Pretime(ms)", rs) + dtmf.append(rset) + + # Auto Reset Time + options = ["%s" % x for x in range(0, 25100, 100)] + rs = RadioSettingValueList(options, options[_dtmf.autoResetTime]) + rset = RadioSetting("dtmf.autoResetTime", "Auto Reset time(ms)", rs) + dtmf.append(rset) + + # Time-Lapse After Encode + options = ["%s" % x for x in range(10, 2510, 10)] + rs = RadioSettingValueList(options, options[_dtmf.timeLapse - 1]) + rset = RadioSetting("dtmf.timeLapse", + "Time-lapse after encode(ms)", rs) + dtmf.append(rset) + + # PTT ID Pause Time + options = ["Off", "-", "-", "-", "-"] + [ + "%s" % x for x in range(5, 76)] + rs = RadioSettingValueList(options, options[_dtmf.pauseTime]) + rset = RadioSetting("dtmf.pauseTime", "PTT ID pause time(s)", rs) + dtmf.append(rset) + + # Side Tone + rs = RadioSettingValueBoolean(_dtmf.sideTone) + rset = RadioSetting("dtmf.sideTone", "Side tone", rs) + dtmf.append(rset) + + # PTT ID Starting + DTMF_CHARS = "0123456789ABCD*# " + _codeobj = _dtmf.pttIdStart + _code = "".join([DTMF_CHARS[x] for x in _codeobj if int(x) < 0x1F]) + val = RadioSettingValueString(0, 16, _code, False) + val.set_charset(DTMF_CHARS) + rs = RadioSetting("dtmf.pttIdStart", "PTT ID starting", val) + + def apply_code(setting, obj): + code = [] + for j in range(0, 16): + try: + code.append(DTMF_CHARS.index(str(setting.value)[j])) + except IndexError: + code.append(0xFF) + obj.pttIdStart = code + rs.set_apply_callback(apply_code, _dtmf) + dtmf.append(rs) + + # PTT ID Ending + _codeobj = _dtmf.pttIdEnd + _code = "".join([DTMF_CHARS[x] for x in _codeobj if int(x) < 0x1F]) + val = RadioSettingValueString(0, 16, _code, False) + val.set_charset(DTMF_CHARS) + rs = RadioSetting("dtmf.pttIdEnd", "PTT ID ending", val) + + def apply_code(setting, obj): + code = [] + for j in range(0, 16): + try: + code.append(DTMF_CHARS.index(str(setting.value)[j])) + except IndexError: + code.append(0xFF) + obj.pttIdEnd = code + rs.set_apply_callback(apply_code, _dtmf) + dtmf.append(rs) + + # Remotely Kill + _codeobj = _dtmf.remoteKill + _code = "".join([DTMF_CHARS[x] for x in _codeobj if int(x) < 0x1F]) + val = RadioSettingValueString(0, 16, _code, False) + val.set_charset(DTMF_CHARS) + rs = RadioSetting("dtmf.remoteKill", "Remotely kill", val) + + def apply_code(setting, obj): + code = [] + for j in range(0, 16): + try: + code.append(DTMF_CHARS.index(str(setting.value)[j])) + except IndexError: + code.append(0xFF) + obj.remoteKill = code + rs.set_apply_callback(apply_code, _dtmf) + dtmf.append(rs) + + # Remotely Stun + _codeobj = _dtmf.remoteStun + _code = "".join([DTMF_CHARS[x] for x in _codeobj if int(x) < 0x1F]) + val = RadioSettingValueString(0, 16, _code, False) + val.set_charset(DTMF_CHARS) + rs = RadioSetting("dtmf.remoteStun", "Remotely stun", val) + + def apply_code(setting, obj): + code = [] + for j in range(0, 16): + try: + code.append(DTMF_CHARS.index(str(setting.value)[j])) + except IndexError: + code.append(0xFF) + obj.remoteStun = code + rs.set_apply_callback(apply_code, _dtmf) + dtmf.append(rs) + + # DTMF Encode + # M1 - M16 + for i in range(0, 16): + _codeobj = self._memobj.pttid[i].code + _code = "".join([DTMF_CHARS[x] for x in _codeobj if int(x) < 0x1F]) + val = RadioSettingValueString(0, 16, _code, False) + val.set_charset(DTMF_CHARS) + rs = RadioSetting("pttid/%i.code" % i, + "DTMF encode M%i" % (i + 1), val) + + def apply_code(setting, obj): + code = [] + for j in range(0, 16): + try: + code.append(DTMF_CHARS.index(str(setting.value)[j])) + except IndexError: + code.append(0xFF) + obj.code = code + rs.set_apply_callback(apply_code, self._memobj.pttid[i]) + dtmf.append(rs) + return group def set_settings(self, settings): @@ -1411,6 +1632,10 @@ if element.has_apply_callback(): LOG.debug("Using apply callback") element.run_apply_callback() + elif setting == "timeLapse": + setattr(obj, setting, int(element.value) + 1) + elif setting == "pretime": + setattr(obj, setting, int(element.value) + 1) elif setting == "backlightBr": setattr(obj, setting, int(element.value) + 1) elif setting == "micKeyBrite":

1 0

[chirp_devel] [PATCH] [AT-778UV] Add Key Assignment Settings Tab to AnyTone AT-778UV [2 of 3]
by Jim Unroe 26 Nov '20

26 Nov '20

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1606445249 18000 # Thu Nov 26 21:47:29 2020 -0500 # Node ID 54be4e5ddd686b017ebdbe5379f5fde43ac10412 # Parent b29aea463aabd57ca7ec4e21451895edda36dd47 [AT-778UV] Add Key Assignment Settings Tab to AnyTone AT-778UV [2 of 3] This patch adds a Key Assignment settings tab that nearly mirrors the OEM software related to #8447 diff -r b29aea463aab -r 54be4e5ddd68 chirp/drivers/anytone778uv.py --- a/chirp/drivers/anytone778uv.py Thu Nov 26 21:46:40 2020 -0500 +++ b/chirp/drivers/anytone778uv.py Thu Nov 26 21:47:29 2020 -0500 @@ -161,10 +161,10 @@ micKeyBrite:6; // hand mic key brightness u8 unk3213:6, // 0x3213 speakerSwitch:2; // speaker switch - u8 unk0x3214; - u8 unk0x3215; - u8 unk0x3216; - u8 unk0x3217; + u8 keyPA; // 0x3214 key pa + u8 keyPB; // 0x3215 key pb + u8 keyPC; // 0x3216 key pc + u8 keyPD; // 0x3217 key pd u8 unk3218:5, // 0x3218 steType:3; // ste type u8 unk3219:6, // 0x3219 @@ -184,6 +184,22 @@ char digits[6]; // password } password; +#seekto 0x3250; +struct { + u8 keyMode1P1; // 0x3250 key mode 1 p1 + u8 keyMode1P2; // 0x3251 key mode 1 p2 + u8 keyMode1P3; // 0x3252 key mode 1 p3 + u8 keyMode1P4; // 0x3253 key mode 1 p4 + u8 keyMode1P5; // 0x3254 key mode 1 p5 + u8 keyMode1P6; // 0x3255 key mode 1 p6 + u8 keyMode2P1; // 0x3256 key mode 2 p1 + u8 keyMode2P2; // 0x3257 key mode 2 p2 + u8 keyMode2P3; // 0x3258 key mode 2 p3 + u8 keyMode2P4; // 0x3259 key mode 2 p4 + u8 keyMode2P5; // 0x325A key mode 2 p5 + u8 keyMode2P6; // 0x325B key mode 2 p6 +} pfkeys; + #seekto 0x3260; struct { u8 mrChanA; // 0x3260 mr channel a @@ -1019,6 +1035,7 @@ _settings = self._memobj.settings _radio_settings = self._memobj.radio_settings _password = self._memobj.password + _pfkeys = self._memobj.pfkeys # Function Setup function = RadioSettingGroup("function", "Function Setup") @@ -1255,6 +1272,115 @@ rset = RadioSetting("settings.trfEnable", "TRF enable", rs) function.append(rset) + # Key Assignment + pfkeys = RadioSettingGroup("pfkeys", "Key Assignment") + group.append(pfkeys) + + options = ["A/B", "V/M", "SQL", "VOL", "POW", "CDT", "REV", "SCN", + "CAL", "TALK", "BND", "SFT", "MON", "DIR", "TRF", "RDW", + "NULL"] + + # Key Mode 1 + # P1 + rs = RadioSettingValueList(options, options[_pfkeys.keyMode1P1 - 1]) + rset = RadioSetting("pfkeys.keyMode1P1", + "Key mode 1 P1", rs) + pfkeys.append(rset) + + # P2 + rs = RadioSettingValueList(options, options[_pfkeys.keyMode1P2 - 1]) + rset = RadioSetting("pfkeys.keyMode1P2", + "Key mode 1 P2", rs) + pfkeys.append(rset) + + # P3 + rs = RadioSettingValueList(options, options[_pfkeys.keyMode1P3 - 1]) + rset = RadioSetting("pfkeys.keyMode1P3", + "Key mode 1 P3", rs) + pfkeys.append(rset) + + # P4 + rs = RadioSettingValueList(options, options[_pfkeys.keyMode1P4 - 1]) + rset = RadioSetting("pfkeys.keyMode1P4", + "Key mode 1 P4", rs) + pfkeys.append(rset) + + # P5 + rs = RadioSettingValueList(options, options[_pfkeys.keyMode1P5 - 1]) + rset = RadioSetting("pfkeys.keyMode1P5", + "Key mode 1 P5", rs) + pfkeys.append(rset) + + # P6 + rs = RadioSettingValueList(options, options[_pfkeys.keyMode1P6 - 1]) + rset = RadioSetting("pfkeys.keyMode1P6", + "Key mode 1 P6", rs) + pfkeys.append(rset) + + # Key Mode 2 + # P1 + rs = RadioSettingValueList(options, options[_pfkeys.keyMode2P1 - 1]) + rset = RadioSetting("pfkeys.keyMode2P1", + "Key mode 2 P1", rs) + pfkeys.append(rset) + + # P2 + rs = RadioSettingValueList(options, options[_pfkeys.keyMode2P2 - 1]) + rset = RadioSetting("pfkeys.keyMode2P2", + "Key mode 2 P2", rs) + pfkeys.append(rset) + + # P3 + rs = RadioSettingValueList(options, options[_pfkeys.keyMode2P3 - 1]) + rset = RadioSetting("pfkeys.keyMode2P3", + "Key mode 2 P3", rs) + pfkeys.append(rset) + + # P4 + rs = RadioSettingValueList(options, options[_pfkeys.keyMode2P4 - 1]) + rset = RadioSetting("pfkeys.keyMode2P4", + "Key mode 2 P4", rs) + pfkeys.append(rset) + + # P5 + rs = RadioSettingValueList(options, options[_pfkeys.keyMode2P5 - 1]) + rset = RadioSetting("pfkeys.keyMode2P5", + "Key mode 2 P5", rs) + pfkeys.append(rset) + + # P6 + rs = RadioSettingValueList(options, options[_pfkeys.keyMode2P6 - 1]) + rset = RadioSetting("pfkeys.keyMode2P6", + "Key mode 2 P6", rs) + pfkeys.append(rset) + + options = ["V/M", "SQL", "VOL", "POW", "CDT", "REV", "SCN", "CAL", + "TALK", "BND", "SFT", "MON", "DIR", "TRF", "RDW"] + + # PA + rs = RadioSettingValueList(options, options[_settings.keyPA - 2]) + rset = RadioSetting("settings.keyPA", + "Key PA", rs) + pfkeys.append(rset) + + # PB + rs = RadioSettingValueList(options, options[_settings.keyPB - 2]) + rset = RadioSetting("settings.keyPB", + "Key PB", rs) + pfkeys.append(rset) + + # PC + rs = RadioSettingValueList(options, options[_settings.keyPC - 2]) + rset = RadioSetting("settings.keyPC", + "Key PC", rs) + pfkeys.append(rset) + + # PD + rs = RadioSettingValueList(options, options[_settings.keyPD - 2]) + rset = RadioSetting("settings.keyPD", + "Key PD", rs) + pfkeys.append(rset) + return group def set_settings(self, settings): @@ -1291,6 +1417,10 @@ setattr(obj, setting, int(element.value) + 1) elif setting == "speakerVol": setattr(obj, setting, int(element.value) + 1) + elif "keyMode" in setting: + setattr(obj, setting, int(element.value) + 1) + elif "keyP" in setting: + setattr(obj, setting, int(element.value) + 2) elif element.value.get_mutable(): LOG.debug("Setting %s = %s" % (setting, element.value)) setattr(obj, setting, element.value)

1 0