From 62524db95642ee0ca094b1ce143e39ebca02d2a3 Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Wed, 20 Jan 2021 00:15:08 +0000
Subject: [PATCH] widget working with power settings

---
 apps/gpsservice/app.js        | 12 +++++++++---
 apps/gpsservice/settings.json |  7 +------
 apps/gpsservice/widget.js     | 10 ++++------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/apps/gpsservice/app.js b/apps/gpsservice/app.js
index c5407e827..aa0c4c846 100644
--- a/apps/gpsservice/app.js
+++ b/apps/gpsservice/app.js
@@ -4,6 +4,8 @@ Bangle.drawWidgets();
 const SETTINGS_FILE = "gpsservice.settings.json";
 let settings = require("Storage").readJSON(SETTINGS_FILE,1)||{};
 
+
+
 function updateSettings() {
   require("Storage").write(SETTINGS_FILE, settings);
 }
@@ -14,6 +16,9 @@ function reloadWidget() {
 }
 
 function showMainMenu() {
+  var powerV = [0,1];
+  var powerN = ["PMS","PSMOO"];
+
   const mainmenu = {
     '': { 'title': 'GPS Service' },
     '< Exit': ()=>{load();},
@@ -28,10 +33,11 @@ function showMainMenu() {
     },
 
     'Power Mode': {
-      value: settings.power,
-      format: v => v ? 'SuperE' : 'PMSOO',
+      value: 0 | powerV.indexOf(settings.power),
+      min: 0, max: 1,
+      format: v => powerN[v],
       onchange: v => {
-        settings.power = v; // ? 'SuperE' : 'PMSOO';
+        settings.power = powerV[v];
 	updateSettings();
       },
     },
diff --git a/apps/gpsservice/settings.json b/apps/gpsservice/settings.json
index aafced3b3..089cb1df4 100644
--- a/apps/gpsservice/settings.json
+++ b/apps/gpsservice/settings.json
@@ -1,6 +1 @@
-{ 
-  "service": false, 
-  "power": "SuperE", 
-  "update": 120, 
-  "search": 6, 
-}
+{"service":false, "power":"PSMOO", "update":120, "search":6}
diff --git a/apps/gpsservice/widget.js b/apps/gpsservice/widget.js
index 82593bbab..20d27cde8 100644
--- a/apps/gpsservice/widget.js
+++ b/apps/gpsservice/widget.js
@@ -23,7 +23,7 @@
     settings.service = settings.service||false;
     settings.update = settings.update||120;
     settings.search = settings.search||5;   
-    settings.power = "PSMOO";  //settings.power||"SuperE";
+    settings.power = settings.power||0;
     console.log(settings);
 	  
     Bangle.removeListener('GPS',onGPS);
@@ -62,8 +62,9 @@
   function setupGPS() {
     Bangle.setGPSPower(1);
     console.log(settings);
-    
-    //if (settings.power === "PMSOO") {
+
+    // 1 == PMSOO, 0 == PSM
+    if (settings.power === 1) {
       console.log("setupGPS() PSMOO");
       UBX_CFG_RESET();
       wait(100);
@@ -76,8 +77,6 @@
       
       UBX_CFG_SAVE();
       wait(20);
-/*
-    
     } else {
       console.log("setupGPS() PMS");
       UBX_CFG_RESET();
@@ -89,7 +88,6 @@
       UBX_CFG_SAVE();
       wait(20);
     }
-*/
     Bangle.on('GPS',onGPS);
   }