summaryrefslogtreecommitdiff
path: root/src/displayapp
diff options
context:
space:
mode:
authorAvamander <avamander@gmail.com>2021-11-28 15:33:06 +0200
committerAvamander <avamander@gmail.com>2021-12-04 22:03:40 +0200
commitffb17357e74fd80a0381361a5cbc6bc481d28000 (patch)
tree35ecac9774eb91200d73f2a7ff967ed1290ba709 /src/displayapp
parented6f0aade4db811b5013441c57944baff4528938 (diff)
Fixed a few compilation errors, fixed UUID.
Diffstat (limited to 'src/displayapp')
-rw-r--r--src/displayapp/screens/Weather.cpp27
-rw-r--r--src/displayapp/screens/Weather.h4
2 files changed, 21 insertions, 10 deletions
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
+}