From 0f2a58dddefe92c6377ebb35d433800036eb54e5 Mon Sep 17 00:00:00 2001
From: Jon Warrington <jonw@ggbetawerks.com>
Date: Mon, 10 Jan 2022 11:31:37 -0700
Subject: [PATCH 1/4] Adding current weather to lcars

---
 apps/lcars/lcars.app.js      | 9 +++++++++
 apps/lcars/lcars.settings.js | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 167adad2d..4e1073723 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -1,5 +1,6 @@
 const SETTINGS_FILE = "lcars.setting.json";
 const Storage = require("Storage");
+const weather = require('weather');
 
 
 // ...and overwrite them with any saved values
@@ -145,6 +146,14 @@ function printData(key, y, c){
     text = "VREF";
     value = E.getAnalogVRef().toFixed(2) + "V";
 
+  } else if (key == "Weather"){
+    text = "TEMP";
+    const w = weather.get();
+    if (!w) {
+      value = "ERR";
+    } else {
+      value = require('locale').temp(w.temp-273.15);  // applies conversion
+    }
   }
 
   g.setColor(c);
diff --git a/apps/lcars/lcars.settings.js b/apps/lcars/lcars.settings.js
index 0d004b002..b1fceb518 100644
--- a/apps/lcars/lcars.settings.js
+++ b/apps/lcars/lcars.settings.js
@@ -18,7 +18,7 @@
     storage.write(SETTINGS_FILE, settings)
   }
 
-  var data_options = ["Battery", "Steps", "Temp.", "HRM", "VREF"];
+  var data_options = ["Battery", "Steps", "Temp.", "HRM", "VREF", "Weather"];
 
   E.showMenu({
     '': { 'title': 'LCARS Clock' },

From 05215fab73314fca30696445cfe986b06b3c0d43 Mon Sep 17 00:00:00 2001
From: Jon Warrington <jonw@ggbetawerks.com>
Date: Mon, 10 Jan 2022 11:38:26 -0700
Subject: [PATCH 2/4] Updating version info for lcars

---
 apps.json            | 2 +-
 apps/lcars/ChangeLog | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index 389603249..8f1783f10 100644
--- a/apps.json
+++ b/apps.json
@@ -4498,7 +4498,7 @@
     "name": "LCARS Clock",
     "shortName":"LCARS",
     "icon": "lcars.png",
-    "version":"0.09",
+    "version":"0.10",
     "readme": "README.md",
     "supports": ["BANGLEJS2"],
     "description": "Library Computer Access Retrieval System (LCARS) clock.",
diff --git a/apps/lcars/ChangeLog b/apps/lcars/ChangeLog
index f5d8346da..8a8970124 100644
--- a/apps/lcars/ChangeLog
+++ b/apps/lcars/ChangeLog
@@ -6,4 +6,5 @@
 0.06: Fix - Alarm disabled, if clock was closed.
 0.07: Added settings to adjust data that is shown for each row.
 0.08: Support for multiple screens. 24h graph for steps + HRM. Fullscreen Mode.
-0.09: Tab anywhere to open the launcher.
\ No newline at end of file
+0.09: Tab anywhere to open the launcher.
+0.10: Added getting the gadgetbridge weather
\ No newline at end of file

From 78dc343afafa8abfaf5fcc391353473028d015c8 Mon Sep 17 00:00:00 2001
From: Jon Warrington <jonw@ggbetawerks.com>
Date: Mon, 10 Jan 2022 11:48:57 -0700
Subject: [PATCH 3/4] Fixing a problem with the lcars settings

---
 apps/lcars/lcars.settings.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/lcars/lcars.settings.js b/apps/lcars/lcars.settings.js
index b1fceb518..a0e54f9b4 100644
--- a/apps/lcars/lcars.settings.js
+++ b/apps/lcars/lcars.settings.js
@@ -25,7 +25,7 @@
     '< Back': back,
     'Row 1': {
       value: 0 | data_options.indexOf(settings.dataRow1),
-      min: 0, max: 4,
+      min: 0, max: 5,
       format: v => data_options[v],
       onchange: v => {
         settings.dataRow1 = data_options[v];
@@ -34,7 +34,7 @@
     },
     'Row 2': {
       value: 0 | data_options.indexOf(settings.dataRow2),
-      min: 0, max: 4,
+      min: 0, max: 5,
       format: v => data_options[v],
       onchange: v => {
         settings.dataRow2 = data_options[v];
@@ -43,7 +43,7 @@
     },
     'Row 3': {
       value: 0 | data_options.indexOf(settings.dataRow3),
-      min: 0, max: 4,
+      min: 0, max: 5,
       format: v => data_options[v],
       onchange: v => {
         settings.dataRow3 = data_options[v];

From 2855ace46ef3cb3b03539576afe7301b14e3067f Mon Sep 17 00:00:00 2001
From: Jon Warrington <jonw@ggbetawerks.com>
Date: Mon, 10 Jan 2022 13:47:50 -0700
Subject: [PATCH 4/4] Incrementing the version number

---
 apps.json            | 2 +-
 apps/lcars/ChangeLog | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index 8f1783f10..658adaaa8 100644
--- a/apps.json
+++ b/apps.json
@@ -4498,7 +4498,7 @@
     "name": "LCARS Clock",
     "shortName":"LCARS",
     "icon": "lcars.png",
-    "version":"0.10",
+    "version":"0.11",
     "readme": "README.md",
     "supports": ["BANGLEJS2"],
     "description": "Library Computer Access Retrieval System (LCARS) clock.",
diff --git a/apps/lcars/ChangeLog b/apps/lcars/ChangeLog
index 8a8970124..ad5330b26 100644
--- a/apps/lcars/ChangeLog
+++ b/apps/lcars/ChangeLog
@@ -7,4 +7,4 @@
 0.07: Added settings to adjust data that is shown for each row.
 0.08: Support for multiple screens. 24h graph for steps + HRM. Fullscreen Mode.
 0.09: Tab anywhere to open the launcher.
-0.10: Added getting the gadgetbridge weather
\ No newline at end of file
+0.11: Added getting the gadgetbridge weather
\ No newline at end of file