[chirp_devel] [PATCH] [kg-uv6] Fix fm preset locations and numbers

[Marco Filippi IZ3GME]

# HG changeset patch
# User Marco Filippi <iz3gme.marco at gmail.com>
# Date 1378654461 -7200
# Node ID 2fdf058355458deb31f1fcb711437ee71dd24ba1
# Parent  b5cced8e6c9da6d5ed82200cd62021fca74e926e
[kg-uv6] Fix fm preset locations and numbers
Fix #1115

diff -r b5cced8e6c9d -r 2fdf05835545 chirp/wouxun.py
--- a/chirp/wouxun.py	ven set 06 22:40:43 2013 -0500
+++ b/chirp/wouxun.py	dom set 08 17:34:21 2013 +0200
@@ -646,7 +646,7 @@
           u8 pad[2];
         } vfo_settings[2];
 	
-        #seekto 0x0f80;
+        #seekto 0x0f82;
         u16 fm_presets_0[9];
 
         #seekto 0x0ff0;
@@ -675,7 +675,7 @@
             u8 pad[9];
         } vfo_offset[2];
 
-        #seekto 0x1f80;
+        #seekto 0x1f82;
         u16 fm_presets_1[9];
     """
 
@@ -919,23 +919,25 @@
                    
         for i in range(0, 9):
             if self._memobj.fm_presets_0[i] != 0xFFFF:
-                rs = RadioSetting("fm_presets_0_%1i" % i, "Bank 0 Location %i" % i,
-                              RadioSettingValueBoolean(True),
-                              RadioSettingValueFloat(76, 108, self._memobj.fm_presets_0[i]/10.0+76, 0.1, 1))
+                used = True
+                preset = self._memobj.fm_presets_0[i]/10.0+76
             else:
-                rs = RadioSetting("fm_presets_0_%1i" % i, "Bank 0 Location %i" % i,
-                              RadioSettingValueBoolean(False),
-                              RadioSettingValueFloat(76, 108, 76, 0.1, 1))
+                used = False
+                preset = 76
+            rs = RadioSetting("fm_presets_0_%1i" % i, "Team 1 Location %i" % (i+1),
+                          RadioSettingValueBoolean(used),
+                          RadioSettingValueFloat(76, 108, preset, 0.1, 1))
             fm_preset.append(rs)
         for i in range(0, 9):
             if self._memobj.fm_presets_1[i] != 0xFFFF:
-                rs = RadioSetting("fm_presets_1_%1i" % i, "Bank 1 Location %i" % i,
-                              RadioSettingValueBoolean(True),
-                              RadioSettingValueFloat(76, 108, self._memobj.fm_presets_1[i]/10.0+76, 0.1, 1))
+                used = True
+                preset = self._memobj.fm_presets_1[i]/10.0+76
             else:
-                rs = RadioSetting("fm_presets_1_%1i" % i, "Bank 1 Location %i" % i,
-                              RadioSettingValueBoolean(False),
-                              RadioSettingValueFloat(76, 108, 76, 0.1, 1))
+                used = False
+                preset = 76
+            rs = RadioSetting("fm_presets_1_%1i" % i, "Team 2 Location %i" % (i+1),
+                          RadioSettingValueBoolean(used),
+                          RadioSettingValueFloat(76, 108, preset, 0.1, 1))
             fm_preset.append(rs)
 
         return top