Merge branch 'develop' of github.com:JF002/Pinetime into develop

# Conflicts:
#	src/main.cpp
#	src/systemtask/SystemTask.h

2 files changed, 46 insertions, 0 deletions

diff --git a/src/components/settings/Settings.cpp b/src/components/settings/Settings.cpp
new file mode 100644
index 0000000..0c6cf61
--- /dev/null
+++ b/src/components/settings/Settings.cpp
@@ -0,0 +1,16 @@
+#include "Settings.h"
+
+using namespace Pinetime::Controllers;
+
+
+// TODO (team): 
+// Read and write the settings to Flash
+//
+void Settings::Init() {
+    // default Clock face
+    clockFace = 0;
+
+    clockType = ClockType::H24;
+
+}
+
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
new file mode 100644
index 0000000..fa67f35
--- /dev/null
+++ b/src/components/settings/Settings.h
@@ -0,0 +1,30 @@
+#pragma once
+#include <cstdint>
+
+namespace Pinetime {
+  namespace Controllers {
+    class Settings {
+      public:
+        enum class ClockType {H24, H12};
+
+        void Init();
+
+        void SetClockFace( uint8_t face ) { clockFace = face; };
+        uint8_t GetClockFace() { return clockFace; };
+
+        void SetAppMenu( uint8_t menu ) { appMenu = menu; };
+        uint8_t GetAppMenu() { return appMenu; };
+
+        void SetClockType( ClockType clocktype ) { clockType = clocktype; };
+        ClockType GetClockType() { return clockType; };
+
+
+      private:
+        uint8_t clockFace = 0;
+        uint8_t appMenu = 0;
+
+        ClockType clockType = ClockType::H24;
+
+    };
+  }
+}
\ No newline at end of file