[chirp_devel] [PATCH] [ft1802] Small fixes to pass all tests. #503

[Tom Hayward]

# HG changeset patch
# User Tom Hayward <tom at tomh.us>
# Date 1360118482 28800
# Node ID fc9e4f7b0f013b7077429c342f1d7f49dd8737d7
# Parent  7d342536ee10842fa2ce6052da82be3a41d7e17c
[ft1802] Small fixes to pass all tests. #503

diff -r 7d342536ee10 -r fc9e4f7b0f01 chirp/ft1802.py
--- a/chirp/ft1802.py	Tue Feb 05 17:10:35 2013 -0800
+++ b/chirp/ft1802.py	Tue Feb 05 18:41:22 2013 -0800
@@ -161,6 +161,7 @@
                 mem.name += CHARSET[0x80 ^ int(i)]
             else:
                 mem.name += CHARSET[i]
+        mem.name = mem.name.rstrip()
         mem.mode = _mem.narrow and "NFM" or "FM"
         mem.skip = pskip and "P" or skip and "S" or ""
         mem.power = POWER_LEVELS[_mem.power]
@@ -223,7 +224,7 @@
             _mem.name[0] += 0x80 # show name instead of frequency
 
         _mem.narrow = MODES.index(mem.mode)
-        _mem.power = POWER_LEVELS.index(mem.power)
+        _mem.power = 3 if mem.power is None else POWER_LEVELS.index(mem.power)
 
         _flag["%s_pskip" % nibble] = mem.skip == "P"
         _flag["%s_skip" % nibble] = mem.skip == "S"