will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

array in SettingWakeUp wrong size

Browse Source
This commit is contained in:
Joaquim José Almeida Pereira 2021-04-05 11:01:44 +01:00
parent 7e2db806c3
commit 96961709f3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/displayapp/screens/settings/SettingWakeUp.h
View File

@ -22,7 +22,7 @@ namespace Pinetime {
Controllers::Settings& settingsController; Controllers::Settings& settingsController;
uint8_t optionsTotal; uint8_t optionsTotal;
lv_obj_t * cbOption[3]; lv_obj_t * cbOption[4];
}; };
} }

2
src/drivers/TwiMaster.cpp
View File

@ -63,8 +63,8 @@ void TwiMaster::Init() {
TwiMaster::ErrorCodes TwiMaster::Read(uint8_t deviceAddress, uint8_t registerAddress, uint8_t *data, size_t size) { 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 // this is causing an error when came from sleep
//
//xSemaphoreTake(mutex, portMAX_DELAY); //xSemaphoreTake(mutex, portMAX_DELAY);
auto ret = ReadWithRetry(deviceAddress, registerAddress, data, size); auto ret = ReadWithRetry(deviceAddress, registerAddress, data, size);
//xSemaphoreGive(mutex); //xSemaphoreGive(mutex);

2
src/systemtask/SystemTask.cpp
View File

@ -280,7 +280,7 @@ void SystemTask::OnTouchEvent() {
if( settingsController.getWakeUpMode() == Pinetime::Controllers::Settings::WakeUpMode::SingleTap ) { if( settingsController.getWakeUpMode() == Pinetime::Controllers::Settings::WakeUpMode::SingleTap ) {
GoToRunning(); GoToRunning();
} else if( settingsController.getWakeUpMode() == Pinetime::Controllers::Settings::WakeUpMode::DoubleTap ) { } else if( settingsController.getWakeUpMode() == Pinetime::Controllers::Settings::WakeUpMode::DoubleTap ) {
// error
auto info = touchPanel.GetTouchInfo(); auto info = touchPanel.GetTouchInfo();
if( info.isTouch and info.gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap ) { if( info.isTouch and info.gesture == Pinetime::Drivers::Cst816S::Gestures::DoubleTap ) {
GoToRunning(); GoToRunning();