pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 09:42:35 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

it works.... is pressed was not working properly

Browse Source
This commit is contained in:
nasimovy 2025-04-20 13:13:26 +00:00
parent 71bc0098e9
commit ffa5476be3
1 changed files with 62 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
src/input/TouchScreenCST226SE.cpp
View File

@ -35,6 +35,7 @@ void TouchScreenCST226SE::init()
attachInterrupt( attachInterrupt(
TOUCH_IRQ, []() { isPressed = true; }, FALLING); TOUCH_IRQ, []() { isPressed = true; }, FALLING);
} }
touch.setMirrorXY(false, true);
LOG_DEBUG("CST226SE init OK at address 0x%02X", addr); LOG_DEBUG("CST226SE init OK at address 0x%02X", addr);
return; return;
} }
@ -45,102 +46,83 @@ void TouchScreenCST226SE::init()
bool TouchScreenCST226SE::getTouch(int16_t &x, int16_t &y) bool TouchScreenCST226SE::getTouch(int16_t &x, int16_t &y)
{ {
if (!touch.isPressed()) {
return false;
}
int16_t x_array[1], y_array[1]; int16_t x_array[1], y_array[1];
uint8_t touched = touch.getPoint(x_array, y_array, 1); uint8_t touched = touch.getPoint(x_array, y_array, 1);
if (touched > 0) { if (touched > 0) {
x = x_array[0]; x = x_array[0];
y = y_array[0]; y = y_array[0];
LOG_DEBUG("TouchScreen filtered %dx %dy", x, y); LOG_DEBUG("TouchScreen touch %dx %dy", x, y);
return true;
}
// bool pressed = false;
// if (TOUCH_IRQ == -1) { // Check bounds
// pressed = touch.isPressed(); if (x < 0 || x >= TFT_WIDTH || y < 0 || y >= TFT_HEIGHT) {
// } else { LOG_DEBUG("Touch ignored - Out of bounds");
// if (!isPressed)
// return false;
// isPressed = false;
// pressed = touch.isPressed();
// }
// if (pressed) {
// int16_t x_array[1], y_array[1];
// uint8_t touched = touch.getPoint(x_array, y_array, 1);
// if (touched > 0) {
// int16_t tx = x_array[0];
// int16_t ty = y_array[0];
// LOG_DEBUG("TouchScreen touched %dx %dy", tx, ty);
// if (tx > (TFT_WIDTH) || tx < 0 || ty > (TFT_HEIGHT) || ty < 0) {
// LOG_DEBUG("touch ignored");
// return false;
// }
// x = tx;
// y = ty;
// LOG_DEBUG("TouchScreen filtered %dx %dy", x, y);
// return true;
// }
// }
return false; return false;
}
return true; // Valid touch detected
}
return false; // No valid touch data
} }
bool TouchScreenCST226SE::forwardGetTouch(int16_t *x, int16_t *y) bool TouchScreenCST226SE::forwardGetTouch(int16_t *x, int16_t *y)
{ {
if (instance) { // if (instance) {
return instance->getTouch(*x, *y); // bool result = instance->getTouch(*x, *y);
LOG_DEBUG("TouchScreen parsed %dx %dy", x, y); // if (result) {
} else { // LOG_DEBUG("TouchScreen parsed %dx %dy", *x, *y);
return false; // }
} // return result;
// } else {
return false; // Instance not initialized
// }
} }
void TouchScreenCST226SE::onEvent(const TouchEvent &event) void TouchScreenCST226SE::onEvent(const TouchEvent &event)
{ {
InputEvent e; // InputEvent e;
e.source = event.source; // e.source = event.source;
e.touchX = event.x; // e.touchX = event.x;
e.touchY = event.y; // e.touchY = event.y;
switch (event.touchEvent) { // switch (event.touchEvent) {
case TOUCH_ACTION_LEFT: { // case TOUCH_ACTION_LEFT: {
e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT); // e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT);
break; // break;
} // }
case TOUCH_ACTION_RIGHT: { // case TOUCH_ACTION_RIGHT: {
e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT); // e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT);
break; // break;
} // }
case TOUCH_ACTION_UP: { // case TOUCH_ACTION_UP: {
e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP); // e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP);
break; // break;
} // }
case TOUCH_ACTION_DOWN: { // case TOUCH_ACTION_DOWN: {
e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN); // e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN);
break; // break;
} // }
case TOUCH_ACTION_DOUBLE_TAP: { // case TOUCH_ACTION_DOUBLE_TAP: {
e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT); // e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT);
break; // break;
} // }
case TOUCH_ACTION_LONG_PRESS: { // case TOUCH_ACTION_LONG_PRESS: {
e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL); // e.inputEvent = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL);
break; // break;
} // }
case TOUCH_ACTION_TAP: { // case TOUCH_ACTION_TAP: {
if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) { // if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) {
externalNotificationModule->stopNow(); // externalNotificationModule->stopNow();
} else { // } else {
powerFSM.trigger(EVENT_INPUT); // powerFSM.trigger(EVENT_INPUT);
} // }
break; // break;
} // }
default: // default:
return; return;
} // }
this->notifyObservers(&e); // this->notifyObservers(&e);
} }
#endif #endif