|
|
|
@ -18,38 +18,37 @@ Pinetime::Drivers::Cst816S::Gestures TouchHandler::GestureGet() {
|
|
|
|
|
return returnGesture;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void TouchHandler::Start() {
|
|
|
|
|
if (pdPASS != xTaskCreate(TouchHandler::Process, "Touch", 100, this, 0, &taskHandle)) {
|
|
|
|
|
APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void TouchHandler::Process(void* instance) {
|
|
|
|
|
auto* app = static_cast<TouchHandler*>(instance);
|
|
|
|
|
app->Work();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void TouchHandler::Work() {
|
|
|
|
|
bool slideReleased = true;
|
|
|
|
|
while (true) {
|
|
|
|
|
vTaskSuspend(taskHandle);
|
|
|
|
|
|
|
|
|
|
bool TouchHandler::GetNewTouchInfo() {
|
|
|
|
|
info = touchPanel.GetTouchInfo();
|
|
|
|
|
|
|
|
|
|
if (info.isValid) {
|
|
|
|
|
if (!info.isValid) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (info.gesture != Pinetime::Drivers::Cst816S::Gestures::None) {
|
|
|
|
|
if (slideReleased) {
|
|
|
|
|
if (info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideDown ||
|
|
|
|
|
info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideLeft ||
|
|
|
|
|
info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideUp ||
|
|
|
|
|
info.gesture == Pinetime::Drivers::Cst816S::Gestures::SlideRight) {
|
|
|
|
|
if (info.touching) {
|
|
|
|
|
gesture = info.gesture;
|
|
|
|
|
slideReleased = false;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
gesture = info.gesture;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!systemTask->IsSleeping()) {
|
|
|
|
|
if (!info.touching) {
|
|
|
|
|
slideReleased = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void TouchHandler::UpdateLvglTouchPoint() {
|
|
|
|
|
if (info.touching) {
|
|
|
|
|
if (!isCancelled) {
|
|
|
|
|
lvgl.SetNewTouchPoint(info.x, info.y, true);
|
|
|
|
@ -61,18 +60,5 @@ void TouchHandler::Work() {
|
|
|
|
|
} else {
|
|
|
|
|
lvgl.SetNewTouchPoint(info.x, info.y, false);
|
|
|
|
|
}
|
|
|
|
|
slideReleased = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
systemTask->OnTouchEvent();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void TouchHandler::Register(Pinetime::System::SystemTask* systemTask) {
|
|
|
|
|
this->systemTask = systemTask;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void TouchHandler::WakeUp() {
|
|
|
|
|
vTaskResume(taskHandle);
|
|
|
|
|
}
|
|
|
|
|