rei-forks
/
InfiniTime
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert new data validity check in CST816S that were added in 1.7.0.

This commit is contained in:
Jean-François Milants 2021-11-14 14:11:19 +01:00
parent a57fda6ba4
commit cbcae2ec54
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.10)
project(pinetime VERSION 1.7.0 LANGUAGES C CXX ASM) project(pinetime VERSION 1.7.99 LANGUAGES C CXX ASM)
set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD 99)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)

4
src/drivers/Cst816s.cpp
View File

@ -32,6 +32,7 @@ bool Cst816S::Init() {
twiMaster.Read(twiAddress, 0xa7, &dummy, 1); twiMaster.Read(twiAddress, 0xa7, &dummy, 1);
vTaskDelay(5); vTaskDelay(5);
/*
static constexpr uint8_t maxRetries = 3; static constexpr uint8_t maxRetries = 3;
bool isDeviceOk; bool isDeviceOk;
uint8_t retries = 0; uint8_t retries = 0;
@ -43,6 +44,7 @@ bool Cst816S::Init() {
if (!isDeviceOk) { if (!isDeviceOk) {
return false; return false;
} }
*/
/* /*
[2] EnConLR - Continuous operation can slide around [2] EnConLR - Continuous operation can slide around
@ -86,6 +88,7 @@ Cst816S::TouchInfos Cst816S::GetTouchInfo() {
Gestures gesture = static_cast<Gestures>(touchData[gestureIndex]); Gestures gesture = static_cast<Gestures>(touchData[gestureIndex]);
// Validity check // Validity check
/*
if(x >= maxX || y >= maxY || if(x >= maxX || y >= maxY ||
(gesture != Gestures::None && (gesture != Gestures::None &&
gesture != Gestures::SlideDown && gesture != Gestures::SlideDown &&
@ -98,6 +101,7 @@ Cst816S::TouchInfos Cst816S::GetTouchInfo() {
info.isValid = false; info.isValid = false;
return info; return info;
} }
*/
info.x = x; info.x = x;
info.y = y; info.y = y;