josh/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

fix errors in g7710 watch face weather

Browse Source
This commit is contained in:
locker98 2024-05-09 10:09:56 -04:00
parent 3f9f8cb7ea
commit e2bfdcc7eb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
View File

@ -20,7 +20,7 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(Controllers::DateTime& dateTi
Controllers::NotificationManager& notificatioManager, Controllers::NotificationManager& notificatioManager,
Controllers::Settings& settingsController, Controllers::Settings& settingsController,
Controllers::MotionController& motionController, Controllers::MotionController& motionController,
Controllers::FS& filesystem Controllers::FS& filesystem,
Controllers::SimpleWeatherService& weatherService) Controllers::SimpleWeatherService& weatherService)
: currentDateTime {{}}, : currentDateTime {{}},
batteryIcon(false), batteryIcon(false),

4
src/displayapp/screens/WatchFaceCasioStyleG7710.h
View File

@ -50,6 +50,7 @@ namespace Pinetime {
Utility::DirtyValue<uint32_t> stepCount {}; Utility::DirtyValue<uint32_t> stepCount {};
Utility::DirtyValue<bool> notificationState {}; Utility::DirtyValue<bool> notificationState {};
Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::days>> currentDate; Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::days>> currentDate;
Utility::DirtyValue<std::optional<Pinetime::Controllers::SimpleWeatherService::CurrentWeather>> currentWeather {};
lv_point_t line_icons_points[3] {{0, 5}, {117, 5}, {122, 0}}; 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}}; 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* notificationIcon;
lv_obj_t* line_icons; lv_obj_t* line_icons;
lv_obj_t* weatherIcon;
lv_obj_t* temperature;
BatteryIcon batteryIcon; BatteryIcon batteryIcon;
Controllers::DateTime& dateTimeController; Controllers::DateTime& dateTimeController;