Skip to content

Commit 6f5e6fd

Browse files
committed
🩹 TFT_BUFFER_SIZE => _WORDS
Followup to #26011
1 parent db4990f commit 6f5e6fd

File tree

4 files changed

+5
-40
lines changed

4 files changed

+5
-40
lines changed

Marlin/src/pins/rp2040/pins_RP2040.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
#define SPI_FLASH_SCK_PIN SD_SCK_PIN
294294
#endif
295295

296-
#define TFT_BUFFER_SIZE 0xFFFF
296+
#define TFT_BUFFER_WORDS 0xFFFF
297297
#ifndef TFT_DRIVER
298298
#define TFT_DRIVER ST7796
299299
#endif

Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@
483483
#elif ENABLED(FYSETC_MINI_12864_2_1)
484484
#define NEOPIXEL_PIN EXP1_06_PIN
485485
#endif
486-
#endif // !FYSETC_MINI_12864
486+
#endif // FYSETC_MINI_12864
487487

488488
#if IS_ULTIPANEL
489489
#define LCD_PINS_D5 EXP1_06_PIN

Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@
472472
#define LCD_READ_ID 0xD3
473473
#define LCD_USE_DMA_SPI
474474

475-
#define TFT_BUFFER_SIZE 14400
475+
#define TFT_BUFFER_WORDS 14400
476476

477477
#endif
478478

Marlin/src/pins/stm32f4/pins_MKS_NEPTUNE_X_common.h

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -208,41 +208,6 @@
208208
#define MKS_TEST_PS_ON_PIN PB2 // PW_OFF
209209
#endif
210210

211-
//
212-
// TFT with FSMC interface
213-
//
214-
#if HAS_FSMC_TFT
215-
/**
216-
* Note: MKS Robin TFT screens use various TFT controllers.
217-
* If the screen stays white, disable 'TFT_RESET_PIN'
218-
* to let the bootloader init the screen.
219-
*/
220-
#define TFT_RESET_PIN PC6 // FSMC_RST
221-
#define TFT_BACKLIGHT_PIN PD13
222-
223-
#define DOGLCD_MOSI -1 // Prevent auto-define by Conditionals_post.h
224-
#define DOGLCD_SCK -1
225-
226-
#define TOUCH_CS_PIN PA7 // SPI2_NSS
227-
#define TOUCH_SCK_PIN PB13 // SPI2_SCK
228-
#define TOUCH_MISO_PIN PB14 // SPI2_MISO
229-
#define TOUCH_MOSI_PIN PB15 // SPI2_MOSI
230-
231-
#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
232-
#define FSMC_CS_PIN PD7
233-
#define FSMC_RS_PIN PD11
234-
#define FSMC_DMA_DEV DMA2
235-
#define FSMC_DMA_CHANNEL DMA_CH5
236-
237-
#define TFT_CS_PIN FSMC_CS_PIN
238-
#define TFT_RS_PIN FSMC_RS_PIN
239-
240-
#define TOUCH_BUTTONS_HW_SPI
241-
#define TOUCH_BUTTONS_HW_SPI_DEVICE 2
242-
243-
#define TFT_BUFFER_SIZE 14400
244-
#endif
245-
246211
//
247212
// Onboard SD card
248213
//
@@ -305,5 +270,5 @@
305270
#define TOUCH_BUTTONS_HW_SPI
306271
#define TOUCH_BUTTONS_HW_SPI_DEVICE 2
307272

308-
#define TFT_BUFFER_SIZE 14400
309-
#endif
273+
#define TFT_BUFFER_WORDS 14400
274+
#endif // HAS_FSMC_TFT

0 commit comments

Comments
 (0)