Skip to content

Commit c3f121f

Browse files
committed
Merge branch 'bugfix-2.1.x' into mike-config
* bugfix-2.1.x: (37 commits) 🚸 Minor M43 improvements 🐛 Fix BLTOUCH_HS_MODE config [cron] Bump distribution date (2023-04-12) 🚸 BLTouch extra clearance for PROBE_PT_RAISE 🚸 More clearance on fast probe failure 🧑‍💻 Use largest_sensorless_adj in DELTA run_z_probe 🧑‍💻 Update move_z_after_probing/homing 🧑‍💻 Modify try_to_probe sanity-checking 🧑‍💻 Clarify G28 R / R0 🧑‍💻 Probe flag in do_z_clearance 🧑‍💻 More debug in motion.* 📝 Improve G30 description ✨ BLTOUCH_HS_EXTRA_CLEARANCE (MarlinFirmware#25655) [cron] Bump distribution date (2023-04-11) 📝 Describe G34, spellcheck 🩹 Fix BLTouch stow in homeaxis(Z) 🚸 Fix G30 behavior 🎨 Misc. probe-related cleanup [cron] Bump distribution date (2023-04-10) 🔧 Update thermocouple 2 pin sanity check (MarlinFirmware#25627) ... # Conflicts: # .github/workflows/bump-date.yml # Marlin/Configuration.h # Marlin/Configuration_adv.h
2 parents 5311df3 + 0f34163 commit c3f121f

File tree

278 files changed

+27975
-27882
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+27975
-27882
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ body:
100100
- type: input
101101
attributes:
102102
label: Printer model
103-
description: Creality Ender 3, Prusa mini, or Kossel Delta?
103+
description: Creality Ender-3, Prusa mini, or Kossel Delta?
104104

105105
- type: input
106106
attributes:

Marlin/Configuration.h

+4-24
Original file line numberDiff line numberDiff line change
@@ -63,26 +63,6 @@
6363
//#define STRING_CONFIG_H_AUTHOR "DMYCO V1.0 (Mike Bignell)" // Who made the changes.
6464
//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
6565

66-
/**
67-
* *** VENDORS PLEASE READ ***
68-
*
69-
* Marlin allows you to add a custom boot image for Graphical LCDs.
70-
* With this option Marlin will first show your custom screen followed
71-
* by the standard Marlin logo with version number and web URL.
72-
*
73-
* We encourage you to take advantage of this new feature and we also
74-
* respectfully request that you retain the unmodified Marlin boot screen.
75-
*/
76-
77-
// Show the Marlin bootscreen on startup. ** ENABLE FOR PRODUCTION **
78-
#define SHOW_BOOTSCREEN
79-
80-
// Show the bitmap in Marlin/_Bootscreen.h on startup.
81-
//#define SHOW_CUSTOM_BOOTSCREEN
82-
83-
// Show the bitmap in Marlin/_Statusscreen.h on the status screen.
84-
#define CUSTOM_STATUS_SCREEN_IMAGE
85-
8666
// @section machine
8767

8868
// Choose the name from boards.h that matches your setup
@@ -2544,7 +2524,7 @@
25442524
#define PASSWORD_ON_STARTUP
25452525
#define PASSWORD_UNLOCK_GCODE // Unlock with the M511 P<password> command. Disable to prevent brute-force attack.
25462526
#define PASSWORD_CHANGE_GCODE // Change the password with M512 P<old> S<new>.
2547-
//#define PASSWORD_ON_SD_PRINT_MENU // This does not prevent gcodes from running
2527+
//#define PASSWORD_ON_SD_PRINT_MENU // This does not prevent G-codes from running
25482528
//#define PASSWORD_AFTER_SD_PRINT_END
25492529
//#define PASSWORD_AFTER_SD_PRINT_ABORT
25502530
//#include "Configuration_Secure.h" // External file with PASSWORD_DEFAULT_VALUE
@@ -3293,9 +3273,9 @@
32933273
/**
32943274
* TFT Font for Color_UI. Choose one of the following:
32953275
*
3296-
* NOTOSANS - Default font with antialiasing. Supports Latin Extended and non-Latin characters.
3297-
* UNIFONT - Lightweight font, no antialiasing. Supports Latin Extended and non-Latin characters.
3298-
* HELVETICA - Lightweight font, no antialiasing. Supports Basic Latin (0x0020-0x007F) and Latin-1 Supplement (0x0080-0x00FF) characters only.
3276+
* NOTOSANS - Default font with anti-aliasing. Supports Latin Extended and non-Latin characters.
3277+
* UNIFONT - Lightweight font, no anti-aliasing. Supports Latin Extended and non-Latin characters.
3278+
* HELVETICA - Lightweight font, no anti-aliasing. Supports Basic Latin (0x0020-0x007F) and Latin-1 Supplement (0x0080-0x00FF) characters only.
32993279
*/
33003280
#define TFT_FONT NOTOSANS
33013281

Marlin/Configuration_adv.h

+48-24
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@
372372
* Thermal Protection Variance Monitor - EXPERIMENTAL
373373
* Kill the machine on a stuck temperature sensor.
374374
*
375-
* This feature may cause some thermally-stable systems to halt. Be sure to test it throughly under
375+
* This feature may cause some thermally-stable systems to halt. Be sure to test it thoroughly under
376376
* a variety of conditions. Disable if you get false positives.
377377
*
378378
* This feature ensures that temperature sensors are updating regularly. If sensors die or get "stuck",
@@ -415,7 +415,7 @@
415415
* You can either just add a constant compensation with the DEFAULT_Kf value
416416
* or follow the instruction below to get speed-dependent compensation.
417417
*
418-
* Constant compensation (use only with fanspeeds of 0% and 100%)
418+
* Constant compensation (use only with fan speeds of 0% and 100%)
419419
* ---------------------------------------------------------------------
420420
* A good starting point for the Kf-value comes from the calculation:
421421
* kf = (power_fan * eff_fan) / power_heater * 255
@@ -442,7 +442,7 @@
442442
//#define PID_FAN_SCALING_ALTERNATIVE_DEFINITION
443443
#if ENABLED(PID_FAN_SCALING_ALTERNATIVE_DEFINITION)
444444
// The alternative definition is used for an easier configuration.
445-
// Just figure out Kf at fullspeed (255) and PID_FAN_SCALING_MIN_SPEED.
445+
// Just figure out Kf at full speed (255) and PID_FAN_SCALING_MIN_SPEED.
446446
// DEFAULT_Kf and PID_FAN_SCALING_LIN_FACTOR are calculated accordingly.
447447

448448
#define PID_FAN_SCALING_AT_FULL_SPEED 13.0 //=PID_FAN_SCALING_LIN_FACTOR*255+DEFAULT_Kf
@@ -621,7 +621,7 @@
621621
* FAST_PWM_FAN_FREQUENCY
622622
* Set this to your desired frequency.
623623
* For AVR, if left undefined this defaults to F = F_CPU/(2*255*1)
624-
* i.e., F = 31.4kHz on 16MHz microcontrollers or F = 39.2kHz on 20MHz microcontrollers.
624+
* i.e., F = 31.4kHz on 16MHz micro-controllers or F = 39.2kHz on 20MHz micro-controllers.
625625
* For non AVR, if left undefined this defaults to F = 1Khz.
626626
* This F value is only to protect the hardware from an absence of configuration
627627
* and not to complete it when users are not aware that the frequency must be specifically set to support the target board.
@@ -960,12 +960,15 @@
960960
* Danger: Don't activate 5V mode unless attached to a 5V-tolerant controller!
961961
* V3.0 or 3.1: Set default mode to 5V mode at Marlin startup.
962962
* If disabled, OD mode is the hard-coded default on 3.0
963-
* On startup, Marlin will compare its eeprom to this value. If the selected mode
964-
* differs, a mode set eeprom write will be completed at initialization.
965-
* Use the option below to force an eeprom write to a V3.1 probe regardless.
963+
* On startup, Marlin will compare its EEPROM to this value. If the selected mode
964+
* differs, a mode set EEPROM write will be completed at initialization.
965+
* Use the option below to force an EEPROM write to a V3.1 probe regardless.
966966
*/
967967
//#define BLTOUCH_SET_5V_MODE
968968

969+
// Safety: Enable voltage mode settings in the LCD menu.
970+
//#define BLTOUCH_LCD_VOLTAGE_MENU
971+
969972
/**
970973
* Safety: Activate if connecting a probe with an unknown voltage mode.
971974
* V3.0: Set a probe into mode selected above at Marlin startup. Required for 5V mode on 3.0
@@ -984,12 +987,16 @@
984987
*/
985988
//#define BLTOUCH_HS_MODE true
986989

987-
// Safety: Enable voltage mode settings in the LCD menu.
988-
//#define BLTOUCH_LCD_VOLTAGE_MENU
990+
#ifdef BLTOUCH_HS_MODE
991+
// The probe Z offset (M851 Z) is the height at which the probe triggers.
992+
// This must be large enough to keep the probe pin off the bed and prevent
993+
// it from snagging on the bed clips.
994+
#define BLTOUCH_HS_EXTRA_CLEARANCE 7 // Extra Z Clearance
995+
#endif
989996

990997
#endif // BLTOUCH
991998

992-
// @section extras
999+
// @section calibration
9931000

9941001
/**
9951002
* Z Steppers Auto-Alignment
@@ -1328,7 +1335,7 @@
13281335
//#define CALIBRATION_MEASURE_WMAX
13291336

13301337
// Probing at the exact top center only works if the center is flat. If
1331-
// probing on a screwhead or hollow washer, probe near the edges.
1338+
// probing on a screw head or hollow washer, probe near the edges.
13321339
//#define CALIBRATION_MEASURE_AT_TOP_EDGES
13331340

13341341
// Define the pin to read during calibration
@@ -1508,19 +1515,36 @@
15081515
#endif // HAS_MARLINUI_MENU
15091516

15101517
#if HAS_DISPLAY
1518+
/**
1519+
* *** VENDORS PLEASE READ ***
1520+
*
1521+
* Marlin allows you to add a custom boot image for Graphical LCDs.
1522+
* With this option Marlin will first show your custom screen followed
1523+
* by the standard Marlin logo with version number and web URL.
1524+
*
1525+
* We encourage you to take advantage of this new feature and we also
1526+
* respectfully request that you retain the unmodified Marlin boot screen.
1527+
*/
1528+
#if ANY(HAS_MARLINUI_U8GLIB, TOUCH_UI_FTDI_EVE, IS_DWIN_MARLINUI)
1529+
#define SHOW_BOOTSCREEN // Show the Marlin bootscreen on startup. ** ENABLE FOR PRODUCTION **
1530+
#if ENABLED(SHOW_BOOTSCREEN)
1531+
#define BOOTSCREEN_TIMEOUT 2000 // (ms) Total Duration to display the boot screen(s)
1532+
#if EITHER(HAS_MARLINUI_U8GLIB, TFT_COLOR_UI)
1533+
#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving lots of flash)
1534+
#endif
1535+
#define SHOW_CUSTOM_BOOTSCREEN // Show the bitmap in Marlin/_Bootscreen.h on startup.
1536+
#endif
1537+
#if HAS_MARLINUI_U8GLIB
1538+
#define CUSTOM_STATUS_SCREEN_IMAGE // Show the bitmap in Marlin/_Statusscreen.h on the status screen.
1539+
#endif
1540+
#endif
1541+
15111542
//#define SOUND_MENU_ITEM // Add a mute option to the LCD menu
15121543
#define SOUND_ON_DEFAULT // Buzzer/speaker default enabled state
15131544

15141545
// The timeout to return to the status screen from sub-menus
15151546
//#define LCD_TIMEOUT_TO_STATUS 15000 // (ms)
15161547

1517-
#if ENABLED(SHOW_BOOTSCREEN)
1518-
#define BOOTSCREEN_TIMEOUT 2000 // (ms) Total Duration to display the boot screen(s)
1519-
#if EITHER(HAS_MARLINUI_U8GLIB, TFT_COLOR_UI)
1520-
#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving lots of flash)
1521-
#endif
1522-
#endif
1523-
15241548
// Scroll a longer status message into view
15251549
#define STATUS_MESSAGE_SCROLLING
15261550

@@ -1906,7 +1930,7 @@
19061930
#endif
19071931

19081932
/**
1909-
* Status (Info) Screen customizations
1933+
* Status (Info) Screen customization
19101934
* These options may affect code size and screen render time.
19111935
* Custom status screens can forcibly override these settings.
19121936
*/
@@ -2159,7 +2183,7 @@
21592183
#if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
21602184
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
21612185
// Note: Extra time may be added to mitigate controller latency.
2162-
//#define MOVE_Z_WHEN_IDLE // Jump to the move Z menu on doubleclick when printer is idle.
2186+
//#define MOVE_Z_WHEN_IDLE // Jump to the move Z menu on double-click when printer is idle.
21632187
#if ENABLED(MOVE_Z_WHEN_IDLE)
21642188
#define MOVE_Z_IDLE_MULTIPLICATOR 1 // Multiply 1mm by this factor for the move step size.
21652189
#endif
@@ -3522,16 +3546,16 @@
35223546
* Feed rates are set by the F parameter of a move command e.g. G1 X0 Y10 F6000
35233547
* Laser power would be calculated by bit shifting off 8 LSB's. In binary this is div 256.
35243548
* The calculation gives us ocr values from 0 to 255, values over F65535 will be set as 255 .
3525-
* More refined power control such as compesation for accell/decell will be addressed in future releases.
3549+
* More refined power control such as compensation for accel/decel will be addressed in future releases.
35263550
*
35273551
* M5 I clears inline mode and set power to 0, M5 sets the power output to 0 but leaves inline mode on.
35283552
*/
35293553

35303554
/**
35313555
* Enable M3 commands for laser mode inline power planner syncing.
35323556
* This feature enables any M3 S-value to be injected into the block buffers while in
3533-
* CUTTER_MODE_CONTINUOUS. The option allows M3 laser power to be commited without waiting
3534-
* for a planner syncronization
3557+
* CUTTER_MODE_CONTINUOUS. The option allows M3 laser power to be committed without waiting
3558+
* for a planner synchronization
35353559
*/
35363560
//#define LASER_POWER_SYNC
35373561

@@ -4130,7 +4154,7 @@
41304154
#define MAX7219_DEBUG_PROFILE 6 // Display the fraction of CPU time spent in profiled code on this LED matrix
41314155
// row. By default idle() is profiled so this shows how "idle" the processor is.
41324156
// See class CodeProfiler.
4133-
//#define MAX7219_DEBUG_MULTISTEPPING 6 // Show multistepping 1 to 128 on this LED matrix row.
4157+
//#define MAX7219_DEBUG_MULTISTEPPING 6 // Show multi-stepping 1 to 128 on this LED matrix row.
41344158
#endif
41354159

41364160
/**

Marlin/Version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* here we define this default string as the date where the latest release
4242
* version was tagged.
4343
*/
44-
//#define STRING_DISTRIBUTION_DATE "2023-04-01"
44+
//#define STRING_DISTRIBUTION_DATE "2023-04-12"
4545

4646
/**
4747
* Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/HAL/AVR/fastio/fastio_1280.h

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
* Hardware Pin : 02 03 06 07 01 05 15 16 17 18 23 24 25 26 64 63 13 12 46 45 44 43 78 77 76 75 74 73 72 71 60 59 58 57 56 55 54 53 50 70 52 51 42 41 40 39 38 37 36 35 22 21 20 19 97 96 95 94 93 92 91 90 89 88 87 86 85 84 83 82 | 04 08 09 10 11 14 27 28 29 30 31 32 33 34 47 48 49 61 62 65 66 67 68 69 79 80 81 98 99 100
2828
* Port : E0 E1 E4 E5 G5 E3 H3 H4 H5 H6 B4 B5 B6 B7 J1 J0 H1 H0 D3 D2 D1 D0 A0 A1 A2 A3 A4 A5 A6 A7 C7 C6 C5 C4 C3 C2 C1 C0 D7 G2 G1 G0 L7 L6 L5 L4 L3 L2 L1 L0 B3 B2 B1 B0 F0 F1 F2 F3 F4 F5 F6 F7 K0 K1 K2 K3 K4 K5 K6 K7 | E2 E6 E7 xx xx H2 H7 G3 G4 xx xx xx xx xx D4 D5 D6 xx xx J2 J3 J4 J5 J6 J7 xx xx xx xx xx
2929
* Logical Pin : 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 78 79 80 xx xx 84 85 71 70 xx xx xx xx xx 81 82 83 xx xx 72 73 75 76 77 74 xx xx xx xx xx
30+
* Analog Input : 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
3031
*
3132
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
3233
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg

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

-4
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

+4
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/AVR/pinsDebug.h

+6-4
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,13 @@
6464

6565
#define VALID_PIN(pin) (pin >= 0 && pin < NUM_DIGITAL_PINS ? 1 : 0)
6666
#if AVR_ATmega1284_FAMILY
67-
#define DIGITAL_PIN_TO_ANALOG_PIN(P) int(analogInputToDigitalPin(0) - (P))
68-
#define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(7) && (P) <= analogInputToDigitalPin(0))
67+
#define IS_ANALOG(P) WITHIN(P, analogInputToDigitalPin(7), analogInputToDigitalPin(0))
68+
#define DIGITAL_PIN_TO_ANALOG_PIN(P) int(IS_ANALOG(P) ? (P) - analogInputToDigitalPin(7) : -1)
6969
#else
70-
#define DIGITAL_PIN_TO_ANALOG_PIN(P) int((P) - analogInputToDigitalPin(0))
71-
#define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(0) && ((P) <= analogInputToDigitalPin(15) || (P) <= analogInputToDigitalPin(7)))
70+
#define _ANALOG1(P) WITHIN(P, analogInputToDigitalPin(0), analogInputToDigitalPin(7))
71+
#define _ANALOG2(P) WITHIN(P, analogInputToDigitalPin(8), analogInputToDigitalPin(15))
72+
#define IS_ANALOG(P) (_ANALOG1(P) || _ANALOG2(P))
73+
#define DIGITAL_PIN_TO_ANALOG_PIN(P) int(_ANALOG1(P) ? (P) - analogInputToDigitalPin(0) : _ANALOG2(P) ? (P) - analogInputToDigitalPin(8) + 8 : -1)
7274
#endif
7375
#define GET_ARRAY_PIN(p) pgm_read_byte(&pin_array[p].pin)
7476
#define MULTI_NAME_PAD 26 // space needed to be pretty if not first name assigned to a pin

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

-4
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

+5-1
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

-4
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

+9-2
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

-4
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

+7-3
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/LINUX/spi_pins.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "../../core/macros.h"
2525
#include "../../inc/MarlinConfigPre.h"
2626

27-
#if BOTH(HAS_MARLINUI_U8GLIB, SDSUPPORT) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
27+
#if BOTH(HAS_MARLINUI_U8GLIB, SDSUPPORT) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
2828
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
2929
// needed due to the speed and mode required for communicating with each device being different.
3030
// This requirement can be removed if the SPI access to these devices is updated to use

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

-4
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

0 commit comments

Comments
 (0)