Skip to content

Commit cf1f56f

Browse files
thinkyheadthinkyhead
committed
🔧 Move TFT sanity checks
1 parent 1e2de0e commit cf1f56f

File tree

21 files changed

+63
-64
lines changed

21 files changed

+63
-64
lines changed

‎Marlin/src/HAL/AVR/inc/Conditionals_LCD.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,3 @@
2020
*
2121
*/
2222
#pragma once
23-
24-
#if HAS_SPI_TFT || HAS_FSMC_TFT
25-
#error "Sorry! TFT displays are not available for HAL/AVR."
26-
#endif

‎Marlin/src/HAL/AVR/inc/SanityCheck.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
* Test AVR-specific configuration values for errors at compile-time.
2626
*/
2727

28+
#if HAS_SPI_TFT || HAS_FSMC_TFT
29+
#error "Sorry! TFT displays are not available for HAL/AVR."
30+
#endif
31+
2832
/**
2933
* Check for common serial pin conflicts
3034
*/

‎Marlin/src/HAL/DUE/inc/Conditionals_LCD.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,3 @@
2020
*
2121
*/
2222
#pragma once
23-
24-
#if HAS_SPI_TFT || HAS_FSMC_TFT
25-
#error "Sorry! TFT displays are not available for HAL/DUE."
26-
#endif

‎Marlin/src/HAL/DUE/inc/SanityCheck.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
* Test Arduino Due specific configuration values for errors at compile-time.
2626
*/
2727

28+
#if HAS_SPI_TFT || HAS_FSMC_TFT
29+
#error "Sorry! TFT displays are not available for HAL/DUE."
30+
#endif
31+
2832
/**
2933
* Check for common serial pin conflicts
3034
*/
@@ -77,7 +81,7 @@
7781
#endif
7882

7983
#if ENABLED(FAST_PWM_FAN) || SPINDLE_LASER_FREQUENCY
80-
#error "Features requiring Hardware PWM (FAST_PWM_FAN, SPINDLE_LASER_FREQUENCY) are not yet supported on DUE."
84+
#error "Features requiring Hardware PWM (FAST_PWM_FAN, SPINDLE_LASER_FREQUENCY) are not yet supported for HAL/DUE."
8185
#endif
8286

8387
#if HAS_TMC_SW_SERIAL

‎Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,3 @@
2020
*
2121
*/
2222
#pragma once
23-
24-
#if HAS_SPI_TFT || HAS_FSMC_TFT
25-
#error "Sorry! TFT displays are not available for HAL/ESP32."
26-
#endif

‎Marlin/src/HAL/ESP32/inc/SanityCheck.h

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

24+
#if HAS_SPI_TFT || HAS_FSMC_TFT
25+
#error "Sorry! TFT displays are not available for HAL/ESP32."
26+
#endif
27+
2428
#if ENABLED(EMERGENCY_PARSER)
2529
#error "EMERGENCY_PARSER is not yet implemented for ESP32. Disable EMERGENCY_PARSER to continue."
2630
#endif
2731

28-
#if (ENABLED(SPINDLE_LASER_USE_PWM) && SPINDLE_LASER_FREQUENCY > 78125) || (ENABLED(FAST_PWM_FAN_FREQUENCY) && FAST_PWM_FAN_FREQUENCY > 78125)
29-
#error "SPINDLE_LASER_FREQUENCY and FAST_PWM_FREQUENCY maximum value is 78125Hz for ESP32."
32+
#if ENABLED(SPINDLE_LASER_USE_PWM) && SPINDLE_LASER_FREQUENCY > 78125
33+
#error "SPINDLE_LASER_FREQUENCY maximum value is 78125Hz for ESP32."
34+
#endif
35+
#if ENABLED(FAST_PWM_FAN) && FAST_PWM_FAN_FREQUENCY > 78125
36+
#error "FAST_PWM_FREQUENCY maximum value is 78125Hz for ESP32."
3037
#endif
3138

3239
#if HAS_TMC_SW_SERIAL

‎Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,3 @@
2020
*
2121
*/
2222
#pragma once
23-
24-
#if HAS_SPI_TFT || HAS_FSMC_TFT
25-
#error "Sorry! TFT displays are not available for HAL/LINUX."
26-
#endif

‎Marlin/src/HAL/LINUX/inc/SanityCheck.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,17 @@
3131
#endif
3232

3333
#if ENABLED(FAST_PWM_FAN) || SPINDLE_LASER_FREQUENCY
34-
#error "Features requiring Hardware PWM (FAST_PWM_FAN, SPINDLE_LASER_FREQUENCY) are not yet supported on LINUX."
34+
#error "Features requiring Hardware PWM (FAST_PWM_FAN, SPINDLE_LASER_FREQUENCY) are not yet supported for HAL/LINUX."
35+
#endif
36+
37+
#if HAS_SPI_TFT || HAS_FSMC_TFT
38+
#error "Sorry! TFT displays are not available for HAL/LINUX."
3539
#endif
3640

3741
#if HAS_TMC_SW_SERIAL
38-
#error "TMC220x Software Serial is not supported on LINUX."
42+
#error "TMC220x Software Serial is not supported for HAL/LINUX."
3943
#endif
4044

4145
#if ENABLED(POSTMORTEM_DEBUGGING)
42-
#error "POSTMORTEM_DEBUGGING is not yet supported on LINUX."
46+
#error "POSTMORTEM_DEBUGGING is not yet supported for HAL/LINUX."
4347
#endif

‎Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,3 @@
2020
*
2121
*/
2222
#pragma once
23-
24-
#if HAS_FSMC_TFT
25-
#error "Sorry! FSMC TFT displays are not current available for HAL/LPC1768."
26-
#endif

‎Marlin/src/HAL/LPC1768/inc/SanityCheck.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ static_assert(!(NUM_SERVOS && ENABLED(FAST_PWM_FAN)), "BLTOUCH and Servos are in
7777
#endif
7878
#endif
7979

80+
#if HAS_FSMC_TFT
81+
#error "Sorry! FSMC TFT displays are not current available for HAL/LPC1768."
82+
#endif
83+
8084
static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported on LPC176x.");
8185

8286
/**

0 commit comments

Comments
 (0)