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

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

1 files changed, 16 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;
+
+}
+