From ffb17357e74fd80a0381361a5cbc6bc481d28000 Mon Sep 17 00:00:00 2001
From: Avamander <avamander@gmail.com>
Date: Sun, 28 Nov 2021 15:33:06 +0200
Subject: [PATCH] Fixed a few compilation errors, fixed UUID.

---
 src/components/ble/weather/WeatherData.h      |  4 +--
 src/components/ble/weather/WeatherService.cpp |  2 +-
 src/components/ble/weather/WeatherService.h   |  2 +-
 src/displayapp/screens/Weather.cpp            | 27 +++++++++++++------
 src/displayapp/screens/Weather.h              |  4 +--
 5 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/components/ble/weather/WeatherData.h b/src/components/ble/weather/WeatherData.h
index 9b424004..19b9709d 100644
--- a/src/components/ble/weather/WeatherData.h
+++ b/src/components/ble/weather/WeatherData.h
@@ -250,7 +250,7 @@ namespace Pinetime {
       class Location : public TimelineHeader {
       public:
         /** Location name */
-        std::unique_ptr<std::string> location;
+        std::string location;
         /** Altitude relative to sea level in meters */
         int16_t altitude;
         /** Latitude, EPSG:3857 (Google Maps, Openstreetmaps datum) */
@@ -311,7 +311,7 @@ namespace Pinetime {
          * For chemical compounds use the molecular formula e.g. "NO2", "CO2", "O3"
          * For pollen use the genus, e.g. "Betula" for birch or "Alternaria" for that mold's spores
          */
-        std::unique_ptr<std::string> polluter;
+        std::string polluter;
         /**
          * Amount of the pollution in SI units,
          * otherwise it's going to be difficult to create UI, alerts
diff --git a/src/components/ble/weather/WeatherService.cpp b/src/components/ble/weather/WeatherService.cpp
index 22c80837..bbaa21f0 100644
--- a/src/components/ble/weather/WeatherService.cpp
+++ b/src/components/ble/weather/WeatherService.cpp
@@ -87,7 +87,7 @@ namespace Pinetime {
             if (UsefulBuf_IsNULLOrEmptyC(String) != 0) {
               return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
             }
-            airquality->polluter = std::make_unique<std::string>(static_cast<const char*>(String.ptr), String.len);
+            airquality->polluter = std::string(static_cast<const char*>(String.ptr), String.len);
             int64_t tmpAmount = 0;
             QCBORDecode_GetInt64InMapSZ(&decodeContext, "Amount", &tmpAmount);
             if (tmpAmount < 0) {
diff --git a/src/components/ble/weather/WeatherService.h b/src/components/ble/weather/WeatherService.h
index 5504ea49..7bf60ee1 100644
--- a/src/components/ble/weather/WeatherService.h
+++ b/src/components/ble/weather/WeatherService.h
@@ -88,7 +88,7 @@ namespace Pinetime {
       // 0003yyxx-78fc-48fe-8e23-433b3a1942d0
       static constexpr ble_uuid128_t CharUuid(uint8_t x, uint8_t y) {
         return ble_uuid128_t {.u = {.type = BLE_UUID_TYPE_128},
-                              .value = {0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, x, y, 0x03, 0x00}};
+                              .value = {0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, y, x, 0x03, 0x00}};
       }
 
       ble_uuid128_t weatherUuid {BaseUuid()};
diff --git a/src/displayapp/screens/Weather.cpp b/src/displayapp/screens/Weather.cpp
index ea96c9f2..025a3bd8 100644
--- a/src/displayapp/screens/Weather.cpp
+++ b/src/displayapp/screens/Weather.cpp
@@ -1,14 +1,26 @@
+/*  Copyright (C) 2021 Avamander
+
+    This file is part of InfiniTime.
+
+    InfiniTime is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    InfiniTime is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
 #include "Weather.h"
 #include <lvgl/lvgl.h>
 #include <components/ble/weather/WeatherService.h>
-#include "../DisplayApp.h"
 #include "Label.h"
-#include "Version.h"
 #include "components/battery/BatteryController.h"
 #include "components/ble/BleController.h"
-#include "components/brightness/BrightnessController.h"
-#include "components/datetime/DateTimeController.h"
-#include "drivers/Watchdog.h"
 #include "components/ble/weather/WeatherData.h"
 
 using namespace Pinetime::Applications::Screens;
@@ -41,11 +53,10 @@ Weather::~Weather() {
   lv_obj_clean(lv_scr_act());
 }
 
-bool Weather::Refresh() {
+void Weather::Refresh() {
   if (running) {
-    screens.Refresh();
+    // screens.Refresh();
   }
-  return running;
 }
 
 bool Weather::OnButtonPushed() {
diff --git a/src/displayapp/screens/Weather.h b/src/displayapp/screens/Weather.h
index 469bf592..99cf15ba 100644
--- a/src/displayapp/screens/Weather.h
+++ b/src/displayapp/screens/Weather.h
@@ -16,7 +16,7 @@ namespace Pinetime {
 
         ~Weather() override;
 
-        bool Refresh() override;
+        void Refresh() override;
 
         bool OnButtonPushed() override;
 
@@ -42,4 +42,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}