Skip to content

Commit 90bc1f6

Browse files
GhoelianGhoelian
committed
feat: add version of casio watchface with weather
1 parent f8f8993 commit 90bc1f6

8 files changed

+509
-0
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,5 @@ src/arm-none-eabi
5050

5151
# clangd
5252
.cache/
53+
54+
node_modules/

‎src/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@ list(APPEND SOURCE_FILES
426426
displayapp/screens/WatchFaceTerminal.cpp
427427
displayapp/screens/WatchFacePineTimeStyle.cpp
428428
displayapp/screens/WatchFaceCasioStyleG7710.cpp
429+
displayapp/screens/WatchFaceCasioStyleG7710Weather.cpp
429430

430431
##
431432

‎src/displayapp/UserApps.h

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "displayapp/screens/WatchFaceDigital.h"
1212
#include "displayapp/screens/WatchFaceAnalog.h"
1313
#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
14+
#include "displayapp/screens/WatchFaceCasioStyleG7710Weather.h"
1415
#include "displayapp/screens/WatchFaceInfineat.h"
1516
#include "displayapp/screens/WatchFacePineTimeStyle.h"
1617
#include "displayapp/screens/WatchFaceTerminal.h"

‎src/displayapp/apps/Apps.h.in

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ namespace Pinetime {
5252
Terminal,
5353
Infineat,
5454
CasioStyleG7710,
55+
CasioStyleG7710Weather
5556
};
5657

5758
template <Apps>

‎src/displayapp/apps/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ else()
2727
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Terminal")
2828
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Infineat")
2929
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::CasioStyleG7710")
30+
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::CasioStyleG7710Weather")
3031
set(WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}" CACHE STRING "List of watch faces to build into the firmware")
3132
endif()
3233

‎src/displayapp/screens/WatchFaceCasioStyleG7710Weather.cpp

+369
Large diffs are not rendered by default.

‎src/displayapp/screens/WatchFaceCasioStyleG7710Weather.h

+133
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
#pragma once
2+
3+
#include <displayapp/screens/BatteryIcon.h>
4+
#include <lvgl/src/lv_core/lv_obj.h>
5+
#include <chrono>
6+
#include <cstdint>
7+
#include <memory>
8+
#include <displayapp/Controllers.h>
9+
#include "displayapp/screens/Screen.h"
10+
#include "components/datetime/DateTimeController.h"
11+
#include "components/ble/BleController.h"
12+
#include "components/ble/SimpleWeatherService.h"
13+
#include "utility/DirtyValue.h"
14+
#include "displayapp/apps/Apps.h"
15+
16+
namespace Pinetime {
17+
namespace Controllers {
18+
class Settings;
19+
class Battery;
20+
class Ble;
21+
class NotificationManager;
22+
class HeartRateController;
23+
class MotionController;
24+
}
25+
26+
namespace Applications {
27+
namespace Screens {
28+
29+
class WatchFaceCasioStyleG7710Weather : public Screen {
30+
public:
31+
WatchFaceCasioStyleG7710Weather(Controllers::DateTime& dateTimeController,
32+
const Controllers::Battery& batteryController,
33+
const Controllers::Ble& bleController,
34+
Controllers::NotificationManager& notificatioManager,
35+
Controllers::Settings& settingsController,
36+
Controllers::HeartRateController& heartRateController,
37+
Controllers::MotionController& motionController,
38+
Controllers::FS& filesystem,
39+
Controllers::SimpleWeatherService& weather);
40+
~WatchFaceCasioStyleG7710Weather() override;
41+
42+
void Refresh() override;
43+
44+
static bool IsAvailable(Pinetime::Controllers::FS& filesystem);
45+
46+
private:
47+
Utility::DirtyValue<uint8_t> batteryPercentRemaining {};
48+
Utility::DirtyValue<bool> powerPresent {};
49+
Utility::DirtyValue<bool> bleState {};
50+
Utility::DirtyValue<bool> bleRadioEnabled {};
51+
Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::minutes>> currentDateTime {};
52+
Utility::DirtyValue<uint32_t> stepCount {};
53+
Utility::DirtyValue<uint8_t> heartbeat {};
54+
Utility::DirtyValue<bool> heartbeatRunning {};
55+
Utility::DirtyValue<bool> notificationState {};
56+
Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::days>> currentDate;
57+
Utility::DirtyValue<std::optional<Pinetime::Controllers::SimpleWeatherService::CurrentWeather>> currentWeather {};
58+
59+
lv_point_t line_icons_points[3] {{0, 5}, {117, 5}, {122, 0}};
60+
lv_point_t line_day_of_week_number_points[4] {{0, 0}, {100, 0}, {95, 95}, {0, 95}};
61+
lv_point_t line_day_of_year_points[3] {{0, 5}, {130, 5}, {135, 0}};
62+
lv_point_t line_date_points[3] {{0, 5}, {135, 5}, {140, 0}};
63+
lv_point_t line_time_points[3] {{0, 0}, {230, 0}, {235, 5}};
64+
65+
lv_color_t color_text = lv_color_hex(0x98B69A);
66+
67+
lv_style_t style_line;
68+
lv_style_t style_border;
69+
70+
lv_obj_t* label_time;
71+
lv_obj_t* line_time;
72+
lv_obj_t* label_time_ampm;
73+
lv_obj_t* label_date;
74+
lv_obj_t* line_date;
75+
lv_obj_t* label_day_of_week;
76+
lv_obj_t* label_week_number;
77+
lv_obj_t* line_day_of_week_number;
78+
lv_obj_t* label_day_of_year;
79+
lv_obj_t* line_day_of_year;
80+
lv_obj_t* backgroundLabel;
81+
lv_obj_t* bleIcon;
82+
lv_obj_t* batteryPlug;
83+
lv_obj_t* label_battery_value;
84+
lv_obj_t* heartbeatIcon;
85+
lv_obj_t* heartbeatValue;
86+
lv_obj_t* stepIcon;
87+
lv_obj_t* stepValue;
88+
lv_obj_t* notificationIcon;
89+
lv_obj_t* line_icons;
90+
lv_obj_t* weatherIcon;
91+
lv_obj_t* label_temperature;
92+
93+
BatteryIcon batteryIcon;
94+
95+
Controllers::DateTime& dateTimeController;
96+
const Controllers::Battery& batteryController;
97+
const Controllers::Ble& bleController;
98+
Controllers::NotificationManager& notificatioManager;
99+
Controllers::Settings& settingsController;
100+
Controllers::HeartRateController& heartRateController;
101+
Controllers::MotionController& motionController;
102+
Controllers::SimpleWeatherService& weatherService;
103+
104+
lv_task_t* taskRefresh;
105+
lv_font_t* font_dot40 = nullptr;
106+
lv_font_t* font_segment40 = nullptr;
107+
lv_font_t* font_segment115 = nullptr;
108+
};
109+
}
110+
111+
template <>
112+
struct WatchFaceTraits<WatchFace::CasioStyleG7710Weather> {
113+
static constexpr WatchFace watchFace = WatchFace::CasioStyleG7710Weather;
114+
static constexpr const char* name = "Casio weather";
115+
116+
static Screens::Screen* Create(AppControllers& controllers) {
117+
return new Screens::WatchFaceCasioStyleG7710Weather(controllers.dateTimeController,
118+
controllers.batteryController,
119+
controllers.bleController,
120+
controllers.notificationManager,
121+
controllers.settingsController,
122+
controllers.heartRateController,
123+
controllers.motionController,
124+
controllers.filesystem,
125+
*controllers.weatherController);
126+
};
127+
128+
static bool IsAvailable(Pinetime::Controllers::FS& filesystem) {
129+
return Screens::WatchFaceCasioStyleG7710Weather::IsAvailable(filesystem);
130+
}
131+
};
132+
}
133+
}

‎src/displayapp/screens/settings/SettingWatchFace.h

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "displayapp/screens/CheckboxList.h"
1212
#include "displayapp/screens/WatchFaceInfineat.h"
1313
#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
14+
#include "displayapp/screens/WatchFaceCasioStyleG7710Weather.h"
1415

1516
namespace Pinetime {
1617

0 commit comments

Comments
 (0)