From 81d629bc471dcf926337836d1dd76910d9ff4bfe Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Mon, 15 Jul 2019 01:16:26 +0200
Subject: [PATCH] Robin & Longer3D SPI TFT driver (#14595)
---
Marlin/Configuration.h | 10 +-
.../HAL_STM32F1/u8g_com_stm32duino_fsmc.cpp | 73 +++-
Marlin/src/Marlin.cpp | 8 +
Marlin/src/feature/touch/xpt2046.cpp | 129 +++++++
Marlin/src/feature/touch/xpt2046.h | 43 +++
...8g_dev_tft_320x240_upscale_from_128x64.cpp | 317 ++++++++++++++++--
Marlin/src/lcd/ultralcd.cpp | 26 +-
Marlin/src/lcd/ultralcd.h | 11 +-
Marlin/src/pins/pinsDebug_list.h | 12 +
.../pins/stm32/pins_BIGTREE_SKR_PRO_V1.1.h | 6 +-
Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h | 11 +-
Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h | 40 ++-
Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h | 38 ++-
Marlin/src/pins/stm32/pins_STM3R_MINI.h | 10 +-
config/default/Configuration.h | 10 +-
.../examples/3DFabXYZ/Migbot/Configuration.h | 10 +-
.../AlephObjects/TAZ4/Configuration.h | 10 +-
.../AliExpress/CL-260/Configuration.h | 10 +-
.../AliExpress/UM2pExt/Configuration.h | 10 +-
config/examples/Anet/A2/Configuration.h | 10 +-
config/examples/Anet/A2plus/Configuration.h | 10 +-
config/examples/Anet/A6/Configuration.h | 10 +-
config/examples/Anet/A8/Configuration.h | 10 +-
config/examples/Anet/A8plus/Configuration.h | 10 +-
config/examples/Anet/E16/Configuration.h | 10 +-
config/examples/AnyCubic/i3/Configuration.h | 10 +-
config/examples/ArmEd/Configuration.h | 10 +-
config/examples/Azteeg/X5GT/Configuration.h | 10 +-
.../BIBO/TouchX/cyclops/Configuration.h | 10 +-
.../BIBO/TouchX/default/Configuration.h | 10 +-
config/examples/BQ/Hephestos/Configuration.h | 10 +-
.../examples/BQ/Hephestos_2/Configuration.h | 10 +-
config/examples/BQ/WITBOX/Configuration.h | 10 +-
config/examples/Cartesio/Configuration.h | 10 +-
.../examples/Creality/CR-10/Configuration.h | 10 +-
.../examples/Creality/CR-10S/Configuration.h | 10 +-
.../Creality/CR-10_5S/Configuration.h | 10 +-
.../Creality/CR-10mini/Configuration.h | 10 +-
.../Creality/CR-20 Pro/Configuration.h | 10 +-
.../examples/Creality/CR-20/Configuration.h | 10 +-
config/examples/Creality/CR-8/Configuration.h | 10 +-
.../examples/Creality/Ender-2/Configuration.h | 10 +-
.../examples/Creality/Ender-3/Configuration.h | 10 +-
.../examples/Creality/Ender-4/Configuration.h | 10 +-
.../examples/Creality/Ender-5/Configuration.h | 10 +-
.../Dagoma/Disco Ultimate/Configuration.h | 10 +-
.../Sidewinder X1/Configuration.h | 10 +-
config/examples/Einstart-S/Configuration.h | 10 +-
config/examples/Felix/Configuration.h | 10 +-
config/examples/Felix/DUAL/Configuration.h | 10 +-
.../FlashForge/CreatorPro/Configuration.h | 10 +-
.../FolgerTech/i3-2020/Configuration.h | 10 +-
.../examples/Formbot/Raptor/Configuration.h | 10 +-
.../examples/Formbot/T_Rex_2+/Configuration.h | 10 +-
.../examples/Formbot/T_Rex_3/Configuration.h | 10 +-
config/examples/Fysetc/AIO_II/Configuration.h | 10 +-
.../examples/Fysetc/CHEETAH/Configuration.h | 10 +-
config/examples/Fysetc/F6_13/Configuration.h | 10 +-
config/examples/Geeetech/A10/Configuration.h | 10 +-
config/examples/Geeetech/A10M/Configuration.h | 10 +-
config/examples/Geeetech/A20M/Configuration.h | 10 +-
.../examples/Geeetech/GT2560/Configuration.h | 10 +-
.../Geeetech/I3_Pro_X-GT2560/Configuration.h | 10 +-
.../Geeetech/MeCreator2/Configuration.h | 10 +-
.../Prusa i3 Pro B/bltouch/Configuration.h | 10 +-
.../Prusa i3 Pro B/noprobe/Configuration.h | 10 +-
.../Geeetech/Prusa i3 Pro C/Configuration.h | 10 +-
.../Geeetech/Prusa i3 Pro W/Configuration.h | 10 +-
.../examples/Infitary/i3-M508/Configuration.h | 10 +-
config/examples/JGAurora/A1/Configuration.h | 10 +-
config/examples/JGAurora/A5/Configuration.h | 10 +-
config/examples/JGAurora/A5S/Configuration.h | 10 +-
config/examples/MakerParts/Configuration.h | 10 +-
config/examples/Malyan/M150/Configuration.h | 10 +-
config/examples/Malyan/M200/Configuration.h | 10 +-
.../Micromake/C1/basic/Configuration.h | 10 +-
.../Micromake/C1/enhanced/Configuration.h | 10 +-
config/examples/Mks/Robin/Configuration.h | 10 +-
config/examples/Mks/Sbase/Configuration.h | 10 +-
.../Printrbot/PrintrboardG2/Configuration.h | 10 +-
.../examples/RapideLite/RL200/Configuration.h | 10 +-
.../examples/RepRapPro/Huxley/Configuration.h | 10 +-
.../RepRapWorld/Megatronics/Configuration.h | 10 +-
config/examples/RigidBot/Configuration.h | 10 +-
config/examples/SCARA/Configuration.h | 10 +-
.../STM32/Black_STM32F407VET6/Configuration.h | 10 +-
.../examples/STM32/STM32F10/Configuration.h | 10 +-
config/examples/STM32/STM32F4/Configuration.h | 10 +-
.../STM32/stm32f103ret6/Configuration.h | 10 +-
config/examples/Sanguinololu/Configuration.h | 10 +-
.../Tevo/Tarantula Pro/Configuration.h | 10 +-
config/examples/TheBorg/Configuration.h | 10 +-
config/examples/TinyBoy2/Configuration.h | 10 +-
config/examples/Tronxy/X1/Configuration.h | 10 +-
config/examples/Tronxy/X3A/Configuration.h | 10 +-
config/examples/Tronxy/X5S-2E/Configuration.h | 10 +-
config/examples/Tronxy/X5S/Configuration.h | 10 +-
config/examples/Tronxy/XY100/Configuration.h | 10 +-
.../UltiMachine/Archim1/Configuration.h | 10 +-
.../UltiMachine/Archim2/Configuration.h | 10 +-
config/examples/VORONDesign/Configuration.h | 10 +-
.../examples/Velleman/K8200/Configuration.h | 10 +-
.../examples/Velleman/K8400/Configuration.h | 10 +-
.../Velleman/K8400/Dual-head/Configuration.h | 10 +-
.../examples/WASP/PowerWASP/Configuration.h | 10 +-
.../Wanhao/Duplicator 6/Configuration.h | 10 +-
.../Wanhao/Duplicator i3 Mini/Configuration.h | 10 +-
.../examples/adafruit/ST7565/Configuration.h | 10 +-
.../delta/Anycubic/Kossel/Configuration.h | 10 +-
.../FLSUN/auto_calibrate/Configuration.h | 10 +-
.../delta/FLSUN/kossel/Configuration.h | 10 +-
.../delta/FLSUN/kossel_mini/Configuration.h | 10 +-
.../Geeetech/Rostock 301/Configuration.h | 10 +-
.../delta/Hatchbox_Alpha/Configuration.h | 10 +-
.../examples/delta/MKS/SBASE/Configuration.h | 10 +-
.../delta/Tevo Little Monster/Configuration.h | 10 +-
config/examples/delta/generic/Configuration.h | 10 +-
.../delta/kossel_mini/Configuration.h | 10 +-
.../examples/delta/kossel_pro/Configuration.h | 10 +-
.../examples/delta/kossel_xl/Configuration.h | 10 +-
.../examples/gCreate/gMax1.5+/Configuration.h | 10 +-
config/examples/makibox/Configuration.h | 10 +-
config/examples/tvrrug/Round2/Configuration.h | 10 +-
config/examples/wt150/Configuration.h | 10 +-
124 files changed, 1653 insertions(+), 181 deletions(-)
create mode 100644 Marlin/src/feature/touch/xpt2046.cpp
create mode 100644 Marlin/src/feature/touch/xpt2046.h
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index bcecca1dca..9a25b6ac9a 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/Marlin/src/HAL/HAL_STM32F1/u8g_com_stm32duino_fsmc.cpp b/Marlin/src/HAL/HAL_STM32F1/u8g_com_stm32duino_fsmc.cpp
index 4be4ae4dd4..0bcbe41692 100644
--- a/Marlin/src/HAL/HAL_STM32F1/u8g_com_stm32duino_fsmc.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/u8g_com_stm32duino_fsmc.cpp
@@ -35,9 +35,12 @@
#include "U8glib.h"
#include "libmaple/fsmc.h"
#include "libmaple/gpio.h"
+#include "libmaple/dma.h"
#include "boards.h"
-#define LCD_READ_ID 0x04 /* Read display identification information */
+#ifndef LCD_READ_ID
+ #define LCD_READ_ID 0x04 // Read display identification information (0xD3 on ILI9341)
+#endif
/* Timing configuration */
#define FSMC_ADDRESS_SETUP_TIME 15 // AddressSetupTime
@@ -47,6 +50,10 @@ void LCD_IO_Init(uint8_t cs, uint8_t rs);
void LCD_IO_WriteData(uint16_t RegValue);
void LCD_IO_WriteReg(uint16_t Reg);
uint32_t LCD_IO_ReadData(uint16_t RegValue, uint8_t ReadSize);
+#ifdef LCD_USE_DMA_FSMC
+ void LCD_IO_WriteMultiple(uint16_t data, uint32_t count);
+ void LCD_IO_WriteSequence(uint16_t *data, uint16_t length);
+#endif
static uint8_t msgInitCount = 2; // Ignore all messages until 2nd U8G_COM_MSG_INIT
@@ -59,21 +66,25 @@ uint8_t u8g_com_stm32duino_fsmc_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, voi
static uint8_t isCommand;
switch (msg) {
- case U8G_COM_MSG_STOP:
- break;
+ case U8G_COM_MSG_STOP: break;
case U8G_COM_MSG_INIT:
u8g_SetPIOutput(u8g, U8G_PI_RESET);
+ #ifdef LCD_USE_DMA_FSMC
+ dma_init(FSMC_DMA_DEV);
+ dma_disable(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
+ dma_set_priority(FSMC_DMA_DEV, FSMC_DMA_CHANNEL, DMA_PRIORITY_MEDIUM);
+ #endif
+
LCD_IO_Init(u8g->pin_list[U8G_PI_CS], u8g->pin_list[U8G_PI_A0]);
- u8g_Delay(100);
+ u8g_Delay(50);
- if (arg_ptr != nullptr)
+ if (arg_ptr)
*((uint32_t *)arg_ptr) = LCD_IO_ReadData(LCD_READ_ID, 3);
-
isCommand = 0;
break;
- case U8G_COM_MSG_ADDRESS: // define cmd (arg_val = 0) or data mode (arg_val = 1)
+ case U8G_COM_MSG_ADDRESS: // define cmd (arg_val = 0) or data mode (arg_val = 1)
isCommand = arg_val == 0 ? 1 : 0;
break;
@@ -89,7 +100,6 @@ uint8_t u8g_com_stm32duino_fsmc_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, voi
break;
case U8G_COM_MSG_WRITE_SEQ:
-
for (uint8_t i = 0; i < arg_val; i += 2)
LCD_IO_WriteData(*(uint16_t *)(((uint32_t)arg_ptr) + i));
break;
@@ -107,7 +117,7 @@ __attribute__((always_inline)) __STATIC_INLINE void __DSB(void) {
__ASM volatile ("dsb 0xF":::"memory");
}
-#define FSMC_CS_NE1 PD7
+#define FSMC_CS_NE1 PD7
#ifdef STM32_XL_DENSITY
#define FSMC_CS_NE2 PG9
@@ -257,7 +267,7 @@ void LCD_IO_WriteReg(uint16_t Reg) {
uint32_t LCD_IO_ReadData(uint16_t RegValue, uint8_t ReadSize) {
volatile uint32_t data;
- LCD->REG = (uint16_t)RegValue;
+ LCD->REG = RegValue;
__DSB();
data = LCD->RAM; // dummy read
@@ -267,9 +277,48 @@ uint32_t LCD_IO_ReadData(uint16_t RegValue, uint8_t ReadSize) {
data <<= 8;
data |= (LCD->RAM & 0x00FF);
}
- return (uint32_t)data;
+ return uint32_t(data);
}
-#endif // HAS_GRAPHICAL_LCD
+#if ENABLED(LCD_USE_DMA_FSMC)
+void LCD_IO_WriteMultiple(uint16_t color, uint32_t count) {
+ while (count > 0) {
+ dma_setup_transfer(FSMC_DMA_DEV, FSMC_DMA_CHANNEL, &color, DMA_SIZE_16BITS, &LCD->RAM, DMA_SIZE_16BITS, DMA_MEM_2_MEM);
+ dma_set_num_transfers(FSMC_DMA_DEV, FSMC_DMA_CHANNEL, count > 65535 ? 65535 : count);
+ dma_clear_isr_bits(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
+ dma_enable(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
+
+ while ((dma_get_isr_bits(FSMC_DMA_DEV, FSMC_DMA_CHANNEL) & 0x0A) == 0) {};
+ dma_disable(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
+
+ count = count > 65535 ? count - 65535 : 0;
+ }
+}
+
+void LCD_IO_WriteSequence(uint16_t *data, uint16_t length) {
+ dma_setup_transfer(FSMC_DMA_DEV, FSMC_DMA_CHANNEL, data, DMA_SIZE_16BITS, &LCD->RAM, DMA_SIZE_16BITS, DMA_MEM_2_MEM | DMA_PINC_MODE);
+ dma_set_num_transfers(FSMC_DMA_DEV, FSMC_DMA_CHANNEL, length);
+ dma_clear_isr_bits(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
+ dma_enable(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
+
+ while ((dma_get_isr_bits(FSMC_DMA_DEV, FSMC_DMA_CHANNEL) & 0x0A) == 0) {};
+ dma_disable(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
+}
+
+void LCD_IO_WriteSequence_Async(uint16_t *data, uint16_t length) {
+ dma_setup_transfer(FSMC_DMA_DEV, FSMC_DMA_CHANNEL, data, DMA_SIZE_16BITS, &LCD->RAM, DMA_SIZE_16BITS, DMA_MEM_2_MEM | DMA_PINC_MODE);
+ dma_set_num_transfers(FSMC_DMA_DEV, FSMC_DMA_CHANNEL, length);
+ dma_clear_isr_bits(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
+ dma_enable(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
+}
+
+void LCD_IO_WaitSequence_Async() {
+ while ((dma_get_isr_bits(FSMC_DMA_DEV, FSMC_DMA_CHANNEL) & 0x0A) == 0) {};
+ dma_disable(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
+}
+
+#endif // LCD_USE_DMA_FSMC
+
+#endif // HAS_GRAPHICAL_LCD
#endif // ARDUINO_ARCH_STM32F1 && FSMC_CS_PIN
diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp
index d94fa51ac4..c248e4814b 100644
--- a/Marlin/src/Marlin.cpp
+++ b/Marlin/src/Marlin.cpp
@@ -57,6 +57,10 @@
#include "gcode/parser.h"
#include "gcode/queue.h"
+#if ENABLED(TOUCH_BUTTONS)
+ #include "feature/touch/xpt2046.h"
+#endif
+
#if ENABLED(HOST_ACTION_COMMANDS)
#include "feature/host_actions.h"
#endif
@@ -943,6 +947,10 @@ void setup() {
// This also updates variables in the planner, elsewhere
settings.first_load();
+ #if ENABLED(TOUCH_BUTTONS)
+ touch.init();
+ #endif
+
#if HAS_M206_COMMAND
// Initialize current position based on home_offset
LOOP_XYZ(a) current_position[a] += home_offset[a];
diff --git a/Marlin/src/feature/touch/xpt2046.cpp b/Marlin/src/feature/touch/xpt2046.cpp
new file mode 100644
index 0000000000..d93e996819
--- /dev/null
+++ b/Marlin/src/feature/touch/xpt2046.cpp
@@ -0,0 +1,129 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../inc/MarlinConfigPre.h"
+
+#if ENABLED(TOUCH_BUTTONS)
+
+#include "xpt2046.h"
+#include "../../inc/MarlinConfig.h"
+
+#ifndef TOUCH_INT_PIN
+ #define TOUCH_INT_PIN -1
+#endif
+#ifndef TOUCH_MISO_PIN
+ #define TOUCH_MISO_PIN MISO_PIN
+#endif
+#ifndef TOUCH_MOSI_PIN
+ #define TOUCH_MOSI_PIN MOSI_PIN
+#endif
+#ifndef TOUCH_SCK_PIN
+ #define TOUCH_SCK_PIN SCK_PIN
+#endif
+#ifndef TOUCH_CS_PIN
+ #define TOUCH_CS_PIN CS_PIN
+#endif
+
+XPT2046 touch;
+extern int8_t encoderDiff;
+
+void XPT2046::init(void) {
+ SET_INPUT(TOUCH_INT_PIN); // Pendrive interrupt pin, used as polling in getInTouch
+ SET_INPUT(TOUCH_MISO_PIN);
+ SET_OUTPUT(TOUCH_MOSI_PIN);
+
+ OUT_WRITE(TOUCH_SCK_PIN, 0);
+ OUT_WRITE(TOUCH_CS_PIN, 1);
+
+ // Read once to enable pendrive status pin
+ getInTouch(XPT2046_X);
+}
+
+#include "../../lcd/ultralcd.h" // For EN_C bit mask
+
+uint8_t XPT2046::read_buttons() {
+ int16_t tsoffsets[4] = { 0 };
+
+ static uint32_t timeout = 0;
+ if (PENDING(millis(), timeout)) return 0;
+ timeout = millis() + 250;
+
+ if (tsoffsets[0] + tsoffsets[1] == 0) {
+ // Not yet set, so use defines as fallback...
+ tsoffsets[0] = XPT2046_X_CALIBRATION;
+ tsoffsets[1] = XPT2046_X_OFFSET;
+ tsoffsets[2] = XPT2046_Y_CALIBRATION;
+ tsoffsets[3] = XPT2046_Y_OFFSET;
+ }
+
+ // We rely on XPT2046 compatible mode to ADS7843, hence no Z1 and Z2 measurements possible.
+
+ if (READ(TOUCH_INT_PIN)) return 0; // If HIGH there are no screen presses.
+ const uint16_t x = uint16_t(((uint32_t(getInTouch(XPT2046_X))) * tsoffsets[0]) >> 16) + tsoffsets[1],
+ y = uint16_t(((uint32_t(getInTouch(XPT2046_Y))) * tsoffsets[2]) >> 16) + tsoffsets[3];
+ if (READ(TOUCH_INT_PIN)) return 0; // Fingers must still be on the TS for a valid read.
+
+ if (y < 185 || y > 224) return 0;
+
+ if (WITHIN(x, 21, 98)) encoderDiff = -(ENCODER_STEPS_PER_MENU_ITEM) * ENCODER_PULSES_PER_STEP;
+ else if (WITHIN(x, 121, 198)) encoderDiff = ENCODER_STEPS_PER_MENU_ITEM * ENCODER_PULSES_PER_STEP;
+ else if (WITHIN(x, 221, 298)) return EN_C;
+
+ return 0;
+}
+
+uint16_t XPT2046::getInTouch(const XPTCoordinate coordinate) {
+ uint16_t data[3];
+
+ OUT_WRITE(TOUCH_CS_PIN, LOW);
+
+ const uint8_t coord = uint8_t(coordinate) | XPT2046_CONTROL | XPT2046_DFR_MODE;
+ for (uint16_t i = 0; i < 3 ; i++) {
+ for (uint8_t j = 0x80; j; j >>= 1) {
+ WRITE(TOUCH_SCK_PIN, LOW);
+ WRITE(TOUCH_MOSI_PIN, bool(coord & j));
+ WRITE(TOUCH_SCK_PIN, HIGH);
+ }
+
+ data[i] = 0;
+ for (uint16_t j = 0x8000; j; j >>= 1) {
+ WRITE(TOUCH_SCK_PIN, LOW);
+ if (READ(TOUCH_MISO_PIN)) data[i] |= j;
+ WRITE(TOUCH_SCK_PIN, HIGH);
+ }
+ WRITE(TOUCH_SCK_PIN, LOW);
+ data[i] >>= 4;
+ }
+
+ WRITE(TOUCH_CS_PIN, HIGH);
+
+ uint16_t delta01 = _MAX(data[0], data[1]) - _MIN(data[0], data[1]),
+ delta02 = _MAX(data[0], data[2]) - _MIN(data[0], data[2]),
+ delta12 = _MAX(data[1], data[2]) - _MIN(data[1], data[2]);
+
+ if (delta01 <= delta02 && delta01 <= delta12)
+ return (data[0] + data[1]) >> 1;
+
+ if (delta02 <= delta12)
+ return (data[0] + data[2]) >> 1;
+
+ return (data[1] + data[2]) >> 1;
+}
+
+#endif // TOUCH_BUTTONS
diff --git a/Marlin/src/feature/touch/xpt2046.h b/Marlin/src/feature/touch/xpt2046.h
new file mode 100644
index 0000000000..26814926a4
--- /dev/null
+++ b/Marlin/src/feature/touch/xpt2046.h
@@ -0,0 +1,43 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <stdint.h>
+
+// Relies on XPT2046-compatible mode of ADS7843,
+// hence no Z1 / Z2 measurements are possible.
+
+#define XPT2046_DFR_MODE 0x00
+#define XPT2046_SER_MODE 0x04
+#define XPT2046_CONTROL 0x80
+
+enum XPTCoordinate : uint8_t {
+ XPT2046_X = 0x10,
+ XPT2046_Y = 0x50
+};
+
+class XPT2046 {
+public:
+ static void init(void);
+ static uint8_t read_buttons();
+private:
+ static uint16_t getInTouch(const XPTCoordinate coordinate);
+};
+
+extern XPT2046 touch;
diff --git a/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
index ca3d7f5757..971bc4c2be 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
@@ -61,14 +61,21 @@
#include "U8glib.h"
#include "HAL_LCD_com_defines.h"
-#include "string.h"
+#include <string.h>
+
+#if ENABLED(LCD_USE_DMA_FSMC)
+ extern void LCD_IO_WriteSequence(uint16_t *data, uint16_t length);
+ extern void LCD_IO_WriteSequence_Async(uint16_t *data, uint16_t length);
+ extern void LCD_IO_WaitSequence_Async();
+ extern void LCD_IO_WriteMultiple(uint16_t color, uint32_t count);
+#endif
#define WIDTH 128
#define HEIGHT 64
#define PAGE_HEIGHT 8
#define X_MIN 32
-#define Y_MIN 56
+#define Y_MIN 32
#define X_MAX (X_MIN + 2 * WIDTH - 1)
#define Y_MAX (Y_MIN + 2 * HEIGHT - 1)
@@ -76,6 +83,30 @@
#define LCD_ROW 0x2B /* Row address register */
#define LCD_WRITE_RAM 0x2C
+// see https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html
+
+#define COLOR_BLACK 0x0000
+#define COLOR_WHITE 0xFFFF
+#define COLOR_BLUE 0x21DD
+#define COLOR_RED 0xF800
+#define COLOR_DARK 0x0003 // Some dark color
+
+#ifndef TFT_MARLINUI_COLOR
+ #define TFT_MARLINUI_COLOR COLOR_WHITE
+#endif
+#ifndef TFT_MARLINBG_COLOR
+ #define TFT_MARLINBG_COLOR COLOR_BLACK
+#endif
+#ifndef TFT_DISABLED_COLOR
+ #define TFT_DISABLED_COLOR COLOR_DARK
+#endif
+#ifndef TFT_BTSLEFT_COLOR
+ #define TFT_BTSLEFT_COLOR COLOR_BLUE
+#endif
+#ifndef TFT_BTRIGHT_COLOR
+ #define TFT_BTRIGHT_COLOR COLOR_RED
+#endif
+
static uint32_t lcd_id = 0;
#define U8G_ESC_DATA(x) (uint8_t)(x >> 8), (uint8_t)(x & 0xFF)
@@ -94,6 +125,45 @@ static const uint8_t clear_screen_sequence[] = {
U8G_ESC_END
};
+#if ENABLED(TOUCH_BUTTONS)
+
+ static const uint8_t separation_line_sequence_left[] = {
+ U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(10), U8G_ESC_DATA(159),
+ U8G_ESC_ADR(0), LCD_ROW, U8G_ESC_ADR(1), U8G_ESC_DATA(170), U8G_ESC_DATA(173),
+ U8G_ESC_ADR(0), LCD_WRITE_RAM, U8G_ESC_ADR(1),
+ U8G_ESC_END
+ };
+
+ static const uint8_t separation_line_sequence_right[] = {
+ U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(160), U8G_ESC_DATA(309),
+ U8G_ESC_ADR(0), LCD_ROW, U8G_ESC_ADR(1), U8G_ESC_DATA(170), U8G_ESC_DATA(173),
+ U8G_ESC_ADR(0), LCD_WRITE_RAM, U8G_ESC_ADR(1),
+ U8G_ESC_END
+ };
+
+ static const uint8_t button0_sequence[] = {
+ U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(20), U8G_ESC_DATA(99),
+ U8G_ESC_ADR(0), LCD_ROW, U8G_ESC_ADR(1), U8G_ESC_DATA(185), U8G_ESC_DATA(224),
+ U8G_ESC_ADR(0), LCD_WRITE_RAM, U8G_ESC_ADR(1),
+ U8G_ESC_END
+ };
+
+ static const uint8_t button1_sequence[] = {
+ U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(120), U8G_ESC_DATA(199),
+ U8G_ESC_ADR(0), LCD_ROW, U8G_ESC_ADR(1), U8G_ESC_DATA(185), U8G_ESC_DATA(224),
+ U8G_ESC_ADR(0), LCD_WRITE_RAM, U8G_ESC_ADR(1),
+ U8G_ESC_END
+ };
+
+ static const uint8_t button2_sequence[] = {
+ U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(220), U8G_ESC_DATA(299),
+ U8G_ESC_ADR(0), LCD_ROW, U8G_ESC_ADR(1), U8G_ESC_DATA(185), U8G_ESC_DATA(224),
+ U8G_ESC_ADR(0), LCD_WRITE_RAM, U8G_ESC_ADR(1),
+ U8G_ESC_END
+ };
+
+#endif
+
static const uint8_t st7789v_init_sequence[] = { // 0x8552 - ST7789V
U8G_ESC_ADR(0),
0x10,
@@ -120,53 +190,254 @@ static const uint8_t st7789v_init_sequence[] = { // 0x8552 - ST7789V
U8G_ESC_END
};
+static const uint8_t ili9341_init_sequence[] = { // 0x9341 - ILI9341
+ U8G_ESC_ADR(0),
+ 0x10,
+ U8G_ESC_DLY(10),
+ 0x01,
+ U8G_ESC_DLY(100), U8G_ESC_DLY(100),
+ 0x36, U8G_ESC_ADR(1), 0xE8,
+ U8G_ESC_ADR(0), 0x3A, U8G_ESC_ADR(1), 0x55,
+ U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), 0x00, 0x00, 0x01, 0x3F,
+ U8G_ESC_ADR(0), LCD_ROW, U8G_ESC_ADR(1), 0x00, 0x00, 0x00, 0xEF,
+ U8G_ESC_ADR(0), 0xC5, U8G_ESC_ADR(1), 0x3E, 0x28,
+ U8G_ESC_ADR(0), 0xC7, U8G_ESC_ADR(1), 0x86,
+ U8G_ESC_ADR(0), 0xB1, U8G_ESC_ADR(1), 0x00, 0x18,
+ U8G_ESC_ADR(0), 0xC0, U8G_ESC_ADR(1), 0x23,
+ U8G_ESC_ADR(0), 0xC1, U8G_ESC_ADR(1), 0x10,
+ U8G_ESC_ADR(0), 0x29,
+ U8G_ESC_ADR(0), 0x11,
+ U8G_ESC_DLY(100),
+ U8G_ESC_END
+};
+
+#if ENABLED(TOUCH_BUTTONS)
+
+ static const uint8_t button0[] = {
+ B01111111,B11111111,B11111111,B11111111,B11111110,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00010000,B00000000,B00000001,
+ B10000000,B00000000,B00010000,B00000000,B00000001,
+ B10000000,B01000000,B00010000,B00000000,B00000001,
+ B10000000,B11100000,B00010000,B00000000,B00000001,
+ B10000001,B11110000,B00010000,B00000000,B00000001,
+ B10000011,B11111000,B00010000,B00000000,B00000001,
+ B10000111,B11111100,B00010000,B11111111,B11100001,
+ B10000000,B11100000,B00010000,B11111111,B11100001,
+ B10000000,B11100000,B00010000,B00000000,B00000001,
+ B10000000,B11100000,B00010000,B00000000,B00000001,
+ B10000000,B11100000,B00010000,B00000000,B00000001,
+ B10000000,B11100000,B00010000,B00000000,B00000001,
+ B10000000,B00000000,B00010000,B00000000,B00000001,
+ B10000000,B00000000,B00010000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B01111111,B11111111,B11111111,B11111111,B11111110,
+ };
+
+ static const uint8_t button1[] = {
+ B01111111,B11111111,B11111111,B11111111,B11111110,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00010000,B00000000,B00000001,
+ B10000000,B00000000,B00010000,B00000110,B00000001,
+ B10000000,B11100000,B00010000,B00000110,B00000001,
+ B10000000,B11100000,B00010000,B00000110,B00000001,
+ B10000000,B11100000,B00010000,B00000110,B00000001,
+ B10000000,B11100000,B00010000,B00000110,B00000001,
+ B10000000,B11100000,B00010000,B11111111,B11110001,
+ B10000111,B11111100,B00010000,B11111111,B11110001,
+ B10000011,B11111000,B00010000,B00000110,B00000001,
+ B10000001,B11110000,B00010000,B00000110,B00000001,
+ B10000000,B11100000,B00010000,B00000110,B00000001,
+ B10000000,B01000000,B00010000,B00000110,B00000001,
+ B10000000,B00000000,B00010000,B00000110,B00000001,
+ B10000000,B00000000,B00010000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B01111111,B11111111,B11111111,B11111111,B11111110,
+ };
+
+ static const uint8_t button2[] = {
+ B01111111,B11111111,B11111111,B11111111,B11111110,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00000001,B11000000,B00000001,
+ B10000000,B00000000,B01000001,B11000000,B00000001,
+ B10000000,B00000000,B11000001,B11000000,B00000001,
+ B10000000,B00000001,B11111111,B11000000,B00000001,
+ B10000000,B00000011,B11111111,B11000000,B00000001,
+ B10000000,B00000001,B11111111,B11000000,B00000001,
+ B10000000,B00000000,B11000000,B00000000,B00000001,
+ B10000000,B00000000,B01000000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B10000000,B00000000,B00000000,B00000000,B00000001,
+ B01111111,B11111111,B11111111,B11111111,B11111110,
+ };
+
+ void drawImage(const uint8_t *data, u8g_t *u8g, u8g_dev_t *dev, uint16_t length, uint16_t height, uint16_t color) {
+ uint16_t buffer[160];
+
+ for (uint16_t i = 0; i < height; i++) {
+ uint16_t k = 0;
+ for (uint16_t j = 0; j < length; j++) {
+ uint16_t v = TFT_MARLINBG_COLOR;
+ if (*(data + (i * (length >> 3) + (j >> 3))) & (0x80 >> (j & 7)))
+ v = color;
+ else
+ v = TFT_MARLINBG_COLOR;
+ buffer[k++] = v; buffer[k++] = v;
+ }
+ #ifdef LCD_USE_DMA_FSMC
+ if (k <= 80) { // generally is... for our buttons
+ memcpy(&buffer[k], &buffer[0], k * sizeof(uint16_t));
+ LCD_IO_WriteSequence(buffer, k * sizeof(uint16_t));
+ }
+ else {
+ LCD_IO_WriteSequence(buffer, k);
+ LCD_IO_WriteSequence(buffer, k);
+ }
+ #else
+ u8g_WriteSequence(u8g, dev, k << 1, (uint8_t *)buffer);
+ u8g_WriteSequence(u8g, dev, k << 1, (uint8_t *)buffer);
+ #endif
+ }
+ }
+
+#endif // TOUCH_BUTTONS
+
+// Used to fill RGB565 (16bits) background
+inline void memset2(const void *ptr, uint16_t fill, size_t cnt) {
+ uint16_t* wptr = (uint16_t*) ptr;
+ for (size_t i = 0; i < cnt; i += 2) {
+ *wptr = fill;
+ wptr++;
+ }
+}
+
+static bool preinit = true;
+static uint8_t page;
+
uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) {
u8g_pb_t *pb = (u8g_pb_t *)(dev->dev_mem);
- uint16_t buffer[256];
- uint32_t i, j, k;
-
+ #ifdef LCD_USE_DMA_FSMC
+ static uint16_t bufferA[512], bufferB[512];
+ uint16_t* buffer = &bufferA[0];
+ bool allow_async = true;
+ #else
+ uint16_t buffer[256]; // 16-bit RGB 565 pixel line buffer
+ #endif
+ uint16_t i;
switch (msg) {
case U8G_DEV_MSG_INIT:
dev->com_fn(u8g, U8G_COM_MSG_INIT, U8G_SPI_CLK_CYCLE_NONE, &lcd_id);
if (lcd_id == 0x040404) return 0; // No connected display on FSMC
if (lcd_id == 0xFFFFFF) return 0; // No connected display on SPI
- memset(buffer, 0x00, sizeof(buffer));
-
if ((lcd_id & 0xFFFF) == 0x8552) // ST7789V
u8g_WriteEscSeqP(u8g, dev, st7789v_init_sequence);
+ if ((lcd_id & 0xFFFF) == 0x9341) // ILI9341
+ u8g_WriteEscSeqP(u8g, dev, ili9341_init_sequence);
+
+ if (preinit) {
+ preinit = false;
+ return u8g_dev_pb8v1_base_fn(u8g, dev, msg, arg);
+ }
u8g_WriteEscSeqP(u8g, dev, clear_screen_sequence);
- for (i = 0; i < 960; i++)
- u8g_WriteSequence(u8g, dev, 160, (uint8_t *)buffer);
- break;
+ #ifdef LCD_USE_DMA_FSMC
+ LCD_IO_WriteMultiple(TFT_MARLINBG_COLOR, (320*240));
+ #else
+ memset2(buffer, TFT_MARLINBG_COLOR, 160);
+ for (uint16_t i = 0; i < 960; i++)
+ u8g_WriteSequence(u8g, dev, 160, (uint8_t *)buffer);
+ #endif
- case U8G_DEV_MSG_STOP:
- break;
+ // bottom line and buttons
+ #if ENABLED(TOUCH_BUTTONS)
+
+ #ifdef LCD_USE_DMA_FSMC
+ u8g_WriteEscSeqP(u8g, dev, separation_line_sequence_left);
+ LCD_IO_WriteMultiple(TFT_DISABLED_COLOR, 300);
+ u8g_WriteEscSeqP(u8g, dev, separation_line_sequence_right);
+ LCD_IO_WriteMultiple(TFT_DISABLED_COLOR, 300);
+ #else
+ memset2(buffer, TFT_DISABLED_COLOR, 150);
+ u8g_WriteEscSeqP(u8g, dev, separation_line_sequence_left);
+ for (uint8_t i = 4; i--;)
+ u8g_WriteSequence(u8g, dev, 150, (uint8_t *)buffer);
+ u8g_WriteEscSeqP(u8g, dev, separation_line_sequence_right);
+ for (uint8_t i = 4; i--;)
+ u8g_WriteSequence(u8g, dev, 150, (uint8_t *)buffer);
+ #endif
+
+ u8g_WriteEscSeqP(u8g, dev, button0_sequence);
+ drawImage(button0, u8g, dev, 40, 20, TFT_BTSLEFT_COLOR);
+
+ u8g_WriteEscSeqP(u8g, dev, button1_sequence);
+ drawImage(button1, u8g, dev, 40, 20, TFT_BTSLEFT_COLOR);
+
+ u8g_WriteEscSeqP(u8g, dev, button2_sequence);
+ drawImage(button2, u8g, dev, 40, 20, TFT_BTRIGHT_COLOR);
+
+ #endif // TOUCH_BUTTONS
+
+ return 0;
+
+ case U8G_DEV_MSG_STOP: preinit = true; break;
case U8G_DEV_MSG_PAGE_FIRST:
+ page = 0;
u8g_WriteEscSeqP(u8g, dev, page_first_sequence);
break;
case U8G_DEV_MSG_PAGE_NEXT:
- for (j = 0; j < 8; j++) {
- k = 0;
- for (i = 0; i < (uint32_t)pb->width; i++) {
+ if (++page > 8) return 1;
+
+ for (uint8_t y = 0; y < 8; y++) {
+ uint32_t k = 0;
+ #ifdef LCD_USE_DMA_FSMC
+ buffer = (y & 1) ? bufferB : bufferA;
+ #endif
+ for (uint16_t i = 0; i < (uint32_t)pb->width; i++) {
const uint8_t b = *(((uint8_t *)pb->buf) + i);
- const uint16_t c = TEST(b, j) ? 0x7FFF : 0x0000;
+ const uint16_t c = TEST(b, y) ? TFT_MARLINUI_COLOR : TFT_MARLINBG_COLOR;
buffer[k++] = c; buffer[k++] = c;
}
- for (k = 0; k < 2; k++) {
- u8g_WriteSequence(u8g, dev, 128, (uint8_t*)buffer);
- u8g_WriteSequence(u8g, dev, 128, (uint8_t*)&(buffer[64]));
- u8g_WriteSequence(u8g, dev, 128, (uint8_t*)&(buffer[128]));
- u8g_WriteSequence(u8g, dev, 128, (uint8_t*)&(buffer[192]));
- }
+ #ifdef LCD_USE_DMA_FSMC
+ memcpy(&buffer[256], &buffer[0], 512);
+ if (allow_async) {
+ if (y > 0 || page > 1) LCD_IO_WaitSequence_Async();
+ if (y == 7 && page == 8)
+ LCD_IO_WriteSequence(buffer, 512); // last line of last page
+ else
+ LCD_IO_WriteSequence_Async(buffer, 512);
+ }
+ else
+ LCD_IO_WriteSequence(buffer, 512);
+ #else
+ for (uint8_t i = 2; i--;) {
+ u8g_WriteSequence(u8g, dev, 128, (uint8_t*)buffer);
+ u8g_WriteSequence(u8g, dev, 128, (uint8_t*)&(buffer[64]));
+ u8g_WriteSequence(u8g, dev, 128, (uint8_t*)&(buffer[128]));
+ u8g_WriteSequence(u8g, dev, 128, (uint8_t*)&(buffer[192]));
+ }
+ #endif
}
break;
case U8G_DEV_MSG_SLEEP_ON:
+ // Enter Sleep Mode (10h)
+ return 1;
case U8G_DEV_MSG_SLEEP_OFF:
+ // Sleep Out (11h)
return 1;
}
return u8g_dev_pb8v1_base_fn(u8g, dev, msg, arg);
@@ -174,4 +445,4 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
U8G_PB_DEV(u8g_dev_tft_320x240_upscale_from_128x64, WIDTH, HEIGHT, PAGE_HEIGHT, u8g_dev_tft_320x240_upscale_from_128x64_fn, U8G_COM_HAL_FSMC_FN);
-#endif // HAS_GRAPHICAL_LCD
+#endif // HAS_GRAPHICAL_LCD && FSMC_CS
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 2fb2b209e9..169aa2f6f6 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -102,6 +102,11 @@
#if HAS_SLOW_BUTTONS
volatile uint8_t MarlinUI::slow_buttons;
#endif
+ #if ENABLED(TOUCH_BUTTONS)
+ #include "../feature/touch/xpt2046.h"
+ volatile uint8_t MarlinUI::touch_buttons;
+ uint8_t MarlinUI::read_touch_buttons() { return touch.read_buttons(); }
+ #endif
#endif
#if ENABLED(INIT_SDCARD_ON_BOOT)
@@ -324,8 +329,13 @@ void MarlinUI::init() {
#endif
#endif
- #if HAS_ENCODER_ACTION && HAS_SLOW_BUTTONS
- slow_buttons = 0;
+ #if HAS_ENCODER_ACTION
+ #if HAS_SLOW_BUTTONS
+ slow_buttons = 0;
+ #endif
+ #if ENABLED(TOUCH_BUTTONS)
+ touch_buttons = 0;
+ #endif
#endif
update_buttons();
@@ -823,6 +833,11 @@ void MarlinUI::update() {
next_lcd_update_ms = ms + LCD_UPDATE_INTERVAL;
+ #if ENABLED(TOUCH_BUTTONS)
+ if (on_status_screen())
+ next_lcd_update_ms += (LCD_UPDATE_INTERVAL) * 2;
+ #endif
+
#if ENABLED(LCD_HAS_STATUS_INDICATORS)
update_indicators();
#endif
@@ -833,6 +848,10 @@ void MarlinUI::update() {
slow_buttons = read_slow_buttons(); // Buttons that take too long to read in interrupt context
#endif
+ #if ENABLED(TOUCH_BUTTONS)
+ touch_buttons = read_touch_buttons();
+ #endif
+
#if ENABLED(REPRAPWORLD_KEYPAD)
if (handle_keypad()) {
@@ -1180,6 +1199,9 @@ void MarlinUI::update() {
#if HAS_SLOW_BUTTONS
| slow_buttons
#endif
+ #if ENABLED(TOUCH_BUTTONS)
+ | touch_buttons
+ #endif
;
#elif HAS_ADC_BUTTONS
buttons = 0;
diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h
index 5a63f67e87..2325b5b959 100644
--- a/Marlin/src/lcd/ultralcd.h
+++ b/Marlin/src/lcd/ultralcd.h
@@ -56,7 +56,11 @@
uint8_t get_ADC_keyValue();
#endif
- #define LCD_UPDATE_INTERVAL 100
+ #if ENABLED(TOUCH_BUTTONS)
+ #define LCD_UPDATE_INTERVAL 50
+ #else
+ #define LCD_UPDATE_INTERVAL 100
+ #endif
#if HAS_LCD_MENU
@@ -497,6 +501,11 @@ public:
static volatile uint8_t slow_buttons;
static uint8_t read_slow_buttons();
#endif
+ #if ENABLED(TOUCH_BUTTONS)
+ static volatile uint8_t touch_buttons;
+ static uint8_t read_touch_buttons();
+ #endif
+
static void update_buttons();
static inline bool button_pressed() { return BUTTON_CLICK(); }
#if EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION)
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 26968ed007..19bdb0aad6 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -1160,3 +1160,15 @@
#if PIN_EXISTS(FET_SAFETY)
REPORT_NAME_DIGITAL(__LINE__, FET_SAFETY_PIN)
#endif
+#if PIN_EXISTS(TOUCH_MISO)
+ REPORT_NAME_DIGITAL(__LINE__, TOUCH_MISO_PIN)
+#endif
+#if PIN_EXISTS(TOUCH_MOSI)
+ REPORT_NAME_DIGITAL(__LINE__, TOUCH_MOSI_PIN)
+#endif
+#if PIN_EXISTS(TOUCH_SCK)
+ REPORT_NAME_DIGITAL(__LINE__, TOUCH_SCK_PIN)
+#endif
+#if PIN_EXISTS(TOUCH_CS)
+ REPORT_NAME_DIGITAL(__LINE__, TOUCH_CS_PIN)
+#endif
diff --git a/Marlin/src/pins/stm32/pins_BIGTREE_SKR_PRO_V1.1.h b/Marlin/src/pins/stm32/pins_BIGTREE_SKR_PRO_V1.1.h
index 2697bbe2da..3b944a5dd0 100644
--- a/Marlin/src/pins/stm32/pins_BIGTREE_SKR_PRO_V1.1.h
+++ b/Marlin/src/pins/stm32/pins_BIGTREE_SKR_PRO_V1.1.h
@@ -103,13 +103,13 @@
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI PC12
+ #define TMC_SW_MOSI PC12
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO PC11
+ #define TMC_SW_MISO PC11
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK PC10
+ #define TMC_SW_SCK PC10
#endif
#endif
diff --git a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h
index f68e8dc514..27c7986daf 100644
--- a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h
+++ b/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h
@@ -117,10 +117,13 @@
#define BEEPER_PIN PC3 // use PB7 to shut up if desired
#define LED_PIN PC13
+//
// Touch support
-#define BTN_ENC PA11 // Real pin is needed to enable encoder's push button functionality used by touch screen. PA11 gives stable value.
-
-#define TOUCH_CS PA4
-//#define TOUCH_INTERRUPT PC4 // Not yet implemented
+//
+#if ENABLED(TOUCH_BUTTONS)
+ #define BTN_ENC PA11 // Real pin needed to enable encoder's push button functionality used by touch screen. PA11 gives stable value.
+ #define TOUCH_CS_PIN PA4
+ #define TOUCH_INT_PIN PC4
+#endif
#define NO_PAUSE_AFTER_PRINT
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h
index d23c1f1d31..0a08e72204 100755
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h
+++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h
@@ -53,6 +53,10 @@
#define Z_MIN_PIN PA11
#define Z_MAX_PIN PC4
+#ifndef FIL_RUNOUT_PIN
+ #define FIL_RUNOUT_PIN PF11 // MT_DET
+#endif
+
//
// Steppers
//
@@ -76,44 +80,54 @@
// Temperature Sensors
//
#define TEMP_0_PIN PC1 // TH1
-//#define TEMP_1_PIN PC2 // TH2
#define TEMP_BED_PIN PC0 // TB1
//
// Heaters / Fans
//
#define HEATER_0_PIN PC3 // HEATER1
-//#define HEATER_1_PIN PA6 // HEATER2
#define HEATER_BED_PIN PA0 // HOT BED
#define FAN_PIN PB1 // FAN
-#define BTN_ENC PB3 // Pin is not connected. Real pin is needed to enable encoder's push button functionality used by touch screen
-
+//
+// Thermocouples
+//
//#define MAX6675_SS_PIN PE5 // TC1 - CS1
//#define MAX6675_SS_PIN PE6 // TC2 - CS2
+//
+// Misc. Functions
+//
#define POWER_LOSS_PIN PA2 // PW_DET
#define PS_ON_PIN PA3 // PW_OFF
-#define FIL_RUNOUT_PIN PF11 // MT_DET
-#define BEEPER_PIN PC5
//#define LED_PIN PB2
+//
+// LCD / Controller
+//
+#define BEEPER_PIN PC5
+#define SD_DETECT_PIN PD12
+
/**
* Note: MKS Robin TFT screens use various TFT controllers.
* If the screen stays white, disable 'LCD_RESET_PIN'
* to let the bootloader init the screen.
*/
-#define LCD_RESET_PIN PF6
-#define NO_LCD_REINIT // Suppress LCD re-initialization
+#if ENABLED(MKS_ROBIN_TFT)
+ #define LCD_RESET_PIN PF6
+ #define NO_LCD_REINIT // Suppress LCD re-initialization
-#define LCD_BACKLIGHT_PIN PD13
-#define FSMC_CS_PIN PD7 // NE4
-#define FSMC_RS_PIN PD11 // A0
-#define TOUCH_CS PC2
+ #define LCD_BACKLIGHT_PIN PD13
-#define SD_DETECT_PIN PD12
+ #if ENABLED(TOUCH_BUTTONS)
+ #define BTN_ENC PB3 // Not connected. TODO: Replace this hack to enable button code
+ #define FSMC_CS_PIN PD7 // NE4
+ #define FSMC_RS_PIN PD11 // A0
+ #define TOUCH_CS_PIN PC2
+ #endif
+#endif
// Motor current PWM pins
#define MOTOR_CURRENT_PWM_XY_PIN PA6
diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h
index 3d0415cb1b..40b0d99e01 100755
--- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h
@@ -51,6 +51,10 @@
#define Z_MIN_PIN PA11
#define Z_MAX_PIN PC4
+#ifndef FIL_RUNOUT_PIN
+ #define FIL_RUNOUT_PIN PA4 // MT_DET
+#endif
+
//
// Steppers
//
@@ -90,29 +94,41 @@
#define FAN_PIN PB1 // FAN
-#define BTN_ENC PC13 // Pin is not connected. Real pin is needed to enable encoder's push button functionality used by touch screen
-
+//
+// Thermocouples
+//
//#define MAX6675_SS_PIN PE5 // TC1 - CS1
//#define MAX6675_SS_PIN PE6 // TC2 - CS2
+//
+// Misc. Functions
+//
#define POWER_LOSS_PIN PA2 // PW_DET
#define PS_ON_PIN PA3 // PW_OFF
-#define FIL_RUNOUT_PIN PA4 // MT_DET
-#define BEEPER_PIN PC5
#define LED_PIN PB2
+//
+// LCD / Controller
+//
+#define BEEPER_PIN PC5
+#define SD_DETECT_PIN PD12
+
/**
* Note: MKS Robin TFT screens use various TFT controllers.
* If the screen stays white, disable 'LCD_RESET_PIN'
* to let the bootloader init the screen.
*/
-#define LCD_RESET_PIN PF6
-#define NO_LCD_REINIT // Suppress LCD re-initialization
+#if ENABLED(MKS_ROBIN_TFT)
+ #define LCD_RESET_PIN PF6
+ #define NO_LCD_REINIT // Suppress LCD re-initialization
-#define LCD_BACKLIGHT_PIN PD13
-#define FSMC_CS_PIN PD7 // NE4
-#define FSMC_RS_PIN PD11 // A0
-#define TOUCH_CS PA7
+ #define LCD_BACKLIGHT_PIN PD13
-#define SD_DETECT_PIN PD12
+ #if ENABLED(TOUCH_BUTTONS)
+ #define BTN_ENC PC13 // Not connected. TODO: Replace this hack to enable button code
+ #define FSMC_CS_PIN PD7 // NE4
+ #define FSMC_RS_PIN PD11 // A0
+ #define TOUCH_CS_PIN PA7
+ #endif
+#endif
diff --git a/Marlin/src/pins/stm32/pins_STM3R_MINI.h b/Marlin/src/pins/stm32/pins_STM3R_MINI.h
index 66568e2e9a..5ababb36bf 100644
--- a/Marlin/src/pins/stm32/pins_STM3R_MINI.h
+++ b/Marlin/src/pins/stm32/pins_STM3R_MINI.h
@@ -143,7 +143,15 @@
#endif
#endif
- #if ENABLED(NEWPANEL)
+ #if ENABLED(TOUCH_BUTTONS)
+
+ #define TOUCH_CS_PIN PB12 // SPI2_NSS
+ #define TOUCH_SCK_PIN PB13
+ #define TOUCH_MOSI_PIN PB14
+ #define TOUCH_MISO_PIN PB15
+ #define TOUCH_INT_PIN PC6 // (PenIRQ coming from ADS7843)
+
+ #elif ENABLED(NEWPANEL)
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
diff --git a/config/default/Configuration.h b/config/default/Configuration.h
index bcecca1dca..9a25b6ac9a 100644
--- a/config/default/Configuration.h
+++ b/config/default/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/3DFabXYZ/Migbot/Configuration.h b/config/examples/3DFabXYZ/Migbot/Configuration.h
index 2792e760ce..8da4a630f0 100644
--- a/config/examples/3DFabXYZ/Migbot/Configuration.h
+++ b/config/examples/3DFabXYZ/Migbot/Configuration.h
@@ -2063,8 +2063,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/AlephObjects/TAZ4/Configuration.h b/config/examples/AlephObjects/TAZ4/Configuration.h
index aa4f1e3e77..04814d8f09 100644
--- a/config/examples/AlephObjects/TAZ4/Configuration.h
+++ b/config/examples/AlephObjects/TAZ4/Configuration.h
@@ -2052,8 +2052,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/AliExpress/CL-260/Configuration.h b/config/examples/AliExpress/CL-260/Configuration.h
index f7490b9f6a..49640b0e5d 100644
--- a/config/examples/AliExpress/CL-260/Configuration.h
+++ b/config/examples/AliExpress/CL-260/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/AliExpress/UM2pExt/Configuration.h b/config/examples/AliExpress/UM2pExt/Configuration.h
index ecff552b6a..33f600b3b3 100644
--- a/config/examples/AliExpress/UM2pExt/Configuration.h
+++ b/config/examples/AliExpress/UM2pExt/Configuration.h
@@ -2043,8 +2043,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Anet/A2/Configuration.h b/config/examples/Anet/A2/Configuration.h
index c27d394a71..a4fe30333d 100644
--- a/config/examples/Anet/A2/Configuration.h
+++ b/config/examples/Anet/A2/Configuration.h
@@ -2034,8 +2034,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Anet/A2plus/Configuration.h b/config/examples/Anet/A2plus/Configuration.h
index c8047e9ac8..87931a181e 100644
--- a/config/examples/Anet/A2plus/Configuration.h
+++ b/config/examples/Anet/A2plus/Configuration.h
@@ -2034,8 +2034,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Anet/A6/Configuration.h b/config/examples/Anet/A6/Configuration.h
index e45372310a..46cda6b4e8 100644
--- a/config/examples/Anet/A6/Configuration.h
+++ b/config/examples/Anet/A6/Configuration.h
@@ -2185,8 +2185,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Anet/A8/Configuration.h b/config/examples/Anet/A8/Configuration.h
index 065f27e265..10cae8b041 100644
--- a/config/examples/Anet/A8/Configuration.h
+++ b/config/examples/Anet/A8/Configuration.h
@@ -2047,8 +2047,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Anet/A8plus/Configuration.h b/config/examples/Anet/A8plus/Configuration.h
index 07ee5ae790..36ebccfa6c 100644
--- a/config/examples/Anet/A8plus/Configuration.h
+++ b/config/examples/Anet/A8plus/Configuration.h
@@ -2043,8 +2043,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Anet/E16/Configuration.h b/config/examples/Anet/E16/Configuration.h
index b28b22e181..2a65cd45c7 100644
--- a/config/examples/Anet/E16/Configuration.h
+++ b/config/examples/Anet/E16/Configuration.h
@@ -2044,8 +2044,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/AnyCubic/i3/Configuration.h b/config/examples/AnyCubic/i3/Configuration.h
index dfeefa3020..c99f8d3823 100644
--- a/config/examples/AnyCubic/i3/Configuration.h
+++ b/config/examples/AnyCubic/i3/Configuration.h
@@ -2042,8 +2042,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/ArmEd/Configuration.h b/config/examples/ArmEd/Configuration.h
index 58d8a24463..a4053fff19 100644
--- a/config/examples/ArmEd/Configuration.h
+++ b/config/examples/ArmEd/Configuration.h
@@ -2033,8 +2033,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Azteeg/X5GT/Configuration.h b/config/examples/Azteeg/X5GT/Configuration.h
index 7081675874..4b6524cc17 100644
--- a/config/examples/Azteeg/X5GT/Configuration.h
+++ b/config/examples/Azteeg/X5GT/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/BIBO/TouchX/cyclops/Configuration.h b/config/examples/BIBO/TouchX/cyclops/Configuration.h
index d18d546eb6..d4202433aa 100644
--- a/config/examples/BIBO/TouchX/cyclops/Configuration.h
+++ b/config/examples/BIBO/TouchX/cyclops/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/BIBO/TouchX/default/Configuration.h b/config/examples/BIBO/TouchX/default/Configuration.h
index 9ae7ac0cf7..68833cce7c 100644
--- a/config/examples/BIBO/TouchX/default/Configuration.h
+++ b/config/examples/BIBO/TouchX/default/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/BQ/Hephestos/Configuration.h b/config/examples/BQ/Hephestos/Configuration.h
index 63e24434ce..5abc10aa29 100644
--- a/config/examples/BQ/Hephestos/Configuration.h
+++ b/config/examples/BQ/Hephestos/Configuration.h
@@ -2020,8 +2020,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/BQ/Hephestos_2/Configuration.h b/config/examples/BQ/Hephestos_2/Configuration.h
index f2cf70294b..17000ea329 100644
--- a/config/examples/BQ/Hephestos_2/Configuration.h
+++ b/config/examples/BQ/Hephestos_2/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/BQ/WITBOX/Configuration.h b/config/examples/BQ/WITBOX/Configuration.h
index 8f1d81e0c8..0071948d72 100644
--- a/config/examples/BQ/WITBOX/Configuration.h
+++ b/config/examples/BQ/WITBOX/Configuration.h
@@ -2020,8 +2020,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Cartesio/Configuration.h b/config/examples/Cartesio/Configuration.h
index 86875b5bae..53aea38d0f 100644
--- a/config/examples/Cartesio/Configuration.h
+++ b/config/examples/Cartesio/Configuration.h
@@ -2031,8 +2031,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Creality/CR-10/Configuration.h b/config/examples/Creality/CR-10/Configuration.h
index d6a4e4d02c..3fac24fb42 100644
--- a/config/examples/Creality/CR-10/Configuration.h
+++ b/config/examples/Creality/CR-10/Configuration.h
@@ -2042,8 +2042,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Creality/CR-10S/Configuration.h b/config/examples/Creality/CR-10S/Configuration.h
index edbf8f826c..6f99beafbb 100644
--- a/config/examples/Creality/CR-10S/Configuration.h
+++ b/config/examples/Creality/CR-10S/Configuration.h
@@ -2033,8 +2033,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Creality/CR-10_5S/Configuration.h b/config/examples/Creality/CR-10_5S/Configuration.h
index eff6b12f17..8ddfeb50d9 100644
--- a/config/examples/Creality/CR-10_5S/Configuration.h
+++ b/config/examples/Creality/CR-10_5S/Configuration.h
@@ -2035,8 +2035,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Creality/CR-10mini/Configuration.h b/config/examples/Creality/CR-10mini/Configuration.h
index 0a56067e31..e2e3631314 100644
--- a/config/examples/Creality/CR-10mini/Configuration.h
+++ b/config/examples/Creality/CR-10mini/Configuration.h
@@ -2051,8 +2051,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Creality/CR-20 Pro/Configuration.h b/config/examples/Creality/CR-20 Pro/Configuration.h
index be6d35ee3c..2b13c1c0b5 100644
--- a/config/examples/Creality/CR-20 Pro/Configuration.h
+++ b/config/examples/Creality/CR-20 Pro/Configuration.h
@@ -2029,8 +2029,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Creality/CR-20/Configuration.h b/config/examples/Creality/CR-20/Configuration.h
index f5e7b7c4fd..fc5785ee03 100644
--- a/config/examples/Creality/CR-20/Configuration.h
+++ b/config/examples/Creality/CR-20/Configuration.h
@@ -2029,8 +2029,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Creality/CR-8/Configuration.h b/config/examples/Creality/CR-8/Configuration.h
index d323a9b2f5..425b15c6d2 100644
--- a/config/examples/Creality/CR-8/Configuration.h
+++ b/config/examples/Creality/CR-8/Configuration.h
@@ -2042,8 +2042,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Creality/Ender-2/Configuration.h b/config/examples/Creality/Ender-2/Configuration.h
index 9c211dbe94..db181c1353 100644
--- a/config/examples/Creality/Ender-2/Configuration.h
+++ b/config/examples/Creality/Ender-2/Configuration.h
@@ -2036,8 +2036,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Creality/Ender-3/Configuration.h b/config/examples/Creality/Ender-3/Configuration.h
index 4cf8a07862..89fd4f10a0 100644
--- a/config/examples/Creality/Ender-3/Configuration.h
+++ b/config/examples/Creality/Ender-3/Configuration.h
@@ -2036,8 +2036,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Creality/Ender-4/Configuration.h b/config/examples/Creality/Ender-4/Configuration.h
index 39856a898b..bf379ed9ed 100644
--- a/config/examples/Creality/Ender-4/Configuration.h
+++ b/config/examples/Creality/Ender-4/Configuration.h
@@ -2042,8 +2042,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Creality/Ender-5/Configuration.h b/config/examples/Creality/Ender-5/Configuration.h
index 23db86738b..ac278a4649 100644
--- a/config/examples/Creality/Ender-5/Configuration.h
+++ b/config/examples/Creality/Ender-5/Configuration.h
@@ -2029,8 +2029,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Dagoma/Disco Ultimate/Configuration.h b/config/examples/Dagoma/Disco Ultimate/Configuration.h
index 25891fff32..e87ea16842 100644
--- a/config/examples/Dagoma/Disco Ultimate/Configuration.h
+++ b/config/examples/Dagoma/Disco Ultimate/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration.h b/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration.h
index 244ead3942..8de028a9d0 100755
--- a/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration.h
+++ b/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration.h
@@ -2037,8 +2037,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Einstart-S/Configuration.h b/config/examples/Einstart-S/Configuration.h
index f5e13f11cf..a48f399adf 100644
--- a/config/examples/Einstart-S/Configuration.h
+++ b/config/examples/Einstart-S/Configuration.h
@@ -2042,8 +2042,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Felix/Configuration.h b/config/examples/Felix/Configuration.h
index 6518bda9d7..f052a755fc 100644
--- a/config/examples/Felix/Configuration.h
+++ b/config/examples/Felix/Configuration.h
@@ -2014,8 +2014,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Felix/DUAL/Configuration.h b/config/examples/Felix/DUAL/Configuration.h
index 7c4831468a..68f5ca58ba 100644
--- a/config/examples/Felix/DUAL/Configuration.h
+++ b/config/examples/Felix/DUAL/Configuration.h
@@ -2014,8 +2014,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/FlashForge/CreatorPro/Configuration.h b/config/examples/FlashForge/CreatorPro/Configuration.h
index ddd643667b..b5f074aeb4 100644
--- a/config/examples/FlashForge/CreatorPro/Configuration.h
+++ b/config/examples/FlashForge/CreatorPro/Configuration.h
@@ -2023,8 +2023,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/FolgerTech/i3-2020/Configuration.h b/config/examples/FolgerTech/i3-2020/Configuration.h
index 67eef9c93c..82f63b1add 100644
--- a/config/examples/FolgerTech/i3-2020/Configuration.h
+++ b/config/examples/FolgerTech/i3-2020/Configuration.h
@@ -2038,8 +2038,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Formbot/Raptor/Configuration.h b/config/examples/Formbot/Raptor/Configuration.h
index a9829a8244..6be6c90613 100644
--- a/config/examples/Formbot/Raptor/Configuration.h
+++ b/config/examples/Formbot/Raptor/Configuration.h
@@ -2137,8 +2137,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Formbot/T_Rex_2+/Configuration.h b/config/examples/Formbot/T_Rex_2+/Configuration.h
index e5529b17f7..33e68d80c8 100644
--- a/config/examples/Formbot/T_Rex_2+/Configuration.h
+++ b/config/examples/Formbot/T_Rex_2+/Configuration.h
@@ -2066,8 +2066,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Formbot/T_Rex_3/Configuration.h b/config/examples/Formbot/T_Rex_3/Configuration.h
index fe6c03b791..5662f6abcd 100644
--- a/config/examples/Formbot/T_Rex_3/Configuration.h
+++ b/config/examples/Formbot/T_Rex_3/Configuration.h
@@ -2060,8 +2060,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Fysetc/AIO_II/Configuration.h b/config/examples/Fysetc/AIO_II/Configuration.h
index 402d5c7f95..a3fb788569 100644
--- a/config/examples/Fysetc/AIO_II/Configuration.h
+++ b/config/examples/Fysetc/AIO_II/Configuration.h
@@ -2026,8 +2026,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Fysetc/CHEETAH/Configuration.h b/config/examples/Fysetc/CHEETAH/Configuration.h
index e2a907447b..87a04dd9a9 100644
--- a/config/examples/Fysetc/CHEETAH/Configuration.h
+++ b/config/examples/Fysetc/CHEETAH/Configuration.h
@@ -2026,8 +2026,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Fysetc/F6_13/Configuration.h b/config/examples/Fysetc/F6_13/Configuration.h
index 4c90aaa7fd..125f2821a5 100644
--- a/config/examples/Fysetc/F6_13/Configuration.h
+++ b/config/examples/Fysetc/F6_13/Configuration.h
@@ -2028,8 +2028,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Geeetech/A10/Configuration.h b/config/examples/Geeetech/A10/Configuration.h
index 4a95c318a6..f11d83a79f 100644
--- a/config/examples/Geeetech/A10/Configuration.h
+++ b/config/examples/Geeetech/A10/Configuration.h
@@ -2017,8 +2017,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Geeetech/A10M/Configuration.h b/config/examples/Geeetech/A10M/Configuration.h
index 27bce2d79b..b2e9f1abb3 100644
--- a/config/examples/Geeetech/A10M/Configuration.h
+++ b/config/examples/Geeetech/A10M/Configuration.h
@@ -2017,8 +2017,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Geeetech/A20M/Configuration.h b/config/examples/Geeetech/A20M/Configuration.h
index dd619d4274..9d4d839fd3 100644
--- a/config/examples/Geeetech/A20M/Configuration.h
+++ b/config/examples/Geeetech/A20M/Configuration.h
@@ -2019,8 +2019,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Geeetech/GT2560/Configuration.h b/config/examples/Geeetech/GT2560/Configuration.h
index 654d734626..fb73eb7c35 100644
--- a/config/examples/Geeetech/GT2560/Configuration.h
+++ b/config/examples/Geeetech/GT2560/Configuration.h
@@ -2047,8 +2047,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h b/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
index a3988d348e..a02efd75fd 100644
--- a/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
+++ b/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Geeetech/MeCreator2/Configuration.h b/config/examples/Geeetech/MeCreator2/Configuration.h
index 193c93ec28..4121954733 100644
--- a/config/examples/Geeetech/MeCreator2/Configuration.h
+++ b/config/examples/Geeetech/MeCreator2/Configuration.h
@@ -2039,8 +2039,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h b/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
index 7148acd47d..4ee990890e 100644
--- a/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
+++ b/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
@@ -2053,8 +2053,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h b/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
index 865caf7a8e..35e45e5d33 100644
--- a/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
+++ b/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
@@ -2052,8 +2052,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h b/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
index 7b2184ad2d..985a21b483 100644
--- a/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
+++ b/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h b/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
index 36b88e644b..7b75702dd1 100644
--- a/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
+++ b/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Infitary/i3-M508/Configuration.h b/config/examples/Infitary/i3-M508/Configuration.h
index a6ec0994c7..3563a32d7e 100644
--- a/config/examples/Infitary/i3-M508/Configuration.h
+++ b/config/examples/Infitary/i3-M508/Configuration.h
@@ -2036,8 +2036,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/JGAurora/A1/Configuration.h b/config/examples/JGAurora/A1/Configuration.h
index 127671feb4..ef3d0edfbd 100644
--- a/config/examples/JGAurora/A1/Configuration.h
+++ b/config/examples/JGAurora/A1/Configuration.h
@@ -2029,8 +2029,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/JGAurora/A5/Configuration.h b/config/examples/JGAurora/A5/Configuration.h
index d4d70ebbc8..52058a3118 100644
--- a/config/examples/JGAurora/A5/Configuration.h
+++ b/config/examples/JGAurora/A5/Configuration.h
@@ -2044,8 +2044,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/JGAurora/A5S/Configuration.h b/config/examples/JGAurora/A5S/Configuration.h
index b086d72bb7..6fa815cf5e 100644
--- a/config/examples/JGAurora/A5S/Configuration.h
+++ b/config/examples/JGAurora/A5S/Configuration.h
@@ -2030,8 +2030,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/MakerParts/Configuration.h b/config/examples/MakerParts/Configuration.h
index a37aff9a50..d894196f8a 100644
--- a/config/examples/MakerParts/Configuration.h
+++ b/config/examples/MakerParts/Configuration.h
@@ -2052,8 +2052,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Malyan/M150/Configuration.h b/config/examples/Malyan/M150/Configuration.h
index 8aa6f8cc60..8099a04eac 100644
--- a/config/examples/Malyan/M150/Configuration.h
+++ b/config/examples/Malyan/M150/Configuration.h
@@ -2060,8 +2060,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Malyan/M200/Configuration.h b/config/examples/Malyan/M200/Configuration.h
index 7fc5851800..8f27ac386e 100644
--- a/config/examples/Malyan/M200/Configuration.h
+++ b/config/examples/Malyan/M200/Configuration.h
@@ -2040,8 +2040,16 @@
#define MALYAN_LCD
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Micromake/C1/basic/Configuration.h b/config/examples/Micromake/C1/basic/Configuration.h
index b61fb46c36..673e421100 100644
--- a/config/examples/Micromake/C1/basic/Configuration.h
+++ b/config/examples/Micromake/C1/basic/Configuration.h
@@ -2036,8 +2036,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Micromake/C1/enhanced/Configuration.h b/config/examples/Micromake/C1/enhanced/Configuration.h
index 2cbfe8fcc6..226b19c605 100644
--- a/config/examples/Micromake/C1/enhanced/Configuration.h
+++ b/config/examples/Micromake/C1/enhanced/Configuration.h
@@ -2036,8 +2036,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Mks/Robin/Configuration.h b/config/examples/Mks/Robin/Configuration.h
index 958535d4f1..8beb1267d5 100644
--- a/config/examples/Mks/Robin/Configuration.h
+++ b/config/examples/Mks/Robin/Configuration.h
@@ -2034,8 +2034,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Mks/Sbase/Configuration.h b/config/examples/Mks/Sbase/Configuration.h
index 55b11f0206..4546f9eb7f 100644
--- a/config/examples/Mks/Sbase/Configuration.h
+++ b/config/examples/Mks/Sbase/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Printrbot/PrintrboardG2/Configuration.h b/config/examples/Printrbot/PrintrboardG2/Configuration.h
index 1639f71068..9b288a1779 100644
--- a/config/examples/Printrbot/PrintrboardG2/Configuration.h
+++ b/config/examples/Printrbot/PrintrboardG2/Configuration.h
@@ -2040,8 +2040,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/RapideLite/RL200/Configuration.h b/config/examples/RapideLite/RL200/Configuration.h
index 8dd46c6abe..77ccabccc8 100644
--- a/config/examples/RapideLite/RL200/Configuration.h
+++ b/config/examples/RapideLite/RL200/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/RepRapPro/Huxley/Configuration.h b/config/examples/RepRapPro/Huxley/Configuration.h
index 642a820fcf..c0e926dfad 100644
--- a/config/examples/RepRapPro/Huxley/Configuration.h
+++ b/config/examples/RepRapPro/Huxley/Configuration.h
@@ -2081,8 +2081,16 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/RepRapWorld/Megatronics/Configuration.h b/config/examples/RepRapWorld/Megatronics/Configuration.h
index 894ed01ad5..9ec0adb6bb 100644
--- a/config/examples/RepRapWorld/Megatronics/Configuration.h
+++ b/config/examples/RepRapWorld/Megatronics/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/RigidBot/Configuration.h b/config/examples/RigidBot/Configuration.h
index aeec7a0b7e..2b8bb8d8ed 100644
--- a/config/examples/RigidBot/Configuration.h
+++ b/config/examples/RigidBot/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/SCARA/Configuration.h b/config/examples/SCARA/Configuration.h
index faf11620f4..81ae7966d2 100644
--- a/config/examples/SCARA/Configuration.h
+++ b/config/examples/SCARA/Configuration.h
@@ -2041,8 +2041,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/STM32/Black_STM32F407VET6/Configuration.h b/config/examples/STM32/Black_STM32F407VET6/Configuration.h
index 25aa7ca945..8687711a66 100644
--- a/config/examples/STM32/Black_STM32F407VET6/Configuration.h
+++ b/config/examples/STM32/Black_STM32F407VET6/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/STM32/STM32F10/Configuration.h b/config/examples/STM32/STM32F10/Configuration.h
index 4a010c099e..bf04ae1508 100644
--- a/config/examples/STM32/STM32F10/Configuration.h
+++ b/config/examples/STM32/STM32F10/Configuration.h
@@ -2034,8 +2034,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/STM32/STM32F4/Configuration.h b/config/examples/STM32/STM32F4/Configuration.h
index f03379f56d..1030c5de0c 100644
--- a/config/examples/STM32/STM32F4/Configuration.h
+++ b/config/examples/STM32/STM32F4/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/STM32/stm32f103ret6/Configuration.h b/config/examples/STM32/stm32f103ret6/Configuration.h
index b027e887ed..1c8fab8699 100644
--- a/config/examples/STM32/stm32f103ret6/Configuration.h
+++ b/config/examples/STM32/stm32f103ret6/Configuration.h
@@ -2034,8 +2034,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Sanguinololu/Configuration.h b/config/examples/Sanguinololu/Configuration.h
index df1b39c999..7bc24ddfb7 100644
--- a/config/examples/Sanguinololu/Configuration.h
+++ b/config/examples/Sanguinololu/Configuration.h
@@ -2063,8 +2063,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Tevo/Tarantula Pro/Configuration.h b/config/examples/Tevo/Tarantula Pro/Configuration.h
index d6ebcda8d7..9fe6d69d85 100644
--- a/config/examples/Tevo/Tarantula Pro/Configuration.h
+++ b/config/examples/Tevo/Tarantula Pro/Configuration.h
@@ -2024,8 +2024,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/TheBorg/Configuration.h b/config/examples/TheBorg/Configuration.h
index 4f4c56774b..8b67005467 100644
--- a/config/examples/TheBorg/Configuration.h
+++ b/config/examples/TheBorg/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/TinyBoy2/Configuration.h b/config/examples/TinyBoy2/Configuration.h
index f778ea9742..4577e21592 100644
--- a/config/examples/TinyBoy2/Configuration.h
+++ b/config/examples/TinyBoy2/Configuration.h
@@ -2088,8 +2088,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Tronxy/X1/Configuration.h b/config/examples/Tronxy/X1/Configuration.h
index 5ba2648e53..7587d0196a 100644
--- a/config/examples/Tronxy/X1/Configuration.h
+++ b/config/examples/Tronxy/X1/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Tronxy/X3A/Configuration.h b/config/examples/Tronxy/X3A/Configuration.h
index a1348957f2..f84631305c 100644
--- a/config/examples/Tronxy/X3A/Configuration.h
+++ b/config/examples/Tronxy/X3A/Configuration.h
@@ -2036,8 +2036,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Tronxy/X5S-2E/Configuration.h b/config/examples/Tronxy/X5S-2E/Configuration.h
index faab4c028c..082c1b8947 100644
--- a/config/examples/Tronxy/X5S-2E/Configuration.h
+++ b/config/examples/Tronxy/X5S-2E/Configuration.h
@@ -2053,8 +2053,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Tronxy/X5S/Configuration.h b/config/examples/Tronxy/X5S/Configuration.h
index 0f4c580867..8db73b707b 100644
--- a/config/examples/Tronxy/X5S/Configuration.h
+++ b/config/examples/Tronxy/X5S/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Tronxy/XY100/Configuration.h b/config/examples/Tronxy/XY100/Configuration.h
index f38990ec56..8f239d9204 100644
--- a/config/examples/Tronxy/XY100/Configuration.h
+++ b/config/examples/Tronxy/XY100/Configuration.h
@@ -2043,8 +2043,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/UltiMachine/Archim1/Configuration.h b/config/examples/UltiMachine/Archim1/Configuration.h
index d836a170d0..1797736650 100644
--- a/config/examples/UltiMachine/Archim1/Configuration.h
+++ b/config/examples/UltiMachine/Archim1/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/UltiMachine/Archim2/Configuration.h b/config/examples/UltiMachine/Archim2/Configuration.h
index 8071a35e22..8460f0d53d 100644
--- a/config/examples/UltiMachine/Archim2/Configuration.h
+++ b/config/examples/UltiMachine/Archim2/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/VORONDesign/Configuration.h b/config/examples/VORONDesign/Configuration.h
index c718d985ed..83b0d7928c 100644
--- a/config/examples/VORONDesign/Configuration.h
+++ b/config/examples/VORONDesign/Configuration.h
@@ -2041,8 +2041,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Velleman/K8200/Configuration.h b/config/examples/Velleman/K8200/Configuration.h
index 440306ab28..99d28567b1 100644
--- a/config/examples/Velleman/K8200/Configuration.h
+++ b/config/examples/Velleman/K8200/Configuration.h
@@ -2030,8 +2030,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Velleman/K8400/Configuration.h b/config/examples/Velleman/K8400/Configuration.h
index edf8cf508b..9ceca3c911 100644
--- a/config/examples/Velleman/K8400/Configuration.h
+++ b/config/examples/Velleman/K8400/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Velleman/K8400/Dual-head/Configuration.h b/config/examples/Velleman/K8400/Dual-head/Configuration.h
index 584a48111d..9bc4e63978 100644
--- a/config/examples/Velleman/K8400/Dual-head/Configuration.h
+++ b/config/examples/Velleman/K8400/Dual-head/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/WASP/PowerWASP/Configuration.h b/config/examples/WASP/PowerWASP/Configuration.h
index b70d4e95bb..7b9d8c64e8 100644
--- a/config/examples/WASP/PowerWASP/Configuration.h
+++ b/config/examples/WASP/PowerWASP/Configuration.h
@@ -2051,8 +2051,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Wanhao/Duplicator 6/Configuration.h b/config/examples/Wanhao/Duplicator 6/Configuration.h
index 9f69e747fd..72b8b30ff8 100644
--- a/config/examples/Wanhao/Duplicator 6/Configuration.h
+++ b/config/examples/Wanhao/Duplicator 6/Configuration.h
@@ -2045,8 +2045,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/Wanhao/Duplicator i3 Mini/Configuration.h b/config/examples/Wanhao/Duplicator i3 Mini/Configuration.h
index 5dcb4b1465..e5322c1bc5 100755
--- a/config/examples/Wanhao/Duplicator i3 Mini/Configuration.h
+++ b/config/examples/Wanhao/Duplicator i3 Mini/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/adafruit/ST7565/Configuration.h b/config/examples/adafruit/ST7565/Configuration.h
index a91e0d7ed5..3d79fefb12 100644
--- a/config/examples/adafruit/ST7565/Configuration.h
+++ b/config/examples/adafruit/ST7565/Configuration.h
@@ -2032,8 +2032,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/delta/Anycubic/Kossel/Configuration.h b/config/examples/delta/Anycubic/Kossel/Configuration.h
index a5bddc91b1..dbd75691d8 100644
--- a/config/examples/delta/Anycubic/Kossel/Configuration.h
+++ b/config/examples/delta/Anycubic/Kossel/Configuration.h
@@ -2220,8 +2220,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/delta/FLSUN/auto_calibrate/Configuration.h b/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
index 699e570292..e588e5fb90 100644
--- a/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
+++ b/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
@@ -2160,8 +2160,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/delta/FLSUN/kossel/Configuration.h b/config/examples/delta/FLSUN/kossel/Configuration.h
index fddf025086..09e2077d40 100644
--- a/config/examples/delta/FLSUN/kossel/Configuration.h
+++ b/config/examples/delta/FLSUN/kossel/Configuration.h
@@ -2159,8 +2159,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/delta/FLSUN/kossel_mini/Configuration.h b/config/examples/delta/FLSUN/kossel_mini/Configuration.h
index 633b25f94f..486e2d63b7 100644
--- a/config/examples/delta/FLSUN/kossel_mini/Configuration.h
+++ b/config/examples/delta/FLSUN/kossel_mini/Configuration.h
@@ -2159,8 +2159,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/delta/Geeetech/Rostock 301/Configuration.h b/config/examples/delta/Geeetech/Rostock 301/Configuration.h
index 6338bee203..6ad6bc0b00 100644
--- a/config/examples/delta/Geeetech/Rostock 301/Configuration.h
+++ b/config/examples/delta/Geeetech/Rostock 301/Configuration.h
@@ -2148,8 +2148,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/delta/Hatchbox_Alpha/Configuration.h b/config/examples/delta/Hatchbox_Alpha/Configuration.h
index 16362ed0af..14c81a8682 100644
--- a/config/examples/delta/Hatchbox_Alpha/Configuration.h
+++ b/config/examples/delta/Hatchbox_Alpha/Configuration.h
@@ -2162,8 +2162,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/delta/MKS/SBASE/Configuration.h b/config/examples/delta/MKS/SBASE/Configuration.h
index 1332d2639c..9fb409414f 100644
--- a/config/examples/delta/MKS/SBASE/Configuration.h
+++ b/config/examples/delta/MKS/SBASE/Configuration.h
@@ -2147,8 +2147,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/delta/Tevo Little Monster/Configuration.h b/config/examples/delta/Tevo Little Monster/Configuration.h
index 0ab7872aa8..ce4ba3af10 100644
--- a/config/examples/delta/Tevo Little Monster/Configuration.h
+++ b/config/examples/delta/Tevo Little Monster/Configuration.h
@@ -2151,8 +2151,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/delta/generic/Configuration.h b/config/examples/delta/generic/Configuration.h
index af30e012cc..17a51d4971 100644
--- a/config/examples/delta/generic/Configuration.h
+++ b/config/examples/delta/generic/Configuration.h
@@ -2147,8 +2147,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/delta/kossel_mini/Configuration.h b/config/examples/delta/kossel_mini/Configuration.h
index f1285212db..e5e50028de 100644
--- a/config/examples/delta/kossel_mini/Configuration.h
+++ b/config/examples/delta/kossel_mini/Configuration.h
@@ -2149,8 +2149,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/delta/kossel_pro/Configuration.h b/config/examples/delta/kossel_pro/Configuration.h
index 202f144877..7c3e556c5e 100644
--- a/config/examples/delta/kossel_pro/Configuration.h
+++ b/config/examples/delta/kossel_pro/Configuration.h
@@ -2150,8 +2150,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/delta/kossel_xl/Configuration.h b/config/examples/delta/kossel_xl/Configuration.h
index 1788176997..802d633d65 100644
--- a/config/examples/delta/kossel_xl/Configuration.h
+++ b/config/examples/delta/kossel_xl/Configuration.h
@@ -2150,8 +2150,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/gCreate/gMax1.5+/Configuration.h b/config/examples/gCreate/gMax1.5+/Configuration.h
index dd87d1c7ac..75fde8dca5 100644
--- a/config/examples/gCreate/gMax1.5+/Configuration.h
+++ b/config/examples/gCreate/gMax1.5+/Configuration.h
@@ -2046,8 +2046,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/makibox/Configuration.h b/config/examples/makibox/Configuration.h
index ab93548f4c..fb09aabdd8 100644
--- a/config/examples/makibox/Configuration.h
+++ b/config/examples/makibox/Configuration.h
@@ -2035,8 +2035,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/tvrrug/Round2/Configuration.h b/config/examples/tvrrug/Round2/Configuration.h
index dbc75f9111..bc82843b1c 100644
--- a/config/examples/tvrrug/Round2/Configuration.h
+++ b/config/examples/tvrrug/Round2/Configuration.h
@@ -2027,8 +2027,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
diff --git a/config/examples/wt150/Configuration.h b/config/examples/wt150/Configuration.h
index ca29af8ff6..38ab2e4d8d 100644
--- a/config/examples/wt150/Configuration.h
+++ b/config/examples/wt150/Configuration.h
@@ -2037,8 +2037,16 @@
//=============================================================================
//
-// CONTROLLER TYPE: Keypad / Add-on
+// Alfawise U30 ILI9341 2.8 TP Ver 1.2
+// (Blue PCB on the back of touchscreen)
//
+//#define TOUCH_BUTTONS
+#if ENABLED(TOUCH_BUTTONS)
+ #define XPT2046_X_CALIBRATION 12316
+ #define XPT2046_Y_CALIBRATION -8981
+ #define XPT2046_X_OFFSET -43
+ #define XPT2046_Y_OFFSET 257
+#endif
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1