CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into infineat-external-resources

Browse Source 
# Conflicts:
#	src/displayapp/screens/Symbols.h
#	src/displayapp/screens/settings/SettingWatchFace.cpp
#	src/displayapp/screens/settings/SettingWatchFace.h
This commit is contained in:
Jean-François Milants
2022-09-11 14:59:49 +02:00
parent 18cff286c7 c9a5c3fa5c
commit ada2c09581
160 changed files with 3250 additions and 46018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/settings/Settings.h
View File

@@ -9,7 +9,7 @@ namespace Pinetime {
class Settings {
public:
enum class ClockType : uint8_t { H24, H12 };
enum class Notification : uint8_t { ON, OFF };
enum class Notification : uint8_t { On, Off, Sleep };
enum class ChimesOption : uint8_t { None, Hours, HalfHours };
enum class WakeUpMode : uint8_t {
SingleTap = 0,
@@ -251,7 +251,7 @@ namespace Pinetime {
uint32_t screenTimeOut = 15000;
ClockType clockType = ClockType::H24;
Notification notificationStatus = Notification::ON;
Notification notificationStatus = Notification::On;
uint8_t clockFace = 0;
ChimesOption chimesOption = ChimesOption::None;