scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime into mruss77-statusBarTimeFormat

Browse source 
# Conflicts:
#	src/components/datetime/DateTimeController.cpp
This commit is contained in:
Jean-François Milants 2022-02-13 11:23:05 +01:00
commit 87d882b151
6 changed files with 38 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/datetime/DateTimeController.h
View file

@ -2,6 +2,8 @@
#include <cstdint>
#include <chrono>
#include <string>
#include "components/settings/Settings.h"
namespace Pinetime {
namespace System {
@ -10,6 +12,7 @@ namespace Pinetime {
namespace Controllers {
class DateTime {
public:
DateTime(Controllers::Settings& settingsController);
enum class Days : uint8_t { Unknown, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday };
enum class Months : uint8_t {
Unknown,
@ -71,6 +74,7 @@ namespace Pinetime {
void Register(System::SystemTask* systemTask);
void SetCurrentTime(std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> t);
std::string FormattedTime();
private:
uint16_t year = 0;
@ -89,6 +93,7 @@ namespace Pinetime {
bool isHourAlreadyNotified = true;
bool isHalfHourAlreadyNotified = true;
System::SystemTask* systemTask = nullptr;
Controllers::Settings& settingsController;
};
}
}