From e2bfdcc7eb24eaa3a3062b534717aa48f19881a3 Mon Sep 17 00:00:00 2001 From: locker98 Date: Thu, 9 May 2024 10:09:56 -0400 Subject: [PATCH] fix errors in g7710 watch face weather --- src/displayapp/screens/WatchFaceCasioStyleG7710.cpp | 2 +- src/displayapp/screens/WatchFaceCasioStyleG7710.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp index 5b1b1996..ec5ed9d1 100644 --- a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp +++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp @@ -20,7 +20,7 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(Controllers::DateTime& dateTi Controllers::NotificationManager& notificatioManager, Controllers::Settings& settingsController, Controllers::MotionController& motionController, - Controllers::FS& filesystem + Controllers::FS& filesystem, Controllers::SimpleWeatherService& weatherService) : currentDateTime {{}}, batteryIcon(false), diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/screens/WatchFaceCasioStyleG7710.h index b1250aa3..69424321 100644 --- a/src/displayapp/screens/WatchFaceCasioStyleG7710.h +++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.h @@ -50,6 +50,7 @@ namespace Pinetime { Utility::DirtyValue stepCount {}; Utility::DirtyValue notificationState {}; Utility::DirtyValue> currentDate; + Utility::DirtyValue> currentWeather {}; lv_point_t line_icons_points[3] {{0, 5}, {117, 5}, {122, 0}}; lv_point_t line_day_of_week_number_points[4] {{0, 0}, {100, 0}, {95, 95}, {0, 95}}; @@ -82,6 +83,9 @@ namespace Pinetime { lv_obj_t* notificationIcon; lv_obj_t* line_icons; + lv_obj_t* weatherIcon; + lv_obj_t* temperature; + BatteryIcon batteryIcon; Controllers::DateTime& dateTimeController;