Skip to content

Commit 498f29a

Browse files
committed
sanity
1 parent 9ad4399 commit 498f29a

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

Marlin/Configuration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3292,7 +3292,7 @@
32923292
*/
32933293
#define TFT_FONT NOTOSANS
32943294

3295-
//#define TFT_SHARED_IO // IO is shared between TFT display and other devices. Disable async data transfer
3295+
//#define TFT_SHARED_IO // I/O is shared between TFT display and other devices. Disable async data transfer.
32963296
#endif
32973297

32983298
#if ENABLED(TFT_LVGL_UI)

Marlin/src/inc/SanityCheck.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,8 @@
698698
#error "DISABLE_INACTIVE_[XYZIJKUVWE] is now DISABLE_IDLE_[XYZIJKUVWE]."
699699
#elif defined(DEFAULT_STEPPER_DEACTIVE_TIME)
700700
#error "DEFAULT_STEPPER_DEACTIVE_TIME is now DEFAULT_STEPPER_TIMEOUT_SEC."
701+
#elif defined(TFT_SHARED_SPI)
702+
#error "TFT_SHARED_SPI is now TFT_SHARED_IO."
701703
#endif
702704

703705
// L64xx stepper drivers have been removed

Marlin/src/lcd/tft_io/st7796s.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static const uint16_t st7796s_init[] = {
150150
ESC_REG(ST7796S_PGC), 0x00F0, 0x0004, 0x0008, 0x0009, 0x0008, 0x0015, 0x002F, 0x0042, 0x0046, 0x0028, 0x0015, 0x0016, 0x0029, 0x002D,
151151
ESC_REG(ST7796S_NGC), 0x00F0, 0x0004, 0x0009, 0x0009, 0x0008, 0x0015, 0x002E, 0x0046, 0x0046, 0x0028, 0x0015, 0x0015, 0x0029, 0x002D,
152152

153-
ESC_REG(TERN(ST7796S_INVERTED, ST7796S_INVON, ST7796S_NORON), // Display inversion
153+
ESC_REG(TERN(ST7796S_INVERTED, ST7796S_INVON, ST7796S_NORON)), // Display inversion
154154
ESC_REG(ST7796S_WRCTRLD), 0x0024,
155155
ESC_REG(ST7796S_CSCON), 0x003C, // disable command 2 part I
156156
ESC_REG(ST7796S_CSCON), 0x0069, // disable command 2 part II

0 commit comments

Comments
 (0)