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

switch gravel face to have seconds around outside

Browse Source
This commit is contained in:
Josh 2024-05-14 20:11:37 -04:00
commit 833200d2f2
6 changed files with 386 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/Flashing Your Watch with an ESP32.md Normal file
View File

@ -0,0 +1,12 @@
# Flashing your watch with an ESP
Here is a link about how to access and wire an SWD to the pinetime.
- https://pine64.org/documentation/PineTime/Further_information/Devkit_wiring
Here is a link that tells you how to setup the esp32 as a SWD.
- https://hackaday.com/2021/07/01/esp3F2-turned-handy-swd-flasher-for-nrf52-chips/
- When setting up WiFi got to http://192.168.4.1/0wifi to set the WiFi password and not crash the esp. If you go to the default http://192.168.4.1/wifi then the esp will often crash due to a watchdog timeout.
Here is the link to the information on what files to flash to your pinetime.
- https://gitea.locker98.com/josh/InfiniTime/src/branch/v14/doc/SWD.md

1
src/CMakeLists.txt
View File

@ -428,6 +428,7 @@ list(APPEND SOURCE_FILES
## Watch faces
displayapp/screens/WatchFaceAnalog.cpp
displayapp/screens/WatchFaceDigital.cpp
displayapp/screens/WatchFaceBinary.cpp
displayapp/screens/WatchFaceInfineat.cpp
displayapp/screens/WatchFaceTerminal.cpp
displayapp/screens/WatchFacePineTimeStyle.cpp

1
src/displayapp/apps/Apps.h.in
View File

@ -53,6 +53,7 @@ namespace Pinetime {
enum class WatchFace : uint8_t {
Digital,
Analog,
Binary,
PineTimeStyle,
Terminal,
Infineat,

1
src/displayapp/apps/CMakeLists.txt
View File

@ -26,6 +26,7 @@ if(DEFINED ENABLE_WATCHFACES)
else()
set(DEFAULT_WATCHFACE_TYPES "WatchFace::Digital")
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Analog")
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Binary")
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::PineTimeStyle")
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Terminal")
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Infineat")

283
src/displayapp/screens/WatchFaceBinary.cpp Normal file
View File

@ -0,0 +1,283 @@
#include "displayapp/screens/WatchFaceBinary.h"
#include <lvgl/lvgl.h>
#include <cstdio>
#include "displayapp/screens/NotificationIcon.h"
#include "displayapp/screens/Symbols.h"
#include "components/battery/BatteryController.h"
#include "components/ble/BleController.h"
#include "components/ble/NotificationManager.h"
#include "components/heartrate/HeartRateController.h"
#include "components/motion/MotionController.h"
#include "components/settings/Settings.h"
using namespace Pinetime::Applications::Screens;
WatchFaceBinary::WatchFaceBinary(Controllers::DateTime& dateTimeController,
const Controllers::Battery& batteryController,
const Controllers::Ble& bleController,
Controllers::NotificationManager& notificationManager,
Controllers::Settings& settingsController,
Controllers::HeartRateController& heartRateController,
Controllers::MotionController& motionController)
: currentDateTime {{}},
dateTimeController {dateTimeController},
notificationManager {notificationManager},
settingsController {settingsController},
heartRateController {heartRateController},
motionController {motionController},
statusIcons(batteryController, bleController) {
statusIcons.Create();
notificationIcon = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_LIME);
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(false));
lv_obj_align(notificationIcon, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 0);
lableDate = lv_label_create(lv_scr_act(), nullptr);
lv_obj_align(lableDate, lv_scr_act(), LV_ALIGN_CENTER, 0, 60);
lv_obj_set_style_local_text_color(lableDate, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
constexpr lv_coord_t pointSize = 32;
constexpr lv_coord_t widthSpacer = 8;
auto offsetX = (lv_coord_t) ((LV_HOR_RES - ((pointSize * 6) + 2 * widthSpacer)) / 5);
#if BINARY_SECONDS_ENABLED
constexpr lv_coord_t hourY = 32;
constexpr lv_coord_t offsetY = pointSize * 1.25;
#else
constexpr lv_coord_t hourY = 48;
constexpr lv_coord_t offsetY = pointSize * 1.5;
#endif
constexpr lv_coord_t minuteY = hourY + offsetY;
#if BINARY_SECONDS_ENABLED
constexpr lv_coord_t secondY = minuteY + offsetY;
#endif
constexpr lv_coord_t tflOffsetX = 4;
constexpr lv_coord_t tflHeight = (pointSize - tflOffsetX) / 2;
constexpr lv_coord_t tflOffsetY = -4;
auto labelAMpmX = (lv_coord_t) (widthSpacer + tflOffsetX + (pointSize + offsetX) * 5);
constexpr lv_coord_t labelAMy = hourY + tflOffsetY;
for (uint8_t i = 0; i < 6; i++) {
// Hours
if (5 > i) {
hourPoints[i] = lv_obj_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_bg_color(hourPoints[i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, BINARY_OFF_COLOR);
lv_obj_set_style_local_radius(hourPoints[i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
lv_obj_set_size(hourPoints[i], pointSize, pointSize);
lv_obj_set_pos(hourPoints[i], (lv_coord_t) (widthSpacer + (pointSize + offsetX) * i), hourY);
}
// Minutes
minutePoints[i] = lv_obj_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_bg_color(minutePoints[i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, BINARY_OFF_COLOR);
lv_obj_set_style_local_radius(minutePoints[i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
lv_obj_set_size(minutePoints[i], pointSize, pointSize);
lv_obj_set_pos(minutePoints[i], (lv_coord_t) (widthSpacer + (pointSize + offsetX) * i), minuteY);
// Seconds
#if BINARY_SECONDS_ENABLED
secondPoints[i] = lv_obj_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_bg_color(secondPoints[i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, BINARY_OFF_COLOR);
lv_obj_set_style_local_radius(secondPoints[i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
lv_obj_set_size(secondPoints[i], pointSize, pointSize);
lv_obj_set_pos(secondPoints[i], (lv_coord_t) (widthSpacer + (pointSize + offsetX) * i), secondY);
#endif
}
labelAM = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text_static(labelAM, "AM");
lv_obj_set_pos(labelAM, labelAMpmX, labelAMy);
lv_obj_set_style_local_text_color(labelAM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, BINARY_OFF_COLOR);
lv_obj_set_size(labelAM, pointSize, tflHeight);
labelPM = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text_static(labelPM, "PM");
lv_obj_set_pos(labelPM, labelAMpmX, labelAMy + tflHeight + 1);
lv_obj_set_style_local_text_color(labelPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, BINARY_OFF_COLOR);
lv_obj_set_size(labelPM, pointSize, tflHeight);
lastClockType = settingsController.GetClockType();
is12HourModeSet = (settingsController.GetClockType() == Controllers::Settings::ClockType::H12);
lv_obj_set_hidden(hourPoints[4], is12HourModeSet);
lv_obj_set_hidden(labelAM, !is12HourModeSet);
lv_obj_set_hidden(labelPM, !is12HourModeSet);
heartbeatIcon = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text_static(heartbeatIcon, Symbols::heartBeat);
lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xCE1B1B));
lv_obj_align(heartbeatIcon, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
heartbeatValue = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(heartbeatValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xCE1B1B));
lv_label_set_text_static(heartbeatValue, "");
lv_obj_align(heartbeatValue, heartbeatIcon, LV_ALIGN_OUT_RIGHT_MID, 5, 0);
stepValue = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FFE7));
lv_label_set_text_static(stepValue, "0");
lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
stepIcon = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(stepIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FFE7));
lv_label_set_text_static(stepIcon, Symbols::shoe);
lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
Refresh();
}
WatchFaceBinary::~WatchFaceBinary() {
lv_task_del(taskRefresh);
lv_obj_clean(lv_scr_act());
}
void WatchFaceBinary::Refresh() {
statusIcons.Update();
notificationState = notificationManager.AreNewNotificationsAvailable();
if (notificationState.IsUpdated()) {
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
}
currentDateTime = std::chrono::time_point_cast<std::chrono::seconds>(dateTimeController.CurrentDateTime());
if (currentDateTime.IsUpdated()) {
uint8_t hours = dateTimeController.Hours();
const uint8_t minutes = dateTimeController.Minutes();
#if BINARY_SECONDS_ENABLED
const uint8_t seconds = dateTimeController.Seconds();
#endif
const bool shouldUpdateHours = (displayedHours != hours);
const bool shouldUpdateMinutes = (displayedMinutes != minutes);
const bool clockTypeChanged = (settingsController.GetClockType() != lastClockType);
if ((settingsController.GetClockType() == Controllers::Settings::ClockType::H12) && (shouldUpdateHours || clockTypeChanged)) {
lastClockType = Controllers::Settings::ClockType::H12;
if (!is12HourModeSet) {
is12HourModeSet = true;
}
if ((12 <= hours) && (24 > hours)) {
if (12 != hours) {
hours -= 12;
}
lv_obj_set_style_local_text_color(labelAM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, BINARY_OFF_COLOR);
lv_obj_set_style_local_text_color(labelPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, BINARY_ON_COLOR);
} else {
if (0 == hours) {
hours = 12;
}
lv_obj_set_style_local_text_color(labelAM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, BINARY_ON_COLOR);
lv_obj_set_style_local_text_color(labelPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, BINARY_OFF_COLOR);
}
hours <<= 1;
} else if (is12HourModeSet) {
is12HourModeSet = false;
}
if (shouldUpdateHours) {
displayedHours = hours;
}
if (shouldUpdateMinutes) {
displayedMinutes = minutes;
}
if (clockTypeChanged) {
lv_obj_set_hidden(hourPoints[4], is12HourModeSet);
lv_obj_set_hidden(labelAM, !is12HourModeSet);
lv_obj_set_hidden(labelPM, !is12HourModeSet);
}
if (BINARY_SECONDS_ENABLED || shouldUpdateHours || shouldUpdateMinutes) {
for (uint8_t i = 0; i < 6; i++) {
// Hours
if (shouldUpdateHours && (5 > i)) {
switch (hours >> i & 0b1) {
case 1:
lv_obj_set_style_local_bg_color(hourPoints[4 - i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, BINARY_ON_COLOR);
break;
default:
lv_obj_set_style_local_bg_color(hourPoints[4 - i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, BINARY_OFF_COLOR);
break;
}
}
// Minutes
if (shouldUpdateMinutes) {
switch (minutes >> i & 0b1) {
case 1:
lv_obj_set_style_local_bg_color(minutePoints[5 - i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, BINARY_ON_COLOR);
break;
default:
lv_obj_set_style_local_bg_color(minutePoints[5 - i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, BINARY_OFF_COLOR);
break;
}
}
// Seconds
#if BINARY_SECONDS_ENABLED
switch (seconds >> i & 0b1) {
case 1:
lv_obj_set_style_local_bg_color(secondPoints[5 - i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, BINARY_ON_COLOR);
break;
default:
lv_obj_set_style_local_bg_color(secondPoints[5 - i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, BINARY_OFF_COLOR);
break;
}
#endif
}
}
currentDate = std::chrono::time_point_cast<days>(currentDateTime.Get());
if (currentDate.IsUpdated()) {
const uint16_t year = dateTimeController.Year();
const uint8_t day = dateTimeController.Day();
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
lv_label_set_text_fmt(lableDate,
"%s %d %s %d",
dateTimeController.DayOfWeekShortToString(),
day,
dateTimeController.MonthShortToString(),
year);
} else {
lv_label_set_text_fmt(lableDate,
"%s %s %d %d",
dateTimeController.DayOfWeekShortToString(),
dateTimeController.MonthShortToString(),
day,
year);
}
lv_obj_realign(lableDate);
}
}
heartbeat = heartRateController.HeartRate();
heartbeatRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;
if (heartbeat.IsUpdated() || heartbeatRunning.IsUpdated()) {
if (heartbeatRunning.Get()) {
lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xCE1B1B));
lv_label_set_text_fmt(heartbeatValue, "%d", heartbeat.Get());
} else {
lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x1B1B1B));
lv_label_set_text_static(heartbeatValue, "");
}
lv_obj_realign(heartbeatIcon);
lv_obj_realign(heartbeatValue);
}
stepCount = motionController.NbSteps();
if (stepCount.IsUpdated()) {
lv_label_set_text_fmt(stepValue, "%lu", stepCount.Get());
lv_obj_realign(stepValue);
lv_obj_realign(stepIcon);
}
}

88
src/displayapp/screens/WatchFaceBinary.h Normal file
View File

@ -0,0 +1,88 @@
#pragma once
#include <lvgl/src/lv_core/lv_obj.h>
#include <chrono>
#include <cstdint>
#include <memory>
#include "displayapp/screens/Screen.h"
#include "components/datetime/DateTimeController.h"
#include "components/ble/BleController.h"
#include "displayapp/widgets/StatusIcons.h"
#include "utility/DirtyValue.h"
// #define LV_COLOR_MATRIX_GREEN LV_COLOR_MAKE(0x00, 0xC0, 0x16)
#define BINARY_ON_COLOR LV_COLOR_RED
#define BINARY_OFF_COLOR LV_COLOR_GRAY
#define BINARY_SECONDS_ENABLED false
namespace Pinetime {
namespace Controllers {
class Settings;
class Battery;
class Ble;
class NotificationManager;
class HeartRateController;
class MotionController;
}
namespace Applications {
namespace Screens {
class WatchFaceBinary : public Screen {
public:
WatchFaceBinary(Controllers::DateTime& dateTimeController,
const Controllers::Battery& batteryController,
const Controllers::Ble& bleController,
Controllers::NotificationManager& notificationManager,
Controllers::Settings& settingsController,
Controllers::HeartRateController& heartRateController,
Controllers::MotionController& motionController);
~WatchFaceBinary() override;
void Refresh() override;
private:
uint8_t displayedHours = -1;
uint8_t displayedMinutes = -1;
bool is12HourModeSet = false;
Controllers::Settings::ClockType lastClockType;
Utility::DirtyValue<uint8_t> batteryPercentRemaining {};
Utility::DirtyValue<bool> powerPresent {};
Utility::DirtyValue<bool> bleState {};
Utility::DirtyValue<bool> bleRadioEnabled {};
Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::seconds>> currentDateTime {};
Utility::DirtyValue<uint32_t> stepCount {};
Utility::DirtyValue<uint8_t> heartbeat {};
Utility::DirtyValue<bool> heartbeatRunning {};
Utility::DirtyValue<bool> notificationState {};
using days = std::chrono::duration<int32_t, std::ratio<86400>>; // TODO: days is standard in c++20
Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, days>> currentDate;
lv_obj_t* heartbeatIcon;
lv_obj_t* heartbeatValue;
lv_obj_t* stepIcon;
lv_obj_t* stepValue;
lv_obj_t* notificationIcon;
lv_obj_t* lableDate;
lv_obj_t* labelAM;
lv_obj_t* labelPM;
lv_obj_t* hourPoints[5];
lv_obj_t* minutePoints[6];
#if BINARY_SECONDS_ENABLED
lv_obj_t* secondPoints[6];
#endif
Controllers::DateTime& dateTimeController;
Controllers::NotificationManager& notificationManager;
Controllers::Settings& settingsController;
Controllers::HeartRateController& heartRateController;
Controllers::MotionController& motionController;
lv_task_t* taskRefresh;
Widgets::StatusIcons statusIcons;
};
}
}
}