# HG changeset patch # User Tom Hayward tom@tomh.us # Date 1366649521 25200 # Node ID 0427d271983b566751d2bc61eb9884dd612bc9f5 # Parent 35bd3e0c31b761d54c438234a0fe53e2a5b84f2e Move OLD_TONES to chirp_common. For #803

diff -r 35bd3e0c31b7 -r 0427d271983b chirp/chirp_common.py --- a/chirp/chirp_common.py Wed Apr 10 19:17:38 2013 -0700 +++ b/chirp/chirp_common.py Mon Apr 22 09:52:01 2013 -0700 @@ -34,6 +34,10 @@

TONES_EXTRA = [62.5]

+OLD_TONES = list(TONES) +[OLD_TONES.remove(x) for x in [159.8, 165.5, 171.3, 177.3, 183.5, 189.9, + 196.6, 199.5, 206.5, 229.1, 254.1]] + # 104 DTCS Codes DTCS_CODES = [ 23, 25, 26, 31, 32, 36, 43, 47, 51, 53, 54, diff -r 35bd3e0c31b7 -r 0427d271983b chirp/kenwood_live.py --- a/chirp/kenwood_live.py Wed Apr 10 19:17:38 2013 -0700 +++ b/chirp/kenwood_live.py Mon Apr 22 09:52:01 2013 -0700 @@ -542,19 +542,6 @@

return mem

-OLD_TONES = list(chirp_common.TONES) -OLD_TONES.remove(159.8) -OLD_TONES.remove(165.5) -OLD_TONES.remove(171.3) -OLD_TONES.remove(177.3) -OLD_TONES.remove(183.5) -OLD_TONES.remove(189.9) -OLD_TONES.remove(196.6) -OLD_TONES.remove(199.5) -OLD_TONES.remove(206.5) -OLD_TONES.remove(229.1) -OLD_TONES.remove(254.1) - @directory.register class TMV7Radio(KenwoodLiveRadio): """Kenwood TM-V7""" @@ -562,10 +549,10 @@

mem_upper_limit = 200 # Will be updated

- _kenwood_valid_tones = list(OLD_TONES) + _kenwood_valid_tones = list(chirp_common.OLD_TONES)

def set_memory(self, memory): - supported_tones = list(OLD_TONES) + supported_tones = list(chirp_common.OLD_TONES) supported_tones.remove(69.3) if memory.rtone not in supported_tones: raise errors.UnsupportedToneError("This radio does not support " +