gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2025-12-09 14:20:57 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add Join WiFi for touch hardware

Browse Source
This commit is contained in:
Just Call Me Koko
2025-06-03 23:13:11 -04:00
parent 75e3e71453
commit 51eddd5b8f
7 changed files with 431 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
esp32_marauder/Display.cpp
View File

@@ -11,7 +11,7 @@ Display::Display()
{
}
int8_t Display::menuButton(uint16_t *x, uint16_t *y, bool pressed) {
int8_t Display::menuButton(uint16_t *x, uint16_t *y, bool pressed, bool check_hold) {
#ifdef HAS_ILI9341
for (uint8_t b = BUTTON_ARRAY_LEN; b < BUTTON_ARRAY_LEN + 3; b++) {
if (pressed && this->key[b].contains(*x, *y)) {
@@ -22,8 +22,15 @@ int8_t Display::menuButton(uint16_t *x, uint16_t *y, bool pressed) {
}
for (uint8_t b = BUTTON_ARRAY_LEN; b < BUTTON_ARRAY_LEN + 3; b++) {
if ((this->key[b].justReleased()) && (!pressed)) {
return b - BUTTON_ARRAY_LEN;
if (!check_hold) {
if ((this->key[b].justReleased()) && (!pressed)) {
return b - BUTTON_ARRAY_LEN;
}
}
else {
if ((this->key[b].isPressed())) {
return b - BUTTON_ARRAY_LEN;
}
}
}
@@ -80,6 +87,28 @@ uint8_t Display::updateTouch(uint16_t *x, uint16_t *y, uint16_t threshold) {
return 0;
}
bool Display::isTouchHeld(uint16_t threshold) {
static unsigned long touchStartTime = 0;
static bool touchHeld = false;
uint16_t x, y;
if (this->updateTouch(&x, &y, threshold)) {
// Touch detected
if (touchStartTime == 0) {
touchStartTime = millis(); // First touch timestamp
} else if (!touchHeld && millis() - touchStartTime >= 1000) {
touchHeld = true; // Held for at least 1000ms
return true;
}
} else {
// Touch released
touchStartTime = 0;
touchHeld = false;
}
return false;
}
// Function to prepare the display and the menus
void Display::RunSetup()
{