Related to #11696 #1350
There are no files selected for viewing
ojfd marked this conversation as resolved.
Show resolved
Hide resolved
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,7 +24,7 @@ | |
| from chirp.settings import RadioSettingGroup, RadioSetting, \ | ||
| RadioSettingValueBoolean, RadioSettingValueList, \ | ||
| RadioSettingValueString, RadioSettingValueInteger, \ | ||
| RadioSettingValueFloat, RadioSettings, RadioSettingValueMap | ||
|
|
||
| LOG = logging.getLogger(__name__) | ||
|
|
||
|
|
@@ -113,15 +113,33 @@ | |
| u8 bitmap[26]; // one bit for each channel skipped | ||
| } chan_skip; | ||
|
|
||
| #seekto 0x1680; | ||
| struct { | ||
| ul32 vhfRxLo; | ||
| ul32 vhfRxUp; | ||
| ul32 vhfTxLo; | ||
| ul32 vhfTxUp; | ||
| ul32 200RxLo; | ||
| ul32 200RxUp; | ||
| ul32 200TxLo; | ||
| ul32 200TxUp; | ||
| ul32 uhfRxLo; | ||
| ul32 uhfRxUp; | ||
| ul32 uhfTxLo; | ||
| ul32 uhfTxUp; | ||
| } RxTxLimits; | ||
|
|
||
|
|
||
| #seekto 0x191E; | ||
| struct { | ||
| u8 unk1:4, // | ||
| region:4; // 0x191E Radio Region (read only) | ||
| // 0 = Unlocked TX: 136-174 MHz / 400-480 MHz | ||
| // 1-2 = Unknown | ||
| // 3 = EU TX: 144-146 MHz / 430-440 MHz | ||
| // 4 = US TX: 144-148 MHz / 420-450 MHz | ||
| // 5-14 = Unknown | ||
| // 15 = Factory unlocked state 0xFF | ||
| } settings2; | ||
|
|
||
| #seekto 0x1940; | ||
|
|
@@ -140,7 +158,7 @@ | |
| #seekto 0x2180; | ||
| struct fm_chn fm_stations[24]; | ||
|
|
||
| // #seekto 0x21E0; | ||
| struct { | ||
| u8 fmset[4]; | ||
| } fmmap; | ||
|
|
@@ -214,54 +232,68 @@ | |
| sideKey1:4; // side key 1 | ||
| u8 sideKey2_long:4, // 0x1161 side key 2 Long | ||
| sideKey1_long:4; // side key 1 Long | ||
| u8 unk1; // | ||
| u8 dwchan; // 0x1163 Dual Wait channel select, P2/62 only | ||
| u8 unk2:4, // | ||
| hndTm:4; // 0x1164 Hand Time seconds, P2/62 only | ||
| u8 unk3; // 0x1165 | ||
| u8 unk4; // 0x1166 | ||
| u8 unk5; // 0x1167 | ||
| u8 unk6; // 0x1168 | ||
| u8 unk7; // 0x1169 | ||
| u8 unk8:4, // | ||
| micLev:4; // 0x116A Mic Gain, 1-8, RA89 only | ||
| u8 manDownTm:4, // 0x116B manDown Tm | ||
| unk9:3, // | ||
| manDownSw:1; // manDown Sw | ||
| u8 offFreqVoltage : 3, // 0x116C unknown referred to in code but not on | ||
| // screen | ||
| unk10:1, // | ||
| sqlLevel : 4; // [05] *OFF, 1-9 | ||
| u8 beep : 1, // 0x116D [09] *OFF, On | ||
| callKind : 2, // code says 1750,2100,1000,1450 as options | ||
| // not on screen | ||
| introScreen: 2, // [20] *OFF, Voltage, Char String | ||
| unk11:1, // | ||
| txChSelect : 2; // [02] *Main CH, Last CH, Active CH+Hand Time | ||
| // (P2/P62 only) | ||
| u8 autoPowOff : 3, // 0x116E not on screen? OFF, 30Min, 1HR, 2HR | ||
| unk12:1, // | ||
| tot : 4; // [11] *OFF, 30 Second, 60 Second, 90 Second, | ||
| // ... , 270 Second | ||
| u8 unk13:1, // 0x116F | ||
| roger:1, // [14] *OFF, On | ||
| dailDef:1, // Unknown - 'Volume, Frequency' | ||
| language:1, // English only | ||
| endToneElim:2, // *Frequency, 120, 180, 240 (RA89) | ||
| unk14:1, // | ||
| unk15:1; // | ||
| u8 scanType: 2, // 0x1170 [17] *Off, On, 5s, 10s, 15s, 20s, 25s, 30s | ||
| disMode : 2, // [33] *Frequency, Channel, Name | ||
| ledMode: 4; // [07] *Off, On, 5s, 10s, 15s, 20s, 25s, 30s | ||
| u8 unk16; // 0x1171 | ||
| u8 elimTailnoSq:4, // 0x1172 *OFF, On 'Eliminate Squelch Tail When | ||
| // No Ctc/Dcs Signaling' checkbox | ||
| // Toggles between 0x0 and 0x4 | ||
| unk17:4; // Has flags to do with logging - factory | ||
| // enabled (bits 16,64,128) | ||
| u8 unk18; // 0x1173 | ||
| u8 swAudio : 1, // 0x1174 [19] *OFF, On | ||
| radioMoni : 1, // [34] *OFF, On | ||
| keylock : 1, // [18] *OFF, On | ||
| dualWait : 1, // [06] *OFF, On | ||
| unk19:1, // | ||
| light : 3; // [08] *1, 2, 3, 4, 5, 6, 7 | ||
| u8 voxSw : 1, // 0x1175 [13] *OFF, On | ||
| voxDelay: 4, // *0.5S, 1.0S, 1.5S, 2.0S, 2.5S, 3.0S, 3.5S, | ||
| // 4.0S, 4.5S, 5.0S | ||
| voxLevel : 3; // [03] *1, 2, 3, 4, 5, 6, 7 | ||
| u8 unk20:4, // 0x1176 | ||
| saveMode : 2, // [16] *OFF, 1:1, 1:2, 1:4 | ||
| keyMode : 2; // [32] *ALL, PTT, KEY, Key & Side Key | ||
| u8 unk21; // 0x1177 | ||
| u8 unk22; // 0x1178 | ||
| u8 unk23; // 0x1179 | ||
| u8 name2[6]; // 0x117A unused | ||
| } basicsettings; | ||
| """ | ||
|
|
@@ -871,30 +903,53 @@ def get_settings(self): | |
|
|
||
| # Menu 02 - TX Channel Select | ||
| if self._hasLCD: | ||
| options = ["Main Channel", "Last Channel"] | ||
| else: | ||
| options = ["Main Channel", "Last Channel", | ||
| "Active Channel with Lockout Time"] | ||
|
There was a problem hiding this comment. Are you sure all h777-based radios without LCD support this extra setting? Or do you want to add that only for the subset of models you know have it? There was a problem hiding this comment. Oops, I just realized this is the second driver, so this comment makes no sense. I'll look to Jim to review this part since I don't have any of these. There was a problem hiding this comment. As before, I don't see h777 based radios in th_uv88 file. This setting is for Retevis P62, Retevis P2 and their father - TYT TC29. They have 3 options in OEM software. Third option activates extra "Active Channel with Lockout Time" |
||
| rx = RadioSettingValueList(options, current_index=_settings.txChSelect) | ||
| rset = RadioSetting("basicsettings.txChSelect", | ||
| "Priority Transmit", rx) | ||
| basic.append(rset) | ||
|
|
||
| if self.MODEL in ["P2", "P62"]: | ||
| if 'hndTm' in _settings: | ||
| rsv = RadioSettingValueMap( | ||
| [(str(x), x) for x in range(16)], _settings.hndTm) | ||
| rs = RadioSetting('basicsettings.hndTm', | ||
| 'Lockout Time (seconds)', rsv) | ||
| basic.append(rs) | ||
|
|
||
| # Menu 03 - VOX Level | ||
| rx = RadioSettingValueInteger(1, 7, _settings.voxLevel + 1) | ||
| rset = RadioSetting("basicsettings.voxLevel", "Vox Level", rx) | ||
| basic.append(rset) | ||
|
|
||
| options = ['0.5S', '1.0S', '1.5S', '2.0S', '2.5S', '3.0S', '3.5S', | ||
| '4.0S', '4.5S', '5.0S'] | ||
| rx = RadioSettingValueList(options, current_index=_settings.voxDelay) | ||
| rset = RadioSetting("basicsettings.voxDelay", "VOX Delay", rx) | ||
| basic.append(rset) | ||
|
There was a problem hiding this comment. Help me out... this is just moved from below but otherwise unchanged? Is there some reason it was moved or just accidental? There was a problem hiding this comment. Yes, purely for cosmetic reasons, so that Vox Level and Vox Delay appear in one place in GUI There was a problem hiding this comment. Okay cool, so this change should be one commit on its own so it's clear that it's just moving (and not changing) anything. There was a problem hiding this comment. This also moves it into basic from advanced. I assume @KC9HI was mirroring the radio vs. software menu structure which is why this was down below in advanced and not with the other one. So I'll let him comment on whether or not he wants this moved. There was a problem hiding this comment. It does. But, just FYI, in OEM software all these functions are in one, s.c. "Basic" window |
||
|
|
||
| # Menu 05 - Squelch Level | ||
| options = ["OFF"] + ["%s" % x for x in range(1, 10)] | ||
| rx = RadioSettingValueList(options, current_index=_settings.sqlLevel) | ||
| rset = RadioSetting("basicsettings.sqlLevel", "Squelch Level", rx) | ||
| basic.append(rset) | ||
|
|
||
| # Menu 06 - Dual Wait | ||
| rx = RadioSettingValueBoolean(_settings.dualWait) | ||
| rset = RadioSetting("basicsettings.dualWait", | ||
| "Dual Wait/Standby", rx) | ||
| basic.append(rset) | ||
|
There was a problem hiding this comment. This adds the dual wait setting for all models, where it was restricted to only ones with LCDs before. Is this intentional? I have h777-based radios without displays that I'm sure don't have dual wait since they only have a way to select a single channel. |
||
|
|
||
| if self.MODEL in ["P2", "P62"]: | ||
| if 'dwchan' in _settings: | ||
| rsv = RadioSettingValueMap( | ||
| [(str(x + 1), x) for x in range(200)], _settings.dwchan) | ||
| rs = RadioSetting('basicsettings.dwchan', | ||
| 'Dual Wait Channel', rsv) | ||
| basic.append(rs) | ||
|
There was a problem hiding this comment. I'm guessing these non-display radios have a dedicated "always dual wait for channel X" function? Mine aren't in this list, which means they'll get a dual-wait setting in settings, but won't get this extra setting either. I think the logic should be "if LCD, always add dual-wait. If not LCD but There was a problem hiding this comment. This and the question above are still relevant to make sure you intended to change this in this way, however my confidence about whether it's correct or not is irrelevant since I don't know anything about these radios. @KC9HI can you review the changes being made to this driver to make sure they jive with your understanding of them all? There was a problem hiding this comment. Yes, in Retevis P62/P2 and TYT TC29, when dual wait is activated, you tell the radio which other, permanently set channel to watch. Range 1 to 200. Dan, you did this piece when we spoke for the first time. See #11864 There was a problem hiding this comment. Yep, and I remember it being too wide a scope in terms of the models it affected, hence it being reverted and hence me asking for someone more familiar with these models to help review :) There was a problem hiding this comment. Nah, it's just two models. Almost identical. One with display - Retevis RA89/TYT TH-UV99, the other one without - Retevis P62/P2/ TYT TC29. |
||
|
|
||
| # Menu 07 - LED Mode | ||
| if self._hasLCD: | ||
|
|
@@ -1003,6 +1058,13 @@ def get_settings(self): | |
| advanced = RadioSettingGroup("advanced", "Advanced Settings") | ||
| group.append(advanced) | ||
|
|
||
| # Menu 38 - Mic Level | ||
| if self.MODEL == "RA89": | ||
| rsv = RadioSettingValueMap( | ||
| [(str(x + 1), x) for x in range(8)], _settings.micLev) | ||
| rs = RadioSetting('basicsettings.micLev', 'Mic Level', rsv) | ||
| basic.append(rs) | ||
|
|
||
| # software only | ||
| if self.MODEL in ["RA89", "P2", "P62"]: | ||
| options = ['Frequency', '120', '180', '240'] | ||
|
|
@@ -1059,19 +1121,13 @@ def _char_to_name(name): | |
| advanced.append(rset) | ||
|
|
||
| # software only | ||
| options = ['Unlocked', 'Unknown 1', 'Unknown 2', 'EU', 'US', | ||
| 'Unknown 3', 'Unknown 4', 'Unknown 5', 'Unknown 6', | ||
| 'Unknown 7', 'Unknown 8', 'Unknown 9', 'Unknown 10', | ||
| 'Unknown 11', 'Unknown 12', 'Factory'] | ||
| # log unknown region codes greater than 4 and less than 15 | ||
| # codes for Canada and Taiwan exist, need to be determined | ||
| if _settings2.region > 4 and _settings2.region < 15: | ||
| LOG.debug("Unknown region code: {value}". | ||
| format(value=_settings2.region)) | ||
| rx = RadioSettingValueList(options, current_index=_settings2.region) | ||
|
|
@@ -1229,7 +1285,6 @@ def myset_freq(setting, obj, atrb, mult): | |
|
|
||
| def set_settings(self, settings): | ||
| _settings = self._memobj.basicsettings | ||
| for element in settings: | ||
| if not isinstance(element, RadioSetting): | ||
| self.set_settings(element) | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be better to check something other than this
PROGRAM_CMD, but I see you're mirroring another piece of code here that already does that. So maybe let's circle back and clean up both in a subsequent change.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did as best as I could. Not the most elegant way, I know. Quick and dirty. I just wanted to get rid of "Scan" for radios that do not support it.