Skip to content

Commit 016ccc0

Browse files
thinkyheadthinkyhead
committed
reorganize
1 parent ac773e4 commit 016ccc0

File tree

6 files changed

+68
-40
lines changed

6 files changed

+68
-40
lines changed

‎Marlin/src/HAL/STM32/tft/tft_spi.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@ void TFT_SPI::DataTransferBegin(uint16_t DataSize) {
125125
WRITE(TFT_CS_PIN, LOW);
126126
}
127127

128+
#ifdef TFT_DEFAULT_DRIVER
129+
#include "../../../lcd/tft_io/tft_ids.h"
130+
#endif
131+
128132
uint32_t TFT_SPI::GetID() {
129133
uint32_t id;
130134
id = ReadID(LCD_READ_ID);

‎Marlin/src/HAL/STM32F1/tft/tft_spi.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ void TFT_SPI::DataTransferBegin(uint16_t DataSize) {
9090
TFT_CS_L;
9191
}
9292

93+
#ifdef TFT_DEFAULT_DRIVER
94+
#include "../../../lcd/tft_io/tft_ids.h"
95+
#endif
96+
9397
uint32_t TFT_SPI::GetID() {
9498
uint32_t id;
9599
id = ReadID(LCD_READ_ID);

‎Marlin/src/inc/Conditionals_LCD.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,53 +1140,53 @@
11401140
* - TFT_COLOR
11411141
* - GRAPHICAL_TFT_UPSCALE
11421142
*/
1143-
#if ENABLED(MKS_TS35_V2_0) // Most common: ST7796
1144-
#define TFT_DEFAULT_DRIVER 0x7796 // ST7796
1143+
#if ENABLED(MKS_TS35_V2_0) // ST7796
1144+
#define TFT_DEFAULT_DRIVER ST7796
11451145
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
11461146
#define TFT_RES_480x320
11471147
#define TFT_INTERFACE_SPI
1148-
#elif ENABLED(MKS_ROBIN_TFT24) // Most common: ST7789
1148+
#elif ENABLED(ANET_ET5_TFT35) // ST7796
1149+
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
1150+
#define TFT_RES_480x320
1151+
#define TFT_INTERFACE_FSMC
1152+
#elif ENABLED(ANET_ET4_TFT28) // ST7789
11491153
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
11501154
#define TFT_RES_320x240
11511155
#define TFT_INTERFACE_FSMC
1152-
#elif ENABLED(MKS_ROBIN_TFT28) // Most common: ST7789
1156+
#elif ENABLED(MKS_ROBIN_TFT24) // ST7789
11531157
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
11541158
#define TFT_RES_320x240
11551159
#define TFT_INTERFACE_FSMC
1156-
#elif ENABLED(MKS_ROBIN_TFT32) // Most common: ST7789
1160+
#elif ENABLED(MKS_ROBIN_TFT28) // ST7789
11571161
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
11581162
#define TFT_RES_320x240
11591163
#define TFT_INTERFACE_FSMC
1160-
#elif ENABLED(MKS_ROBIN_TFT35) // Most common: ILI9488
1164+
#elif ENABLED(MKS_ROBIN_TFT32) // ST7789
1165+
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
1166+
#define TFT_RES_320x240
1167+
#define TFT_INTERFACE_FSMC
1168+
#elif ENABLED(MKS_ROBIN_TFT35) // ILI9488
11611169
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
11621170
#define TFT_RES_480x320
11631171
#define TFT_INTERFACE_FSMC
11641172
#elif ENABLED(MKS_ROBIN_TFT43)
1165-
#define TFT_DEFAULT_ORIENTATION 0
11661173
#define TFT_DRIVER SSD1963
1174+
#define TFT_DEFAULT_ORIENTATION 0
11671175
#define TFT_RES_480x272
11681176
#define TFT_INTERFACE_FSMC
11691177
#elif ENABLED(MKS_ROBIN_TFT_V1_1R) // ILI9328 or R61505
11701178
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
11711179
#define TFT_RES_320x240
11721180
#define TFT_INTERFACE_FSMC
11731181
#elif EITHER(TFT_TRONXY_X5SA, ANYCUBIC_TFT35) // ILI9488
1174-
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
11751182
#define TFT_DRIVER ILI9488
1183+
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
11761184
#define TFT_RES_480x320
11771185
#define TFT_INTERFACE_FSMC
11781186
#elif ENABLED(LONGER_LK_TFT28)
11791187
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
11801188
#define TFT_RES_320x240
11811189
#define TFT_INTERFACE_FSMC
1182-
#elif ENABLED(ANET_ET4_TFT28) // ST7789
1183-
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
1184-
#define TFT_RES_320x240
1185-
#define TFT_INTERFACE_FSMC
1186-
#elif ENABLED(ANET_ET5_TFT35) // ST7796
1187-
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
1188-
#define TFT_RES_480x320
1189-
#define TFT_INTERFACE_FSMC
11901190
#elif ENABLED(BIQU_BX_TFT70) // RGB
11911191
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
11921192
#define TFT_RES_1024x600

‎Marlin/src/lcd/tft_io/tft_ids.h‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/**
2+
* Marlin 3D Printer Firmware
3+
* Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4+
*
5+
* Based on Sprinter and grbl.
6+
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7+
*
8+
* This program is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU General Public License as published by
10+
* the Free Software Foundation, either version 3 of the License, or
11+
* (at your option) any later version.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU General Public License
19+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
20+
*
21+
*/
22+
#pragma once
23+
24+
#define LTDC_RGB 0xABAB
25+
#define SSD1963 0x5761
26+
#define ST7735 0x89F0
27+
#define ST7789 0x8552
28+
#define ST7796 0x7796
29+
#define R61505 0x1505
30+
#define ILI9328 0x9328
31+
#define ILI9341 0x9341
32+
#define ILI9488 0x9488
33+
#define ILI9488_ID1 0x8066 // Some ILI9488 have 0x8066 in the 0x04
34+
#define LERDGE_ST7796 0xFFFE
35+
#define AUTO 0xFFFF

‎Marlin/src/lcd/tft_io/tft_io.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@
2020
*
2121
*/
2222

23-
#include "tft_io.h"
23+
#include "../../inc/MarlinConfigPre.h"
2424

2525
#if HAS_SPI_TFT || HAS_FSMC_TFT || HAS_LTDC_TFT
2626

27+
#include "tft_io.h"
28+
#include "tft_ids.h"
2729
#include "st7735.h"
2830
#include "st7789v.h"
2931
#include "st7796s.h"
@@ -236,4 +238,4 @@ void TFT_IO::write_esc_sequence(const uint16_t *Sequence) {
236238
io.DataTransferEnd();
237239
}
238240

239-
#endif // HAS_SPI_TFT || HAS_FSMC_TFT
241+
#endif // HAS_SPI_TFT || HAS_FSMC_TFT || HAS_LTDC_TFT

‎Marlin/src/lcd/tft_io/tft_io.h‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
*/
2222
#pragma once
2323

24-
#include "../../inc/MarlinConfig.h"
25-
26-
#if HAS_SPI_TFT || HAS_FSMC_TFT || HAS_LTDC_TFT
24+
#include "../../inc/MarlinConfigPre.h"
2725

2826
#if HAS_SPI_TFT
2927
#include HAL_PATH(../../HAL, tft/tft_spi.h)
@@ -93,27 +91,14 @@
9391
#define TOUCH_ORIENTATION TOUCH_LANDSCAPE
9492
#endif
9593

96-
#define LTDC_RGB 0xABAB
97-
#define SSD1963 0x5761
98-
#define ST7735 0x89F0
99-
#define ST7789 0x8552
100-
#define ST7796 0x7796
101-
#define R61505 0x1505
102-
#define ILI9328 0x9328
103-
#define ILI9341 0x9341
104-
#define ILI9488 0x9488
105-
#define ILI9488_ID1 0x8066 //Some ILI9488 have 0x8066 in the 0x04
106-
#define LERDGE_ST7796 0xFFFE
107-
#define AUTO 0xFFFF
108-
10994
#ifndef TFT_DRIVER
11095
#define TFT_DRIVER AUTO
11196
#endif
11297

113-
#define ESC_REG(x) 0xFFFF, 0x00FF & (uint16_t)x
114-
#define ESC_DELAY(x) 0xFFFF, 0x8000 | (x & 0x7FFF)
115-
#define ESC_END 0xFFFF, 0x7FFF
116-
#define ESC_FFFF 0xFFFF, 0xFFFF
98+
#define ESC_REG(x) 0xFFFF, 0x00FF & (uint16_t)x
99+
#define ESC_DELAY(x) 0xFFFF, 0x8000 | (x & 0x7FFF)
100+
#define ESC_END 0xFFFF, 0x7FFF
101+
#define ESC_FFFF 0xFFFF, 0xFFFF
117102

118103
class TFT_IO {
119104
public:
@@ -143,5 +128,3 @@ class TFT_IO {
143128
protected:
144129
static uint32_t lcd_id;
145130
};
146-
147-
#endif // HAS_SPI_TFT || HAS_FSMC_TFT

0 commit comments

Comments
 (0)