From 1d3742e14f09316a1d795527713eb8f9742f0ffb Mon Sep 17 00:00:00 2001
From: Joaquim <joaquim.org@gmail.com>
Date: Sun, 4 Apr 2021 03:08:51 +0100
Subject: Big UI and navigation Rewrite new navigation add some color to the
 apps redesign menus new settings menu new quick settings code clean up size
 reduction by converting navigation images to font and more...

---
 src/displayapp/screens/settings/SettingWakeUp.h | 30 +++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/displayapp/screens/settings/SettingWakeUp.h

(limited to 'src/displayapp/screens/settings/SettingWakeUp.h')

diff --git a/src/displayapp/screens/settings/SettingWakeUp.h b/src/displayapp/screens/settings/SettingWakeUp.h
new file mode 100644
index 00000000..99ddd363
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingWakeUp.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "components/settings/Settings.h"
+#include "displayapp/screens/Screen.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingWakeUp : public Screen{
+        public:
+          SettingWakeUp(DisplayApp* app, Pinetime::Controllers::Settings &settingsController);
+          ~SettingWakeUp() override;
+
+          bool Refresh() override;
+          void UpdateSelected(lv_obj_t *object, lv_event_t event);
+         
+        private:          
+
+          Controllers::Settings& settingsController;
+          uint8_t optionsTotal;
+          lv_obj_t * cbOption[3];
+          
+      };
+    }
+  }
+}
-- 
cgit v1.2.3-70-g09d2


From 96961709f3a659fd89ccbb8a13813ed9f3c586eb Mon Sep 17 00:00:00 2001
From: Joaquim José Almeida Pereira <joaquim.org@gmail.com>
Date: Mon, 5 Apr 2021 11:01:44 +0100
Subject: array in SettingWakeUp wrong size

---
 src/displayapp/screens/settings/SettingWakeUp.h | 2 +-
 src/drivers/TwiMaster.cpp                       | 2 +-
 src/systemtask/SystemTask.cpp                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/displayapp/screens/settings/SettingWakeUp.h')

diff --git a/src/displayapp/screens/settings/SettingWakeUp.h b/src/displayapp/screens/settings/SettingWakeUp.h
index 99ddd363..86b52837 100644
--- a/src/displayapp/screens/settings/SettingWakeUp.h
+++ b/src/displayapp/screens/settings/SettingWakeUp.h
@@ -22,7 +22,7 @@ namespace Pinetime {
 
           Controllers::Settings& settingsController;
           uint8_t optionsTotal;
-          lv_obj_t * cbOption[3];
+          lv_obj_t * cbOption[4];
           
       };
     }
diff --git a/src/drivers/TwiMaster.cpp b/src/drivers/TwiMaster.cpp
index d5898b5e..072dd5fc 100644
--- a/src/drivers/TwiMaster.cpp
+++ b/src/drivers/TwiMaster.cpp
@@ -63,8 +63,8 @@ void TwiMaster::Init() {
 
 TwiMaster::ErrorCodes TwiMaster::Read(uint8_t deviceAddress, uint8_t registerAddress, uint8_t *data, size_t size) {
   // this is causing an error when came from sleep
+  // 
   //xSemaphoreTake(mutex, portMAX_DELAY);  
-  
   auto ret = ReadWithRetry(deviceAddress, registerAddress, data, size);
   //xSemaphoreGive(mutex);
 
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 2aa071dc..43e6f082 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -280,7 +280,7 @@ void SystemTask::OnTouchEvent() {
     if( settingsController.getWakeUpMode() == Pinetime::Controllers::Settings::WakeUpMode::SingleTap ) {
       GoToRunning();
     } else if( settingsController.getWakeUpMode() == Pinetime::Controllers::Settings::WakeUpMode::DoubleTap ) {
-      // error 
+      
       auto info = touchPanel.GetTouchInfo();
       if( info.isTouch and info.gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap ) {
         GoToRunning();
-- 
cgit v1.2.3-70-g09d2