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

Hahaha double silly

Browse Source
This commit is contained in:
Just Call Me Koko
2025-10-17 10:56:01 -04:00
parent 68085fc6a7
commit 48164bc4ec
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
esp32_marauder/Display.cpp
View File

@@ -110,34 +110,36 @@ bool Display::isTouchHeld(uint16_t threshold) {
} }
void Display::setCalData(bool landscape) { void Display::setCalData(bool landscape) {
if (!landscape) { #ifndef HAS_CYD_TOUCH
#ifdef TFT_SHIELD if (!landscape) {
uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield #ifdef TFT_SHIELD
#elif defined(MARAUDER_CYD_3_5_INCH) uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield
uint16_t calData[5] = { 239, 3560, 262, 3643, 4 }; #elif defined(MARAUDER_CYD_3_5_INCH)
#elif defined(MARAUDER_V8) uint16_t calData[5] = { 239, 3560, 262, 3643, 4 };
uint16_t calData[5] = { 298, 3451, 377, 3509, 4 }; #elif defined(MARAUDER_V8)
#elif defined(TFT_DIY) uint16_t calData[5] = { 298, 3451, 377, 3509, 4 };
uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT #elif defined(TFT_DIY)
#endif uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT
#ifdef HAS_ILI9341 #endif
tft.setTouch(calData); #ifdef HAS_ILI9341
#endif tft.setTouch(calData);
} #endif
else { }
#ifdef TFT_SHIELD else {
uint16_t calData[5] = { 391, 3491, 266, 3505, 7 }; // Landscape TFT Shield #ifdef TFT_SHIELD
#elif defined(MARAUDER_CYD_3_5_INCH) uint16_t calData[5] = { 391, 3491, 266, 3505, 7 }; // Landscape TFT Shield
uint16_t calData[5] = { 272, 3648, 234, 3565, 7 }; #elif defined(MARAUDER_CYD_3_5_INCH)
#elif defined(MARAUDER_V8) uint16_t calData[5] = { 272, 3648, 234, 3565, 7 };
uint16_t calData[5] = { 382, 3492, 293, 3502, 7 }; #elif defined(MARAUDER_V8)
#else if defined(TFT_DIY) uint16_t calData[5] = { 382, 3492, 293, 3502, 7 };
uint16_t calData[5] = { 213, 3469, 320, 3446, 1 }; // Landscape TFT DIY #else if defined(TFT_DIY)
#endif uint16_t calData[5] = { 213, 3469, 320, 3446, 1 }; // Landscape TFT DIY
#ifdef HAS_ILI9341 #endif
tft.setTouch(calData); #ifdef HAS_ILI9341
#endif tft.setTouch(calData);
} #endif
}
#endif
} }
// Function to prepare the display and the menus // Function to prepare the display and the menus