From de5cca6b1f660776e85d646d9c227c03ef60ccf1 Mon Sep 17 00:00:00 2001
From: Diego von Deschwanden <68632259+Diegovd@users.noreply.github.com>
Date: Tue, 28 Jul 2020 08:04:44 +0200
Subject: [PATCH 001/194] Update more external links (#18819)
---
LICENSE | 5 ++---
Marlin/src/HAL/DUE/HAL.cpp | 1 +
Marlin/src/HAL/ESP32/ota.cpp | 1 +
Marlin/src/HAL/STM32/SoftwareSerial.cpp | 10 +++++-----
Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp | 2 +-
Marlin/src/feature/dac/dac_mcp4728.cpp | 2 +-
Marlin/src/gcode/motion/G5.cpp | 2 +-
buildroot/share/vscode/avrdude.conf | 16 ++++++++--------
buildroot/share/vscode/avrdude_linux.conf | 16 ++++++++--------
buildroot/share/vscode/avrdude_macOS.conf | 8 ++++----
platformio.ini | 2 +-
11 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/LICENSE b/LICENSE
index 4ad6d9b1e2..6c0e10f3b8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3,7 +3,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (c) 2007 Free Software Foundation, Inc.
+ Copyright (c) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -673,5 +673,4 @@ into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
-.
-
+.
diff --git a/Marlin/src/HAL/DUE/HAL.cpp b/Marlin/src/HAL/DUE/HAL.cpp
index f2bf4ebbf5..4b9260c359 100644
--- a/Marlin/src/HAL/DUE/HAL.cpp
+++ b/Marlin/src/HAL/DUE/HAL.cpp
@@ -15,6 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
+ *
*/
/**
diff --git a/Marlin/src/HAL/ESP32/ota.cpp b/Marlin/src/HAL/ESP32/ota.cpp
index 7cf65ed2d3..69a3e25e56 100644
--- a/Marlin/src/HAL/ESP32/ota.cpp
+++ b/Marlin/src/HAL/ESP32/ota.cpp
@@ -15,6 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
+ *
*/
#ifdef ARDUINO_ARCH_ESP32
diff --git a/Marlin/src/HAL/STM32/SoftwareSerial.cpp b/Marlin/src/HAL/STM32/SoftwareSerial.cpp
index af92548cbb..2228a177be 100644
--- a/Marlin/src/HAL/STM32/SoftwareSerial.cpp
+++ b/Marlin/src/HAL/STM32/SoftwareSerial.cpp
@@ -3,14 +3,14 @@
*
* Multi-instance software serial library for Arduino/Wiring
* -- Interrupt-driven receive and other improvements by ladyada
- * (https://ladyada.net)
+ *
* -- Tuning, circular buffer, derivation from class Print/Stream,
* multi-instance support, porting to 8MHz processors,
* various optimizations, PROGMEM delay tables, inverse logic and
- * direct port writing by Mikal Hart (http://www.arduiniana.org)
- * -- Pin change interrupt macros by Paul Stoffregen (https://www.pjrc.com)
- * -- 20MHz processor support by Garrett Mace (http://www.macetech.com)
- * -- ATmega1280/2560 support by Brett Hagman (https://www.roguerobotics.com/)
+ * direct port writing by Mikal Hart
+ * -- Pin change interrupt macros by Paul Stoffregen
+ * -- 20MHz processor support by Garrett Mace
+ * -- ATmega1280/2560 support by Brett Hagman
* -- STM32 support by Armin van der Togt
*
* This library is free software; you can redistribute it and/or
diff --git a/Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp b/Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp
index f524673ecd..bfc062af20 100644
--- a/Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp
+++ b/Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp
@@ -4,7 +4,7 @@
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://www.mozilla.org/en-US/MPL/2.0/
*
* This library was modified, some bugs fixed, stack address validated
* and adapted to be used in Marlin 3D printer firmware as backtracer
diff --git a/Marlin/src/feature/dac/dac_mcp4728.cpp b/Marlin/src/feature/dac/dac_mcp4728.cpp
index 4976b36907..55f10a49ef 100644
--- a/Marlin/src/feature/dac/dac_mcp4728.cpp
+++ b/Marlin/src/feature/dac/dac_mcp4728.cpp
@@ -27,7 +27,7 @@
* https://ww1.microchip.com/downloads/en/DeviceDoc/22187a.pdf
*
* For discussion and feedback, please go to:
- * https://arduino.cc/forum/index.php/topic,51842.0.html
+ * https://forum.arduino.cc/index.php/topic,51842.0.html
*/
#include "../../inc/MarlinConfig.h"
diff --git a/Marlin/src/gcode/motion/G5.cpp b/Marlin/src/gcode/motion/G5.cpp
index 35cc428023..2c98fae845 100644
--- a/Marlin/src/gcode/motion/G5.cpp
+++ b/Marlin/src/gcode/motion/G5.cpp
@@ -29,7 +29,7 @@
/**
* Parameters interpreted according to:
- * https://linuxcnc.org/docs/2.6/html/gcode/gcode.html#sec:G5-Cubic-Spline
+ * https://linuxcnc.org/docs/2.7/html/gcode/g-code.html#gcode:g5
* However I, J omission is not supported at this point; all
* parameters can be omitted and default to zero.
*/
diff --git a/buildroot/share/vscode/avrdude.conf b/buildroot/share/vscode/avrdude.conf
index 1194847f77..475f8bf108 100644
--- a/buildroot/share/vscode/avrdude.conf
+++ b/buildroot/share/vscode/avrdude.conf
@@ -145,9 +145,9 @@
# VCC pins are not defined for the programmer, a message
# indicating that the device needs a power-cycle is printed out.
# This flag was added to work around a problem with the
-# at90s4433/2333's; see the at90s4433 errata at:
+# at90s4433/2333's; see the at90s4433 errata page 2 at:
#
-# http://www.atmel.com/atmel/acrobat/doc1280.pdf
+# https://ww1.microchip.com/downloads/en/AppNotes/doc2574.pdf
#
# INSTRUCTION FORMATS
#
@@ -416,13 +416,13 @@ programmer
programmer
id = "usbasp";
- desc = "USBasp, http://www.fischl.de/usbasp/";
+ desc = "USBasp, https://www.fischl.de/usbasp/";
type = usbasp;
;
programmer
id = "usbtiny";
- desc = "USBtiny simple USB programmer, http://www.ladyada.net/make/usbtinyisp/";
+ desc = "USBtiny simple USB programmer, https://learn.adafruit.com/usbtinyisp";
type = usbtiny;
;
@@ -596,7 +596,7 @@ programmer
programmer
id = "bsd";
- desc = "Brian Dean's Programmer, http://www.bsdhome.com/avrdude/";
+ desc = "Brian Dean's Programmer, https://savannah.nongnu.org/projects/avrdude";
type = par;
vcc = 2, 3, 4, 5;
reset = 7;
@@ -743,7 +743,7 @@ programmer
programmer
id = "atisp";
- desc = "AT-ISP V1.1 programming cable for AVR-SDK1 from micro-research.co.th";
+ desc = "AT-ISP V1.1 programming cable for AVR-SDK1 from micro-research.co.th";
type = par;
reset = ~6;
sck = ~8;
@@ -773,7 +773,7 @@ programmer
;
# It is almost same as pony-stk200, except vcc on pin 5 to auto
-# disconnect port (download on http://electropol.free.fr)
+# disconnect port download on http://www.electropol.fr
programmer
id = "frank-stk200";
desc = "Frank STK200";
@@ -787,7 +787,7 @@ programmer
;
# The AT98ISP Cable is a simple parallel dongle for AT89 family.
-# http://www.atmel.com/dyn/products/tools_card.asp?tool_id=2877
+# https://www.microchip.com/wwwAppNotes/AppNotes.aspx?appnote=en592141
programmer
id = "89isp";
desc = "Atmel at89isp cable";
diff --git a/buildroot/share/vscode/avrdude_linux.conf b/buildroot/share/vscode/avrdude_linux.conf
index 46e7ace34b..cbc65d6917 100644
--- a/buildroot/share/vscode/avrdude_linux.conf
+++ b/buildroot/share/vscode/avrdude_linux.conf
@@ -145,9 +145,9 @@
# VCC pins are not defined for the programmer, a message
# indicating that the device needs a power-cycle is printed out.
# This flag was added to work around a problem with the
-# at90s4433/2333's; see the at90s4433 errata at:
+# at90s4433/2333's; see the at90s4433 errata page 2 at:
#
-# http://www.atmel.com/atmel/acrobat/doc1280.pdf
+# https://ww1.microchip.com/downloads/en/AppNotes/doc2574.pdf
#
# INSTRUCTION FORMATS
#
@@ -416,13 +416,13 @@ programmer
programmer
id = "usbasp";
- desc = "USBasp, http://www.fischl.de/usbasp/";
+ desc = "USBasp, https://www.fischl.de/usbasp/";
type = usbasp;
;
programmer
id = "usbtiny";
- desc = "USBtiny simple USB programmer, http://www.ladyada.net/make/usbtinyisp/";
+ desc = "USBtiny simple USB programmer, https://learn.adafruit.com/usbtinyisp";
type = usbtiny;
;
@@ -596,7 +596,7 @@ programmer
programmer
id = "bsd";
- desc = "Brian Dean's Programmer, http://www.bsdhome.com/avrdude/";
+ desc = "Brian Dean's Programmer, https://savannah.nongnu.org/projects/avrdude";
type = par;
vcc = 2, 3, 4, 5;
reset = 7;
@@ -743,7 +743,7 @@ programmer
programmer
id = "atisp";
- desc = "AT-ISP V1.1 programming cable for AVR-SDK1 from micro-research.co.th";
+ desc = "AT-ISP V1.1 programming cable for AVR-SDK1 from micro-research.co.th";
type = par;
reset = ~6;
sck = ~8;
@@ -773,7 +773,7 @@ programmer
;
# It is almost same as pony-stk200, except vcc on pin 5 to auto
-# disconnect port (download on http://electropol.free.fr)
+# disconnect port download on http://www.electropol.fr
programmer
id = "frank-stk200";
desc = "Frank STK200";
@@ -787,7 +787,7 @@ programmer
;
# The AT98ISP Cable is a simple parallel dongle for AT89 family.
-# http://www.atmel.com/dyn/products/tools_card.asp?tool_id=2877
+# https://www.microchip.com/wwwAppNotes/AppNotes.aspx?appnote=en592141
programmer
id = "89isp";
desc = "Atmel at89isp cable";
diff --git a/buildroot/share/vscode/avrdude_macOS.conf b/buildroot/share/vscode/avrdude_macOS.conf
index d933567452..814e87e35e 100644
--- a/buildroot/share/vscode/avrdude_macOS.conf
+++ b/buildroot/share/vscode/avrdude_macOS.conf
@@ -145,9 +145,9 @@
# VCC pins are not defined for the programmer, a message
# indicating that the device needs a power-cycle is printed out.
# This flag was added to work around a problem with the
-# at90s4433/2333's; see the at90s4433 errata at:
+# at90s4433/2333's; see the at90s4433 errata page 2 at:
#
-# http://www.atmel.com/atmel/acrobat/doc1280.pdf
+# https://ww1.microchip.com/downloads/en/AppNotes/doc2574.pdf
#
# INSTRUCTION FORMATS
#
@@ -416,13 +416,13 @@ programmer
programmer
id = "usbasp";
- desc = "USBasp, http://www.fischl.de/usbasp/";
+ desc = "USBasp, https://www.fischl.de/usbasp/";
type = usbasp;
;
programmer
id = "usbtiny";
- desc = "USBtiny simple USB programmer, http://www.ladyada.net/make/usbtinyisp/";
+ desc = "USBtiny simple USB programmer, https://learn.adafruit.com/usbtinyisp";
type = usbtiny;
;
diff --git a/platformio.ini b/platformio.ini
index 543b837f54..f60ebcce35 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -4,7 +4,7 @@
#
# For detailed documentation with EXAMPLES:
#
-# https://docs.platformio.org/en/latest/projectconf.html
+# https://docs.platformio.org/en/latest/projectconf/index.html
#
# Automatic targets - enable auto-uploading
From b80cc09b13dbac0b1b289a89568641a07e226345 Mon Sep 17 00:00:00 2001
From: Scott Lahteine
Date: Tue, 28 Jul 2020 03:10:00 -0500
Subject: [PATCH 002/194] Keep -std=gnu++11 in stm32 build_unflags
---
platformio.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platformio.ini b/platformio.ini
index f60ebcce35..24d416444f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -380,7 +380,7 @@ src_filter = ${common.default_src_filter} +
platform = ${common_stm32.platform}
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL
-build_unflags = -std=gnu11
+build_unflags = -std=gnu11 -std=gnu++11
src_filter = ${common.default_src_filter} +
lib_ignore = SPI
lib_deps = ${common.lib_deps}
From aaf1ee78a454969cf948b69e6afdd121adb80fc7 Mon Sep 17 00:00:00 2001
From: thinkyhead
Date: Wed, 29 Jul 2020 00:09:42 +0000
Subject: [PATCH 003/194] [cron] Bump distribution date (2020-07-29)
---
Marlin/src/inc/Version.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index aea45c24c5..c85a31df07 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
- #define STRING_DISTRIBUTION_DATE "2020-07-28"
+ #define STRING_DISTRIBUTION_DATE "2020-07-29"
#endif
/**
From f205cd7d2cf3b78c75f60648f972cd12377f0784 Mon Sep 17 00:00:00 2001
From: natemason
Date: Wed, 29 Jul 2020 09:18:02 +0800
Subject: [PATCH 004/194] Add TEMP_PROBE_PIN for Einsy Rambo (#18823)
---
Marlin/src/pins/rambo/pins_EINSY_RAMBO.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index 76c3f131a9..8fb3be47da 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -109,6 +109,7 @@
#define TEMP_0_PIN 0 // Analog Input
#define TEMP_1_PIN 1 // Analog Input
#define TEMP_BED_PIN 2 // Analog Input
+#define TEMP_PROBE_PIN 3 // Analog Input
//
// Heaters / Fans
From 159dcd8e8a6e829fa8caaa90ecf1a5140ea87989 Mon Sep 17 00:00:00 2001
From: MoellerDi
Date: Wed, 29 Jul 2020 03:19:12 +0200
Subject: [PATCH 005/194] Fix NEOPIXEL_LED compile w/out PRINTER_EVENT_LEDS
(#18824)
---
Marlin/src/inc/Conditionals_LCD.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 66e83c5299..992a788eb5 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -752,6 +752,6 @@
/**
* To check if we need the folder src/features/leds
*/
-#if ANY(TEMP_STAT_LEDS, HAS_COLOR_LEDS, HAS_CASE_LIGHT, PRINTER_EVENT_LEDS, LED_BACKLIGHT_TIMEOUT, PCA9632_BUZZER, LED_CONTROL_MENU)
+#if ANY(TEMP_STAT_LEDS, HAS_COLOR_LEDS, HAS_CASE_LIGHT, PRINTER_EVENT_LEDS, LED_BACKLIGHT_TIMEOUT, PCA9632_BUZZER, LED_CONTROL_MENU, NEOPIXEL_LED)
#define HAS_LED_FEATURE 1
#endif
From 62da2c97d0f17fff6bc5bf3ca7be7ba6f9c8e0a7 Mon Sep 17 00:00:00 2001
From: Victor Oliveira
Date: Tue, 28 Jul 2020 23:15:17 -0300
Subject: [PATCH 006/194] DISABLE_DEBUG required to free Robin nano Z_DIR_PIN
(#18832)
---
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index dd0d1e9465..ee88962e12 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -37,7 +37,7 @@
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
//
-//#define DISABLE_DEBUG
+#define DISABLE_DEBUG
//
// EEPROM
From 83e15f7701d36f3c8401ab0064278d233e2be6de Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Wed, 29 Jul 2020 04:19:46 +0200
Subject: [PATCH 007/194] [SAMD51] ES Interrupt parity with other HALs (#18836)
---
Marlin/src/HAL/SAMD51/endstop_interrupts.h | 27 +++++++++++-----------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/Marlin/src/HAL/SAMD51/endstop_interrupts.h b/Marlin/src/HAL/SAMD51/endstop_interrupts.h
index 03c2469453..daac773387 100644
--- a/Marlin/src/HAL/SAMD51/endstop_interrupts.h
+++ b/Marlin/src/HAL/SAMD51/endstop_interrupts.h
@@ -126,82 +126,83 @@
void endstop_ISR() { endstops.update(); }
void setup_endstop_interrupts() {
+ #define _ATTACH(P) attachInterrupt(P, endstop_ISR, CHANGE)
#if HAS_X_MAX
#if !AVAILABLE_EILINE(X_MAX_PIN)
#error "X_MAX_PIN has no EXTINT line available."
#endif
- attachInterrupt(X_MAX_PIN, endstop_ISR, CHANGE);
+ _ATTACH(X_MAX_PIN);
#endif
#if HAS_X_MIN
#if !AVAILABLE_EILINE(X_MIN_PIN)
#error "X_MIN_PIN has no EXTINT line available."
#endif
- attachInterrupt(X_MIN_PIN, endstop_ISR, CHANGE);
+ _ATTACH(X_MIN_PIN);
#endif
#if HAS_Y_MAX
#if !AVAILABLE_EILINE(Y_MAX_PIN)
#error "Y_MAX_PIN has no EXTINT line available."
#endif
- attachInterrupt(Y_MAX_PIN, endstop_ISR, CHANGE);
+ _ATTACH(Y_MAX_PIN);
#endif
#if HAS_Y_MIN
#if !AVAILABLE_EILINE(Y_MIN_PIN)
#error "Y_MIN_PIN has no EXTINT line available."
#endif
- attachInterrupt(Y_MIN_PIN, endstop_ISR, CHANGE);
+ _ATTACH(Y_MIN_PIN);
#endif
#if HAS_Z_MAX
#if !AVAILABLE_EILINE(Z_MAX_PIN)
#error "Z_MAX_PIN has no EXTINT line available."
#endif
- attachInterrupt(Z_MAX_PIN, endstop_ISR, CHANGE);
+ _ATTACH(Z_MAX_PIN);
#endif
#if HAS_Z_MIN
#if !AVAILABLE_EILINE(Z_MIN_PIN)
#error "Z_MIN_PIN has no EXTINT line available."
#endif
- attachInterrupt(Z_MIN_PIN, endstop_ISR, CHANGE);
+ _ATTACH(Z_MIN_PIN);
#endif
#if HAS_Z2_MAX
#if !AVAILABLE_EILINE(Z2_MAX_PIN)
#error "Z2_MAX_PIN has no EXTINT line available."
#endif
- attachInterrupt(Z2_MAX_PIN, endstop_ISR, CHANGE);
+ _ATTACH(Z2_MAX_PIN);
#endif
#if HAS_Z2_MIN
#if !AVAILABLE_EILINE(Z2_MIN_PIN)
#error "Z2_MIN_PIN has no EXTINT line available."
#endif
- attachInterrupt(Z2_MIN_PIN, endstop_ISR, CHANGE);
+ _ATTACH(Z2_MIN_PIN);
#endif
#if HAS_Z3_MAX
#if !AVAILABLE_EILINE(Z3_MAX_PIN)
#error "Z3_MAX_PIN has no EXTINT line available."
#endif
- attachInterrupt(Z3_MAX_PIN, endstop_ISR, CHANGE);
+ _ATTACH(Z3_MAX_PIN);
#endif
#if HAS_Z3_MIN
#if !AVAILABLE_EILINE(Z3_MIN_PIN)
#error "Z3_MIN_PIN has no EXTINT line available."
#endif
- attachInterrupt(Z3_MIN_PIN, endstop_ISR, CHANGE);
+ _ATTACH(Z3_MIN_PIN);
#endif
#if HAS_Z4_MAX
#if !AVAILABLE_EILINE(Z4_MAX_PIN)
#error "Z4_MAX_PIN has no EXTINT line available."
#endif
- attachInterrupt(Z4_MAX_PIN, endstop_ISR, CHANGE);
+ _ATTACH(Z4_MAX_PIN);
#endif
#if HAS_Z4_MIN
#if !AVAILABLE_EILINE(Z4_MIN_PIN)
#error "Z4_MIN_PIN has no EXTINT line available."
#endif
- attachInterrupt(Z4_MIN_PIN, endstop_ISR, CHANGE);
+ _ATTACH(Z4_MIN_PIN);
#endif
#if HAS_Z_MIN_PROBE_PIN
#if !AVAILABLE_EILINE(Z_MIN_PROBE_PIN)
#error "Z_MIN_PROBE_PIN has no EXTINT line available."
#endif
- attachInterrupt(Z_MIN_PROBE_PIN, endstop_ISR, CHANGE);
+ _ATTACH(Z_MIN_PROBE_PIN);
#endif
}
From 37b03dea8d34cbb6baa69f52ed365df94541763b Mon Sep 17 00:00:00 2001
From: swissnorp <67485708+swissnorp@users.noreply.github.com>
Date: Wed, 29 Jul 2020 04:28:58 +0200
Subject: [PATCH 008/194] Fix Cancel Objects index display (zero-based)
(#18841)
---
Marlin/src/feature/cancel_object.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/src/feature/cancel_object.cpp b/Marlin/src/feature/cancel_object.cpp
index 7eb4715435..16f876f136 100644
--- a/Marlin/src/feature/cancel_object.cpp
+++ b/Marlin/src/feature/cancel_object.cpp
@@ -45,7 +45,7 @@ void CancelObject::set_active_object(const int8_t obj) {
#if HAS_DISPLAY
if (active_object >= 0)
- ui.status_printf_P(0, PSTR(S_FMT " %i"), GET_TEXT(MSG_PRINTING_OBJECT), int(active_object + 1));
+ ui.status_printf_P(0, PSTR(S_FMT " %i"), GET_TEXT(MSG_PRINTING_OBJECT), int(active_object));
else
ui.reset_status();
#endif
From 05d95171cc4ef51e91c0c0f069d935f8f252dcdc Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Wed, 29 Jul 2020 21:35:31 +0200
Subject: [PATCH 009/194] Clarify Nozzle-to-Probe offset (#18828)
Co-authored-by: Scott Lahteine
---
Marlin/Configuration.h | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a01571c422..bde1e78552 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -964,24 +964,34 @@
//
/**
- * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
+ * Nozzle-to-Probe offsets { X, Y, Z }
*
- * In the following example the X and Y offsets are both positive:
+ * - Use a caliper or ruler to measure the distance from the tip of
+ * the Nozzle to the center-point of the Probe in the X and Y axes.
+ * - For the Z offset use your best known value and adjust at runtime.
+ * - Probe Offsets can be tuned at runtime with 'M851', LCD menus, babystepping, etc.
*
- * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
+ * Assuming the typical work area orientation:
+ * - Probe to RIGHT of the Nozzle has a Positive X offset
+ * - Probe to LEFT of the Nozzle has a Negative X offset
+ * - Probe in BACK of the Nozzle has a Positive Y offset
+ * - Probe in FRONT of the Nozzle has a Negative Y offset
+ *
+ * Some examples:
+ * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, -1 } // Example "1"
+ * #define NOZZLE_TO_PROBE_OFFSET {-10, 5, -1 } // Example "2"
+ * #define NOZZLE_TO_PROBE_OFFSET { 5, -5, -1 } // Example "3"
+ * #define NOZZLE_TO_PROBE_OFFSET {-15,-10, -1 } // Example "4"
*
* +-- BACK ---+
- * | |
- * L | (+) P | R <-- probe (20,20)
- * E | | I
- * F | (-) N (+) | G <-- nozzle (10,10)
- * T | | H
- * | (-) | T
- * | |
+ * | [+] |
+ * L | 1 | R <-- Example "1" (right+, back+)
+ * E | 2 | I <-- Example "2" ( left-, back+)
+ * F |[-] N [+]| G <-- Nozzle
+ * T | 3 | H <-- Example "3" (right+, front-)
+ * | 4 | T <-- Example "4" ( left-, front-)
+ * | [-] |
* O-- FRONT --+
- * (0,0)
- *
- * Specify a Probe position as { X, Y, Z }
*/
#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
From fc959463805171f1f4063886d5ecaba7cd046040 Mon Sep 17 00:00:00 2001
From: lethalwallabies <54120706+lethalwallabies@users.noreply.github.com>
Date: Wed, 29 Jul 2020 21:49:07 +0200
Subject: [PATCH 010/194] Typo fix (#18856)
---
Marlin/Configuration_adv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 3f097c09e3..7ebab9d166 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -680,7 +680,7 @@
* Danger: Don't activate 5V mode unless attached to a 5V-tolerant controller!
* V3.0 or 3.1: Set default mode to 5V mode at Marlin startup.
* If disabled, OD mode is the hard-coded default on 3.0
- * On startup, Marlin will compare its eeprom to this vale. If the selected mode
+ * On startup, Marlin will compare its eeprom to this value. If the selected mode
* differs, a mode set eeprom write will be completed at initialization.
* Use the option below to force an eeprom write to a V3.1 probe regardless.
*/
From 5eae8e78306ac570d94128e05dd3e6563b63c32b Mon Sep 17 00:00:00 2001
From: Scott Lahteine
Date: Wed, 29 Jul 2020 15:44:05 -0500
Subject: [PATCH 011/194] Update keypad link
---
Marlin/Configuration.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index bde1e78552..1f34c06918 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2197,7 +2197,7 @@
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
-// https://reprapworld.com/?products_details&products_id=202&cPath=1591_1626
+// https://reprapworld.com/products/electronics/ramps/keypad_v1_0_fully_assembled/
//
//#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 // (mm) Distance to move per key-press
From e549d474aa66a4f92eebd9512940b34e188b97c2 Mon Sep 17 00:00:00 2001
From: Diego von Deschwanden <68632259+Diegovd@users.noreply.github.com>
Date: Thu, 30 Jul 2020 02:04:37 +0200
Subject: [PATCH 012/194] Fix URLs to websites and resources (#18844)
---
buildroot/share/vscode/avrdude.conf | 2 +-
buildroot/share/vscode/avrdude_linux.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildroot/share/vscode/avrdude.conf b/buildroot/share/vscode/avrdude.conf
index 475f8bf108..9f85aa0d26 100644
--- a/buildroot/share/vscode/avrdude.conf
+++ b/buildroot/share/vscode/avrdude.conf
@@ -753,7 +753,7 @@ programmer
programmer
id = "ere-isp-avr";
- desc = "ERE ISP-AVR ";
+ desc = "ERE ISP-AVR ";
type = par;
reset = ~4;
sck = 3;
diff --git a/buildroot/share/vscode/avrdude_linux.conf b/buildroot/share/vscode/avrdude_linux.conf
index cbc65d6917..64d3b677d5 100644
--- a/buildroot/share/vscode/avrdude_linux.conf
+++ b/buildroot/share/vscode/avrdude_linux.conf
@@ -753,7 +753,7 @@ programmer
programmer
id = "ere-isp-avr";
- desc = "ERE ISP-AVR ";
+ desc = "ERE ISP-AVR ";
type = par;
reset = ~4;
sck = 3;
From 251c5c47aae1451e5be8f1151fb248b5e6a9a68b Mon Sep 17 00:00:00 2001
From: thinkyhead
Date: Thu, 30 Jul 2020 00:15:26 +0000
Subject: [PATCH 013/194] [cron] Bump distribution date (2020-07-30)
---
Marlin/src/inc/Version.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c85a31df07..199f09221d 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
- #define STRING_DISTRIBUTION_DATE "2020-07-29"
+ #define STRING_DISTRIBUTION_DATE "2020-07-30"
#endif
/**
From 95f990a656faefe071eabac107c1ffa012598710 Mon Sep 17 00:00:00 2001
From: Scott Lahteine
Date: Wed, 29 Jul 2020 20:43:35 -0500
Subject: [PATCH 014/194] Fix UNKNOWN_Z_NO_RAISE in G28
Bug introduced in 73fc0778b86
---
Marlin/src/gcode/calibrate/G28.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 1fbb3dd353..0b2bb9801b 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -312,7 +312,7 @@ void GcodeSuite::G28() {
#endif
const float z_homing_height =
- ENABLED(UNKNOWN_Z_NO_RAISE) && TEST(axis_known_position, Z_AXIS)
+ ENABLED(UNKNOWN_Z_NO_RAISE) && !TEST(axis_known_position, Z_AXIS)
? 0
: (parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT);
From 73ce80af3a3f8415a7c3f7f5551b429d58019a05 Mon Sep 17 00:00:00 2001
From: Scott Lahteine
Date: Wed, 29 Jul 2020 20:50:10 -0500
Subject: [PATCH 015/194] In G28 Z is sort-of known
---
Marlin/src/gcode/calibrate/G28.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 0b2bb9801b..78695bc05b 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -319,7 +319,7 @@ void GcodeSuite::G28() {
if (z_homing_height && (doX || doY || (ENABLED(Z_SAFE_HOMING) && doZ))) {
// Raise Z before homing any other axes and z is not already high enough (never lower z)
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Raise Z (before homing) by ", z_homing_height);
- do_z_clearance(z_homing_height, TEST(axis_known_position, Z_AXIS), DISABLED(UNKNOWN_Z_NO_RAISE));
+ do_z_clearance(z_homing_height, true, DISABLED(UNKNOWN_Z_NO_RAISE));
}
#if ENABLED(QUICK_HOME)
From 38ce5966e19094fb499ce7d647961c0594c5f811 Mon Sep 17 00:00:00 2001
From: Victor Oliveira
Date: Wed, 29 Jul 2020 23:25:07 -0300
Subject: [PATCH 016/194] SPI Emulated DOGM (like FSMC_GRAPHICAL_TFT, but SPI)
(#18817)
---
Marlin/Configuration.h | 14 +-
Marlin/Configuration_adv.h | 5 +-
Marlin/src/HAL/STM32F1/SPI.h | 2 +
.../STM32F1/dogm/u8g_com_stm32duino_hwspi.cpp | 236 ++++++++++++++++++
Marlin/src/feature/touch/xpt2046.cpp | 84 +++++--
Marlin/src/feature/touch/xpt2046.h | 4 -
Marlin/src/inc/Conditionals_LCD.h | 6 +-
Marlin/src/inc/Conditionals_post.h | 2 +-
Marlin/src/inc/SanityCheck.h | 26 +-
Marlin/src/lcd/dogm/HAL_LCD_com_defines.h | 5 +
...8g_dev_tft_320x240_upscale_from_128x64.cpp | 131 +++++-----
Marlin/src/lcd/dogm/ultralcd_DOGM.h | 14 +-
Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h | 25 +-
Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h | 24 +-
.../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 89 ++++++-
15 files changed, 542 insertions(+), 125 deletions(-)
create mode 100644 Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_hwspi.cpp
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 1f34c06918..c6ec607d9b 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2156,6 +2156,12 @@
//
//#define FSMC_GRAPHICAL_TFT
+//
+// SPI display (MKS Robin Nano V2.0, MKS Gen L V2.0)
+// Upscaled 128x64 Marlin UI
+//
+//#define SPI_GRAPHICAL_TFT
+
//
// TFT LVGL UI
//
@@ -2189,10 +2195,10 @@
#define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens
#define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus
- #define XPT2046_X_CALIBRATION 12316
- #define XPT2046_Y_CALIBRATION -8981
- #define XPT2046_X_OFFSET -43
- #define XPT2046_Y_OFFSET 257
+ //#define XPT2046_X_CALIBRATION 12316
+ //#define XPT2046_Y_CALIBRATION -8981
+ //#define XPT2046_X_OFFSET -43
+ //#define XPT2046_Y_OFFSET 257
#endif
//
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 7ebab9d166..37c9979771 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1509,9 +1509,10 @@
#endif
//
-// FSMC Graphical TFT
+// FSMC / SPI Graphical TFT
//
-#if ENABLED(FSMC_GRAPHICAL_TFT)
+#if TFT_SCALED_DOGLCD
+ //#define GRAPHICAL_TFT_ROTATE_180
//#define TFT_MARLINUI_COLOR 0xFFFF // White
//#define TFT_MARLINBG_COLOR 0x0000 // Black
//#define TFT_DISABLED_COLOR 0x0003 // Almost black
diff --git a/Marlin/src/HAL/STM32F1/SPI.h b/Marlin/src/HAL/STM32F1/SPI.h
index dc2a215865..0d20a46577 100644
--- a/Marlin/src/HAL/STM32F1/SPI.h
+++ b/Marlin/src/HAL/STM32F1/SPI.h
@@ -208,6 +208,8 @@ public:
*/
void setDataSize(uint32_t ds);
+ uint32_t getDataSize() { return _currentSetting->dataSize; }
+
/* Victor Perez 2017. Added to set and clear callback functions for callback
* on DMA transfer completion.
* onReceive used to set the callback in case of dmaTransfer (tx/rx), once rx is completed
diff --git a/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_hwspi.cpp b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_hwspi.cpp
new file mode 100644
index 0000000000..286dcfb5d0
--- /dev/null
+++ b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_hwspi.cpp
@@ -0,0 +1,236 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 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 .
+ *
+ */
+#ifdef __STM32F1__
+
+#include "../../../inc/MarlinConfig.h"
+
+#if BOTH(HAS_GRAPHICAL_LCD, SPI_GRAPHICAL_TFT) && DISABLED(FORCE_SOFT_SPI)
+
+#include "../HAL.h"
+#include
+#include
+
+#define SPI_TFT_CS_H OUT_WRITE(SPI_TFT_CS_PIN, HIGH)
+#define SPI_TFT_CS_L OUT_WRITE(SPI_TFT_CS_PIN, LOW)
+
+#define SPI_TFT_DC_H OUT_WRITE(SPI_TFT_DC_PIN, HIGH)
+#define SPI_TFT_DC_L OUT_WRITE(SPI_TFT_DC_PIN, LOW)
+
+#define SPI_TFT_RST_H OUT_WRITE(SPI_TFT_RST_PIN, HIGH)
+#define SPI_TFT_RST_L OUT_WRITE(SPI_TFT_RST_PIN, LOW)
+
+#define SPI_TFT_BLK_H OUT_WRITE(LCD_BACKLIGHT_PIN, HIGH)
+#define SPI_TFT_BLK_L OUT_WRITE(LCD_BACKLIGHT_PIN, LOW)
+
+void LCD_IO_Init(uint8_t cs, uint8_t rs);
+void LCD_IO_WriteData(uint16_t RegValue);
+void LCD_IO_WriteReg(uint16_t Reg);
+uint16_t LCD_IO_ReadData(uint16_t RegValue);
+uint32_t LCD_IO_ReadData(uint16_t RegValue, uint8_t ReadSize);
+#ifdef LCD_USE_DMA_SPI
+ void LCD_IO_WriteMultiple(uint16_t data, uint32_t count);
+ void LCD_IO_WriteSequence(uint16_t *data, uint16_t length);
+#endif
+
+void LCD_WR_REG(uint8_t cmd) {
+ SPI_TFT_CS_L;
+ SPI_TFT_DC_L;
+ SPI.send(cmd);
+ SPI_TFT_CS_H;
+}
+void LCD_WR_DATA(uint8_t data) {
+ SPI_TFT_CS_L;
+ SPI_TFT_DC_H;
+ SPI.send(data);
+ SPI_TFT_CS_H;
+}
+
+void spi1Init(uint8_t spiRate) {
+ SPI_TFT_CS_H;
+
+ /**
+ * STM32F1 APB2 = 72MHz, APB1 = 36MHz, max SPI speed of this MCU if 18Mhz
+ * STM32F1 has 3 SPI ports, SPI1 in APB2, SPI2/SPI3 in APB1
+ * so the minimum prescale of SPI1 is DIV4, SPI2/SPI3 is DIV2
+ */
+ uint8_t clock;
+ switch (spiRate) {
+ case SPI_FULL_SPEED: clock = SPI_CLOCK_DIV4; break;
+ case SPI_HALF_SPEED: clock = SPI_CLOCK_DIV4; break;
+ case SPI_QUARTER_SPEED: clock = SPI_CLOCK_DIV8; break;
+ case SPI_EIGHTH_SPEED: clock = SPI_CLOCK_DIV16; break;
+ case SPI_SPEED_5: clock = SPI_CLOCK_DIV32; break;
+ case SPI_SPEED_6: clock = SPI_CLOCK_DIV64; break;
+ default: clock = SPI_CLOCK_DIV2; // Default from the SPI library
+ }
+ SPI.setModule(1);
+ SPI.begin();
+ SPI.setClockDivider(clock);
+ SPI.setBitOrder(MSBFIRST);
+ SPI.setDataMode(SPI_MODE0);
+}
+
+void LCD_IO_Init(uint8_t cs, uint8_t rs) {
+ spi1Init(SPI_FULL_SPEED);
+}
+
+void LCD_IO_WriteData(uint16_t RegValue) {
+ LCD_WR_DATA(RegValue);
+}
+
+void LCD_IO_WriteReg(uint16_t Reg) {
+ LCD_WR_REG(Reg);
+}
+
+uint16_t LCD_IO_ReadData(uint16_t RegValue) {
+ uint16_t d = 0;
+ SPI_TFT_CS_L;
+
+ SPI_TFT_DC_L;
+ SPI.send(RegValue);
+ SPI_TFT_DC_H;
+
+ SPI.read((uint8_t*)&d, 1); //dummy read
+ SPI.read((uint8_t*)&d, 1);
+
+ SPI_TFT_CS_H;
+ return d >> 7;
+}
+
+uint32_t LCD_IO_ReadData(uint16_t RegValue, uint8_t ReadSize) {
+ uint32_t data = 0;
+ uint8_t d = 0;
+ SPI_TFT_CS_L;
+
+ SPI_TFT_DC_L;
+ SPI.send(RegValue);
+ SPI_TFT_DC_H;
+
+ SPI.read((uint8_t*)&d, 1); //dummy read
+ SPI.read((uint8_t*)&d, 1);
+ data = d;
+ while (--ReadSize) {
+ data <<= 8;
+ SPI.read((uint8_t*)&d, 1);
+ data |= (d & 0xFF);
+ }
+
+ SPI_TFT_CS_H;
+ return uint32_t(data >> 7);
+}
+
+#ifdef LCD_USE_DMA_SPI
+ void LCD_IO_WriteMultiple(uint16_t data, uint32_t count) {
+ if (SPI.getDataSize() == DATA_SIZE_8BIT) {
+ count *= 2;
+ }
+ while (count > 0) {
+ SPI_TFT_CS_L;
+ SPI_TFT_DC_H;
+ SPI.dmaSend(&data, 1, true);
+ SPI_TFT_CS_H;
+ count--;
+ }
+ }
+
+ void LCD_IO_WriteSequence(uint16_t *data, uint16_t length) {
+ if (SPI.getDataSize() == DATA_SIZE_8BIT) {
+ length *= 2;
+ }
+ SPI_TFT_CS_L;
+ SPI_TFT_DC_H;
+ SPI.dmaSend(data, length, true);
+ SPI_TFT_CS_H;
+ }
+
+ void LCD_IO_WriteSequence_Async(uint16_t *data, uint16_t length) {
+ if (SPI.getDataSize() == DATA_SIZE_8BIT) {
+ length *= 2;
+ }
+ SPI_TFT_CS_L;
+ SPI_TFT_DC_H;
+ SPI.dmaSendAsync(data, length, true);
+ SPI_TFT_CS_H;
+ }
+
+ void LCD_IO_WaitSequence_Async() {
+ SPI_TFT_CS_L;
+ SPI_TFT_DC_H;
+ SPI.dmaSendAsync(NULL, 0, true);
+ SPI_TFT_CS_H;
+ }
+#endif
+
+static uint8_t msgInitCount = 2; // Ignore all messages until 2nd U8G_COM_MSG_INIT
+
+#ifndef LCD_READ_ID
+ #define LCD_READ_ID 0x04 // Read display identification information (0xD3 on ILI9341)
+#endif
+
+uint8_t u8g_com_stm32duino_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {
+ if (msgInitCount) {
+ if (msg == U8G_COM_MSG_INIT) msgInitCount--;
+ if (msgInitCount) return -1;
+ }
+
+ static uint8_t isCommand;
+
+ LCD_IO_Init(-1, -1);
+
+ switch (msg) {
+ case U8G_COM_MSG_STOP: break;
+ case U8G_COM_MSG_INIT:
+ u8g_SetPIOutput(u8g, U8G_PI_RESET);
+
+ u8g_Delay(50);
+
+ if (arg_ptr) {
+ spi1Init(SPI_EIGHTH_SPEED);
+ *((uint32_t *)arg_ptr) = (LCD_READ_ID << 24) | LCD_IO_ReadData(LCD_READ_ID, 3);
+ spi1Init(SPI_FULL_SPEED);
+ }
+ isCommand = 0;
+ break;
+
+ case U8G_COM_MSG_ADDRESS: // define cmd (arg_val = 0) or data mode (arg_val = 1)
+ isCommand = arg_val == 0 ? 1 : 0;
+ break;
+
+ case U8G_COM_MSG_RESET:
+ u8g_SetPILevel(u8g, U8G_PI_RESET, arg_val);
+ break;
+
+ case U8G_COM_MSG_WRITE_BYTE:
+ if (isCommand)
+ LCD_IO_WriteReg(arg_val);
+ else
+ LCD_IO_WriteData((uint16_t)arg_val);
+ 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;
+
+ }
+ return 1;
+}
+
+#endif // HAS_GRAPHICAL_LCD
+#endif // STM32F1
diff --git a/Marlin/src/feature/touch/xpt2046.cpp b/Marlin/src/feature/touch/xpt2046.cpp
index 235c17b50c..d613fbc89a 100644
--- a/Marlin/src/feature/touch/xpt2046.cpp
+++ b/Marlin/src/feature/touch/xpt2046.cpp
@@ -23,10 +23,14 @@
#include "xpt2046.h"
#include "../../inc/MarlinConfig.h"
-#if ENABLED(FSMC_GRAPHICAL_TFT)
+
+#if TFT_SCALED_DOGLCD
#include "../../lcd/dogm/ultralcd_DOGM.h" // for LCD_FULL_PIXEL_WIDTH, etc.
#endif
+#ifndef XPT2046_Z1_THRESHOLD
+ #define XPT2046_Z1_THRESHOLD 10
+#endif
/*
* Draw and Touch processing
@@ -117,10 +121,15 @@ uint8_t XPT2046::read_buttons() {
// We rely on XPT2046 compatible mode to ADS7843, hence no Z1 and Z2 measurements possible.
if (!isTouched()) return 0;
- 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];
+ 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 (!isTouched()) return 0; // Fingers must still be on the TS for a valid read.
+ #if ENABLED(GRAPHICAL_TFT_ROTATE_180)
+ x = TOUCH_SCREEN_WIDTH - x;
+ y = TOUCH_SCREEN_HEIGHT - y;
+ #endif
+
// Touch within the button area simulates an encoder button
if (y > BUTTON_AREA_TOP && y < BUTTON_AREA_BOT)
return WITHIN(x, 14, 77) ? EN_D
@@ -151,30 +160,69 @@ bool XPT2046::isTouched() {
);
}
+#if ENABLED(TOUCH_BUTTONS_HW_SPI)
+ #include
+
+ static void touch_spi_init(uint8_t spiRate) {
+ /**
+ * STM32F1 APB2 = 72MHz, APB1 = 36MHz, max SPI speed of this MCU if 18Mhz
+ * STM32F1 has 3 SPI ports, SPI1 in APB2, SPI2/SPI3 in APB1
+ * so the minimum prescale of SPI1 is DIV4, SPI2/SPI3 is DIV2
+ */
+ uint8_t clock;
+ switch (spiRate) {
+ case SPI_FULL_SPEED: clock = SPI_CLOCK_DIV4; break;
+ case SPI_HALF_SPEED: clock = SPI_CLOCK_DIV4; break;
+ case SPI_QUARTER_SPEED: clock = SPI_CLOCK_DIV8; break;
+ case SPI_EIGHTH_SPEED: clock = SPI_CLOCK_DIV16; break;
+ case SPI_SPEED_5: clock = SPI_CLOCK_DIV32; break;
+ case SPI_SPEED_6: clock = SPI_CLOCK_DIV64; break;
+ default: clock = SPI_CLOCK_DIV2; // Default from the SPI library
+ }
+ SPI.setModule(TOUCH_BUTTONS_HW_SPI_DEVICE);
+ SPI.begin();
+ SPI.setClockDivider(clock);
+ SPI.setBitOrder(MSBFIRST);
+ SPI.setDataMode(SPI_MODE0);
+ }
+#endif // TOUCH_BUTTONS_HW_SPI
+
uint16_t XPT2046::getInTouch(const XPTCoordinate coordinate) {
uint16_t data[3];
+ const uint8_t coord = uint8_t(coordinate) | XPT2046_CONTROL | XPT2046_DFR_MODE;
- OUT_WRITE(TOUCH_CS_PIN, LOW);
+ #if ENABLED(TOUCH_BUTTONS_HW_SPI)
- 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);
+ touch_spi_init(SPI_SPEED_6);
+ for (uint16_t i = 0; i < 3; i++) {
+ OUT_WRITE(TOUCH_CS_PIN, LOW);
+ SPI.transfer(coord);
+ data[i] = (((SPI.transfer(0xFF) << 8) | SPI.transfer(0xFF)) >> 3) & 0x0FFF;
+ WRITE(TOUCH_CS_PIN, HIGH);
}
- data[i] = 0;
- for (uint16_t j = 0x8000; j; j >>= 1) {
+ #else // !TOUCH_BUTTONS_HW_SPI
+
+ OUT_WRITE(TOUCH_CS_PIN, LOW);
+ 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);
- if (READ(TOUCH_MISO_PIN)) data[i] |= j;
- WRITE(TOUCH_SCK_PIN, HIGH);
+ data[i] >>= 4;
}
- WRITE(TOUCH_SCK_PIN, LOW);
- data[i] >>= 4;
- }
+ WRITE(TOUCH_CS_PIN, HIGH);
- WRITE(TOUCH_CS_PIN, HIGH);
+ #endif // !TOUCH_BUTTONS_HW_SPI
uint16_t delta01 = _MAX(data[0], data[1]) - _MIN(data[0], data[1]),
delta02 = _MAX(data[0], data[2]) - _MIN(data[0], data[2]),
diff --git a/Marlin/src/feature/touch/xpt2046.h b/Marlin/src/feature/touch/xpt2046.h
index 347881e0ad..467317901b 100644
--- a/Marlin/src/feature/touch/xpt2046.h
+++ b/Marlin/src/feature/touch/xpt2046.h
@@ -34,10 +34,6 @@ enum XPTCoordinate : uint8_t {
XPT2046_Z2 = 0x40
};
-#ifndef XPT2046_Z1_THRESHOLD
- #define XPT2046_Z1_THRESHOLD 10
-#endif
-
class XPT2046 {
public:
static void init();
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 992a788eb5..1605ced3c8 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -261,7 +261,11 @@
#endif
// FSMC/SPI TFT Panels
-#if ENABLED(FSMC_GRAPHICAL_TFT)
+#if EITHER(FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT)
+ #define TFT_SCALED_DOGLCD 1
+#endif
+
+#if TFT_SCALED_DOGLCD
#define DOGLCD
#define IS_ULTIPANEL
#define DELAYED_BACKLIGHT_INIT
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index e12310e07c..c7171b06d8 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -373,7 +373,7 @@
#endif
-#if EITHER(LCD_USE_DMA_FSMC, FSMC_GRAPHICAL_TFT) || !PIN_EXISTS(SD_DETECT)
+#if ANY(LCD_USE_DMA_FSMC, FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT) || !PIN_EXISTS(SD_DETECT)
#define NO_LCD_REINIT 1 // Suppress LCD re-initialization
#endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 9fde639b0f..9fb742f505 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -451,8 +451,6 @@
#error "MKS_ROBIN_TFT is now FSMC_GRAPHICAL_TFT. Please update your configuration."
#elif defined(TFT_LVGL_UI)
#error "TFT_LVGL_UI is now TFT_LVGL_UI_FSMC. Please update your configuration."
-#elif defined(SPI_GRAPHICAL_TFT)
- #error "SPI_GRAPHICAL_TFT is now TFT_LVGL_UI_SPI. Please update your configuration."
#elif defined(SDPOWER)
#error "SDPOWER is now SDPOWER_PIN. Please update your configuration and/or pins."
#elif defined(STRING_SPLASH_LINE1) || defined(STRING_SPLASH_LINE2)
@@ -3036,11 +3034,27 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
#endif
/**
- * Sanity checks for stepper chunk support
+ * Stepper Chunk support
*/
-#if ENABLED(DIRECT_STEPPING)
- #if ENABLED(LIN_ADVANCE)
- #error "DIRECT_STEPPING is incompatible with LIN_ADVANCE. Enable in external planner if possible."
+#if BOTH(DIRECT_STEPPING, LIN_ADVANCE)
+ #error "DIRECT_STEPPING is incompatible with LIN_ADVANCE. Enable in external planner if possible."
+#endif
+
+/**
+ * Touch Buttons
+ */
+#if ENABLED(TOUCH_BUTTONS)
+ #ifndef XPT2046_X_CALIBRATION
+ #error "XPT2046_X_CALIBRATION must be defined with TOUCH_BUTTONS."
+ #endif
+ #ifndef XPT2046_Y_CALIBRATION
+ #error "XPT2046_Y_CALIBRATION must be defined with TOUCH_BUTTONS."
+ #endif
+ #ifndef XPT2046_X_OFFSET
+ #error "XPT2046_X_OFFSET must be defined with TOUCH_BUTTONS."
+ #endif
+ #ifndef XPT2046_Y_OFFSET
+ #error "XPT2046_Y_OFFSET must be defined with TOUCH_BUTTONS."
#endif
#endif
diff --git a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
index df7f8dd44b..1f9621e9c0 100644
--- a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
+++ b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
@@ -87,6 +87,11 @@
#define U8G_COM_HAL_FSMC_FN u8g_com_stm32duino_fsmc_fn
#endif
+ #if ENABLED(SPI_GRAPHICAL_TFT)
+ uint8_t u8g_com_stm32duino_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
+ #define U8G_COM_HAL_FSMC_FN u8g_com_stm32duino_spi_fn
+ #endif
+
#elif defined(TARGET_LPC1768)
uint8_t u8g_com_HAL_LPC1768_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
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 fc7a22b261..33cd5ecca6 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
@@ -57,14 +57,21 @@
#include "../../inc/MarlinConfig.h"
-#if HAS_GRAPHICAL_LCD && PIN_EXISTS(FSMC_CS)
+#if HAS_GRAPHICAL_LCD && (PIN_EXISTS(FSMC_CS) || ENABLED(SPI_GRAPHICAL_TFT))
#include "HAL_LCD_com_defines.h"
#include "ultralcd_DOGM.h"
#include
-#ifdef LCD_USE_DMA_FSMC
+#if EITHER(LCD_USE_DMA_FSMC, LCD_USE_DMA_SPI)
+ #define HAS_LCD_IO 1
+#endif
+
+#if HAS_LCD_IO
+ extern void LCD_IO_Init(uint8_t cs, uint8_t rs);
+ extern uint16_t LCD_IO_ReadData(uint16_t Reg);
+ extern uint32_t LCD_IO_ReadData(uint16_t RegValue, uint8_t ReadSize);
extern void LCD_IO_WriteReg(uint16_t Reg);
extern void LCD_IO_WriteData(uint16_t RegValue);
extern void LCD_IO_WriteSequence(uint16_t *data, uint16_t length);
@@ -148,46 +155,34 @@ static uint32_t lcd_id = 0;
static void setWindow_ili9328(u8g_t *u8g, u8g_dev_t *dev, uint16_t Xmin, uint16_t Ymin, uint16_t Xmax, uint16_t Ymax) {
- #ifdef LCD_USE_DMA_FSMC
- LCD_IO_WriteReg(ILI9328_HASTART);
- LCD_IO_WriteData(Ymin);
- LCD_IO_WriteReg(ILI9328_HAEND);
- LCD_IO_WriteData(Ymax);
- LCD_IO_WriteReg(ILI9328_VASTART);
- LCD_IO_WriteData(Xmin);
- LCD_IO_WriteReg(ILI9328_VAEND);
- LCD_IO_WriteData(Xmax);
-
- LCD_IO_WriteReg(ILI9328_HASET);
- LCD_IO_WriteData(Ymin);
- LCD_IO_WriteReg(ILI9328_VASET);
- LCD_IO_WriteData(Xmin);
-
- LCD_IO_WriteReg(ILI9328_WRITE_RAM);
+ #if HAS_LCD_IO
+ #define IO_REG_DATA(R,D) do { LCD_IO_WriteReg(R); LCD_IO_WriteData(D); }while(0)
#else
+ #define IO_REG_DATA(R,D) do { u8g_WriteByte(u8g, dev, R); u8g_WriteSequence(u8g, dev, 2, (uint8_t *)&D); }while(0)
+ #endif
+
+ #if NONE(LCD_USE_DMA_FSMC, LCD_USE_DMA_SPI)
u8g_SetAddress(u8g, dev, 0);
+ #endif
- u8g_WriteByte(u8g, dev, ILI9328_HASTART);
- u8g_WriteSequence(u8g, dev, 2, (uint8_t *)&Ymin);
- u8g_WriteByte(u8g, dev, ILI9328_HAEND);
- u8g_WriteSequence(u8g, dev, 2, (uint8_t *)&Ymax);
- u8g_WriteByte(u8g, dev, ILI9328_VASTART);
- u8g_WriteSequence(u8g, dev, 2, (uint8_t *)&Xmin);
- u8g_WriteByte(u8g, dev, ILI9328_VAEND);
- u8g_WriteSequence(u8g, dev, 2, (uint8_t *)&Xmax);
+ IO_REG_DATA(ILI9328_HASTART, Ymin);
+ IO_REG_DATA(ILI9328_HAEND, Ymax);
+ IO_REG_DATA(ILI9328_VASTART, Xmin);
+ IO_REG_DATA(ILI9328_VAEND, Xmax);
- u8g_WriteByte(u8g, dev, ILI9328_HASET);
- u8g_WriteSequence(u8g, dev, 2, (uint8_t *)&Ymin);
- u8g_WriteByte(u8g, dev, ILI9328_VASET);
- u8g_WriteSequence(u8g, dev, 2, (uint8_t *)&Xmin);
+ IO_REG_DATA(ILI9328_HASET, Ymin);
+ IO_REG_DATA(ILI9328_VASET, Xmin);
+ #if HAS_LCD_IO
+ LCD_IO_WriteReg(ILI9328_WRITE_RAM);
+ #else
u8g_WriteByte(u8g, dev, ILI9328_WRITE_RAM);
u8g_SetAddress(u8g, dev, 1);
#endif
}
static void setWindow_st7789v(u8g_t *u8g, u8g_dev_t *dev, uint16_t Xmin, uint16_t Ymin, uint16_t Xmax, uint16_t Ymax) {
- #ifdef LCD_USE_DMA_FSMC
+ #if HAS_LCD_IO
LCD_IO_WriteReg(ST7789V_CASET);
LCD_IO_WriteData((Xmin >> 8) & 0xFF);
LCD_IO_WriteData(Xmin & 0xFF);
@@ -227,7 +222,7 @@ void (*setWindow)(u8g_t *u8g, u8g_dev_t *dev, uint16_t Xmin, uint16_t Ymin, uint
#define ESC_END 0xFFFF, 0x7FFF
#define ESC_FFFF 0xFFFF, 0xFFFF
-#ifdef LCD_USE_DMA_FSMC
+#if HAS_LCD_IO
void writeEscSequence(const uint16_t *sequence) {
uint16_t data;
for (;;) {
@@ -247,6 +242,7 @@ void (*setWindow)(u8g_t *u8g, u8g_dev_t *dev, uint16_t Xmin, uint16_t Ymin, uint
}
}
}
+ #define WRITE_ESC_SEQUENCE(V) writeEscSequence(V)
#else
void writeEscSequence8(u8g_t *u8g, u8g_dev_t *dev, const uint16_t *sequence) {
uint16_t data;
@@ -271,6 +267,8 @@ void (*setWindow)(u8g_t *u8g, u8g_dev_t *dev, uint16_t Xmin, uint16_t Ymin, uint
}
}
+ #define WRITE_ESC_SEQUENCE(V) writeEscSequence8(u8g, dev, V)
+
void writeEscSequence16(u8g_t *u8g, u8g_dev_t *dev, const uint16_t *sequence) {
uint16_t data;
u8g_SetAddress(u8g, dev, 0);
@@ -381,6 +379,30 @@ static const uint16_t ili9341_init[] = {
ESC_END
};
+static const uint16_t st9677_init[] = {
+ ESC_REG(0x0010), ESC_DELAY(120),
+ ESC_REG(0x0001), ESC_DELAY(120),
+ ESC_REG(0x0011), ESC_DELAY(120),
+ ESC_REG(0x00F0), 0x00C3,
+ ESC_REG(0x00F0), 0x0096,
+ ESC_REG(0x0036), TERN(GRAPHICAL_TFT_ROTATE_180, 0x00E8, 0x0028),
+ ESC_REG(0x003A), 0x0055,
+ ESC_REG(0x00B4), 0x0001,
+ ESC_REG(0x00B7), 0x00C6,
+ ESC_REG(0x00E8), 0x0040, 0x008A, 0x0000, 0x0000, 0x0029, 0x0019, 0x00A5, 0x0033,
+ ESC_REG(0x00C1), 0x0006,
+ ESC_REG(0x00C2), 0x00A7,
+ ESC_REG(0x00C5), 0x0018,
+ ESC_REG(0x00E0), 0x00F0, 0x0009, 0x000B, 0x0006, 0x0004, 0x0015, 0x002F, 0x0054, 0x0042, 0x003C, 0x0017, 0x0014, 0x0018, 0x001B,
+ ESC_REG(0x00E1), 0x00F0, 0x0009, 0x000B, 0x0006, 0x0004, 0x0003, 0x002D, 0x0043, 0x0042, 0x003B, 0x0016, 0x0014, 0x0017, 0x001B,
+ ESC_REG(0x00F0), 0x003C,
+ ESC_REG(0x00F0), 0x0069, ESC_DELAY(120),
+ ESC_REG(0x0029),
+ ESC_REG(0x0011),
+ ESC_DELAY(100),
+ ESC_END
+};
+
#if ENABLED(TOUCH_BUTTONS)
static const uint8_t buttonD[] = {
@@ -560,7 +582,7 @@ static const uint16_t ili9341_init[] = {
v = TFT_MARLINBG_COLOR;
LOOP_L_N(n, FSMC_UPSCALE) buffer[k++] = v;
}
- #ifdef LCD_USE_DMA_FSMC
+ #if HAS_LCD_IO
LOOP_S_L_N(n, 1, FSMC_UPSCALE)
for (uint16_t l = 0; l < length * (FSMC_UPSCALE); l++)
buffer[l + (length * (FSMC_UPSCALE) * n)] = buffer[l];
@@ -586,41 +608,39 @@ 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);
- #ifdef LCD_USE_DMA_FSMC
+
+ #if ENABLED(SPI_GRAPHICAL_TFT)
+ LCD_IO_Init(-1, -1);
+ #endif
+
+ #if HAS_LCD_IO
static uint16_t bufferA[WIDTH * sq(FSMC_UPSCALE)], bufferB[WIDTH * sq(FSMC_UPSCALE)];
uint16_t* buffer = &bufferA[0];
- bool allow_async = true;
+ bool allow_async = DISABLED(SPI_GRAPHICAL_TFT);
#else
uint16_t buffer[WIDTH*2]; // 16-bit RGB 565 pixel line buffer
#endif
+
switch (msg) {
case U8G_DEV_MSG_INIT:
dev->com_fn(u8g, U8G_COM_MSG_INIT, U8G_SPI_CLK_CYCLE_NONE, &lcd_id);
switch (lcd_id & 0xFFFF) {
case 0x8552: // ST7789V
- #ifdef LCD_USE_DMA_FSMC
- writeEscSequence(st7789v_init);
- #else
- writeEscSequence8(u8g, dev, st7789v_init);
- #endif
+ WRITE_ESC_SEQUENCE(st7789v_init);
setWindow = setWindow_st7789v;
break;
case 0x9328: // ILI9328
- #ifdef LCD_USE_DMA_FSMC
- writeEscSequence(ili9328_init);
- #else
- writeEscSequence16(u8g, dev, ili9328_init);
- #endif
+ WRITE_ESC_SEQUENCE(ili9328_init);
setWindow = setWindow_ili9328;
break;
case 0x9341: // ILI9341
case 0x8066: // Anycubic / TronXY TFTs (480x320)
- #ifdef LCD_USE_DMA_FSMC
- writeEscSequence(ili9341_init);
- #else
- writeEscSequence8(u8g, dev, ili9341_init);
- #endif
+ WRITE_ESC_SEQUENCE(ili9341_init);
+ setWindow = setWindow_st7789v;
+ break;
+ case 0x7796:
+ WRITE_ESC_SEQUENCE(TERN(HAS_LCD_IO, st9677_init, ili9341_init));
setWindow = setWindow_st7789v;
break;
case 0x0404: // No connected display on FSMC
@@ -630,10 +650,7 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
lcd_id = 0;
return 0;
default:
- if (lcd_id && 0xFF000000)
- setWindow = setWindow_st7789v;
- else
- setWindow = setWindow_ili9328;
+ setWindow = (lcd_id & 0xFF000000) ? setWindow_st7789v : setWindow_ili9328;
break;
}
@@ -644,7 +661,7 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
// Clear Screen
setWindow(u8g, dev, 0, 0, LCD_FULL_PIXEL_WIDTH - 1, LCD_FULL_PIXEL_HEIGHT - 1);
- #ifdef LCD_USE_DMA_FSMC
+ #if HAS_LCD_IO
LCD_IO_WriteMultiple(TFT_MARLINBG_COLOR, LCD_FULL_PIXEL_WIDTH * LCD_FULL_PIXEL_HEIGHT);
#else
memset2(buffer, TFT_MARLINBG_COLOR, 160);
@@ -681,7 +698,7 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
LOOP_L_N(y, PAGE_HEIGHT) {
uint32_t k = 0;
- #ifdef LCD_USE_DMA_FSMC
+ #if HAS_LCD_IO
buffer = (y & 1) ? bufferB : bufferA;
#endif
for (uint16_t i = 0; i < (uint32_t)pb->width; i++) {
@@ -689,7 +706,7 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
const uint16_t c = TEST(b, y) ? TFT_MARLINUI_COLOR : TFT_MARLINBG_COLOR;
LOOP_L_N(n, FSMC_UPSCALE) buffer[k++] = c;
}
- #ifdef LCD_USE_DMA_FSMC
+ #if HAS_LCD_IO
LOOP_S_L_N(n, 1, FSMC_UPSCALE)
for (uint16_t l = 0; l < WIDTH * (FSMC_UPSCALE); l++)
buffer[l + WIDTH * (FSMC_UPSCALE) * n] = buffer[l];
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.h b/Marlin/src/lcd/dogm/ultralcd_DOGM.h
index 1b6dd0b9de..5ebff37edf 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.h
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.h
@@ -182,12 +182,16 @@
#define U8G_CLASS U8GLIB_SH1106_128X64
#define U8G_PARAM DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, LCD_PINS_DC, LCD_PINS_RS
-#elif ENABLED(FSMC_GRAPHICAL_TFT)
+#elif TFT_SCALED_DOGLCD
// Unspecified 320x240 TFT pre-initialized by built-in bootloader
#define U8G_CLASS U8GLIB_TFT_320X240_UPSCALE_FROM_128X64
- #define U8G_PARAM FSMC_CS_PIN, FSMC_RS_PIN
+ #if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define U8G_PARAM FSMC_CS_PIN, FSMC_RS_PIN
+ #else
+ #define U8G_PARAM -1, -1
+ #endif
#else
@@ -210,18 +214,18 @@
// LCD_FULL_PIXEL_WIDTH =
// LCD_PIXEL_OFFSET_X + (LCD_PIXEL_WIDTH * 2) + LCD_PIXEL_OFFSET_X
-#if ENABLED(FSMC_GRAPHICAL_TFT)
+#if TFT_SCALED_DOGLCD
#ifndef LCD_FULL_PIXEL_WIDTH
#define LCD_FULL_PIXEL_WIDTH 320
#endif
#ifndef LCD_PIXEL_OFFSET_X
- #define LCD_PIXEL_OFFSET_X 32
+ #define LCD_PIXEL_OFFSET_X 32
#endif
#ifndef LCD_FULL_PIXEL_HEIGHT
#define LCD_FULL_PIXEL_HEIGHT 240
#endif
#ifndef LCD_PIXEL_OFFSET_Y
- #define LCD_PIXEL_OFFSET_Y 32
+ #define LCD_PIXEL_OFFSET_Y 32
#endif
#endif
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
index 0a733049b8..5a672d29b1 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
@@ -112,10 +112,10 @@
#if ENABLED(FSMC_GRAPHICAL_TFT)
#define FSMC_UPSCALE 3
- #define LCD_FULL_PIXEL_WIDTH 480
- #define LCD_PIXEL_OFFSET_X 48
- #define LCD_FULL_PIXEL_HEIGHT 320
- #define LCD_PIXEL_OFFSET_Y 48
+ #define LCD_FULL_PIXEL_WIDTH 480
+ #define LCD_PIXEL_OFFSET_X 48
+ #define LCD_FULL_PIXEL_HEIGHT 320
+ #define LCD_PIXEL_OFFSET_Y 48
#define LCD_RESET_PIN PF11
#define LCD_BACKLIGHT_PIN PD13
@@ -135,10 +135,19 @@
#define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens
#define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus
- #define XPT2046_X_CALIBRATION -12316
- #define XPT2046_Y_CALIBRATION 8981
- #define XPT2046_X_OFFSET 340
- #define XPT2046_Y_OFFSET -20
+ #ifndef XPT2046_X_CALIBRATION
+ #define XPT2046_X_CALIBRATION -12316
+ #endif
+ #ifndef XPT2046_Y_CALIBRATION
+ #define XPT2046_Y_CALIBRATION 8981
+ #endif
+ #ifndef XPT2046_X_OFFSET
+ #define XPT2046_X_OFFSET 340
+ #endif
+ #ifndef XPT2046_Y_OFFSET
+ #define XPT2046_Y_OFFSET -20
+ #endif
+
#endif
#endif
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
index 0fb3a9a879..be71d3f2c2 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
@@ -118,10 +118,10 @@
//
#if ENABLED(FSMC_GRAPHICAL_TFT)
#define FSMC_UPSCALE 3
- #define LCD_FULL_PIXEL_WIDTH 480
- #define LCD_PIXEL_OFFSET_X 48
- #define LCD_FULL_PIXEL_HEIGHT 320
- #define LCD_PIXEL_OFFSET_Y 48
+ #define LCD_FULL_PIXEL_WIDTH 480
+ #define LCD_PIXEL_OFFSET_X 48
+ #define LCD_FULL_PIXEL_HEIGHT 320
+ #define LCD_PIXEL_OFFSET_Y 48
#define LCD_RESET_PIN PF11
#define LCD_BACKLIGHT_PIN PD13
@@ -141,10 +141,18 @@
#define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens
#define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus
- #define XPT2046_X_CALIBRATION -12316
- #define XPT2046_Y_CALIBRATION 8981
- #define XPT2046_X_OFFSET 340
- #define XPT2046_Y_OFFSET -20
+ #ifndef XPT2046_X_CALIBRATION
+ #define XPT2046_X_CALIBRATION -12316
+ #endif
+ #ifndef XPT2046_Y_CALIBRATION
+ #define XPT2046_Y_CALIBRATION 8981
+ #endif
+ #ifndef XPT2046_X_OFFSET
+ #define XPT2046_X_OFFSET 340
+ #endif
+ #ifndef XPT2046_Y_OFFSET
+ #define XPT2046_Y_OFFSET -20
+ #endif
#endif
#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index ee88962e12..afbcc8f32a 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -207,6 +207,13 @@
#define MT_DET_2_PIN PE6
#define MT_DET_PIN_INVERTING false
+#ifndef FIL_RUNOUT_PIN
+ #define FIL_RUNOUT_PIN MT_DET_1_PIN
+#endif
+#ifndef FIL_RUNOUT2_PIN
+ #define FIL_RUNOUT2_PIN MT_DET_2_PIN
+#endif
+
#define WIFI_IO0_PIN PC13
//
@@ -224,7 +231,9 @@
//
// LCD / Controller
//
-#define BEEPER_PIN PC5
+#ifndef BEEPER_PIN
+ #define BEEPER_PIN PC5
+#endif
/**
* Note: MKS Robin TFT screens use various TFT controllers.
@@ -250,7 +259,6 @@
#define BTN_EN1 PE8
#define BTN_EN2 PE11
- #define BEEPER_PIN PC5
#define BTN_ENC PE13
#elif ENABLED(TFT_LITTLE_VGL_UI)
@@ -269,16 +277,71 @@
#if HAS_SPI_LCD
- #define BEEPER_PIN PC5
- #define BTN_ENC PE13
- #define LCD_PINS_ENABLE PD13
- #define LCD_PINS_RS PC6
- #define BTN_EN1 PE8
- #define BTN_EN2 PE11
- #define LCD_BACKLIGHT_PIN -1
+ #if ENABLED(SPI_GRAPHICAL_TFT) // Emulated DOGM SPI
+ #define SPI_TFT_CS_PIN PD11
+ #define SPI_TFT_SCK_PIN PA5
+ #define SPI_TFT_MISO_PIN PA6
+ #define SPI_TFT_MOSI_PIN PA7
+ #define SPI_TFT_DC_PIN PD10
+ #define SPI_TFT_RST_PIN PC6
+
+ #define LCD_BACKLIGHT_PIN PD13
+
+ #define LCD_READ_ID 0xD3
+ #define LCD_USE_DMA_SPI
+
+ #define TOUCH_BUTTONS_HW_SPI
+ #define TOUCH_BUTTONS_HW_SPI_DEVICE 1
+
+ //#define TOUCH_BUTTONS
+ #if ENABLED(TOUCH_BUTTONS)
+ #define TOUCH_CS_PIN PE14 // SPI1_NSS
+ #define TOUCH_SCK_PIN PA5 // SPI1_SCK
+ #define TOUCH_MISO_PIN PA6 // SPI1_MISO
+ #define TOUCH_MOSI_PIN PA7 // SPI1_MOSI
+
+ #ifndef XPT2046_X_CALIBRATION
+ #define XPT2046_X_CALIBRATION -5481
+ #endif
+ #ifndef XPT2046_Y_CALIBRATION
+ #define XPT2046_Y_CALIBRATION 4000
+ #endif
+ #ifndef XPT2046_X_OFFSET
+ #define XPT2046_X_OFFSET 343
+ #endif
+ #ifndef XPT2046_Y_OFFSET
+ #define XPT2046_Y_OFFSET 0
+ #endif
+ #endif
+
+ #ifndef FSMC_UPSCALE
+ #define FSMC_UPSCALE 3
+ #endif
+ #ifndef LCD_FULL_PIXEL_WIDTH
+ #define LCD_FULL_PIXEL_WIDTH 480
+ #endif
+ #ifndef LCD_PIXEL_OFFSET_X
+ #define LCD_PIXEL_OFFSET_X 48
+ #endif
+ #ifndef LCD_FULL_PIXEL_HEIGHT
+ #define LCD_FULL_PIXEL_HEIGHT 320
+ #endif
+ #ifndef LCD_PIXEL_OFFSET_Y
+ #define LCD_PIXEL_OFFSET_Y 32
+ #endif
+
+ #define BTN_ENC PE13
+ #define BTN_EN1 PE8
+ #define BTN_EN2 PE11
+
+ #define LCD_PINS_ENABLE PD13
+ #define LCD_PINS_RS PC6
+
+ #elif ENABLED(MKS_MINI_12864)
+
+ // MKS MINI12864 and MKS LCD12864B
+ // If using MKS LCD12864A (Need to remove RPK2 resistor)
- // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
- #if ENABLED(MKS_MINI_12864)
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN -1
#define DOGLCD_A0 PD11
@@ -320,3 +383,7 @@
#define W25QXX_MISO_PIN PB14
#define W25QXX_SCK_PIN PB13
#endif
+
+#if ENABLED(SPEAKER) && BEEPER_PIN == PC5
+ #error "MKS Robin nano default BEEPER_PIN is not a SPEAKER."
+#endif
From 8faa31df5427be7001affd28a96cf6886e9d1f49 Mon Sep 17 00:00:00 2001
From: ellensp
Date: Thu, 30 Jul 2020 14:26:18 +1200
Subject: [PATCH 017/194] No HEATER_0_PIN needed with 0 EXTRUDERS (#18827)
---
Marlin/src/inc/SanityCheck.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 9fb742f505..1db779b31e 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1797,7 +1797,7 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
/**
* Test Heater, Temp Sensor, and Extruder Pins
*/
-#if !HAS_HEATER_0
+#if !HAS_HEATER_0 && EXTRUDERS
#error "HEATER_0_PIN not defined for this board."
#elif !ANY_PIN(TEMP_0, MAX6675_SS)
#error "TEMP_0_PIN not defined for this board."
From bba157e5bd5a715e1c1e58061b9038adb981793a Mon Sep 17 00:00:00 2001
From: Victor Oliveira
Date: Thu, 30 Jul 2020 00:04:47 -0300
Subject: [PATCH 018/194] SanityCheck: No Adafruit NeoPixel for STM32F1
(#18833)
---
Marlin/src/HAL/STM32F1/inc/SanityCheck.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Marlin/src/HAL/STM32F1/inc/SanityCheck.h b/Marlin/src/HAL/STM32F1/inc/SanityCheck.h
index 5559b3d4a4..ec7e8cf176 100644
--- a/Marlin/src/HAL/STM32F1/inc/SanityCheck.h
+++ b/Marlin/src/HAL/STM32F1/inc/SanityCheck.h
@@ -51,3 +51,7 @@
#elif ENABLED(SERIAL_STATS_DROPPED_RX)
#error "SERIAL_STATS_DROPPED_RX is not supported on this platform."
#endif
+
+#if ENABLED(NEOPIXEL_LED)
+ #error "NEOPIXEL_LED (Adafruit NeoPixel) is not supported for HAL/STM32F1. Comment out this line to proceed at your own risk!"
+#endif
From 117df87d193994f6fbcd46c45573095adf921784 Mon Sep 17 00:00:00 2001
From: Alexander Gavrilenko
Date: Thu, 30 Jul 2020 09:43:19 +0300
Subject: [PATCH 019/194] Support for TFT & Touch Screens (#18130)
---
.github/workflows/test-builds.yml | 1 +
Marlin/Configuration.h | 22 +-
Marlin/src/HAL/AVR/inc/Conditionals_LCD.h | 4 +
Marlin/src/HAL/DUE/inc/Conditionals_LCD.h | 4 +
Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h | 4 +
Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h | 4 +
Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h | 4 +
Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h | 4 +
Marlin/src/HAL/STM32/HAL.h | 5 +
.../src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp | 73 +-
Marlin/src/HAL/STM32/tft/tft_fsmc.cpp | 180 +++++
Marlin/src/HAL/STM32/tft/tft_fsmc.h | 160 +++++
Marlin/src/HAL/STM32/tft/tft_spi.cpp | 212 ++++++
Marlin/src/HAL/STM32/tft/tft_spi.h | 67 ++
Marlin/src/HAL/STM32/tft/xpt2046.cpp | 185 +++++
Marlin/src/HAL/STM32/tft/xpt2046.h | 86 +++
Marlin/src/HAL/STM32F1/SPI.cpp | 2 +-
Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h | 11 +
.../HAL/STM32_F4_F7/inc/Conditionals_LCD.h | 4 +
.../HAL/TEENSY31_32/inc/Conditionals_LCD.h | 4 +
.../HAL/TEENSY35_36/inc/Conditionals_LCD.h | 4 +
Marlin/src/MarlinCore.cpp | 4 +-
Marlin/src/core/boards.h | 5 +
Marlin/src/feature/touch/xpt2046.cpp | 13 +-
Marlin/src/gcode/bedlevel/G26.cpp | 2 +-
Marlin/src/gcode/gcode.cpp | 4 +
Marlin/src/gcode/gcode.h | 3 +
Marlin/src/gcode/lcd/M995.cpp | 39 ++
Marlin/src/inc/Conditionals_LCD.h | 40 +-
Marlin/src/inc/Conditionals_adv.h | 11 +
Marlin/src/inc/Conditionals_post.h | 2 +-
Marlin/src/inc/SanityCheck.h | 18 +-
...8g_dev_tft_320x240_upscale_from_128x64.cpp | 8 +-
Marlin/src/lcd/extui/lib/mks_ui/tft_fsmc.cpp | 345 ++++-----
.../lib/mks_ui/tft_lvgl_configuration.cpp | 6 +-
Marlin/src/lcd/menu/menu.cpp | 8 +-
Marlin/src/lcd/menu/menu.h | 4 +
Marlin/src/lcd/menu/menu_filament.cpp | 2 +-
Marlin/src/lcd/menu/menu_motion.cpp | 23 +-
Marlin/src/lcd/menu/menu_touch_screen.cpp | 34 +
Marlin/src/lcd/menu/menu_ubl.cpp | 6 +-
Marlin/src/lcd/tft/bitmaps/back.bmp | Bin 0 -> 3126 bytes
Marlin/src/lcd/tft/bitmaps/bed.bmp | Bin 0 -> 12342 bytes
Marlin/src/lcd/tft/bitmaps/bed_heated.bmp | Bin 0 -> 12342 bytes
Marlin/src/lcd/tft/bitmaps/cancel.bmp | Bin 0 -> 12410 bytes
Marlin/src/lcd/tft/bitmaps/chamber.bmp | Bin 0 -> 12342 bytes
Marlin/src/lcd/tft/bitmaps/chamber_heated.bmp | Bin 0 -> 12342 bytes
Marlin/src/lcd/tft/bitmaps/confirm.bmp | Bin 0 -> 12410 bytes
Marlin/src/lcd/tft/bitmaps/decrease.bmp | Bin 0 -> 12410 bytes
Marlin/src/lcd/tft/bitmaps/directory.bmp | Bin 0 -> 3194 bytes
Marlin/src/lcd/tft/bitmaps/down.bmp | Bin 0 -> 3126 bytes
Marlin/src/lcd/tft/bitmaps/fan0.bmp | Bin 0 -> 12410 bytes
Marlin/src/lcd/tft/bitmaps/fan1.bmp | Bin 0 -> 12410 bytes
Marlin/src/lcd/tft/bitmaps/fan_fast0.bmp | Bin 0 -> 12410 bytes
Marlin/src/lcd/tft/bitmaps/fan_fast1.bmp | Bin 0 -> 12410 bytes
Marlin/src/lcd/tft/bitmaps/fan_slow0.bmp | Bin 0 -> 12410 bytes
Marlin/src/lcd/tft/bitmaps/fan_slow1.bmp | Bin 0 -> 12410 bytes
Marlin/src/lcd/tft/bitmaps/feedrate.bmp | Bin 0 -> 3194 bytes
Marlin/src/lcd/tft/bitmaps/flowrate.bmp | Bin 0 -> 3194 bytes
Marlin/src/lcd/tft/bitmaps/hotend.bmp | Bin 0 -> 12410 bytes
Marlin/src/lcd/tft/bitmaps/increase.bmp | Bin 0 -> 12342 bytes
Marlin/src/lcd/tft/bitmaps/left.bmp | Bin 0 -> 3194 bytes
Marlin/src/lcd/tft/bitmaps/leveling.bmp | Bin 0 -> 3126 bytes
.../bitmaps/marlin-logo/Marlin-1500x319.png | Bin 0 -> 387923 bytes
.../tft/bitmaps/marlin-logo/Marlin-195x59.png | Bin 0 -> 18386 bytes
.../marlin-logo/Marlin-228x255-greyscale.png | Bin 0 -> 7940 bytes
.../bitmaps/marlin-logo/Marlin-228x255.png | Bin 0 -> 81470 bytes
.../bitmaps/marlin-logo/Marlin-280x200.png | Bin 0 -> 46851 bytes
.../bitmaps/marlin-logo/Marlin-320x240.png | Bin 0 -> 97523 bytes
.../bitmaps/marlin-logo/Marlin-480x319.png | Bin 0 -> 168816 bytes
.../bitmaps/marlin-logo/Marlin-480x320.png | Bin 0 -> 168834 bytes
Marlin/src/lcd/tft/bitmaps/menu.bmp | Bin 0 -> 12342 bytes
Marlin/src/lcd/tft/bitmaps/pause.bmp | Bin 0 -> 12410 bytes
Marlin/src/lcd/tft/bitmaps/refresh.bmp | Bin 0 -> 3194 bytes
Marlin/src/lcd/tft/bitmaps/right.bmp | Bin 0 -> 3194 bytes
Marlin/src/lcd/tft/bitmaps/sd.bmp | Bin 0 -> 12410 bytes
Marlin/src/lcd/tft/bitmaps/settings.bmp | Bin 0 -> 12342 bytes
Marlin/src/lcd/tft/bitmaps/up.bmp | Bin 0 -> 3126 bytes
Marlin/src/lcd/tft/canvas.cpp | 179 +++++
Marlin/src/lcd/tft/canvas.h | 57 ++
.../src/lcd/tft/fontdata/fontdata_10x20.cpp | 257 +++++++
.../lcd/tft/fontdata/fontdata_ISO10646_1.cpp | 314 +++++++++
.../lcd/tft/fontdata/helvetica_12_bold.cpp | 302 ++++++++
Marlin/src/lcd/tft/fontdata/helvetica_14.cpp | 378 ++++++++++
Marlin/src/lcd/tft/fontdata/helvetica_18.cpp | 492 +++++++++++++
Marlin/src/lcd/tft/fontdata/profont_22.cpp | 426 ++++++++++++
Marlin/src/lcd/tft/ili9328.h | 150 ++++
Marlin/src/lcd/tft/ili9341.h | 162 +++++
Marlin/src/lcd/tft/ili9488.h | 156 +++++
Marlin/src/lcd/tft/images/back_32x32x4.cpp | 62 ++
.../lcd/tft/images/background_320x30x16.cpp | 60 ++
.../lcd/tft/images/bootscreen_112x38x1.cpp | 70 ++
.../lcd/tft/images/bootscreen_195x59x16.cpp | 89 +++
.../lcd/tft/images/bootscreen_228x255x2.cpp | 285 ++++++++
.../lcd/tft/images/bootscreen_228x255x4.cpp | 285 ++++++++
.../lcd/tft/images/bootscreen_320x240x16.cpp | 270 +++++++
.../lcd/tft/images/bootscreen_480x320x16.cpp | 350 ++++++++++
Marlin/src/lcd/tft/images/cancel_64x64x4.cpp | 94 +++
Marlin/src/lcd/tft/images/chamber_64x64x4.cpp | 161 +++++
Marlin/src/lcd/tft/images/confirm_64x64x4.cpp | 94 +++
.../src/lcd/tft/images/decrease_64x64x4.cpp | 94 +++
.../src/lcd/tft/images/directory_32x32x4.cpp | 62 ++
Marlin/src/lcd/tft/images/down_32x32x4.cpp | 62 ++
Marlin/src/lcd/tft/images/fan_64x64x4.cpp | 161 +++++
.../src/lcd/tft/images/fan_fast_64x64x4.cpp | 161 +++++
.../src/lcd/tft/images/fan_slow_64x64x4.cpp | 161 +++++
.../src/lcd/tft/images/feedrate_32x32x4.cpp | 62 ++
.../src/lcd/tft/images/flowrate_32x32x4.cpp | 62 ++
.../src/lcd/tft/images/heated_bed_64x64x4.cpp | 161 +++++
Marlin/src/lcd/tft/images/hotend_64x64x4.cpp | 94 +++
.../src/lcd/tft/images/increase_64x64x4.cpp | 94 +++
Marlin/src/lcd/tft/images/left_32x32x4.cpp | 62 ++
.../src/lcd/tft/images/leveling_32x32x4.cpp | 62 ++
Marlin/src/lcd/tft/images/menu_64x64x4.cpp | 94 +++
Marlin/src/lcd/tft/images/pause_64x64x4.cpp | 94 +++
Marlin/src/lcd/tft/images/refresh_32x32x4.cpp | 62 ++
Marlin/src/lcd/tft/images/right_32x32x4.cpp | 62 ++
Marlin/src/lcd/tft/images/sd_64x64x4.cpp | 94 +++
.../src/lcd/tft/images/settings_64x64x4.cpp | 94 +++
Marlin/src/lcd/tft/images/slider_8x16x4.cpp | 46 ++
Marlin/src/lcd/tft/images/up_32x32x4.cpp | 62 ++
Marlin/src/lcd/tft/r65105.h | 155 +++++
Marlin/src/lcd/tft/st7735.h | 128 ++++
Marlin/src/lcd/tft/st7789v.h | 148 ++++
Marlin/src/lcd/tft/st7796s.h | 175 +++++
Marlin/src/lcd/tft/tft.cpp | 199 ++++++
Marlin/src/lcd/tft/tft.h | 113 +++
Marlin/src/lcd/tft/tft_color.h | 112 +++
Marlin/src/lcd/tft/tft_image.cpp | 69 ++
Marlin/src/lcd/tft/tft_image.h | 160 +++++
Marlin/src/lcd/tft/tft_io.h | 30 +
Marlin/src/lcd/tft/tft_queue.cpp | 346 +++++++++
Marlin/src/lcd/tft/tft_queue.h | 140 ++++
Marlin/src/lcd/tft/tft_string.cpp | 159 +++++
Marlin/src/lcd/tft/tft_string.h | 104 +++
Marlin/src/lcd/tft/touch.cpp | 293 ++++++++
Marlin/src/lcd/tft/touch.h | 180 +++++
Marlin/src/lcd/tft/ui_320x240.cpp | 653 +++++++++++++++++
Marlin/src/lcd/tft/ui_320x240.h | 106 +++
Marlin/src/lcd/tft/ui_480x320.cpp | 657 ++++++++++++++++++
Marlin/src/lcd/tft/ui_480x320.h | 106 +++
Marlin/src/lcd/ultralcd.cpp | 20 +-
Marlin/src/lcd/ultralcd.h | 25 +-
Marlin/src/module/configuration_store.cpp | 31 +
Marlin/src/pins/pins.h | 8 +-
Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h | 4 +-
Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h | 2 +-
.../src/pins/stm32f1/pins_JGAURORA_A5S_A1.h | 2 +-
Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h | 2 +-
Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h | 68 +-
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h | 2 +-
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h | 2 +-
.../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 4 +-
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h | 2 +-
Marlin/src/pins/stm32f1/pins_STM3R_MINI.h | 2 +-
Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h | 2 +-
buildroot/bin/opt_add | 2 +-
buildroot/bin/use_example_configs | 15 +-
.../share/PlatformIO/scripts/mks_encrypt.py | 32 +
.../variants/CHITU_F103/wirish/boards.cpp | 2 +-
.../variants/MARLIN_F103Vx/PeripheralPins.c | 425 +++++++++++
.../variants/MARLIN_F103Vx/PinNamesVar.h | 30 +
.../variants/MARLIN_F103Vx/ldscript.ld | 200 ++++++
.../variants/MARLIN_F103Vx/variant.cpp | 235 +++++++
.../variants/MARLIN_F103Vx/variant.h | 181 +++++
.../variants/MARLIN_F103Zx/PeripheralPins.c | 368 ++++++++++
.../variants/MARLIN_F103Zx/PinNamesVar.h | 30 +
.../variants/MARLIN_F103Zx/hal_conf_custom.h | 412 +++++++++++
.../variants/MARLIN_F103Zx/ldscript.ld | 200 ++++++
.../variants/MARLIN_F103Zx/variant.cpp | 222 ++++++
.../variants/MARLIN_F103Zx/variant.h | 232 +++++++
buildroot/tests/mks_robin-tests | 7 +-
buildroot/tests/mks_robin_mini-tests | 5 +-
buildroot/tests/mks_robin_nano-tests | 5 +-
buildroot/tests/mks_robin_stm32-tests | 13 +
platformio.ini | 25 +-
176 files changed, 14755 insertions(+), 311 deletions(-)
create mode 100644 Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
create mode 100644 Marlin/src/HAL/STM32/tft/tft_fsmc.h
create mode 100644 Marlin/src/HAL/STM32/tft/tft_spi.cpp
create mode 100644 Marlin/src/HAL/STM32/tft/tft_spi.h
create mode 100644 Marlin/src/HAL/STM32/tft/xpt2046.cpp
create mode 100644 Marlin/src/HAL/STM32/tft/xpt2046.h
create mode 100644 Marlin/src/gcode/lcd/M995.cpp
create mode 100644 Marlin/src/lcd/menu/menu_touch_screen.cpp
create mode 100644 Marlin/src/lcd/tft/bitmaps/back.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/bed.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/bed_heated.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/cancel.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/chamber.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/chamber_heated.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/confirm.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/decrease.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/directory.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/down.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/fan0.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/fan1.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/fan_fast0.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/fan_fast1.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/fan_slow0.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/fan_slow1.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/feedrate.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/flowrate.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/hotend.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/increase.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/left.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/leveling.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/marlin-logo/Marlin-1500x319.png
create mode 100644 Marlin/src/lcd/tft/bitmaps/marlin-logo/Marlin-195x59.png
create mode 100644 Marlin/src/lcd/tft/bitmaps/marlin-logo/Marlin-228x255-greyscale.png
create mode 100644 Marlin/src/lcd/tft/bitmaps/marlin-logo/Marlin-228x255.png
create mode 100644 Marlin/src/lcd/tft/bitmaps/marlin-logo/Marlin-280x200.png
create mode 100644 Marlin/src/lcd/tft/bitmaps/marlin-logo/Marlin-320x240.png
create mode 100644 Marlin/src/lcd/tft/bitmaps/marlin-logo/Marlin-480x319.png
create mode 100644 Marlin/src/lcd/tft/bitmaps/marlin-logo/Marlin-480x320.png
create mode 100644 Marlin/src/lcd/tft/bitmaps/menu.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/pause.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/refresh.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/right.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/sd.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/settings.bmp
create mode 100644 Marlin/src/lcd/tft/bitmaps/up.bmp
create mode 100644 Marlin/src/lcd/tft/canvas.cpp
create mode 100644 Marlin/src/lcd/tft/canvas.h
create mode 100644 Marlin/src/lcd/tft/fontdata/fontdata_10x20.cpp
create mode 100644 Marlin/src/lcd/tft/fontdata/fontdata_ISO10646_1.cpp
create mode 100644 Marlin/src/lcd/tft/fontdata/helvetica_12_bold.cpp
create mode 100644 Marlin/src/lcd/tft/fontdata/helvetica_14.cpp
create mode 100644 Marlin/src/lcd/tft/fontdata/helvetica_18.cpp
create mode 100644 Marlin/src/lcd/tft/fontdata/profont_22.cpp
create mode 100644 Marlin/src/lcd/tft/ili9328.h
create mode 100644 Marlin/src/lcd/tft/ili9341.h
create mode 100644 Marlin/src/lcd/tft/ili9488.h
create mode 100644 Marlin/src/lcd/tft/images/back_32x32x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/background_320x30x16.cpp
create mode 100644 Marlin/src/lcd/tft/images/bootscreen_112x38x1.cpp
create mode 100644 Marlin/src/lcd/tft/images/bootscreen_195x59x16.cpp
create mode 100644 Marlin/src/lcd/tft/images/bootscreen_228x255x2.cpp
create mode 100644 Marlin/src/lcd/tft/images/bootscreen_228x255x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/bootscreen_320x240x16.cpp
create mode 100644 Marlin/src/lcd/tft/images/bootscreen_480x320x16.cpp
create mode 100644 Marlin/src/lcd/tft/images/cancel_64x64x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/chamber_64x64x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/confirm_64x64x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/decrease_64x64x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/directory_32x32x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/down_32x32x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/fan_64x64x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/fan_fast_64x64x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/fan_slow_64x64x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/feedrate_32x32x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/flowrate_32x32x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/heated_bed_64x64x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/hotend_64x64x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/increase_64x64x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/left_32x32x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/leveling_32x32x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/menu_64x64x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/pause_64x64x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/refresh_32x32x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/right_32x32x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/sd_64x64x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/settings_64x64x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/slider_8x16x4.cpp
create mode 100644 Marlin/src/lcd/tft/images/up_32x32x4.cpp
create mode 100644 Marlin/src/lcd/tft/r65105.h
create mode 100644 Marlin/src/lcd/tft/st7735.h
create mode 100644 Marlin/src/lcd/tft/st7789v.h
create mode 100644 Marlin/src/lcd/tft/st7796s.h
create mode 100644 Marlin/src/lcd/tft/tft.cpp
create mode 100644 Marlin/src/lcd/tft/tft.h
create mode 100644 Marlin/src/lcd/tft/tft_color.h
create mode 100644 Marlin/src/lcd/tft/tft_image.cpp
create mode 100644 Marlin/src/lcd/tft/tft_image.h
create mode 100644 Marlin/src/lcd/tft/tft_io.h
create mode 100644 Marlin/src/lcd/tft/tft_queue.cpp
create mode 100644 Marlin/src/lcd/tft/tft_queue.h
create mode 100644 Marlin/src/lcd/tft/tft_string.cpp
create mode 100644 Marlin/src/lcd/tft/tft_string.h
create mode 100644 Marlin/src/lcd/tft/touch.cpp
create mode 100644 Marlin/src/lcd/tft/touch.h
create mode 100644 Marlin/src/lcd/tft/ui_320x240.cpp
create mode 100644 Marlin/src/lcd/tft/ui_320x240.h
create mode 100644 Marlin/src/lcd/tft/ui_480x320.cpp
create mode 100644 Marlin/src/lcd/tft/ui_480x320.h
create mode 100644 buildroot/share/PlatformIO/scripts/mks_encrypt.py
create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Vx/PeripheralPins.c
create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Vx/PinNamesVar.h
create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld
create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.cpp
create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h
create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Zx/PeripheralPins.c
create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Zx/PinNamesVar.h
create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h
create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld
create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Zx/variant.cpp
create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Zx/variant.h
create mode 100644 buildroot/tests/mks_robin_stm32-tests
diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 4dd483499b..bcc42fbd60 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -67,6 +67,7 @@ jobs:
- BIGTREE_SKR_PRO
- BIGTREE_GTR_V1_0
- mks_robin
+ - mks_robin_stm32
- ARMED
- FYSETC_S6
- STM32F070RB_malyan
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index c6ec607d9b..363ea2f351 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2150,6 +2150,22 @@
//=============================== Graphical TFTs ==============================
//=============================================================================
+//
+// TFT display with optional touch screen
+// Color Marlin UI with standard menu system
+//
+//#define TFT_320x240
+//#define TFT_320x240_SPI
+//#define TFT_480x320
+//#define TFT_480x320_SPI
+
+//
+// Skip autodetect and force specific TFT driver
+// Mandatory for SPI screens with no MISO line
+// Available drivers are: ST7735, ST7789, ST7796, R61505, ILI9328, ILI9341, ILI9488
+//
+//#define TFT_DRIVER AUTO
+
//
// FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
// Upscaled 128x64 Marlin UI
@@ -2190,11 +2206,13 @@
//
// ADS7843/XPT2046 ADC Touchscreen such as ILI9341 2.8
//
-//#define TOUCH_BUTTONS
-#if ENABLED(TOUCH_BUTTONS)
+//#define TOUCH_SCREEN
+#if ENABLED(TOUCH_SCREEN)
#define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens
#define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus
+ #define TOUCH_SCREEN_CALIBRATION
+
//#define XPT2046_X_CALIBRATION 12316
//#define XPT2046_Y_CALIBRATION -8981
//#define XPT2046_X_OFFSET -43
diff --git a/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h b/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
index 5f1c4b1601..a611ccd7c4 100644
--- a/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
@@ -20,3 +20,7 @@
*
*/
#pragma once
+
+#if HAS_SPI_TFT || HAS_FSMC_TFT
+ #error "Sorry! TFT displays are not available for HAL/AVR."
+#endif
diff --git a/Marlin/src/HAL/DUE/inc/Conditionals_LCD.h b/Marlin/src/HAL/DUE/inc/Conditionals_LCD.h
index 5f1c4b1601..5867414447 100644
--- a/Marlin/src/HAL/DUE/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/DUE/inc/Conditionals_LCD.h
@@ -20,3 +20,7 @@
*
*/
#pragma once
+
+#if HAS_SPI_TFT || HAS_FSMC_TFT
+ #error "Sorry! TFT displays are not available for HAL/DUE."
+#endif
diff --git a/Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h b/Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h
index 5f1c4b1601..4da600179d 100644
--- a/Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h
@@ -20,3 +20,7 @@
*
*/
#pragma once
+
+#if HAS_SPI_TFT || HAS_FSMC_TFT
+ #error "Sorry! TFT displays are not available for HAL/ESP32."
+#endif
diff --git a/Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h b/Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h
index 5f1c4b1601..99a6fc2753 100644
--- a/Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h
@@ -20,3 +20,7 @@
*
*/
#pragma once
+
+#if HAS_SPI_TFT || HAS_FSMC_TFT
+ #error "Sorry! TFT displays are not available for HAL/LINUX."
+#endif
diff --git a/Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h b/Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h
index 5f1c4b1601..7d4de40faa 100644
--- a/Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h
@@ -20,3 +20,7 @@
*
*/
#pragma once
+
+#if HAS_SPI_TFT || HAS_FSMC_TFT
+ #error "Sorry! TFT displays are not available for HAL/LPC1768."
+#endif
diff --git a/Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h b/Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h
index 5f1c4b1601..932348c52f 100644
--- a/Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h
@@ -20,3 +20,7 @@
*
*/
#pragma once
+
+#if HAS_SPI_TFT || HAS_FSMC_TFT
+ #error "Sorry! TFT displays are not available for HAL/SAMD51."
+#endif
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index 730ada96c1..08081331b7 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -213,5 +213,10 @@ uint16_t HAL_adc_get_result();
#define GET_PIN_MAP_INDEX(pin) pin
#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
+#ifdef STM32F1xx
+ #define JTAG_DISABLE() AFIO_DBGAFR_CONFIG(AFIO_MAPR_SWJ_CFG_JTAGDISABLE)
+ #define JTAGSWD_DISABLE() AFIO_DBGAFR_CONFIG(AFIO_MAPR_SWJ_CFG_DISABLE)
+#endif
+
#define PLATFORM_M997_SUPPORT
void flashFirmware(const int16_t);
diff --git a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
index 9d32b342e4..6e73e87c21 100644
--- a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
+++ b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
@@ -76,7 +76,24 @@
SD_HandleTypeDef hsd; // create SDIO structure
- #define TRANSFER_CLOCK_DIV (uint8_t(SDIO_INIT_CLK_DIV) / 40)
+ /*
+ SDIO_INIT_CLK_DIV is 118
+ SDIO clock frequency is 48MHz / (TRANSFER_CLOCK_DIV + 2)
+ SDIO init clock frequency should not exceed 400KHz = 48MHz / (118 + 2)
+
+ Default TRANSFER_CLOCK_DIV is 2 (118 / 40)
+ Default SDIO clock frequency is 48MHz / (2 + 2) = 12 MHz
+ This might be too fast for stable SDIO operations
+
+ MKS Robin board seems to have stable SDIO with BusWide 1bit and ClockDiv 8 i.e. 4.8MHz SDIO clock frequency
+ Additional testing is required as there are clearly some 4bit initialization problems
+
+ Add -DTRANSFER_CLOCK_DIV=8 to build parameters to improve SDIO stability
+ */
+
+ #ifndef TRANSFER_CLOCK_DIV
+ #define TRANSFER_CLOCK_DIV (uint8_t(SDIO_INIT_CLK_DIV) / 40)
+ #endif
#ifndef USBD_OK
#define USBD_OK 0
@@ -100,24 +117,25 @@
void SD_LowLevel_Init(void) {
uint32_t tempreg;
- GPIO_InitTypeDef GPIO_InitStruct;
-
+ __HAL_RCC_SDIO_CLK_ENABLE();
__HAL_RCC_GPIOC_CLK_ENABLE(); //enable GPIO clocks
__HAL_RCC_GPIOD_CLK_ENABLE(); //enable GPIO clocks
- GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_12; // D0 & SCK
+ GPIO_InitTypeDef GPIO_InitStruct;
+
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
GPIO_InitStruct.Pull = 1; //GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
- GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+
+ #if DISABLED(STM32F1xx)
+ GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+ #endif
+
+ GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_12; // D0 & SCK
HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
#if PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3) // define D1-D3 only if have a four bit wide SDIO bus
GPIO_InitStruct.Pin = GPIO_PIN_9 | GPIO_PIN_10 | GPIO_PIN_11; // D1-D3
- GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
- GPIO_InitStruct.Pull = 1; // GPIO_NOPULL;
- GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
- GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
#endif
@@ -125,10 +143,13 @@
GPIO_InitStruct.Pin = GPIO_PIN_2;
HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
- RCC->APB2RSTR &= ~RCC_APB2RSTR_SDIORST_Msk; // take SDIO out of reset
- RCC->APB2ENR |= RCC_APB2RSTR_SDIORST_Msk; // enable SDIO clock
- // Enable the DMA2 Clock
+ #if DISABLED(STM32F1xx)
+ // TODO: use __HAL_RCC_SDIO_RELEASE_RESET() and __HAL_RCC_SDIO_CLK_ENABLE();
+ RCC->APB2RSTR &= ~RCC_APB2RSTR_SDIORST_Msk; // take SDIO out of reset
+ RCC->APB2ENR |= RCC_APB2RSTR_SDIORST_Msk; // enable SDIO clock
+ // Enable the DMA2 Clock
+ #endif
//Initialize the SDIO (with initial <400Khz Clock)
tempreg = 0; //Reset value
@@ -156,10 +177,21 @@
bool status;
hsd.Instance = SDIO;
hsd.State = (HAL_SD_StateTypeDef) 0; // HAL_SD_STATE_RESET
+
+ /*
+ hsd.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
+ hsd.Init.ClockBypass = SDIO_CLOCK_BYPASS_DISABLE;
+ hsd.Init.ClockPowerSave = SDIO_CLOCK_POWER_SAVE_DISABLE;
+ hsd.Init.BusWide = SDIO_BUS_WIDE_1B;
+ hsd.Init.HardwareFlowControl = SDIO_HARDWARE_FLOW_CONTROL_DISABLE;
+ hsd.Init.ClockDiv = 8;
+ */
+
SD_LowLevel_Init();
uint8_t retry_Cnt = retryCnt;
for (;;) {
+ TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
status = (bool) HAL_SD_Init(&hsd);
if (!status) break;
if (!--retry_Cnt) return false; // return failing status if retries are exhausted
@@ -170,6 +202,7 @@
#if PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3) // go to 4 bit wide mode if pins are defined
retry_Cnt = retryCnt;
for (;;) {
+ TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
if (!HAL_SD_ConfigWideBusOperation(&hsd, SDIO_BUS_WIDE_4B)) break; // some cards are only 1 bit wide so a pass here is not required
if (!--retry_Cnt) break;
}
@@ -178,6 +211,7 @@
SD_LowLevel_Init();
retry_Cnt = retryCnt;
for (;;) {
+ TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
status = (bool) HAL_SD_Init(&hsd);
if (!status) break;
if (!--retry_Cnt) return false; // return failing status if retries are exhausted
@@ -187,15 +221,15 @@
return true;
}
-
+ /*
void init_SDIO_pins(void) {
GPIO_InitTypeDef GPIO_InitStruct = {0};
- /**SDIO GPIO Configuration
- PC8 ------> SDIO_D0
- PC12 ------> SDIO_CK
- PD2 ------> SDIO_CMD
- */
+ // SDIO GPIO Configuration
+ // PC8 ------> SDIO_D0
+ // PC12 ------> SDIO_CK
+ // PD2 ------> SDIO_CMD
+
GPIO_InitStruct.Pin = GPIO_PIN_8;
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -217,7 +251,7 @@
GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
}
-
+ */
//bool SDIO_init() { return (bool) (SD_SDIO_Init() ? 1 : 0);}
//bool SDIO_Init_C() { return (bool) (SD_SDIO_Init() ? 1 : 0);}
@@ -227,6 +261,7 @@
bool status;
for (;;) {
+ TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
status = (bool) HAL_SD_ReadBlocks(&hsd, (uint8_t*)dst, block, 1, 1000); // read one 512 byte block with 500mS timeout
status |= (bool) HAL_SD_GetCardState(&hsd); // make sure all is OK
if (!status) break; // return passing status
diff --git a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
new file mode 100644
index 0000000000..f11fab39db
--- /dev/null
+++ b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
@@ -0,0 +1,180 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * 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 .
+ *
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if HAS_FSMC_TFT
+
+#include "tft_fsmc.h"
+#include "pinconfig.h"
+
+SRAM_HandleTypeDef TFT_FSMC::SRAMx;
+DMA_HandleTypeDef TFT_FSMC::DMAtx;
+LCD_CONTROLLER_TypeDef *TFT_FSMC::LCD;
+
+void TFT_FSMC::Init() {
+ uint32_t controllerAddress;
+
+ #if PIN_EXISTS(TFT_RESET)
+ OUT_WRITE(TFT_RESET_PIN, HIGH);
+ HAL_Delay(100);
+ #endif
+
+ #if PIN_EXISTS(TFT_BACKLIGHT)
+ OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH);
+ #endif
+
+ FSMC_NORSRAM_TimingTypeDef Timing, ExtTiming;
+
+ uint32_t NSBank = (uint32_t)pinmap_peripheral(digitalPinToPinName(TFT_CS_PIN), PinMap_FSMC_CS);
+
+ SRAMx.Instance = FSMC_NORSRAM_DEVICE;
+ SRAMx.Extended = FSMC_NORSRAM_EXTENDED_DEVICE;
+ /* SRAMx.Init */
+ SRAMx.Init.NSBank = NSBank;
+ SRAMx.Init.DataAddressMux = FSMC_DATA_ADDRESS_MUX_DISABLE;
+ SRAMx.Init.MemoryType = FSMC_MEMORY_TYPE_SRAM;
+ SRAMx.Init.MemoryDataWidth = FSMC_NORSRAM_MEM_BUS_WIDTH_16;
+ SRAMx.Init.BurstAccessMode = FSMC_BURST_ACCESS_MODE_DISABLE;
+ SRAMx.Init.WaitSignalPolarity = FSMC_WAIT_SIGNAL_POLARITY_LOW;
+ SRAMx.Init.WrapMode = FSMC_WRAP_MODE_DISABLE;
+ SRAMx.Init.WaitSignalActive = FSMC_WAIT_TIMING_BEFORE_WS;
+ SRAMx.Init.WriteOperation = FSMC_WRITE_OPERATION_ENABLE;
+ SRAMx.Init.WaitSignal = FSMC_WAIT_SIGNAL_DISABLE;
+ SRAMx.Init.ExtendedMode = FSMC_EXTENDED_MODE_ENABLE;
+ SRAMx.Init.AsynchronousWait = FSMC_ASYNCHRONOUS_WAIT_DISABLE;
+ SRAMx.Init.WriteBurst = FSMC_WRITE_BURST_DISABLE;
+ #ifdef STM32F4xx
+ SRAMx.Init.PageSize = FSMC_PAGE_SIZE_NONE;
+ #endif
+ /* Read Timing - relatively slow to ensure ID information is correctly read from TFT controller */
+ /* Can be decreases from 15-15-24 to 4-4-8 with risk of stability loss */
+ Timing.AddressSetupTime = 15;
+ Timing.AddressHoldTime = 15;
+ Timing.DataSetupTime = 24;
+ Timing.BusTurnAroundDuration = 0;
+ Timing.CLKDivision = 16;
+ Timing.DataLatency = 17;
+ Timing.AccessMode = FSMC_ACCESS_MODE_A;
+ /* Write Timing */
+ /* Can be decreases from 8-15-8 to 0-0-1 with risk of stability loss */
+ ExtTiming.AddressSetupTime = 8;
+ ExtTiming.AddressHoldTime = 15;
+ ExtTiming.DataSetupTime = 8;
+ ExtTiming.BusTurnAroundDuration = 0;
+ ExtTiming.CLKDivision = 16;
+ ExtTiming.DataLatency = 17;
+ ExtTiming.AccessMode = FSMC_ACCESS_MODE_A;
+
+ __HAL_RCC_FSMC_CLK_ENABLE();
+
+ for(uint16_t i = 0; PinMap_FSMC[i].pin != NC; i++)
+ pinmap_pinout(PinMap_FSMC[i].pin, PinMap_FSMC);
+ pinmap_pinout(digitalPinToPinName(TFT_CS_PIN), PinMap_FSMC_CS);
+ pinmap_pinout(digitalPinToPinName(TFT_RS_PIN), PinMap_FSMC_RS);
+
+ controllerAddress = FSMC_BANK1_1;
+ #ifdef PF0
+ switch (NSBank) {
+ case FSMC_NORSRAM_BANK2: controllerAddress = FSMC_BANK1_2 ; break;
+ case FSMC_NORSRAM_BANK3: controllerAddress = FSMC_BANK1_3 ; break;
+ case FSMC_NORSRAM_BANK4: controllerAddress = FSMC_BANK1_4 ; break;
+ }
+ #endif
+
+ controllerAddress |= (uint32_t)pinmap_peripheral(digitalPinToPinName(TFT_RS_PIN), PinMap_FSMC_RS);
+
+ HAL_SRAM_Init(&SRAMx, &Timing, &ExtTiming);
+
+ __HAL_RCC_DMA2_CLK_ENABLE();
+
+ #ifdef STM32F1xx
+ DMAtx.Instance = DMA2_Channel1;
+ #elif defined(STM32F4xx)
+ DMAtx.Instance = DMA2_Stream0;
+ DMAtx.Init.Channel = DMA_CHANNEL_0;
+ DMAtx.Init.FIFOMode = DMA_FIFOMODE_ENABLE;
+ DMAtx.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL;
+ DMAtx.Init.MemBurst = DMA_MBURST_SINGLE;
+ DMAtx.Init.PeriphBurst = DMA_PBURST_SINGLE;
+ #endif
+
+ DMAtx.Init.Direction = DMA_MEMORY_TO_MEMORY;
+ DMAtx.Init.MemInc = DMA_MINC_DISABLE;
+ DMAtx.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
+ DMAtx.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;
+ DMAtx.Init.Mode = DMA_NORMAL;
+ DMAtx.Init.Priority = DMA_PRIORITY_HIGH;
+
+ LCD = (LCD_CONTROLLER_TypeDef *)controllerAddress;
+}
+
+uint32_t TFT_FSMC::GetID() {
+ uint32_t id;
+ WriteReg(0x0000);
+ id = LCD->RAM;
+
+ if (id == 0)
+ id = ReadID(LCD_READ_ID);
+ if ((id & 0xFFFF) == 0 || (id & 0xFFFF) == 0xFFFF)
+ id = ReadID(LCD_READ_ID4);
+ return id;
+}
+
+ uint32_t TFT_FSMC::ReadID(uint16_t Reg) {
+ uint32_t id;
+ WriteReg(Reg);
+ id = LCD->RAM; // dummy read
+ id = Reg << 24;
+ id |= (LCD->RAM & 0x00FF) << 16;
+ id |= (LCD->RAM & 0x00FF) << 8;
+ id |= LCD->RAM & 0x00FF;
+ return id;
+ }
+
+bool TFT_FSMC::isBusy() {
+ if (__IS_DMA_ENABLED(&DMAtx))
+ if (__HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TC_FLAG_INDEX(&DMAtx)) != 0 || __HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TE_FLAG_INDEX(&DMAtx)) != 0)
+ Abort();
+ return __IS_DMA_ENABLED(&DMAtx);
+}
+
+void TFT_FSMC::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
+ DMAtx.Init.PeriphInc = MemoryIncrease;
+ HAL_DMA_Init(&DMAtx);
+
+ __HAL_DMA_CLEAR_FLAG(&DMAtx, __HAL_DMA_GET_TC_FLAG_INDEX(&DMAtx));
+ __HAL_DMA_CLEAR_FLAG(&DMAtx, __HAL_DMA_GET_TE_FLAG_INDEX(&DMAtx));
+
+ #ifdef STM32F1xx
+ DMAtx.Instance->CNDTR = Count;
+ DMAtx.Instance->CPAR = (uint32_t)Data;
+ DMAtx.Instance->CMAR = (uint32_t)&(LCD->RAM);
+ #elif defined(STM32F4xx)
+ DMAtx.Instance->NDTR = Count;
+ DMAtx.Instance->PAR = (uint32_t)Data;
+ DMAtx.Instance->M0AR = (uint32_t)&(LCD->RAM);
+ #endif
+ __HAL_DMA_ENABLE(&DMAtx);
+}
+
+#endif // HAS_FSMC_TFT
diff --git a/Marlin/src/HAL/STM32/tft/tft_fsmc.h b/Marlin/src/HAL/STM32/tft/tft_fsmc.h
new file mode 100644
index 0000000000..8500fee113
--- /dev/null
+++ b/Marlin/src/HAL/STM32/tft/tft_fsmc.h
@@ -0,0 +1,160 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * 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 .
+ *
+ */
+#pragma once
+
+#ifdef STM32F1xx
+ #include "stm32f1xx_hal.h"
+#elif defined(STM32F4xx)
+ #include "stm32f4xx_hal.h"
+#else
+ #error FSMC TFT is currently only supported on STM32F1 and STM32F4 hardware.
+#endif
+
+#ifndef LCD_READ_ID
+ #define LCD_READ_ID 0x04 // Read display identification information (0xD3 on ILI9341)
+#endif
+#ifndef LCD_READ_ID4
+ #define LCD_READ_ID4 0xD3 // Read display identification information (0xD3 on ILI9341)
+#endif
+
+#define DATASIZE_8BIT SPI_DATASIZE_8BIT
+#define DATASIZE_16BIT SPI_DATASIZE_16BIT
+#define TFT_IO TFT_FSMC
+
+#ifdef STM32F1xx
+ #define __IS_DMA_ENABLED(__HANDLE__) ((__HANDLE__)->Instance->CCR & DMA_CCR_EN)
+#elif defined(STM32F4xx)
+ #define __IS_DMA_ENABLED(__HANDLE__) ((__HANDLE__)->Instance->CR & DMA_SxCR_EN)
+#endif
+
+typedef struct {
+ __IO uint16_t REG;
+ __IO uint16_t RAM;
+} LCD_CONTROLLER_TypeDef;
+
+class TFT_FSMC {
+ private:
+ static SRAM_HandleTypeDef SRAMx;
+ static DMA_HandleTypeDef DMAtx;
+
+ static LCD_CONTROLLER_TypeDef *LCD;
+
+ static uint32_t ReadID(uint16_t Reg);
+ static void Transmit(uint16_t Data) { LCD->RAM = Data; __DSB(); }
+ static void TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
+
+ public:
+ static void Init();
+ static uint32_t GetID();
+ static bool isBusy();
+ static void Abort() { __HAL_DMA_DISABLE(&DMAtx); }
+
+ static void DataTransferBegin(uint16_t DataWidth = DATASIZE_16BIT) {}
+ static void DataTransferEnd() {};
+
+ static void WriteData(uint16_t Data) { Transmit(Data); }
+ static void WriteReg(uint16_t Reg) { LCD->REG = Reg; __DSB(); }
+
+ static void WriteSequence(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_PINC_ENABLE, Data, Count); }
+ static void WriteMultiple(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_PINC_DISABLE, &Data, Count); }
+};
+
+
+#ifdef STM32F1xx
+ #define FSMC_PIN_DATA STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)
+#elif defined(STM32F4xx)
+ #define FSMC_PIN_DATA STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_FSMC)
+ #define FSMC_BANK1_1 0x60000000U
+ #define FSMC_BANK1_2 0x64000000U
+ #define FSMC_BANK1_3 0x68000000U
+ #define FSMC_BANK1_4 0x6C000000U
+#else
+ #error No configuration for this MCU
+#endif
+
+const PinMap PinMap_FSMC[] = {
+ {PD_14, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D00
+ {PD_15, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D01
+ {PD_0, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D02
+ {PD_1, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D03
+ {PE_7, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D04
+ {PE_8, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D05
+ {PE_9, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D06
+ {PE_10, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D07
+ {PE_11, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D08
+ {PE_12, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D09
+ {PE_13, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D10
+ {PE_14, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D11
+ {PE_15, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D12
+ {PD_8, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D13
+ {PD_9, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D14
+ {PD_10, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_D15
+ {PD_4, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_NOE
+ {PD_5, FSMC_NORSRAM_DEVICE, FSMC_PIN_DATA}, // FSMC_NWE
+ {NC, NP, 0}
+};
+
+const PinMap PinMap_FSMC_CS[] = {
+ {PD_7, (void *)FSMC_NORSRAM_BANK1, FSMC_PIN_DATA}, // FSMC_NE1
+ #ifdef PF0
+ {PG_9, (void *)FSMC_NORSRAM_BANK2, FSMC_PIN_DATA}, // FSMC_NE2
+ {PG_10, (void *)FSMC_NORSRAM_BANK3, FSMC_PIN_DATA}, // FSMC_NE3
+ {PG_12, (void *)FSMC_NORSRAM_BANK4, FSMC_PIN_DATA}, // FSMC_NE4
+ #endif
+ {NC, NP, 0}
+};
+
+#define FSMC_RS(A) (void *)((2 << A) - 2)
+
+const PinMap PinMap_FSMC_RS[] = {
+ #ifdef PF0
+ {PF_0, FSMC_RS( 0), FSMC_PIN_DATA}, // FSMC_A0
+ {PF_1, FSMC_RS( 1), FSMC_PIN_DATA}, // FSMC_A1
+ {PF_2, FSMC_RS( 2), FSMC_PIN_DATA}, // FSMC_A2
+ {PF_3, FSMC_RS( 3), FSMC_PIN_DATA}, // FSMC_A3
+ {PF_4, FSMC_RS( 4), FSMC_PIN_DATA}, // FSMC_A4
+ {PF_5, FSMC_RS( 5), FSMC_PIN_DATA}, // FSMC_A5
+ {PF_12, FSMC_RS( 6), FSMC_PIN_DATA}, // FSMC_A6
+ {PF_13, FSMC_RS( 7), FSMC_PIN_DATA}, // FSMC_A7
+ {PF_14, FSMC_RS( 8), FSMC_PIN_DATA}, // FSMC_A8
+ {PF_15, FSMC_RS( 9), FSMC_PIN_DATA}, // FSMC_A9
+ {PG_0, FSMC_RS(10), FSMC_PIN_DATA}, // FSMC_A10
+ {PG_1, FSMC_RS(11), FSMC_PIN_DATA}, // FSMC_A11
+ {PG_2, FSMC_RS(12), FSMC_PIN_DATA}, // FSMC_A12
+ {PG_3, FSMC_RS(13), FSMC_PIN_DATA}, // FSMC_A13
+ {PG_4, FSMC_RS(14), FSMC_PIN_DATA}, // FSMC_A14
+ {PG_5, FSMC_RS(15), FSMC_PIN_DATA}, // FSMC_A15
+ #endif
+ {PD_11, FSMC_RS(16), FSMC_PIN_DATA}, // FSMC_A16
+ {PD_12, FSMC_RS(17), FSMC_PIN_DATA}, // FSMC_A17
+ {PD_13, FSMC_RS(18), FSMC_PIN_DATA}, // FSMC_A18
+ {PE_3, FSMC_RS(19), FSMC_PIN_DATA}, // FSMC_A19
+ {PE_4, FSMC_RS(20), FSMC_PIN_DATA}, // FSMC_A20
+ {PE_5, FSMC_RS(21), FSMC_PIN_DATA}, // FSMC_A21
+ {PE_6, FSMC_RS(22), FSMC_PIN_DATA}, // FSMC_A22
+ {PE_2, FSMC_RS(23), FSMC_PIN_DATA}, // FSMC_A23
+ #ifdef PF0
+ {PG_13, FSMC_RS(24), FSMC_PIN_DATA}, // FSMC_A24
+ {PG_14, FSMC_RS(25), FSMC_PIN_DATA}, // FSMC_A25
+ #endif
+ {NC, NP, 0}
+};
diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.cpp b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
new file mode 100644
index 0000000000..d3eb4ba8db
--- /dev/null
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
@@ -0,0 +1,212 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * 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 .
+ *
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if HAS_SPI_TFT
+
+#include "tft_spi.h"
+#include "pinconfig.h"
+
+SPI_HandleTypeDef TFT_SPI::SPIx;
+DMA_HandleTypeDef TFT_SPI::DMAtx;
+
+void TFT_SPI::Init() {
+ SPI_TypeDef *spiInstance;
+
+ #if PIN_EXISTS(TFT_RESET)
+ OUT_WRITE(TFT_RESET_PIN, HIGH);
+ HAL_Delay(100);
+ #endif
+
+ #if PIN_EXISTS(TFT_BACKLIGHT)
+ OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH);
+ #endif
+
+ OUT_WRITE(TFT_A0_PIN, HIGH);
+ OUT_WRITE(TFT_CS_PIN, HIGH);
+
+ if ((spiInstance = (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_SCK_PIN), PinMap_SPI_SCLK)) == NP) return;
+ if (spiInstance != (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_MOSI_PIN), PinMap_SPI_MOSI)) return;
+
+ #if PIN_EXISTS(TFT_MISO) && (TFT_MISO_PIN != TFT_MOSI_PIN)
+ if (spiInstance != (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_MISO_PIN), PinMap_SPI_MISO)) return;
+ #endif
+
+ SPIx.Instance = spiInstance;
+ SPIx.State = HAL_SPI_STATE_RESET;
+ SPIx.Init.NSS = SPI_NSS_SOFT;
+ SPIx.Init.Mode = SPI_MODE_MASTER;
+ SPIx.Init.Direction =
+ #if TFT_MISO_PIN == TFT_MOSI_PIN
+ SPI_DIRECTION_1LINE;
+ #else
+ SPI_DIRECTION_2LINES;
+ #endif
+ SPIx.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2;
+ SPIx.Init.CLKPhase = SPI_PHASE_1EDGE;
+ SPIx.Init.CLKPolarity = SPI_POLARITY_LOW;
+ SPIx.Init.DataSize = SPI_DATASIZE_8BIT;
+ SPIx.Init.FirstBit = SPI_FIRSTBIT_MSB;
+ SPIx.Init.TIMode = SPI_TIMODE_DISABLE;
+ SPIx.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
+ SPIx.Init.CRCPolynomial = 10;
+
+ pinmap_pinout(digitalPinToPinName(TFT_SCK_PIN), PinMap_SPI_SCLK);
+ pinmap_pinout(digitalPinToPinName(TFT_MOSI_PIN), PinMap_SPI_MOSI);
+ #if PIN_EXISTS(TFT_MISO) && (TFT_MISO_PIN != TFT_MOSI_PIN)
+ pinmap_pinout(digitalPinToPinName(TFT_MISO_PIN), PinMap_SPI_MISO);
+ #endif
+ pin_PullConfig(get_GPIO_Port(STM_PORT(digitalPinToPinName(TFT_SCK_PIN))), STM_LL_GPIO_PIN(digitalPinToPinName(TFT_SCK_PIN)), GPIO_PULLDOWN);
+
+ #ifdef SPI1_BASE
+ if (SPIx.Instance == SPI1) {
+ __HAL_RCC_SPI1_CLK_ENABLE();
+ __HAL_RCC_DMA1_CLK_ENABLE();
+ SPIx.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_4;
+ DMAtx.Instance = DMA1_Channel3;
+ }
+ #endif
+ #ifdef SPI2_BASE
+ if (SPIx.Instance == SPI2) {
+ __HAL_RCC_SPI2_CLK_ENABLE();
+ __HAL_RCC_DMA1_CLK_ENABLE();
+ DMAtx.Instance = DMA1_Channel5;
+ }
+ #endif
+ #ifdef SPI3_BASE
+ if (SPIx.Instance == SPI3) {
+ __HAL_RCC_SPI3_CLK_ENABLE();
+ __HAL_RCC_DMA2_CLK_ENABLE();
+ DMAtx.Instance = DMA2_Channel2;
+ }
+ #endif
+
+ HAL_SPI_Init(&SPIx);
+
+ DMAtx.Init.Direction = DMA_MEMORY_TO_PERIPH;
+ DMAtx.Init.PeriphInc = DMA_PINC_DISABLE;
+ DMAtx.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
+ DMAtx.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;
+ DMAtx.Init.Mode = DMA_NORMAL;
+ DMAtx.Init.Priority = DMA_PRIORITY_LOW;
+}
+
+void TFT_SPI::DataTransferBegin(uint16_t DataSize) {
+ SPIx.Init.DataSize = DataSize == DATASIZE_8BIT ? SPI_DATASIZE_8BIT : SPI_DATASIZE_16BIT;
+ HAL_SPI_Init(&SPIx);
+ WRITE(TFT_CS_PIN, LOW);
+}
+
+uint32_t TFT_SPI::GetID() {
+ uint32_t id;
+ id = ReadID(LCD_READ_ID);
+
+ if ((id & 0xFFFF) == 0 || (id & 0xFFFF) == 0xFFFF)
+ id = ReadID(LCD_READ_ID4);
+ return id;
+}
+
+uint32_t TFT_SPI::ReadID(uint16_t Reg) {
+ #if !PIN_EXISTS(TFT_MISO)
+ return 0;
+ #else
+ uint32_t BaudRatePrescaler = SPIx.Init.BaudRatePrescaler;
+ uint32_t i, Data = 0;
+
+ SPIx.Init.BaudRatePrescaler = SPIx.Instance == SPI1 ? SPI_BAUDRATEPRESCALER_8 : SPI_BAUDRATEPRESCALER_4;
+ DataTransferBegin(DATASIZE_8BIT);
+ WriteReg(Reg);
+
+ if (SPIx.Init.Direction == SPI_DIRECTION_1LINE) SPI_1LINE_RX(&SPIx);
+ __HAL_SPI_ENABLE(&SPIx);
+
+ for (i = 0; i < 4; i++) {
+ #if TFT_MISO_PIN != TFT_MOSI_PIN
+ //if (hspi->Init.Direction == SPI_DIRECTION_2LINES) {
+ while ((SPIx.Instance->SR & SPI_FLAG_TXE) != SPI_FLAG_TXE) {}
+ SPIx.Instance->DR = 0;
+ //}
+ #endif
+ while ((SPIx.Instance->SR & SPI_FLAG_RXNE) != SPI_FLAG_RXNE) {}
+ Data = (Data << 8) | SPIx.Instance->DR;
+ }
+
+ __HAL_SPI_DISABLE(&SPIx);
+ DataTransferEnd();
+
+ SPIx.Init.BaudRatePrescaler = BaudRatePrescaler;
+
+ return Data >> 7;
+ #endif
+}
+
+bool TFT_SPI::isBusy() {
+ if (DMAtx.Instance->CCR & DMA_CCR_EN)
+ if (__HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TC_FLAG_INDEX(&DMAtx)) != 0 || __HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TE_FLAG_INDEX(&DMAtx)) != 0)
+ Abort();
+ return DMAtx.Instance->CCR & DMA_CCR_EN;
+}
+
+void TFT_SPI::Abort() {
+ __HAL_DMA_DISABLE(&DMAtx);
+ DataTransferEnd();
+}
+
+void TFT_SPI::Transmit(uint16_t Data) {
+ #if TFT_MISO_PIN == TFT_MOSI_PIN
+ SPI_1LINE_TX(&SPIx);
+ #endif
+
+ __HAL_SPI_ENABLE(&SPIx);
+
+ SPIx.Instance->DR = Data;
+
+ while ((SPIx.Instance->SR & SPI_FLAG_TXE) != SPI_FLAG_TXE) {}
+ while ((SPIx.Instance->SR & SPI_FLAG_BSY) == SPI_FLAG_BSY) {}
+
+ #if TFT_MISO_PIN != TFT_MOSI_PIN
+ __HAL_SPI_CLEAR_OVRFLAG(&SPIx); /* Clear overrun flag in 2 Lines communication mode because received is not read */
+ #endif
+}
+
+void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
+ DMAtx.Init.MemInc = MemoryIncrease;
+ HAL_DMA_Init(&DMAtx);
+
+ DataTransferBegin();
+
+ #if TFT_MISO_PIN == TFT_MOSI_PIN
+ SPI_1LINE_TX(&SPIx);
+ #endif
+
+ DMAtx.DmaBaseAddress->IFCR = (DMA_ISR_GIF1 << DMAtx.ChannelIndex);
+ DMAtx.Instance->CNDTR = Count;
+ DMAtx.Instance->CPAR = (uint32_t)&(SPIx.Instance->DR);
+ DMAtx.Instance->CMAR = (uint32_t)Data;
+ __HAL_DMA_ENABLE(&DMAtx);
+ __HAL_SPI_ENABLE(&SPIx);
+
+ SET_BIT(SPIx.Instance->CR2, SPI_CR2_TXDMAEN); /* Enable Tx DMA Request */
+}
+
+#endif // HAS_SPI_TFT
diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.h b/Marlin/src/HAL/STM32/tft/tft_spi.h
new file mode 100644
index 0000000000..1eed45a709
--- /dev/null
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.h
@@ -0,0 +1,67 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * 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 .
+ *
+ */
+#pragma once
+
+#ifdef STM32F1xx
+ #include "stm32f1xx_hal.h"
+#elif defined(STM32F4xx)
+ #include "stm32f4xx_hal.h"
+#else
+ #error SPI TFT is currently only supported on STM32F1 and STM32F4 hardware.
+#endif
+
+#ifndef LCD_READ_ID
+ #define LCD_READ_ID 0x04 // Read display identification information (0xD3 on ILI9341)
+#endif
+#ifndef LCD_READ_ID4
+ #define LCD_READ_ID4 0xD3 // Read display identification information (0xD3 on ILI9341)
+#endif
+
+#define DATASIZE_8BIT SPI_DATASIZE_8BIT
+#define DATASIZE_16BIT SPI_DATASIZE_16BIT
+#define TFT_IO TFT_SPI
+
+class TFT_SPI {
+private:
+ static SPI_HandleTypeDef SPIx;
+ static DMA_HandleTypeDef DMAtx;
+
+ static uint32_t ReadID(uint16_t Reg);
+ static void Transmit(uint16_t Data);
+ static void TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
+
+public:
+ static void Init();
+ static uint32_t GetID();
+ static bool isBusy();
+ static void Abort();
+
+ static void DataTransferBegin(uint16_t DataWidth = DATASIZE_16BIT);
+ static void DataTransferEnd() { WRITE(TFT_CS_PIN, HIGH); };
+ static void DataTransferAbort();
+
+ static void WriteData(uint16_t Data) { Transmit(Data); }
+ static void WriteReg(uint16_t Reg) { WRITE(TFT_A0_PIN, LOW); Transmit(Reg); WRITE(TFT_A0_PIN, HIGH); }
+
+ static void WriteSequence(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_MINC_ENABLE, Data, Count); }
+ static void WriteMultiple(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_MINC_DISABLE, &Data, Count); }
+};
diff --git a/Marlin/src/HAL/STM32/tft/xpt2046.cpp b/Marlin/src/HAL/STM32/tft/xpt2046.cpp
new file mode 100644
index 0000000000..49e64da6a1
--- /dev/null
+++ b/Marlin/src/HAL/STM32/tft/xpt2046.cpp
@@ -0,0 +1,185 @@
+/**
+ * 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 .
+ *
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if HAS_TFT_XPT2046
+
+#include "xpt2046.h"
+#include "pinconfig.h"
+
+uint16_t delta(uint16_t a, uint16_t b) { return a > b ? a - b : b - a; }
+
+SPI_HandleTypeDef XPT2046::SPIx;
+DMA_HandleTypeDef XPT2046::DMAtx;
+
+void XPT2046::Init() {
+ SPI_TypeDef *spiInstance;
+
+ OUT_WRITE(TOUCH_CS_PIN, HIGH);
+
+ #if PIN_EXISTS(TOUCH_INT)
+ // Optional Pendrive interrupt pin
+ SET_INPUT(TOUCH_INT_PIN);
+ #endif
+
+ spiInstance = (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TOUCH_SCK_PIN), PinMap_SPI_SCLK);
+ if (spiInstance != (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TOUCH_MOSI_PIN), PinMap_SPI_MOSI)) spiInstance = NP;
+ if (spiInstance != (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TOUCH_MISO_PIN), PinMap_SPI_MISO)) spiInstance = NP;
+
+ SPIx.Instance = spiInstance;
+
+ if (SPIx.Instance) {
+ SPIx.State = HAL_SPI_STATE_RESET;
+ SPIx.Init.NSS = SPI_NSS_SOFT;
+ SPIx.Init.Mode = SPI_MODE_MASTER;
+ SPIx.Init.Direction = SPI_DIRECTION_2LINES;
+ SPIx.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_8;
+ SPIx.Init.CLKPhase = SPI_PHASE_2EDGE;
+ SPIx.Init.CLKPolarity = SPI_POLARITY_HIGH;
+ SPIx.Init.DataSize = SPI_DATASIZE_8BIT;
+ SPIx.Init.FirstBit = SPI_FIRSTBIT_MSB;
+ SPIx.Init.TIMode = SPI_TIMODE_DISABLE;
+ SPIx.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
+ SPIx.Init.CRCPolynomial = 10;
+
+ pinmap_pinout(digitalPinToPinName(TOUCH_SCK_PIN), PinMap_SPI_SCLK);
+ pinmap_pinout(digitalPinToPinName(TOUCH_MOSI_PIN), PinMap_SPI_MOSI);
+ pinmap_pinout(digitalPinToPinName(TOUCH_MISO_PIN), PinMap_SPI_MISO);
+
+ #ifdef SPI1_BASE
+ if (SPIx.Instance == SPI1) {
+ __HAL_RCC_SPI1_CLK_ENABLE();
+ SPIx.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16;
+ #ifdef STM32F1xx
+ DMAtx.Instance = DMA1_Channel3;
+ #elif defined(STM32F4xx)
+ DMAtx.Instance = DMA2_Stream3; // DMA2_Stream5
+ #endif
+ //SERIAL_ECHO_MSG(" Touch Screen on SPI1");
+ }
+ #endif
+ #ifdef SPI2_BASE
+ if (SPIx.Instance == SPI2) {
+ __HAL_RCC_SPI2_CLK_ENABLE();
+ #ifdef STM32F1xx
+ DMAtx.Instance = DMA1_Channel5;
+ #elif defined(STM32F4xx)
+ DMAtx.Instance = DMA1_Stream4;
+ #endif
+ //SERIAL_ECHO_MSG(" Touch Screen on SPI2");
+ }
+ #endif
+ #ifdef SPI3_BASE
+ if (SPIx.Instance == SPI3) {
+ __HAL_RCC_SPI3_CLK_ENABLE();
+ #ifdef STM32F1xx
+ DMAtx.Instance = DMA2_Channel2;
+ #elif defined(STM32F4xx)
+ DMAtx.Instance = DMA1_Stream5; // DMA1_Stream7
+ #endif
+ //SERIAL_ECHO_MSG(" Touch Screen on SPI3");
+ }
+ #endif
+ }
+ else {
+ SPIx.Instance = NULL;
+ SET_INPUT(TOUCH_MISO_PIN);
+ SET_OUTPUT(TOUCH_MOSI_PIN);
+ SET_OUTPUT(TOUCH_SCK_PIN);
+ //SERIAL_ECHO_MSG(" Touch Screen on Software SPI");
+ }
+
+ getRawData(XPT2046_Z1);
+}
+
+bool XPT2046::isTouched() {
+ return isBusy() ? false : (
+ #if PIN_EXISTS(TOUCH_INT)
+ READ(TOUCH_INT_PIN) != HIGH
+ #else
+ getRawData(XPT2046_Z1) >= XPT2046_Z1_THRESHOLD
+ #endif
+ );
+}
+
+bool XPT2046::getRawPoint(int16_t *x, int16_t *y) {
+ if (isBusy()) return false;
+ if (!isTouched()) return false;
+ *x = getRawData(XPT2046_X);
+ *y = getRawData(XPT2046_Y);
+ return isTouched();
+}
+
+uint16_t XPT2046::getRawData(const XPTCoordinate coordinate) {
+ uint16_t data[3];
+
+ DataTransferBegin();
+
+ for (uint16_t i = 0; i < 3 ; i++) {
+ IO(coordinate);
+ data[i] = (IO() << 4) | (IO() >> 4);
+ }
+
+ DataTransferEnd();
+
+ uint16_t delta01 = delta(data[0], data[1]);
+ uint16_t delta02 = delta(data[0], data[2]);
+ uint16_t delta12 = delta(data[1], data[2]);
+
+ if (delta01 > delta02 || delta01 > delta12) {
+ if (delta02 > delta12)
+ data[0] = data[2];
+ else
+ data[1] = data[2];
+ }
+
+ return (data[0] + data[1]) >> 1;
+}
+
+uint16_t XPT2046::HardwareIO(uint16_t data) {
+ __HAL_SPI_ENABLE(&SPIx);
+ while((SPIx.Instance->SR & SPI_FLAG_TXE) != SPI_FLAG_TXE) {}
+ SPIx.Instance->DR = data;
+ while((SPIx.Instance->SR & SPI_FLAG_RXNE) != SPI_FLAG_RXNE) {}
+ __HAL_SPI_DISABLE(&SPIx);
+
+ return SPIx.Instance->DR;
+}
+
+uint16_t XPT2046::SoftwareIO(uint16_t data) {
+ uint16_t result = 0;
+
+ for (uint8_t j = 0x80; j > 0; j >>= 1) {
+ WRITE(TOUCH_SCK_PIN, LOW);
+ __DSB();
+ WRITE(TOUCH_MOSI_PIN, data & j ? HIGH : LOW);
+ __DSB();
+ if (READ(TOUCH_MISO_PIN)) result |= j;
+ __DSB();
+ WRITE(TOUCH_SCK_PIN, HIGH);
+ __DSB();
+ }
+ WRITE(TOUCH_SCK_PIN, LOW);
+ __DSB();
+
+ return result;
+}
+
+#endif // HAS_TFT_XPT2046
diff --git a/Marlin/src/HAL/STM32/tft/xpt2046.h b/Marlin/src/HAL/STM32/tft/xpt2046.h
new file mode 100644
index 0000000000..7a6d8439c5
--- /dev/null
+++ b/Marlin/src/HAL/STM32/tft/xpt2046.h
@@ -0,0 +1,86 @@
+/**
+ * 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 .
+ *
+ */
+#pragma once
+
+#ifdef STM32F1xx
+ #include
+#elif defined(STM32F4xx)
+ #include
+#endif
+
+#include "../../../inc/MarlinConfig.h"
+
+// Not using regular SPI interface by default to avoid SPI mode conflicts with other SPI devices
+
+#if !PIN_EXISTS(TOUCH_MISO)
+ #error "TOUCH_MISO_PIN is not defined."
+#elif !PIN_EXISTS(TOUCH_MOSI)
+ #error "TOUCH_MOSI_PIN is not defined."
+#elif !PIN_EXISTS(TOUCH_SCK)
+ #error "TOUCH_SCK_PIN is not defined."
+#elif !PIN_EXISTS(TOUCH_CS)
+ #error "TOUCH_CS_PIN is not defined."
+#endif
+
+#ifndef TOUCH_INT_PIN
+ #define TOUCH_INT_PIN -1
+#endif
+
+#define XPT2046_DFR_MODE 0x00
+#define XPT2046_SER_MODE 0x04
+#define XPT2046_CONTROL 0x80
+
+enum XPTCoordinate : uint8_t {
+ XPT2046_X = 0x10 | XPT2046_CONTROL | XPT2046_DFR_MODE,
+ XPT2046_Y = 0x50 | XPT2046_CONTROL | XPT2046_DFR_MODE,
+ XPT2046_Z1 = 0x30 | XPT2046_CONTROL | XPT2046_DFR_MODE,
+ XPT2046_Z2 = 0x40 | XPT2046_CONTROL | XPT2046_DFR_MODE,
+};
+
+#if !defined(XPT2046_Z1_THRESHOLD)
+ #define XPT2046_Z1_THRESHOLD 10
+#endif
+
+#ifdef STM32F1xx
+ #define __IS_DMA_ENABLED(__HANDLE__) ((__HANDLE__)->Instance->CCR & DMA_CCR_EN)
+#elif defined(STM32F4xx)
+ #define __IS_DMA_ENABLED(__HANDLE__) ((__HANDLE__)->Instance->CR & DMA_SxCR_EN)
+#endif
+
+
+class XPT2046 {
+private:
+ static SPI_HandleTypeDef SPIx;
+ static DMA_HandleTypeDef DMAtx;
+
+ static bool isBusy() { return SPIx.Instance ? __IS_DMA_ENABLED(&DMAtx) : false; }
+
+ static uint16_t getRawData(const XPTCoordinate coordinate);
+ static bool isTouched();
+
+ static inline void DataTransferBegin() { if (SPIx.Instance) { HAL_SPI_Init(&SPIx); } WRITE(TOUCH_CS_PIN, LOW); };
+ static inline void DataTransferEnd() { WRITE(TOUCH_CS_PIN, HIGH); };
+ static uint16_t HardwareIO(uint16_t data);
+ static uint16_t SoftwareIO(uint16_t data);
+ static uint16_t IO(uint16_t data = 0) { return SPIx.Instance ? HardwareIO(data) : SoftwareIO(data); }
+
+public:
+ static void Init();
+ static bool getRawPoint(int16_t *x, int16_t *y);
+};
diff --git a/Marlin/src/HAL/STM32F1/SPI.cpp b/Marlin/src/HAL/STM32F1/SPI.cpp
index 80095ba1dc..423772dbc9 100644
--- a/Marlin/src/HAL/STM32F1/SPI.cpp
+++ b/Marlin/src/HAL/STM32F1/SPI.cpp
@@ -277,7 +277,7 @@ void SPIClass::read(uint8_t *buf, uint32_t len) {
regs->DR = 0x00FF; // write the first byte
// main loop
while (--len) {
- while(!(regs->SR & SPI_SR_TXE)) { /* nada */ } // wait for TXE flag
+ while (!(regs->SR & SPI_SR_TXE)) { /* nada */ } // wait for TXE flag
noInterrupts(); // go atomic level - avoid interrupts to surely get the previously received data
regs->DR = 0x00FF; // write the next data item to be transmitted into the SPI_DR register. This clears the TXE flag.
while (!(regs->SR & SPI_SR_RXNE)) { /* nada */ } // wait till data is available in the DR register
diff --git a/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h b/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h
index f52e6fec2b..14977381e1 100644
--- a/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h
@@ -25,3 +25,14 @@
//#warning "SD_CHECK_AND_RETRY isn't needed with USE_USB_COMPOSITE."
#undef SD_CHECK_AND_RETRY
#endif
+
+#if HAS_GRAPHICAL_TFT
+ #error "Sorry! TFT displays are not available for HAL/STM32F1."
+#endif
+
+// This platform has 'touch/xpt2046', not 'tft/xpt2046'
+#if ENABLED(TOUCH_SCREEN)
+ #undef TOUCH_SCREEN
+ #undef TOUCH_SCREEN_CALIBRATION
+ #define HAS_TOUCH_XPT2046 1
+#endif
diff --git a/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h
index 5f1c4b1601..a9f1b58222 100644
--- a/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h
@@ -20,3 +20,7 @@
*
*/
#pragma once
+
+#if HAS_SPI_TFT || HAS_FSMC_TFT
+ #error "Sorry! TFT displays are not available for HAL/STM32F4_F7."
+#endif
diff --git a/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h
index 5f1c4b1601..54ec166643 100644
--- a/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h
@@ -20,3 +20,7 @@
*
*/
#pragma once
+
+#if HAS_SPI_TFT || HAS_FSMC_TFT
+ #error "Sorry! TFT displays are not available for HAL/TEENSY31_32."
+#endif
diff --git a/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h b/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h
index 5f1c4b1601..632ee533ac 100644
--- a/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h
@@ -20,3 +20,7 @@
*
*/
#pragma once
+
+#if HAS_SPI_TFT || HAS_FSMC_TFT
+ #error "Sorry! TFT displays are not available for HAL/TEENSY35_36."
+#endif
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 00ea51b058..98f4527eee 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -80,7 +80,7 @@
#include "feature/direct_stepping.h"
#endif
-#if ENABLED(TOUCH_BUTTONS)
+#if HAS_TOUCH_XPT2046
#include "feature/touch/xpt2046.h"
#endif
@@ -1006,7 +1006,7 @@ void setup() {
SETUP_RUN(settings.first_load()); // Load data from EEPROM if available (or use defaults)
// This also updates variables in the planner, elsewhere
- #if ENABLED(TOUCH_BUTTONS)
+ #if HAS_TOUCH_XPT2046
SETUP_RUN(touch.init());
#endif
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 6e57a43747..eb33258e26 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -366,6 +366,11 @@
//
#define BOARD_AGCM4_RAMPS_144 6100 // RAMPS 1.4.4
+//
+// Custom board
+//
+#define BOARD_CUSTOM 9998 // Custom pins definition for development and/or rare boards
+
//
// Simulations
//
diff --git a/Marlin/src/feature/touch/xpt2046.cpp b/Marlin/src/feature/touch/xpt2046.cpp
index d613fbc89a..b75f3ee2f2 100644
--- a/Marlin/src/feature/touch/xpt2046.cpp
+++ b/Marlin/src/feature/touch/xpt2046.cpp
@@ -17,22 +17,21 @@
*
*/
-#include "../../inc/MarlinConfigPre.h"
-
-#if ENABLED(TOUCH_BUTTONS)
-
-#include "xpt2046.h"
#include "../../inc/MarlinConfig.h"
+#if HAS_TOUCH_XPT2046
+
#if TFT_SCALED_DOGLCD
#include "../../lcd/dogm/ultralcd_DOGM.h" // for LCD_FULL_PIXEL_WIDTH, etc.
#endif
+#include "xpt2046.h"
+
#ifndef XPT2046_Z1_THRESHOLD
#define XPT2046_Z1_THRESHOLD 10
#endif
-/*
+/**
* Draw and Touch processing
*
* LCD_PIXEL_WIDTH/HEIGHT (128x64) is the (emulated DOGM) Pixel Drawing resolution.
@@ -245,4 +244,4 @@ bool XPT2046::getTouchPoint(uint16_t &x, uint16_t &y) {
return isTouched();
}
-#endif // TOUCH_BUTTONS
+#endif // HAS_TOUCH_XPT2046
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 438a619242..2399f207bf 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -405,7 +405,7 @@ inline bool turn_on_heaters() {
inline bool prime_nozzle() {
const feedRate_t fr_slow_e = planner.settings.max_feedrate_mm_s[E_AXIS] / 15.0f;
- #if HAS_LCD_MENU && DISABLED(TOUCH_BUTTONS) // ui.button_pressed issue with touchscreen
+ #if HAS_LCD_MENU && !HAS_TOUCH_XPT2046 // ui.button_pressed issue with touchscreen
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
float Total_Prime = 0.0;
#endif
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 7f00ec5a34..8d103d52b1 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -871,6 +871,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 422: M422(); break; // M422: Set Z Stepper automatic alignment position using probe
#endif
+ #if ENABLED(TOUCH_SCREEN_CALIBRATION)
+ case 995: M995(); break; // M995: Touch screen calibration for TFT display
+ #endif
+
#if ENABLED(PLATFORM_M997_SUPPORT)
case 997: M997(); break; // M997: Perform in-application firmware update
#endif
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index b3f339e295..7c469458cd 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -276,6 +276,7 @@
* ************ Custom codes - This can change to suit future G-code regulations
* G425 - Calibrate using a conductive object. (Requires CALIBRATION_GCODE)
* M928 - Start SD logging: "M928 filename.gco". Stop with M29. (Requires SDSUPPORT)
+ * M995 - Touch screen calibration for TFT display
* M997 - Perform in-application firmware update
* M999 - Restart after being stopped by error
*
@@ -843,6 +844,8 @@ private:
TERN_(MAGNETIC_PARKING_EXTRUDER, static void M951());
+ TERN_(TOUCH_SCREEN_CALIBRATION, static void M995());
+
TERN_(PLATFORM_M997_SUPPORT, static void M997());
static void M999();
diff --git a/Marlin/src/gcode/lcd/M995.cpp b/Marlin/src/gcode/lcd/M995.cpp
new file mode 100644
index 0000000000..72d0d29f76
--- /dev/null
+++ b/Marlin/src/gcode/lcd/M995.cpp
@@ -0,0 +1,39 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * 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 .
+ *
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(TOUCH_SCREEN_CALIBRATION)
+
+#include "../gcode.h"
+#include "../../lcd/menu/menu.h"
+
+/**
+ * M995: Touch screen calibration for TFT display
+ */
+void GcodeSuite::M995() {
+
+ ui.goto_screen(touch_screen_calibration);
+
+}
+
+#endif // TOUCH_SCREEN_CALIBRATION
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 1605ced3c8..c309822f92 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -255,7 +255,7 @@
#define IS_ULTIPANEL
#endif
-// LVGL UI, SPI or FSMC
+// FSMC/SPI TFT Panels (LVGL)
#if EITHER(TFT_LVGL_UI_SPI, TFT_LVGL_UI_FSMC)
#define HAS_TFT_LVGL_UI 1
#endif
@@ -273,6 +273,27 @@
#define DELAYED_BACKLIGHT_INIT
#endif
+// FSMC/SPI TFT Panels (HAL STM32)
+#if EITHER(TFT_320x240, TFT_480x320)
+ #define HAS_FSMC_TFT 1
+#elif EITHER(TFT_320x240_SPI, TFT_480x320_SPI)
+ #define HAS_SPI_TFT 1
+#endif
+
+#if HAS_FSMC_TFT || HAS_SPI_TFT
+ #define HAS_GRAPHICAL_TFT 1
+ #define IS_ULTIPANEL
+#endif
+
+// Fewer lines with touch buttons on-screen
+#if EITHER(TFT_320x240, TFT_320x240_SPI)
+ #define HAS_UI_320x240 1
+ #define LCD_HEIGHT TERN(TOUCH_SCREEN, 6, 7)
+#elif EITHER(TFT_480x320, TFT_480x320_SPI)
+ #define HAS_UI_480x320 1
+ #define LCD_HEIGHT TERN(TOUCH_SCREEN, 6, 7)
+#endif
+
/**
* I2C Panels
*/
@@ -329,7 +350,7 @@
#endif
#ifndef STD_ENCODER_PULSES_PER_STEP
- #if ENABLED(TOUCH_BUTTONS)
+ #if ENABLED(TOUCH_SCREEN)
#define STD_ENCODER_PULSES_PER_STEP 2
#else
#define STD_ENCODER_PULSES_PER_STEP 5
@@ -398,13 +419,14 @@
// Aliases for LCD features
#if EITHER(ULTRA_LCD, EXTENSIBLE_UI)
#define HAS_DISPLAY 1
- #if ENABLED(ULTRA_LCD)
- #define HAS_SPI_LCD 1
- #if ENABLED(DOGLCD)
- #define HAS_GRAPHICAL_LCD 1
- #else
- #define HAS_CHARACTER_LCD 1
- #endif
+#endif
+
+#if ENABLED(ULTRA_LCD)
+ #define HAS_SPI_LCD 1
+ #if ENABLED(DOGLCD)
+ #define HAS_GRAPHICAL_LCD 1
+ #elif DISABLED(HAS_GRAPHICAL_TFT)
+ #define HAS_CHARACTER_LCD 1
#endif
#endif
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 85cb26dadb..7b35dc7755 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -251,6 +251,17 @@
#define EARLY_WATCHDOG 1
#endif
+// Full Touch Screen needs 'tft/xpt2046'
+#if ENABLED(TOUCH_SCREEN)
+ #define HAS_TFT_XPT2046 1
+#endif
+
+// Touch Screen or "Touch Buttons" need XPT2046 pins
+// but they use different components
+#if EITHER(HAS_TFT_XPT2046, HAS_TOUCH_XPT2046)
+ #define NEED_TOUCH_PINS 1
+#endif
+
// Extensible UI pin mapping for RepRapDiscount
#if ENABLED(TOUCH_UI_FTDI_EVE) && ANY(AO_EXP1_PINMAP, AO_EXP2_PINMAP, CR10_TFT_PINMAP)
#define TOUCH_UI_ULTIPANEL 1
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index c7171b06d8..b7f92fcb25 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -373,7 +373,7 @@
#endif
-#if ANY(LCD_USE_DMA_FSMC, FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT) || !PIN_EXISTS(SD_DETECT)
+#if ANY(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT) || !PIN_EXISTS(SD_DETECT)
#define NO_LCD_REINIT 1 // Suppress LCD re-initialization
#endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 1db779b31e..03b869aa6e 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -513,6 +513,8 @@
#error "[XYZ]_HOME_BUMP_MM is now HOMING_BUMP_MM. Please update Configuration_adv.h."
#elif defined(DIGIPOT_I2C)
#error "DIGIPOT_I2C is now DIGIPOT_MCP4451 (or DIGIPOT_MCP4018). Please update Configuration_adv.h."
+#elif defined(TOUCH_BUTTONS)
+ #error "TOUCH_BUTTONS is now TOUCH_SCREEN. Please update your Configuration.h."
#endif
#ifdef FIL_RUNOUT_INVERTING
@@ -687,8 +689,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#elif PROGRESS_MSG_EXPIRE < 0
#error "PROGRESS_MSG_EXPIRE must be greater than or equal to 0."
#endif
-#elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_GRAPHICAL_LCD, EXTENSIBLE_UI)
- #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Graphical LCD, or EXTENSIBLE_UI."
+#elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_GRAPHICAL_LCD, HAS_GRAPHICAL_TFT, EXTENSIBLE_UI)
+ #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Graphical LCD, TFT, or EXTENSIBLE_UI."
#endif
#if !HAS_LCD_MENU && ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
@@ -2224,6 +2226,8 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
+ ENABLED(DGUS_LCD_UI_HIPRECY) \
+ ENABLED(MALYAN_LCD) \
+ ENABLED(TOUCH_UI_FTDI_EVE) \
+ + ENABLED(TFT_320x240) \
+ + ENABLED(TFT_320x240_SPI) \
+ ENABLED(FSMC_GRAPHICAL_TFT) \
+ ENABLED(TFT_LVGL_UI_FSMC) \
+ ENABLED(TFT_LVGL_UI_SPI)
@@ -3043,18 +3047,18 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
/**
* Touch Buttons
*/
-#if ENABLED(TOUCH_BUTTONS)
+#if ENABLED(TOUCH_SCREEN)
#ifndef XPT2046_X_CALIBRATION
- #error "XPT2046_X_CALIBRATION must be defined with TOUCH_BUTTONS."
+ #error "XPT2046_X_CALIBRATION must be defined with TOUCH_SCREEN."
#endif
#ifndef XPT2046_Y_CALIBRATION
- #error "XPT2046_Y_CALIBRATION must be defined with TOUCH_BUTTONS."
+ #error "XPT2046_Y_CALIBRATION must be defined with TOUCH_SCREEN."
#endif
#ifndef XPT2046_X_OFFSET
- #error "XPT2046_X_OFFSET must be defined with TOUCH_BUTTONS."
+ #error "XPT2046_X_OFFSET must be defined with TOUCH_SCREEN."
#endif
#ifndef XPT2046_Y_OFFSET
- #error "XPT2046_Y_OFFSET must be defined with TOUCH_BUTTONS."
+ #error "XPT2046_Y_OFFSET must be defined with TOUCH_SCREEN."
#endif
#endif
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 33cd5ecca6..d081541c5a 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
@@ -403,7 +403,7 @@ static const uint16_t st9677_init[] = {
ESC_END
};
-#if ENABLED(TOUCH_BUTTONS)
+#if HAS_TOUCH_XPT2046
static const uint8_t buttonD[] = {
B01111111,B11111111,B11111111,B11111110,
@@ -595,7 +595,7 @@ static const uint16_t st9677_init[] = {
}
}
-#endif // TOUCH_BUTTONS
+#endif // HAS_TOUCH_XPT2046
// Used to fill RGB565 (16bits) background
inline void memset2(const void *ptr, uint16_t fill, size_t cnt) {
@@ -670,7 +670,7 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
#endif
// Bottom buttons
- #if ENABLED(TOUCH_BUTTONS)
+ #if HAS_TOUCH_XPT2046
setWindow(u8g, dev, BUTTOND_X_LO, BUTTON_Y_LO, BUTTOND_X_HI, BUTTON_Y_HI);
drawImage(buttonD, u8g, dev, 32, 20, TFT_BTCANCEL_COLOR);
@@ -682,7 +682,7 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
setWindow(u8g, dev, BUTTONC_X_LO, BUTTON_Y_LO, BUTTONC_X_HI, BUTTON_Y_HI);
drawImage(buttonC, u8g, dev, 32, 20, TFT_BTOKMENU_COLOR);
- #endif // TOUCH_BUTTONS
+ #endif // HAS_TOUCH_XPT2046
return 0;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_fsmc.cpp b/Marlin/src/lcd/extui/lib/mks_ui/tft_fsmc.cpp
index e8ac3f3519..a039cbe0cb 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/tft_fsmc.cpp
+++ b/Marlin/src/lcd/extui/lib/mks_ui/tft_fsmc.cpp
@@ -24,104 +24,104 @@
#if HAS_TFT_LVGL_UI
- #if defined(ARDUINO_ARCH_STM32F1) && PIN_EXISTS(FSMC_CS) // FSMC on 100/144 pins SoCs
-
- #include
- #include
- #include
- #include
-
-/* Timing configuration */
- #define FSMC_ADDRESS_SETUP_TIME 15// AddressSetupTime
- #define FSMC_DATA_SETUP_TIME 15// DataSetupTime
-
- void LCD_IO_Init(uint8_t cs, uint8_t rs);
- void LCD_IO_WriteData(uint16_t RegValue);
- void LCD_IO_WriteReg(uint16_t Reg);
- uint16_t LCD_IO_ReadData(uint16_t RegValue);
- uint32_t LCD_IO_ReadData(uint16_t RegValue, uint8_t ReadSize);
- uint16_t ILI9488_ReadRAM();
- #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
-
-/**
- * FSMC LCD IO
- */
- #define __ASM __asm
- #define __STATIC_INLINE static inline
-
- __attribute__((always_inline)) __STATIC_INLINE void __DSB() {__ASM volatile ("dsb 0xF" ::: "memory");}
-
- #define FSMC_CS_NE1 PD7
-
- #if ENABLED(STM32_XL_DENSITY)
- #define FSMC_CS_NE2 PG9
- #define FSMC_CS_NE3 PG10
- #define FSMC_CS_NE4 PG12
-
- #define FSMC_RS_A0 PF0
- #define FSMC_RS_A1 PF1
- #define FSMC_RS_A2 PF2
- #define FSMC_RS_A3 PF3
- #define FSMC_RS_A4 PF4
- #define FSMC_RS_A5 PF5
- #define FSMC_RS_A6 PF12
- #define FSMC_RS_A7 PF13
- #define FSMC_RS_A8 PF14
- #define FSMC_RS_A9 PF15
- #define FSMC_RS_A10 PG0
- #define FSMC_RS_A11 PG1
- #define FSMC_RS_A12 PG2
- #define FSMC_RS_A13 PG3
- #define FSMC_RS_A14 PG4
- #define FSMC_RS_A15 PG5
- #endif
-
- #define FSMC_RS_A16 PD11
- #define FSMC_RS_A17 PD12
- #define FSMC_RS_A18 PD13
- #define FSMC_RS_A19 PE3
- #define FSMC_RS_A20 PE4
- #define FSMC_RS_A21 PE5
- #define FSMC_RS_A22 PE6
- #define FSMC_RS_A23 PE2
-
- #if ENABLED(STM32_XL_DENSITY)
- #define FSMC_RS_A24 PG13
- #define FSMC_RS_A25 PG14
- #endif
-
- static uint8_t fsmcInit = 0;
-
- typedef struct {
- __IO uint16_t REG;
- __IO uint16_t RAM;
- } LCD_CONTROLLER_TypeDef;
-
- LCD_CONTROLLER_TypeDef *LCD;
-
- void LCD_IO_Init(uint8_t cs, uint8_t rs) {
- uint32_t controllerAddress;
-
- if (fsmcInit) return;
- fsmcInit = 1;
-
- switch (cs) {
- case FSMC_CS_NE1: controllerAddress = (uint32_t)FSMC_NOR_PSRAM_REGION1; break;
- #if ENABLED(STM32_XL_DENSITY)
+#if defined(ARDUINO_ARCH_STM32F1) && PIN_EXISTS(FSMC_CS) // FSMC on 100/144 pins SoCs
+
+ #include
+ #include
+ #include
+ #include
+
+ /* Timing configuration */
+ #define FSMC_ADDRESS_SETUP_TIME 15// AddressSetupTime
+ #define FSMC_DATA_SETUP_TIME 15// DataSetupTime
+
+ void LCD_IO_Init(uint8_t cs, uint8_t rs);
+ void LCD_IO_WriteData(uint16_t RegValue);
+ void LCD_IO_WriteReg(uint16_t Reg);
+ uint16_t LCD_IO_ReadData(uint16_t RegValue);
+ uint32_t LCD_IO_ReadData(uint16_t RegValue, uint8_t ReadSize);
+ uint16_t ILI9488_ReadRAM();
+ #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
+
+ /**
+ * FSMC LCD IO
+ */
+ #define __ASM __asm
+ #define __STATIC_INLINE static inline
+
+ __attribute__((always_inline)) __STATIC_INLINE void __DSB() {__ASM volatile ("dsb 0xF" ::: "memory");}
+
+ #define FSMC_CS_NE1 PD7
+
+ #if ENABLED(STM32_XL_DENSITY)
+ #define FSMC_CS_NE2 PG9
+ #define FSMC_CS_NE3 PG10
+ #define FSMC_CS_NE4 PG12
+
+ #define FSMC_RS_A0 PF0
+ #define FSMC_RS_A1 PF1
+ #define FSMC_RS_A2 PF2
+ #define FSMC_RS_A3 PF3
+ #define FSMC_RS_A4 PF4
+ #define FSMC_RS_A5 PF5
+ #define FSMC_RS_A6 PF12
+ #define FSMC_RS_A7 PF13
+ #define FSMC_RS_A8 PF14
+ #define FSMC_RS_A9 PF15
+ #define FSMC_RS_A10 PG0
+ #define FSMC_RS_A11 PG1
+ #define FSMC_RS_A12 PG2
+ #define FSMC_RS_A13 PG3
+ #define FSMC_RS_A14 PG4
+ #define FSMC_RS_A15 PG5
+ #endif
+
+ #define FSMC_RS_A16 PD11
+ #define FSMC_RS_A17 PD12
+ #define FSMC_RS_A18 PD13
+ #define FSMC_RS_A19 PE3
+ #define FSMC_RS_A20 PE4
+ #define FSMC_RS_A21 PE5
+ #define FSMC_RS_A22 PE6
+ #define FSMC_RS_A23 PE2
+
+ #if ENABLED(STM32_XL_DENSITY)
+ #define FSMC_RS_A24 PG13
+ #define FSMC_RS_A25 PG14
+ #endif
+
+ static uint8_t fsmcInit = 0;
+
+ typedef struct {
+ __IO uint16_t REG;
+ __IO uint16_t RAM;
+ } LCD_CONTROLLER_TypeDef;
+
+ LCD_CONTROLLER_TypeDef *LCD;
+
+ void LCD_IO_Init(uint8_t cs, uint8_t rs) {
+ uint32_t controllerAddress;
+
+ if (fsmcInit) return;
+ fsmcInit = 1;
+
+ switch (cs) {
+ case FSMC_CS_NE1: controllerAddress = (uint32_t)FSMC_NOR_PSRAM_REGION1; break;
+ #if ENABLED(STM32_XL_DENSITY)
case FSMC_CS_NE2: controllerAddress = (uint32_t)FSMC_NOR_PSRAM_REGION2; break;
case FSMC_CS_NE3: controllerAddress = (uint32_t)FSMC_NOR_PSRAM_REGION3; break;
case FSMC_CS_NE4: controllerAddress = (uint32_t)FSMC_NOR_PSRAM_REGION4; break;
- #endif
- default: return;
- }
+ #endif
+ default: return;
+ }
- #define _ORADDR(N) controllerAddress |= (_BV32(N) - 2)
+ #define _ORADDR(N) controllerAddress |= (_BV32(N) - 2)
- switch (rs) {
- #if ENABLED(STM32_XL_DENSITY)
+ switch (rs) {
+ #if ENABLED(STM32_XL_DENSITY)
case FSMC_RS_A0: _ORADDR( 1); break;
case FSMC_RS_A1: _ORADDR( 2); break;
case FSMC_RS_A2: _ORADDR( 3); break;
@@ -138,99 +138,99 @@
case FSMC_RS_A13: _ORADDR(14); break;
case FSMC_RS_A14: _ORADDR(15); break;
case FSMC_RS_A15: _ORADDR(16); break;
- #endif
- case FSMC_RS_A16: _ORADDR(17); break;
- case FSMC_RS_A17: _ORADDR(18); break;
- case FSMC_RS_A18: _ORADDR(19); break;
- case FSMC_RS_A19: _ORADDR(20); break;
- case FSMC_RS_A20: _ORADDR(21); break;
- case FSMC_RS_A21: _ORADDR(22); break;
- case FSMC_RS_A22: _ORADDR(23); break;
- case FSMC_RS_A23: _ORADDR(24); break;
- #if ENABLED(STM32_XL_DENSITY)
+ #endif
+ case FSMC_RS_A16: _ORADDR(17); break;
+ case FSMC_RS_A17: _ORADDR(18); break;
+ case FSMC_RS_A18: _ORADDR(19); break;
+ case FSMC_RS_A19: _ORADDR(20); break;
+ case FSMC_RS_A20: _ORADDR(21); break;
+ case FSMC_RS_A21: _ORADDR(22); break;
+ case FSMC_RS_A22: _ORADDR(23); break;
+ case FSMC_RS_A23: _ORADDR(24); break;
+ #if ENABLED(STM32_XL_DENSITY)
case FSMC_RS_A24: _ORADDR(25); break;
case FSMC_RS_A25: _ORADDR(26); break;
- #endif
- default: return;
- }
+ #endif
+ default: return;
+ }
- rcc_clk_enable(RCC_FSMC);
-
- gpio_set_mode(GPIOD, 14, GPIO_AF_OUTPUT_PP); // FSMC_D00
- gpio_set_mode(GPIOD, 15, GPIO_AF_OUTPUT_PP); // FSMC_D01
- gpio_set_mode(GPIOD, 0, GPIO_AF_OUTPUT_PP);// FSMC_D02
- gpio_set_mode(GPIOD, 1, GPIO_AF_OUTPUT_PP);// FSMC_D03
- gpio_set_mode(GPIOE, 7, GPIO_AF_OUTPUT_PP);// FSMC_D04
- gpio_set_mode(GPIOE, 8, GPIO_AF_OUTPUT_PP);// FSMC_D05
- gpio_set_mode(GPIOE, 9, GPIO_AF_OUTPUT_PP);// FSMC_D06
- gpio_set_mode(GPIOE, 10, GPIO_AF_OUTPUT_PP); // FSMC_D07
- gpio_set_mode(GPIOE, 11, GPIO_AF_OUTPUT_PP); // FSMC_D08
- gpio_set_mode(GPIOE, 12, GPIO_AF_OUTPUT_PP); // FSMC_D09
- gpio_set_mode(GPIOE, 13, GPIO_AF_OUTPUT_PP); // FSMC_D10
- gpio_set_mode(GPIOE, 14, GPIO_AF_OUTPUT_PP); // FSMC_D11
- gpio_set_mode(GPIOE, 15, GPIO_AF_OUTPUT_PP); // FSMC_D12
- gpio_set_mode(GPIOD, 8, GPIO_AF_OUTPUT_PP);// FSMC_D13
- gpio_set_mode(GPIOD, 9, GPIO_AF_OUTPUT_PP);// FSMC_D14
- gpio_set_mode(GPIOD, 10, GPIO_AF_OUTPUT_PP); // FSMC_D15
-
- gpio_set_mode(GPIOD, 4, GPIO_AF_OUTPUT_PP);// FSMC_NOE
- gpio_set_mode(GPIOD, 5, GPIO_AF_OUTPUT_PP);// FSMC_NWE
-
- gpio_set_mode(PIN_MAP[cs].gpio_device, PIN_MAP[cs].gpio_bit, GPIO_AF_OUTPUT_PP); //FSMC_CS_NEx
- gpio_set_mode(PIN_MAP[rs].gpio_device, PIN_MAP[rs].gpio_bit, GPIO_AF_OUTPUT_PP); //FSMC_RS_Ax
+ rcc_clk_enable(RCC_FSMC);
+
+ gpio_set_mode(GPIOD, 14, GPIO_AF_OUTPUT_PP); // FSMC_D00
+ gpio_set_mode(GPIOD, 15, GPIO_AF_OUTPUT_PP); // FSMC_D01
+ gpio_set_mode(GPIOD, 0, GPIO_AF_OUTPUT_PP);// FSMC_D02
+ gpio_set_mode(GPIOD, 1, GPIO_AF_OUTPUT_PP);// FSMC_D03
+ gpio_set_mode(GPIOE, 7, GPIO_AF_OUTPUT_PP);// FSMC_D04
+ gpio_set_mode(GPIOE, 8, GPIO_AF_OUTPUT_PP);// FSMC_D05
+ gpio_set_mode(GPIOE, 9, GPIO_AF_OUTPUT_PP);// FSMC_D06
+ gpio_set_mode(GPIOE, 10, GPIO_AF_OUTPUT_PP); // FSMC_D07
+ gpio_set_mode(GPIOE, 11, GPIO_AF_OUTPUT_PP); // FSMC_D08
+ gpio_set_mode(GPIOE, 12, GPIO_AF_OUTPUT_PP); // FSMC_D09
+ gpio_set_mode(GPIOE, 13, GPIO_AF_OUTPUT_PP); // FSMC_D10
+ gpio_set_mode(GPIOE, 14, GPIO_AF_OUTPUT_PP); // FSMC_D11
+ gpio_set_mode(GPIOE, 15, GPIO_AF_OUTPUT_PP); // FSMC_D12
+ gpio_set_mode(GPIOD, 8, GPIO_AF_OUTPUT_PP);// FSMC_D13
+ gpio_set_mode(GPIOD, 9, GPIO_AF_OUTPUT_PP);// FSMC_D14
+ gpio_set_mode(GPIOD, 10, GPIO_AF_OUTPUT_PP); // FSMC_D15
+
+ gpio_set_mode(GPIOD, 4, GPIO_AF_OUTPUT_PP);// FSMC_NOE
+ gpio_set_mode(GPIOD, 5, GPIO_AF_OUTPUT_PP);// FSMC_NWE
+
+ gpio_set_mode(PIN_MAP[cs].gpio_device, PIN_MAP[cs].gpio_bit, GPIO_AF_OUTPUT_PP); //FSMC_CS_NEx
+ gpio_set_mode(PIN_MAP[rs].gpio_device, PIN_MAP[rs].gpio_bit, GPIO_AF_OUTPUT_PP); //FSMC_RS_Ax
- #if ENABLED(STM32_XL_DENSITY)
- FSMC_NOR_PSRAM4_BASE->BCR = FSMC_BCR_WREN | FSMC_BCR_MTYP_SRAM | FSMC_BCR_MWID_16BITS | FSMC_BCR_MBKEN;
- FSMC_NOR_PSRAM4_BASE->BTR = (FSMC_DATA_SETUP_TIME << 8) | FSMC_ADDRESS_SETUP_TIME;
- #else // PSRAM1 for STM32F103V (high density)
- FSMC_NOR_PSRAM1_BASE->BCR = FSMC_BCR_WREN | FSMC_BCR_MTYP_SRAM | FSMC_BCR_MWID_16BITS | FSMC_BCR_MBKEN;
- FSMC_NOR_PSRAM1_BASE->BTR = (FSMC_DATA_SETUP_TIME << 8) | FSMC_ADDRESS_SETUP_TIME;
- #endif
+ #if ENABLED(STM32_XL_DENSITY)
+ FSMC_NOR_PSRAM4_BASE->BCR = FSMC_BCR_WREN | FSMC_BCR_MTYP_SRAM | FSMC_BCR_MWID_16BITS | FSMC_BCR_MBKEN;
+ FSMC_NOR_PSRAM4_BASE->BTR = (FSMC_DATA_SETUP_TIME << 8) | FSMC_ADDRESS_SETUP_TIME;
+ #else // PSRAM1 for STM32F103V (high density)
+ FSMC_NOR_PSRAM1_BASE->BCR = FSMC_BCR_WREN | FSMC_BCR_MTYP_SRAM | FSMC_BCR_MWID_16BITS | FSMC_BCR_MBKEN;
+ FSMC_NOR_PSRAM1_BASE->BTR = (FSMC_DATA_SETUP_TIME << 8) | FSMC_ADDRESS_SETUP_TIME;
+ #endif
- afio_remap(AFIO_REMAP_FSMC_NADV);
+ afio_remap(AFIO_REMAP_FSMC_NADV);
- LCD = (LCD_CONTROLLER_TypeDef*)controllerAddress;
- }
+ LCD = (LCD_CONTROLLER_TypeDef*)controllerAddress;
+ }
- void LCD_IO_WriteData(uint16_t RegValue) {
- LCD->RAM = RegValue;
- __DSB();
- }
+ void LCD_IO_WriteData(uint16_t RegValue) {
+ LCD->RAM = RegValue;
+ __DSB();
+ }
- void LCD_IO_WriteReg(uint16_t Reg) {
- LCD->REG = Reg;
- __DSB();
- }
+ void LCD_IO_WriteReg(uint16_t Reg) {
+ LCD->REG = Reg;
+ __DSB();
+ }
- uint16_t LCD_IO_ReadData(uint16_t RegValue) {
- LCD->REG = RegValue;
- __DSB();
+ uint16_t LCD_IO_ReadData(uint16_t RegValue) {
+ LCD->REG = RegValue;
+ __DSB();
- return LCD->RAM;
- }
+ return LCD->RAM;
+ }
- uint16_t ILI9488_ReadRAM() {
- uint16_t data;
- data = LCD->RAM;
- return data;
- }
+ uint16_t ILI9488_ReadRAM() {
+ uint16_t data;
+ data = LCD->RAM;
+ return data;
+ }
- uint32_t LCD_IO_ReadData(uint16_t RegValue, uint8_t ReadSize) {
- volatile uint32_t data;
- LCD->REG = RegValue;
- __DSB();
+ uint32_t LCD_IO_ReadData(uint16_t RegValue, uint8_t ReadSize) {
+ volatile uint32_t data;
+ LCD->REG = RegValue;
+ __DSB();
- data = LCD->RAM; // dummy read
- data = LCD->RAM & 0x00FF;
+ data = LCD->RAM; // dummy read
+ data = LCD->RAM & 0x00FF;
- while (--ReadSize) {
- data <<= 8;
- data |= (LCD->RAM & 0x00FF);
- }
- return uint32_t(data);
+ while (--ReadSize) {
+ data <<= 8;
+ data |= (LCD->RAM & 0x00FF);
}
+ return uint32_t(data);
+ }
- #ifdef LCD_USE_DMA_FSMC
+ #ifdef LCD_USE_DMA_FSMC
void LCD_IO_WriteMultiple(uint16_t color, uint32_t count) {
while (count > 0) {
@@ -268,6 +268,7 @@
dma_disable(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
}
- #endif // LCD_USE_DMA_FSMC
- #endif // ARDUINO_ARCH_STM32F1 && FSMC_CS_PIN
+ #endif // LCD_USE_DMA_FSMC
+
+#endif // ARDUINO_ARCH_STM32F1 && FSMC_CS_PIN
#endif // HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp
index f24f08e98e..96eedd3296 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp
@@ -429,7 +429,7 @@ void tft_lvgl_init() {
//spi_flash_read_test();
- TERN_(TOUCH_BUTTONS, touch.init());
+ TERN_(HAS_TOUCH_XPT2046, touch.init());
lv_init();
@@ -660,7 +660,7 @@ void XPT2046_Rd_Addata(uint16_t *X_Addata, uint16_t *Y_Addata) {
SPI_TFT.spi_read_write_byte(CHY);
x_addata[i] = SPI2_ReadWrite2Bytes();
WRITE(TOUCH_CS_PIN, HIGH);
- #else // #if ENABLED(TOUCH_BUTTONS)
+ #else // #if HAS_TOUCH_XPT2046
OUT_WRITE(TOUCH_CS_PIN, LOW);
W25QXX.spi_flash_read_write_byte(CHX);
y_addata[i] = SPI2_ReadWrite2Bytes();
@@ -729,7 +729,7 @@ bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data) {
/*Save the pressed coordinates and the state*/
if (diffTime > 10) {
//use marlin touch code if enabled
- #if ENABLED(TOUCH_BUTTONS)
+ #if HAS_TOUCH_XPT2046
touch.getTouchPoint(reinterpret_cast(last_x), reinterpret_cast(last_y));
#else
XPT2046_Rd_Addata((uint16_t *)&last_x, (uint16_t *)&last_y);
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 2a9e4766d8..373051fd4e 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -86,7 +86,7 @@ void MarlinUI::save_previous_screen() {
void MarlinUI::_goto_previous_screen(TERN_(TURBO_BACK_MENU_ITEM, const bool is_back/*=false*/)) {
TERN(TURBO_BACK_MENU_ITEM,,constexpr bool is_back = false);
- TERN_(TOUCH_BUTTONS, on_edit_screen = false);
+ TERN_(HAS_TOUCH_XPT2046, on_edit_screen = false);
if (screen_history_depth > 0) {
menuPosition &sh = screen_history[--screen_history_depth];
goto_screen(sh.menu_function,
@@ -133,7 +133,7 @@ void MenuItem_gcode::action(PGM_P const, PGM_P const pgcode) { queue.inject_P(pg
* MenuItem_int3::draw(encoderLine == _thisItemNr, _lcdLineNr, plabel, &feedrate_percentage, 10, 999)
*/
void MenuEditItemBase::edit_screen(strfunc_t strfunc, loadfunc_t loadfunc) {
- TERN_(TOUCH_BUTTONS, ui.repeat_delay = BUTTON_DELAY_EDIT);
+ TERN_(HAS_TOUCH_XPT2046, ui.repeat_delay = BUTTON_DELAY_EDIT);
if (int32_t(ui.encoderPosition) < 0) ui.encoderPosition = 0;
if (int32_t(ui.encoderPosition) > maxEditValue) ui.encoderPosition = maxEditValue;
if (ui.should_draw())
@@ -155,7 +155,7 @@ void MenuEditItemBase::goto_edit_screen(
const screenFunc_t cb, // Callback after edit
const bool le // Flag to call cb() during editing
) {
- TERN_(TOUCH_BUTTONS, ui.on_edit_screen = true);
+ TERN_(HAS_TOUCH_XPT2046, ui.on_edit_screen = true);
ui.screen_changed = true;
ui.save_previous_screen();
ui.refresh();
@@ -214,7 +214,7 @@ bool printer_busy() {
void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, const uint8_t top/*=0*/, const uint8_t items/*=0*/) {
if (currentScreen != screen) {
- TERN_(TOUCH_BUTTONS, repeat_delay = BUTTON_DELAY_MENU);
+ TERN_(HAS_TOUCH_XPT2046, repeat_delay = BUTTON_DELAY_MENU);
TERN_(LCD_SET_PROGRESS_MANUALLY, progress_reset());
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index e8edea76d1..d298376ce2 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -652,3 +652,7 @@ void _lcd_draw_homing();
#if ENABLED(POWER_LOSS_RECOVERY)
void menu_job_recovery();
#endif
+
+#if ENABLED(TOUCH_SCREEN_CALIBRATION)
+ void touch_screen_calibration();
+#endif
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 869935b59a..b430e0448b 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -220,7 +220,7 @@ static PGM_P pause_header() {
#define HOTEND_STATUS_ITEM() do { \
if (_menuLineNr == _thisItemNr) { \
if (ui.should_draw()) { \
- MenuItem_static::draw(_lcdLineNr, GET_TEXT(MSG_FILAMENT_CHANGE_NOZZLE), SS_INVERT); \
+ TERN(HAS_GRAPHICAL_TFT,, MenuItem_static::draw(_lcdLineNr, GET_TEXT(MSG_FILAMENT_CHANGE_NOZZLE), SS_INVERT)); \
ui.draw_hotend_status(_lcdLineNr, hotend_status_extruder); \
} \
if (_skipStatic && encoderLine <= _thisItemNr) { \
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 9c49a3cdb7..5887bf9d4a 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -195,16 +195,21 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
SUBMENU(MSG_MOVE_1MM, []{ _goto_manual_move( 1); });
SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); });
if (axis == Z_AXIS && (SHORT_MANUAL_Z_MOVE) > 0.0f && (SHORT_MANUAL_Z_MOVE) < 0.1f) {
- extern const char NUL_STR[];
- SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); });
- MENU_ITEM_ADDON_START(0 + ENABLED(HAS_CHARACTER_LCD));
- char tmp[20], numstr[10];
- // Determine digits needed right of decimal
- const uint8_t digs = !UNEAR_ZERO((SHORT_MANUAL_Z_MOVE) * 1000 - int((SHORT_MANUAL_Z_MOVE) * 1000)) ? 4 :
- !UNEAR_ZERO((SHORT_MANUAL_Z_MOVE) * 100 - int((SHORT_MANUAL_Z_MOVE) * 100)) ? 3 : 2;
- sprintf_P(tmp, GET_TEXT(MSG_MOVE_Z_DIST), dtostrf(SHORT_MANUAL_Z_MOVE, 1, digs, numstr));
+ char tmp[20], numstr[10];
+ // Determine digits needed right of decimal
+ const uint8_t digs = !UNEAR_ZERO((SHORT_MANUAL_Z_MOVE) * 1000 - int((SHORT_MANUAL_Z_MOVE) * 1000)) ? 4 :
+ !UNEAR_ZERO((SHORT_MANUAL_Z_MOVE) * 100 - int((SHORT_MANUAL_Z_MOVE) * 100)) ? 3 : 2;
+ sprintf_P(tmp, GET_TEXT(MSG_MOVE_Z_DIST), dtostrf(SHORT_MANUAL_Z_MOVE, 1, digs, numstr));
+
+ #if DISABLED(HAS_GRAPHICAL_TFT)
+ extern const char NUL_STR[];
+ SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); });
+ MENU_ITEM_ADDON_START(0 + ENABLED(HAS_CHARACTER_LCD));
lcd_put_u8str(tmp);
- MENU_ITEM_ADDON_END();
+ MENU_ITEM_ADDON_END();
+ #else
+ SUBMENU_P(tmp, []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); });
+ #endif
}
}
END_MENU();
diff --git a/Marlin/src/lcd/menu/menu_touch_screen.cpp b/Marlin/src/lcd/menu/menu_touch_screen.cpp
new file mode 100644
index 0000000000..1f315f181a
--- /dev/null
+++ b/Marlin/src/lcd/menu/menu_touch_screen.cpp
@@ -0,0 +1,34 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * 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 .
+ *
+ */
+
+#include "../../inc/MarlinConfigPre.h"
+
+#if ENABLED(TOUCH_SCREEN_CALIBRATION)
+
+#include "menu.h"
+#include "../ultralcd.h"
+
+void touch_screen_calibration() {
+ ui.touch_calibration();
+}
+
+#endif // TOUCH_SCREEN_CALIBRATION
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index 705b19869a..8a5095c88f 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -68,6 +68,7 @@ static void _lcd_mesh_fine_tune(PGM_P const msg) {
const float rounded_f = rounded_mesh_value();
MenuEditItemBase::draw_edit_screen(msg, ftostr43sign(rounded_f));
TERN_(MESH_EDIT_GFX_OVERLAY, _lcd_zoffset_overlay_gfx(rounded_f));
+ TERN_(HAS_GRAPHICAL_TFT, ui.refresh(LCDVIEW_NONE));
}
}
@@ -77,6 +78,7 @@ static void _lcd_mesh_fine_tune(PGM_P const msg) {
float lcd_mesh_edit() { return rounded_mesh_value(); }
void lcd_mesh_edit_setup(const float &initial) {
+ TERN_(HAS_GRAPHICAL_TFT, ui.clear_lcd());
mesh_edit_accumulator = initial;
ui.goto_screen([]{ _lcd_mesh_fine_tune(GET_TEXT(MSG_MESH_EDIT_Z)); });
}
@@ -456,8 +458,8 @@ void ubl_map_screen() {
do {
// Now, keep the encoder position within range
- if (int32_t(ui.encoderPosition) < 0) ui.encoderPosition = GRID_MAX_POINTS - 1;
- if (int32_t(ui.encoderPosition) > GRID_MAX_POINTS - 1) ui.encoderPosition = 0;
+ if (int32_t(ui.encoderPosition) < 0) ui.encoderPosition = GRID_MAX_POINTS + TERN(TOUCH_SCREEN, ui.encoderPosition, -1);
+ if (int32_t(ui.encoderPosition) > GRID_MAX_POINTS - 1) ui.encoderPosition = TERN(TOUCH_SCREEN, ui.encoderPosition - GRID_MAX_POINTS, 0);
// Draw the grid point based on the encoder
x = ui.encoderPosition % (GRID_MAX_POINTS_X);
diff --git a/Marlin/src/lcd/tft/bitmaps/back.bmp b/Marlin/src/lcd/tft/bitmaps/back.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..5ad1f82542fb70779ed91bce77de3ee29299cce5
GIT binary patch
literal 3126
zcmeH|y-s356vx?qA7INZ_X+HG`+WlW5Ct`A0s#aBloe?#OlY96FciE5l<)!?2o{C}
zY!HE{@uL7E`&-XuGF&bQ?3!$`H{oXPoio4lKmR#*`1XC_qviEl;Qoc*=ik2%mQReh
znEz^(pS-YGe*C}89Eiu`dwY9kGbZl{HhDY#mBeQpPwHe
zABRFAJ=v@Cn}D-Zte!W-6P_K0ZFavIlo}cZhd59H#N2ywmAOF!#&LOP!C&NR39L?4!@;
zgM4*$rGgopoSaZE=1_%Z$*&=vaJAcQJ)ZqV&&I|EK)>I=v$Jz}c$mxOPESwuFd4I7
zh*?@%8r?6*2-B6z5(+PsN|j0lqnLeuejdfDH|ca5{_5(gK|FBuw^}U~Ime(}F5?WH
zNh9gzi*mK0bC6l`@bG|#Z0qLcrY>HT8$6#Q1>WKe-xM99#Pc$lO!5WI0o0eU+9=8f_+oAA(y0J`OVFZ
zGD^<3wY4>lENYbYo>H@c&!ehBrI7QP#uh8)CaYYM0>QVpw^T9t{8y`H8b}KM7W@5v
zv)RP?asMwfVfA3O7wG5I`s;jhVK^Jgc}UN^2VYV^Mn8Ynf4;N2KWdCo9E0x!S6Tke
F!B0sxQ3?P6
literal 0
HcmV?d00001
diff --git a/Marlin/src/lcd/tft/bitmaps/bed.bmp b/Marlin/src/lcd/tft/bitmaps/bed.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..842174f82081429e5f914f27cfad78a722f067fd
GIT binary patch
literal 12342
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
B);a(H
literal 0
HcmV?d00001
diff --git a/Marlin/src/lcd/tft/bitmaps/confirm.bmp b/Marlin/src/lcd/tft/bitmaps/confirm.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..076fa57897deb90f8ec673b42d73fdd92c062cd0
GIT binary patch
literal 12410
zcmeI0$xa(V5Qd#R1&@(ONVxa_W-%N9<-&zU^34apW=U9tkl+>Agajw{GYAke%MEek
zMG#x^g-S}TZo>@YF_}T#l1)$BO#k)&e^uAGF<1JMc^)O+3%tJmeSOL_Fk|rfx9{?j
zg-oU~n=k&GhyDB6`r;2iJOiEq&wyvZGvFEcC=5(ZO-)WtrZJkI&trIaxLhtXO;-p2
zhW0|Ckk99PdU}S2h7ckxAqe=v!NF`c+tk#Q%jLSeyAdK4ApjnnfbZ<=1an76M{{#?
zOG`^CLJ;Qr`}v
za5}$pkEFI~YikR%jT-_+T3J~^0<)-2Pfx#3gQ4I_SgrFe$k$iYNM;D{pn`zskc!5<
z85BlZU0oFwq^Q=r%~R&XfQR9mn;R3bJFlujo!UGFPr~l*?z&*i6}ZJ(V`F2dr>Ew+
zJ0}E+Diy4*ZJr4}Fkwkg$|FGW?)g}8D7@Qjd$l-LI51-#V5(a}*ZFE1}G&aF%HbdIq{qNedMBK^Fz
zqjd>*`X39tgn$Z60z=>qR3uy^MykEphI!cQ?d{#%+_ccTms?v~Y8!!VzKfC0&d%I_
zG*?JxJ=$tl0o`Y3XHQN}%q`qG(!a#K8A3E8)zYc*(?|GfV|w0%ZO%igAh{q$s^zI|
ze0+R
zsuR*VmRw*v&U7mTz`vDwGY}*|+)AZV6}c|5i#FS8qzIj=s{(lufq658km=0PCPpG1
z2tm?0LZ_-KP~r{`54nUu6HkOWDv&sVr!z*<2T$!(sqJswk?rQ@=GNEOu~Y5fWq0n$
zBru&-1?jgrQX@#fMr>E3ZCuhs%D{9+cTQ)1D8NE=hSBi5yT`HuEeINDB=UM;VWC(o
zCJMYTKnUc*>lNwv_;_Y!CKkr(aTAP06fdc8aBx6V%@^vibzJup72I3^eC&A_7iQ}|
zgka^u(a{m$B1$C87g1b*(2VbO1
z`qQL~WDs(1pl}Y{#2C3b`S=qT&*81`n~)w~Y26*ym2g8x6ng)Dby$ZJg0Oga@&1nI
zK3`8Rd`BPv0SG_<0uX=z1Rwwb2tWV=5P$##*a;*_@^PuKYkk~_ihG`CS=New*6TG{
zvHc2ZnmUf7Y1$Ld=(>A!xztNHXB7z
znD_U6zpm>&|Fmr@NfM9#Wm)pCzu)b4vMi(j@KrfIsa%l7_7^S|A0zxk){`!EdYUOD*zp8qn-vQPfW^Zfj(CwGYB_>F&}C_4G+
hI0*p=KmY;|fB*y_009U<00Izz00bZa0SH`P;0K*ldIJCe
literal 0
HcmV?d00001
diff --git a/Marlin/src/lcd/tft/bitmaps/directory.bmp b/Marlin/src/lcd/tft/bitmaps/directory.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..994abc70db0e527afe43b672db0e19fe4a63d080
GIT binary patch
literal 3194
zcmZ?rt>R$-gDN1I1H=kY%*Y@CWB~zC-Z2J(Ap#5xPVPa)FgCF?6Pm(?;RPBS8=EKt
zKof8U2~euCvNE4CP*hX|bRbqMDk>^!Yim0@J3Gh)ZEbByNlAHmd6-rJP2RR`+kc9|
zxpU`$Rx~#^qj{max|(9Mp#~%*Bn*i8|Ni}>iWhLXf7EbmtX=&0$aLtX?=Y?TIB-d5@~)*OAAmXFtOnRz
literal 0
HcmV?d00001
diff --git a/Marlin/src/lcd/tft/bitmaps/down.bmp b/Marlin/src/lcd/tft/bitmaps/down.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..42ff4e5cafcd9ba7e72e12d05c91892e4daeb061
GIT binary patch
literal 3126
zcmeH{xvFA85Qd$69$>-==K=I0ijKP&OrY^32BL|P;J$BQ;D!r|A|irI;2W5V8wkFP
zqUhWo>mtSRDvl!)*>IXV-PPY;U0vOpUvFPUr}l>a2fptg-xtw0SZJ76|E7-yM55@c
zy)wWukVqur@i-fJrWp!_tX8Yj>4eHNxzT7O5<%EDn@uW}s?}<**ZV{Xz};?lzu#Z2
zRvL{)sZ<&a2A|LOltcmU@p$U>`kzyqOeQ~1O{dcZ0)c;&Ab7P}B{=od=~O0@K?HjV
zhr<*?iBHsC0gSS*Gh%jL2_0u_Zz2MMFmcuj)fh*JRXbUG*!%mR)#0R|*W
zrPASW;GVPD3~maA0+C!wT!Z7zVhOMWr#FWr3WWma!$zV=0$0!BaPWJ9%RU;71pb4;
zKrWZVjl;P_Hk%bJ!Eu|-W~{PUEXib&oYA{nuI+ZqodHK-d2=~!
z1%ttKI=$I!$hp_+U5or25*bJ}m&jx?TCFyfN^v-O;(}mDyWMU)9wPuaT>1#$XNi11
zkHEU!uE}J&R-ZUENWc@uon+#}AIFE|#_#Qg@I<1}e;VhF!G{;#V7{ha8Tbzwcn25a
BkSPEF
literal 0
HcmV?d00001
diff --git a/Marlin/src/lcd/tft/bitmaps/fan0.bmp b/Marlin/src/lcd/tft/bitmaps/fan0.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..558dbe4f8fea2eab1ba5caebe31737c560b11154
GIT binary patch
literal 12410
zcmeI&g^pay5e8r8|>#`mgHh9{*Oe;I9=5TY=B+{{Hs+-=8Y{#gpd!-&=&g
z&{3hnZea4YyJ^#=0|ySwdlgIs
zc))-G9XodXM`7#KsS|-Z^OhN77w~jJUa?}us#UAPU!z8i)~#EcLSxLtB40r`Y}hc!
z$*ESYTJ`GHYu2n;t5&W0_3L-&(1DkNbw$q2qjU7=(f#`Mt5c^AKVeRej96
zYp(7x-Yl-DQl(0R1`V1uYX&weID|}AG;G+gZ{NOwT6v(2Od*Ff>c);8d+pk_@87?_
zfB$~MgbAERUAuPea>8#gvP0OaRjc{)=N~z8k|zs928y?Yy+
z$Ks~r2cGA7Y0;uZU;`i8#fujkH*U-XpYSBqVwk}eap=&YSFc|EL)h>C-nemN(xgd<
zr11=oF#&*dJUKm^YoYmS@#4i1T^~MtfJ7kB64pA2Wd7{dt(%EYo;-;N3|~Kg{=9PK
zO0*0n@SC8^X?;^L%ql1-Xw<0Dym|A!e*K!MZques{IAJKNxa1Qg9i`h`TO_pXG%-&
z*}Qo(w_p(~TDEM--aJg8PGsRZpQH;piiw3Kg)eE_CUpFVb|M~@z5)AHrZ7kLSVXz9|WOT3F{m)r5stZV|)`#*j9G;!j@
z5Y9}H@sju_*hQD*?DOW$o9Qw$pZD(FE2(mn7>Q4$VY3#YnL@Jlh!OE?eaW|1Vo|~+
zFcKKpvPn+$zkU0*fB*heSb}(>BG~HHt5XvbKAb*%8aeF?&!*UnP90P>d-WT!_-ygv9jUzI|JMgI_KUlH-?P#E20#k*80e#>kAkx_kF-_wL<;
z3Aoy%NfY4~B8a;<1o@90I~JLh{3|?xqEbq+QH(t6)~!n}JdCs*BM%b-k*tM?W)xp>
z$oTQ&i_Q5l8j*oOo>5@L^M|htIDh_pjI?a8Zr!>yX3Q9hWK`~w`kFUyP9TTaQWK`l
zB85MG{5VCSu&miAWT9uyocZk8vm)gb+xhY1$6dR2Q9+$>LsuC?ARIq_yx6%h1ML1*
zkV6!8(j9@>@YA?_`SNTVZj6fbSJZ9Ww#{15r8RX)NDYHaim}KCDnl(Hh
z{AM9kgO@H{N=KE`^SE*2;Fp8lSE}J{_{FSKRZ57|N@>VQcCl1{
zt`9S2%xKY~1ufZvSHGp7GiT15H*azkF1;(U_y_)zCr?JEtC?*F5{RHyGNr#&q)EIo
zwo{~P=gO5UHe9=B`dQC-d-s9`3%Iw~{BOHCbm&mJiX_i8_UzeHwvp&wzkVH=0yDd8
zKuY50&z}c8BHczgefo4paUI8MxJ?3AFIlo=%a$z%4<0;w_UxH6XN-)Yefo;P@0`vX
z;xPgv+gJHk2_fg$KH!PC&a8Lu-ibbe;3&tId-v`wTegf+>Dr3Z7{G^5Uv=8`Gy=g!
zcs<^xxUV)_w3oTYSk*Rtt{32oVi;G+W=K+#V(-@o53*{
z!Yi1Ab;XX13^0)jE9;75?b@}rkN*_59Xoc|AXcnc;kskWlqt;opPLH7z|TwS2Sh^Y
zl+`S?C(5f%?zo}xPek2M`pWhIugFg@($|zNdK91Hv~%aq4zOI!XlB~W^xHsv+Kv-4
zxde@ZGu4U|>#e9+x^yWg!!KLfvj7&eo+W?H(&(`Z;8N+EP$cYBXRt0@rgiPwHDr5+
zfDN#R`ie7csd^nEDr+(9$S*PckbL#H8~5E
zCU_AIzfv;^!k95CJr{KFmoj+xWgbeU&2X6$12Wqy_nEGD^1EBemJ)O7XM)rEtXZ>M
z_zQ&0JD+UGonlQ~Au|<%&k<;&b&=@AO-K>(r
z@Pl%~LcqhHZf?QDYJ~wOA3l88iNK*)lJv8V+a&gCru?ANpD`UOjTI1zN*hGTElkr>
S7TEGLtS*;X?tx$Bf&T*c{D|HF
literal 0
HcmV?d00001
diff --git a/Marlin/src/lcd/tft/bitmaps/fan1.bmp b/Marlin/src/lcd/tft/bitmaps/fan1.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..6da6f3294e63d813e55ced63e2b51bbc38451c5c
GIT binary patch
literal 12410
zcmeI&^^P3N6$fA^Pm#ySBP3TcGcz+Y#t<{JC8Lb83^K}=nItpGB$-iWW{mCR%hpZb
zQO``zEM(VzY)RX$uC6-gcd$;?__vzF{#v1+4fE{b?{B~V{i(uV^fcf9-Xi>kfeICV
zt6Z=D|N8m<`{&rif0nm$4U}u3
zC8!|O#*ZIAXU?3}t5C=njKTDP@Y2LiK%!6Rj0Tps(
z0sQ~suTrH7)jfIgB!g!27?L&{H*P#|;K0&UevlPM`1yaWTD24gd4P>ixqkh6`}Xa7
z_wLOV3#q>nn2ssdb?VfqR;?Ox-@bi|<4b)1`t|FiNt3#F?_MV00j7WHx#Q@Dqd=2}avl5P>5p
zO8-^RoD;cvj~+b$Rw+Gw`jiw7#lIB(AcC`iN=7cy7=j4XrcKl5RE(mLORziqo;Y!W
zyjo<$U!lW`L}jyP%>sU~HJBO2NR1jb^hv?fR;*aT$FkusknHzIDa#dhgeFaz0PM+a
zRHys)?K^w+?50hdx^(FRzj3E^E*D{g)d=%tYo&Is0Yg<23L8m@!>0!Fy?gh1_3Fj7
zM1-h^DgY)6FP*=_egz
z#u1odu!KuQ#x)Ye@ijEB0V*OZSFUt7_3`6J7eR8-kRe0VIWau4DA)+jm@xz9jDTZH
z!mA^az!x<*W&|7?1lulo;lhQB7cU+?dersK^5x5C&z{XUd#aU+LC+pzAzI?oHlIO&~;quCw<;UuF91wD>)uNejNLn^Yz1r5A)~GXYo|P
zu|D0lXwibIb5hGT!I3s(dj}l89Zi$=-Q2?O)QO8DO!O)LjzCD*`#3zN^y5M!f10tG
z!qzSjlD|NhH*cN`I-%XFRjUC52Eec6K6&zFY*n7GJ9g|4SuveQuY9{>$ByuuQ{?+h
zNcQjF53M~*qwR_nD|&YB+?na+)va5%7Wv8|Cw^RPl=POf5>D2b<2lV!HAB>^SI=H1
z=SZz0J$YgBR~tmK{xPz}*g$O`$)s|Ab+6)pCfjfuLG8ArnAg1WtvxZ}?7;u=a*`5&
z5?wLb*{u*1vp9C>(4k$scKpYMf6*eBx?a6{RWbG+j}M#;h{4;xlN52!v8X-+Pm#yFbB=Rk8GeUv$?fn2qH|LJlXwov?{s784yf%9_#`y
z;YRnbEC|yTMqImQFu)2Za^7tcffq4>
zjLO_rr4mW)`*n#bq!f^{p-mqrsiu|)B2bhAY%1AoeKm8xe*Mx3#zuhQV4O45Do$7#
z3EFVQxM~oX7=@g#k)r}nQEC|XHW|4@gL1wQQ=jC+jtI6$_%#(>L?r6i{T<~RHEKjs
zU~&RZpJ0_Acf#EuDHLO_{<0nV#E7VIJ(4Fc_*sftxR8bEiIg9T5s^|T&xuK4t@y=-
zBN0KfiHOihOQEA!rFpp>l6;hpi)khY7xGNqj-B<~#?zZ(yExzj7y2ZEqK+47!dZdg
zy2EcS;WEt?hiad$;K@_@K}#m9PHBb<@$+y;dh6CL=X4rlonnFyTqp`1)F6Z(JNp7D
zNF=go$xezLLl+7>;^te$Ez#6uJg;Gcrg?cO04V;G2zWVoI-LbWa3o421-_j+b&{M5
z3m&TAY5o%eg`gu4oYbg7(3ObhV}e77queg9(vk)_UO~FpcS%=Dlkn>@4pYqHBhdBUrGc2
E0l_+m-T(jq
literal 0
HcmV?d00001
diff --git a/Marlin/src/lcd/tft/bitmaps/fan_fast0.bmp b/Marlin/src/lcd/tft/bitmaps/fan_fast0.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..bd0de9a1eb3cdb55b92cac26b2322453fef25a28
GIT binary patch
literal 12410
zcmeI&SC19T5eIPWPvMW@k6_;yKluf?Mr1@Xh+x3PMSyJ(8G%V6i+lx_Br+l+G9n|=
z1(6Y1WJI)oY(r@Jt5&W4RM&p2YcUY7I&|nTYSgH2K?N8vrKY9^@^KE$8kv5yi1oZlO|2twr$(lvuCed
zxpMvb^^+%0u358Y_3G6>*S6?v*sx*Ms#W43!=D5&^#=|dC^|yB7;kbdh{ax!7&f0g
zdGg-9dw;2Imo8m8ckbNz^XJc;IkRrvIyV0))o5fyI8!_<0Gke*LryOYtzr
zh!OH>A$>Jrqyr4RsARz1yLZ2O_3Him_m?kUK7IOh9rmw(a{>Ej@M8}9<3HWQ?7$Pq
z9sJ1JQ>ILrJ$v?q2@~`qSy4gb7mJ$NNc&rkDdZ63ym8~kzv|lK$B$2)I#m(BI9R%L
zDc!|;fbs0#zdwP?mMyz;=gy~3pFV&7{PE+*TeohZ88vwXov0vvQ6ZewFfHO+aZ1jE
z2M_A7fBoBv7cX9<0<(t}W%(l<#5hV|HRJ>i9z2+B#ZFpU(kEodkRep4b;4IKG?+-%
z(j;(}zkmOJvP9BhJqagqK`DQNJOc&{VAYTY3`gwQvnLT!+OZZ*!wVupn1tfhy1-ZB
z$m%z5-Yi|k$jg^6g#gZn3gL)Nn>Ho!%lL~HE$Y~@BPPI4AZa#*veMFn$O&z-A@YcC
ztHN(NW*24Pr6s5Ps4MNKqk#9fZrz&T7t1y@Hbeu}9f9M=kAL>;Sz1Va{oA*1_v+Ov
zh!oKWQdKJ0Q+DjwQJ?%6=j$|n5wUaU&cKg6GAFw+BRl8_fkTH5SG2Mr{8FeqX@04YoDo7|U$Dm&
zXOXq2aP8W)9LdS6bQBAL6DLl{nRKtMAbwU`@Oy?~^P@nDqo%;j$jSNn
z^yyRhBN3s{(W6JBe!zdGu(UcsEaynbd1a#!^^9OgV2z6QcOFske)#YqM`q>~PemY0
zr|eG!QEYpaKNSX|PZ$dA%vZ&KDq4VNholI}aRK}X4jd>hJem3M;X^L4qftRPZ``<1
z3UVl5I$p3@Br~h+JbLs<=|v7ZBqv}MZ{
zg?*7dD`!Rioik?+{OY1~5nk#AhC-eY#m1LuLwnF~Q_F+2EBb#8JNeg#h;QILR3d`9F~#+mS?_Uut161T_}nRp9q@eF2ifL#FjiTKu#X+6QeS
zrqRpO1ZVt;_(KKfCN`;<^h{uFyOpfP{_xA0rS_MXcvdY+tSn@LJr15InWFYCeVP-^
zOys8*`!hmL{!EgRjSP|S)`^262*9BlB-kaND~4f~71?CWm@#U5#R-yY+?R2d)L~J)
zbrA#xeWOewCt8e@s*sFu!I2|J@V{aSk*L68iVaVcz*}{NrZaBbI3%YaQ%fnf6>8dK
zXU?1%RTdK&VPx@$SG#uYG8wy!W6|;B$C;g3DCHKyQ$LiV3q=yl>5h8XOeT^-38`=Y
zO2B72KGCSdhB74N>|lFx9tYJaN%G_odZAEwK_a5K`EK3}Y6zyHQxvJIb>eo{Nrwa}
ziv)Ee)o?ze1!uwUW&n696a){9nJ}xm;eEK$c%+EKY_QG
z;kKpW(ZZ^pEKeP5VMgGsuHk@%1c+RxW+P3kX@uaL0F)$k7y%(E;zKw!I~t`(-~~@A
z@Q4utslX<*i2GsQ#QzM=vOj^RCNi@jp$BI#Eq
z2f(dea%RVTMFp88lV&gD2%HfGPG_M4fg#gR=g?!vjxoOEi99}0-T+V*b7qi*&G$4v
zu2^Lit_Pdh;g5yb%0lX7h7yA?=cimTA{@e%Dq$vdOv5Fy$p~o`^jXF#;sVp8ICy|8
zLVlB#k#UCrE#q)#zz&-S_*ep4!pra{_Rr+c^iMe9=T=@oFmysiISQ9DDpfc6vmZ%d0Xf6#`fojX*7}
z0-_?V1gNGh$b8n|CPG*v(n}h7aE47V8EpbQ{J_f+rIk+_cDm1HVi}RBAj+_s3JVu5
z6bMvEG7=crg*i|aVSadlDD?nQ=#hjfEyS9qj3?Ek^K;;@_SEm+C?gQ0Xz(lzA^8Un
z9>gUopsv-Ky&!WE3Wc)1B}(|Sxh9T8goFlpVs^+i>hOhQd)mSk`|ex(TL2YALF`KG
zCUtPGbrIM}P^464`9uYxR6BN6Ucf+R(E&SBO~8(4Fkf9)5pd}Q78V6^5rzc4t?RsR
zoC_FGKU|XlE8a<1B)QoQA!qqC^60y;RW{_O{ZiyHVq+4&RIsrkj|LvVbWtdJHW+-!
z@wwc~o61+=SqfgxSD6vknd{LAx@FwMCqwiE(@vnpbH|FiT$f0hDJ^h3$#$W+XVzd
zWA4Kf1v$~tvXQ{5`kV^p+tckYjkye@f`q^tA+Rb8jhxI8E)zUmJ}{u8O0`6ivTP{8
zlha5r4gNf|@VR4@96}LS+F}H!q8N5Fquhd1mx7IQyn7w=K*I=da24n)Bio&tJMxp
ZAXzvXjWi?1s}=Qq{&x#}w?K{s{tbONfS&*W
literal 0
HcmV?d00001
diff --git a/Marlin/src/lcd/tft/bitmaps/fan_fast1.bmp b/Marlin/src/lcd/tft/bitmaps/fan_fast1.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..6da67fa44eaa086144192ff4bf9860c455f8ebd8
GIT binary patch
literal 12410
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
J1ip#{{skjZ8zle$
literal 0
HcmV?d00001
diff --git a/Marlin/src/lcd/tft/bitmaps/fan_slow1.bmp b/Marlin/src/lcd/tft/bitmaps/fan_slow1.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..79d284b722553bf2a00577b1e24f37fbd1a468b1
GIT binary patch
literal 12410
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
DyH+S5
literal 0
HcmV?d00001
diff --git a/Marlin/src/lcd/tft/bitmaps/flowrate.bmp b/Marlin/src/lcd/tft/bitmaps/flowrate.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..739375bd72a7ca2592a603e07288049be3983509
GIT binary patch
literal 3194
zcmds&$4lKo5XVif$tkBC^S5}(DVH4Vy({)7mS>AWA}V&ojs>xSD53`y1$#lTS46Rk
zieRs3KD;r@@_dS-rwqJxe!H{ZnVtF0X#K(VfB7Uo*|4&*
z{{GYOPk-s(k7kCy-XIAH2~kl|Mx*f!7*AeJN=k~3j&^f%^YrvY;qyt;*B^iuA0O}T
z?(X2=;OOWW5D@Ub_+$pj&d&Dn@o{o;a&>hjQSayiw8Fx|o12@gtSozbdtCVY`zIzQ
zzCIHcZV-7yM8x9a;{E;o?CdOAB1O*5&LJTouX+N;gajI^ei886+S=ROTkw&hq9UF^
zA-ui4bu$Z*nYOSI2@MVP@bK{R@`52?$|hwcCwqH)0?xXS@qBU{(kOKWwBTIfq{WI
z;-##TVY~<{z{k79qr+O%$HvCM=i>DAGzQ>H#z;|SW@c4YRc>ysq>(b=Lh=J=c+SSg
zhK@@6E^wz
z`Jf-$TJd=my6WheZ1o&lTWsEog^)S#64-XmIxB!;gO-)Vh@9!&{=H_P72np#j
zQYTPydT?++W~g{?Z!bHHP}*5t)RoT8PVz(F4Gj(H`=o`6P$}Xh2FM1ZAdhZCbHRUh
z7(Sw)Z*FelOYvlVeVu1Mg-`r+E`yyna?1?Ap`oF#uMfUmv)svGGF=Hk9z#@1dhMt}tbwoQrp`4r?!9k$}atg7TNUB&PBO{bm_(Li4
z^72%Di53@hG}UBwsVmeM=1UXN*T5DO6oiF^(UmFyrSLR@7yf{gmX^k(Ri`LtXJ?E@
zeP>}|0p{~4=COCXm}@h0hg7d^z?M93{*=?
zOJ!xH!h{BlK{jc+$;nA{5EMQGfpp1#UNH5rb$oOJfQOI)@0ig?@&xKgcx>X7|169|
zNv!0vwY8P8iM<(`#ZO+Lp2nPniU{o^0n=-O13m(2IprVO3&G7ia!Uj#vm^O@{?y_X
XeUl8E!hGPEek8gWus%NepLYHN7OGr}
literal 0
HcmV?d00001
diff --git a/Marlin/src/lcd/tft/bitmaps/hotend.bmp b/Marlin/src/lcd/tft/bitmaps/hotend.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..ed24b6011e70cacc01b06f32b300402f8c3ca9b1
GIT binary patch
literal 12410
zcmeI1NlRN%6vxwkihhiKgw{=0RgANy8pYX))i}nfRdFZcfQX2w3#W?1LO~Z!2#Sas
zH}2GpSZ728MQne~tuef(&*Z*mjO8A9$;+M2|NQU&o_CUjeRjXMdCbl0SFR8Lt~a)K
z++p;8bcjnd*lb~+?5?|ef8XC~27Xtj7*Gr-1{4E|0mXohfge7m>kRbVq)Us8
z>1jtt2O}{;z`VyH_#1&oG=q{;Qc{paPfyRq#f1*Cw&CXHW_)~{)Fh4rA#famuO*=w
z{G#^M)YRG8SuIe*&+F^!VPs=3n4HKR*x5y>+9frlukyBFx}#
zX=yQ&9!-WaIXS8DEB>Wb^xE|^F)|i8O&GCr(dKQ`D7|l*r-d
zcboS1_Or7ylQ5*GFD)%m+{%Hc-k?sPzU8a;=;-LrI~yJzrdE-LWH51VZjNfUyStl5
zu&~a~PU<(g%16wi$iFK*|Gu*$6rT$V3kEQxyFhEV+j&}fJwl)v@cOwdh^?-!N`o|*
z*x%nziI|<8?e#0I9PbL68-agiWyJu7beF=fVO#%E@o%6mr60XuG%ZR$#`@v6pv=rn
zL7L^slVyX+zrwE(zvACO{B&vZ=WEo@t3JPdeSQ3L$e%bc{~Y8C{ZmnIY-|`SL9TaZ
zW`^Qif9Nc10X)WkbNs_)xuJg+w-D`PONnnWaAmFWwdFC7s$DUl7*Gr-1|%4Grf0DP
K5;f)jW8e>u78A|@
literal 0
HcmV?d00001
diff --git a/Marlin/src/lcd/tft/bitmaps/increase.bmp b/Marlin/src/lcd/tft/bitmaps/increase.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..53d71d0c5afd45c53ab5fe015d3056f24abe1ac6
GIT binary patch
literal 12342
zcmeI0yJ`Ya5QfcLR&;iE&VRlg_ss73#mTW{trL76VLScY4lIZG24Vl%rM77S
zi{*~R1egF5U;<2l2`~W@5V+qZ6L=&oz$g?H%wI2n1X%*Of?a
zw;NM4zkm3=7724Qv;RaQQ7)Hfv)PMC^?Kdubeh?JJRWZ}8gGR9{l3HDFuDI)twz{?
z>vTHof3No^)DQFDD`9zZ<}c@?e=nBK2U@uQ<0db^|M>m>WHL$T_}GI{ApLH)GoV7y
z-cUksQ>j$s{?Qgiqfsh@7LUbZ+e7P&00{7Uy)B|tX7fdL5ZnNT*HEtktt{#&gU4iKLBJ&1{53K$E8q?7r^>7`QXNveE4-|coO
z|Ksr(2S^h<6$%9um~#KOYb_QF%A3MC$fJE#%U|<9pU)Ng6sB6OR^f1%{clu0^A}dj
zcJLq6Pbd_^?etIof3Zqpp;x$mY4yKcF1N3^@<=wDh53y?p#Gnj0v-ULr5X;0lgWgd
z(R4a(x7)p5Z!{WFX^?`0%m6HCOC&w41=0Kn{%4*fUktbxxli;aU8v`Unxf|8PBhUVl`N7$Gq4cx4y+L!}Zt
zFR8Ebckd6}gKxhz%H?vcRx6cCKOwMEsU#AKP$-m2r9h-C1pxE;yv1U%*=&BlA4^bh
z6#&m>vrs;t&ovs2-EI#CgT-P|5ef$Ga=EtK?d^7JwOTrz&T6%Sj&2bH_jE%Dp5JArBEoC&1O#d>2zu|
z8t|NGOFEs_>-C$>My~vPJ~x|9VnSgoA{vb@mrFS~l*i-oWHL$IN3aEJKO7EnaE!y@
zuvV)@H$$~kC?Fmbv2Xg3gp7)^Py-dMj;odsD8iCQ6LxWd<+BvFp3h4VlWtR6tme3M?)+Yqv&VC
z7zH+(oZ@&qqT^wTB3^ozTLr-Xe}wb^eZVM2qtW$xWrwd);w5bWM3=^wA+#$FF0uTQ
F!8>#{kj?-A
literal 0
HcmV?d00001
diff --git a/Marlin/src/lcd/tft/bitmaps/leveling.bmp b/Marlin/src/lcd/tft/bitmaps/leveling.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..34866402701c02c0a73accb772d6d27aba595e2f
GIT binary patch
literal 3126
zcmeH|Jx`iZ6vye_574n=KY@F@5iBni2u8pV%AmXxh$twvU?ji*CM1RpLc#_EgJA`n
zG|>;h;Nn&wG0fOsyyS++^AMZJR8I2f@!WHN_uT(E&*Qi68y__w%XmPWhma3k%n!~hBhGYjK{PZPjV6JcndO6LV`Y7%nd_Y0Y3T*xA|PPtH0%J{G6Qjf~3O-JRWTx7lnm
zsOCUUr_-@mOt07X`~CU8hr?l=PPe_ijR=gir~v`<`8;XOW^;3M6B*gQ1n%?stX3;^
z(zbcH@GF&yR;#5QySuxb0w)j%OePbt$`z223o7!_jgp*BCkcyW8R2C?2eaAi_xow+
z&CQKmq9l%kqsRxF%jIP9awi&%?(gplF_B0Z$_UZa_}OfBIaaPxJbZx641NFcV(4bE
zSQtw+{@d#>7K_x(mFx97yUxze&d<*ag#vw1yMmZoK6kZRP1d>S+}_?&tbm|@tJRV@
zynXwRMHE4HLQ$_e>WEw7j$sZN~ID_gfoxAr>gmg
Zq$xTaF&k*5UvI2ak-QGB75G;L{sIvY2vz_9
literal 0
HcmV?d00001
diff --git a/Marlin/src/lcd/tft/bitmaps/marlin-logo/Marlin-1500x319.png b/Marlin/src/lcd/tft/bitmaps/marlin-logo/Marlin-1500x319.png
new file mode 100644
index 0000000000000000000000000000000000000000..d94d3efd2c4ebbcb06c3b3ad5f09e30a0e873268
GIT binary patch
literal 387923
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