[chirp_devel] [PATCH] [UV-5X3] Update Service Settings Menu
# HG changeset patch # User Jim Unroe rock.unroe@gmail.com # Date 1510453111 18000 # Node ID d51f87f82911939b418a26ff869637cc04d6abf0 # Parent 0e0470d3e892bfd4818bfb972b8b85d58f2b00d4 [UV-5X3] Update Service Settings Menu
The settings labeled VHF Squelch [0-9] are actually the 220 squelch settings. This patch renames these settings to 220 Squelch [0-9] and adds the missing VHF Squelch [0-9] settings.
related to #5333
diff -r 0e0470d3e892 -r d51f87f82911 chirp/drivers/uv5x3.py --- a/chirp/drivers/uv5x3.py Fri Nov 03 20:24:29 2017 -0400 +++ b/chirp/drivers/uv5x3.py Sat Nov 11 21:18:31 2017 -0500 @@ -116,6 +116,7 @@ _ranges = [(0x0000, 0x0DF0), (0x0E00, 0x1800), (0x1EE0, 0x1EF0), + (0x1F60, 0x1F70), (0x1F80, 0x1F90), (0x1FA0, 0x1FB0), (0x1FE0, 0x2000)] @@ -357,11 +358,14 @@ u8 sql9; };
- #seekto 0x1F80; + #seekto 0x1F60; struct { struct squelch vhf; u8 unknown0[6]; u8 unknown1[16]; + struct squelch vhf2; + u8 unknown2[6]; + u8 unknown3[16]; struct squelch uhf; } squelch;
@@ -1174,18 +1178,23 @@ dtmfd.append(rs)
# Service settings - for band in ["vhf", "uhf"]: + for band in ["vhf", "vhf2", "uhf"]: for index in range(0, 10): key = "squelch.%s.sql%i" % (band, index) if band == "vhf": _obj = self._memobj.squelch.vhf + _name = "VHF" + elif band == "vhf2": + _obj = self._memobj.squelch.vhf2 + _name = "220" elif band == "uhf": _obj = self._memobj.squelch.uhf + _name = "UHF" val = RadioSettingValueInteger(0, 123, getattr(_obj, "sql%i" % (index))) if index == 0: val.set_mutable(False) - name = "%s Squelch %i" % (band.upper(), index) + name = "%s Squelch %i" % (_name, index) rs = RadioSetting(key, name, val) service.append(rs)
# HG changeset patch # User Jim Unroe rock.unroe@gmail.com # Date 1510453111 18000 # Node ID d51f87f82911939b418a26ff869637cc04d6abf0 # Parent 0e0470d3e892bfd4818bfb972b8b85d58f2b00d4 [UV-5X3] Update Service Settings Menu
The settings labeled VHF Squelch [0-9] are actually the 220 squelch settings. This patch renames these settings to 220 Squelch [0-9] and adds the missing VHF Squelch [0-9] settings.
related to #5333
Sorry for my extreme tardiness in applying this… I get a conflict when I try. Does this need a rebase perhaps?
If it’s not obvious let me know and I’ll dig in deeper to resolve the conflict.
—Dan
On Sun, Nov 19, 2017 at 10:00 AM, Dan Smith via chirp_devel chirp_devel@intrepid.danplanet.com wrote:
# HG changeset patch # User Jim Unroe rock.unroe@gmail.com # Date 1510453111 18000 # Node ID d51f87f82911939b418a26ff869637cc04d6abf0 # Parent 0e0470d3e892bfd4818bfb972b8b85d58f2b00d4 [UV-5X3] Update Service Settings Menu
The settings labeled VHF Squelch [0-9] are actually the 220 squelch settings. This patch renames these settings to 220 Squelch [0-9] and adds the missing VHF Squelch [0-9] settings.
related to #5333
Sorry for my extreme tardiness in applying this… I get a conflict when I try. Does this need a rebase perhaps?
If it’s not obvious let me know and I’ll dig in deeper to resolve the conflict.
—Dan
Hi Dan,
It isn't obvious, but that is probably just me. ;-)
Here is what I just did...
hg export tip > 1.patch hg qpop hg qrefresh hg pull -u hg qpush hg export tip > 2.patch
Comparing the 2 files the only difference are lines 3, 4 and 5 (Date/Node ID/Parent) and lines 14, 15 and 16 (diff/---/+++). Would you like me to submit it to see if it makes a difference?
Jim
It isn't obvious, but that is probably just me. ;-)
Hmm, definitely not obvious. Your patch displays with broken formatting in my mailer, but the “raw source” looks correct. However, my patchbot wrote the patch file out with the broken formatting as well, which is why it wasn’t formatting. Not sure what happened there, since I normally don’t have problems with your patches…
Anyway, I edited/reconstructed it and pushed. Please check to make sure it looks right.
Thanks!
—Dan
participants (2)
-
Dan Smith -
Jim Unroe