From 96961709f3a659fd89ccbb8a13813ed9f3c586eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaquim=20Jos=C3=A9=20Almeida=20Pereira?= Date: Mon, 5 Apr 2021 11:01:44 +0100 Subject: [PATCH] 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(-) 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();