From b2cb677869b9c5599797c60d5f72ab8189ed84d8 Mon Sep 17 00:00:00 2001
From: jaahaavi <jaakko_haavisto@yahoo.com>
Date: Sun, 23 Nov 2014 11:41:24 +0200
Subject: [PATCH] Updated GPS settings

- Added SBAS disabled (-1) to configuration tab
- Fixed GPS signal strength bars
---
 js/msp.js             |  2 +-
 tabs/configuration.js |  3 ++-
 tabs/gps.html         | 32 ++++++++++++++++----------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/js/msp.js b/js/msp.js
index 46daa0395a..82ff64a200 100644
--- a/js/msp.js
+++ b/js/msp.js
@@ -297,7 +297,7 @@ var MSP = {
                 MISC.failsafe_throttle = data.getUint16(8, 1); // 1000-2000
                 MISC.gps_type = data.getUint8(10);
                 MISC.gps_baudrate = data.getUint8(11);
-                MISC.gps_ubx_sbas = data.getUint8(12);
+                MISC.gps_ubx_sbas = data.getInt8(12);
                 MISC.multiwiicurrentoutput = data.getUint8(13);
                 MISC.rssi_aux_channel = data.getUint8(14);
                 MISC.placeholder2 = data.getUint8(15);
diff --git a/tabs/configuration.js b/tabs/configuration.js
index 7e96887dec..91ea87b182 100644
--- a/tabs/configuration.js
+++ b/tabs/configuration.js
@@ -123,6 +123,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
         ];
 
         var gpsSbas = [
+            'Disabled',
             'Auto-detect',
             'European EGNOS',
             'North American WAAS',
@@ -150,7 +151,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
 
         var gps_ubx_sbas_e = $('select.gps_ubx_sbas');
         for (var i = 0; i < gpsSbas.length; i++) {
-            gps_ubx_sbas_e.append('<option value="' + i + '">' + gpsSbas[i] + '</option>');
+            gps_ubx_sbas_e.append('<option value="' + (i-1) + '">' + gpsSbas[i] + '</option>');
         }
 
         gps_ubx_sbas_e.change(function () {
diff --git a/tabs/gps.html b/tabs/gps.html
index 491788d6cb..c6bce68907 100644
--- a/tabs/gps.html
+++ b/tabs/gps.html
@@ -43,82 +43,82 @@
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
             <tr>
                 <td>0</td>
                 <td>0</td>
-                <td><progress value="0" max="16"></progress></td>
+                <td><progress value="0" max="99"></progress></td>
             </tr>
         </table>
     </div>