Skip to content

Commit 6f65b95

Browse files
Squashed commit of the following:
commit a942c93 Author: ellensp <[email protected]> Date: Mon May 27 05:09:18 2024 +1200 🩹 Longer3D LK has ONBOARD_SDIO (MarlinFirmware#27129) commit fff0d70 Author: Scott Lahteine <[email protected]> Date: Sat Jun 15 20:37:43 2024 -0500 🔖 Version 2.1.2.4 commit 53392f3 Author: ellensp <[email protected]> Date: Sun Jun 16 13:14:46 2024 +1200 🐛 Mount media early for POWER_LOSS_RECOVERY (MarlinFirmware#27177) commit 1f8587d Author: Mihai <[email protected]> Date: Sun Jun 16 02:01:36 2024 +0300 🧑‍💻 Adjust pulse_phase_isr code guards (MarlinFirmware#27112) commit aa778c3 Author: Scott Lahteine <[email protected]> Date: Sat Jun 8 17:13:20 2024 -0500 🚸 Prefer friendly Power Off over Auto-unalive commit af8747e Author: Scott Lahteine <[email protected]> Date: Sun Jun 9 17:38:55 2024 -0500 📝 "Boards Manager" commit e6787f7 Author: Scott Lahteine <[email protected]> Date: Sat Jun 8 17:12:07 2024 -0500 🔧 Assume RAMPS_CREALITY is not CR2020 commit 4f146ef Author: TheRaf974 <[email protected]> Date: Sat Jun 8 23:45:51 2024 +0200 🔧 Overridable SUICIDE_PIN for RAMPS_CREALITY (MarlinFirmware#27143) commit c674f01 Author: Scott Lahteine <[email protected]> Date: Sat Jun 8 14:52:11 2024 -0500 🎨 Misc. SPI cleanup commit f7680f3 Author: Mihai <[email protected]> Date: Sat Jun 8 21:33:08 2024 +0300 ⚡️ Optimize LPC176x pin toggle (MarlinFirmware#27149) commit 3430543 Author: ellensp <[email protected]> Date: Sat Jun 8 13:38:44 2024 +1200 ✏️ Fix comma typo (MarlinFirmware#27138) commit 23fda5b Author: Scott Lahteine <[email protected]> Date: Fri Jun 7 17:20:15 2024 -0500 📝 Remove dead video links commit 1d13aaa Author: Scott Lahteine <[email protected]> Date: Tue May 28 18:49:32 2024 -0500 🔨 Update SAMD51 build deps commit 9e02be4 Author: ellensp <[email protected]> Date: Sat Jun 15 03:41:21 2024 +1200 🩹 Fix broken STEPTEST commit 798284a Author: Scott Lahteine <[email protected]> Date: Tue May 28 23:56:26 2024 -0500 🔖 Version 2.1.2.3 commit 7c48553 Author: Mihai <[email protected]> Date: Wed May 29 02:22:39 2024 +0300 🐛 Prevent 'EVAL' macro collision (MarlinFirmware#27132) commit 63fba61 Author: Scott Lahteine <[email protected]> Date: Mon May 6 19:10:38 2024 -0500 🩹 Fix serial temp error language commit fe9e890 Author: Keith Bennett <[email protected]> Date: Mon May 6 15:50:41 2024 -0700 🐛 Fix bool operator for XYval, etc. (MarlinFirmware#27026) Co-authored-by: sjasonsmith <[email protected]> commit 1289141 Author: Keith Bennett <[email protected]> Date: Mon May 6 15:49:02 2024 -0700 🩹 Fix ESP3D WiFi, bump config version (MarlinFirmware#27025) Co-authored-by: Scott Lahteine <[email protected]> commit 18288ce Author: Keith Bennett <[email protected]> Date: Mon May 6 15:46:41 2024 -0700 🩹 Fix missing HAS_DUAL_Y_STEPPERS (MarlinFirmware#27024) Co-authored-by: ellensp <[email protected]> commit 5b0c818 Author: Keith Bennett <[email protected]> Date: Mon May 6 15:45:44 2024 -0700 🩹 Update preheat end time var (MarlinFirmware#27023) Co-authored-by: ellensp <[email protected]> Co-authored-by: Scott Lahteine <[email protected]> commit ece37ba Author: Keith Bennett <[email protected]> Date: Mon May 6 15:41:47 2024 -0700 🩹 Fix broken ENDSTOPPULLUP_ZMIN_PROBE (MarlinFirmware#27022) Co-authored-by: ellensp <[email protected]> commit 80071ea Author: Keith Bennett <[email protected]> Date: Mon May 6 15:40:33 2024 -0700 🩹 Fix missing EXTENSIBLE_UI include (MarlinFirmware#27021) Co-authored-by: ellensp <[email protected]> commit d3cc44a Author: Keith Bennett <[email protected]> Date: Mon May 6 15:33:26 2024 -0700 🩹 Fix missing MSG_ATTACH_SD_MEDIA define (MarlinFirmware#27020) Co-authored-by: ellensp <[email protected]> commit 5170d27 Author: Jordan Stocker <[email protected]> Date: Thu Mar 28 06:14:03 2024 +1030 🔨 Fix binary upload firmware path (MarlinFirmware#26909) commit 3f3d1f0 Author: Ikko Eltociear Ashimine <[email protected]> Date: Mon Mar 25 03:49:25 2024 +0900 📝 Fix Cutter.md typo (MarlinFirmware#26901) commit 7616d0e Author: John Robertson <[email protected]> Date: Sat Mar 23 00:57:23 2024 +0000 🐛 Fix ESP32 laser M4 exception (MarlinFirmware#26884) commit e81b3fe Author: Sophist <[email protected]> Date: Sat Mar 23 00:27:13 2024 +0000 🚸 Hide auto-run as needed (MarlinFirmware#26853) commit cb62e14 Author: Holger Mößinger <[email protected]> Date: Fri Mar 22 22:36:42 2024 +0100 ✏️ Fix stepper MS pin typos (MarlinFirmware#26891) commit 7efc5cb Author: Scott Lahteine <[email protected]> Date: Sat Mar 16 15:40:45 2024 -0500 👷 Minor signature.py adjustments commit 11ea940 Author: Sophist <[email protected]> Date: Sat Mar 16 20:00:16 2024 +0000 📝 Fix M201 typos (MarlinFirmware#26854) commit 2378a7f Author: janenen <[email protected]> Date: Sat Mar 16 20:52:14 2024 +0100 🐛 Fix DETECT_BROKEN_ENDSTOP on IDEX (MarlinFirmware#26790) Co-authored-by: Scott Lahteine <[email protected]> commit 9755d8e Author: Keith Bennett <[email protected]> Date: Sat Mar 16 11:34:02 2024 -0700 📝 Remove Flattr Link (MarlinFirmware#26796) commit b691178 Author: Scott Lahteine <[email protected]> Date: Wed Feb 7 21:11:55 2024 -0600 🔖 Version 2.1.2.2 commit af6dac3 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 18:36:32 2024 -0600 🧑‍💻 Other code patches commit 108f0b0 Author: Scott Lahteine <[email protected]> Date: Mon Jan 29 22:31:49 2024 -0600 🧑‍💻 LCD Code patches commit 6b65665 Author: Scott Lahteine <[email protected]> Date: Mon Dec 18 19:12:10 2023 -0600 🧑‍💻 SD card commit 8753015 Author: Scott Lahteine <[email protected]> Date: Sat Dec 16 02:40:51 2023 -0600 🧑‍💻 HAL Patches commit 550a303 Author: Scott Lahteine <[email protected]> Date: Fri Dec 15 18:47:34 2023 -0600 🔨 Better build, envs, tests commit a53ad3b Author: Scott Lahteine <[email protected]> Date: Sat Dec 16 23:52:22 2023 -0600 🧑‍💻 Pins updates commit cbaff4b Author: Scott Lahteine <[email protected]> Date: Wed Feb 7 21:11:33 2024 -0600 🔧 Config updates commit a18045a Author: Scott Lahteine <[email protected]> Date: Fri Dec 15 17:37:36 2023 -0600 🧑‍💻 Support files updates commit 5f84e7f Author: Scott Lahteine <[email protected]> Date: Mon Feb 5 23:34:27 2024 -0600 🚸 Fix Filament Change item position commit 580a35b Author: Scott Lahteine <[email protected]> Date: Thu Mar 30 15:12:56 2023 -0500 🎨 Misc. probe-related cleanup commit 39e42eb Author: Scott Lahteine <[email protected]> Date: Sat Dec 16 23:22:38 2023 -0600 🎨 Cosmetic and comments commit a3101a0 Author: InsanityAutomation <[email protected]> Date: Wed Jan 31 20:24:08 2024 -0500 🚸 Fix repeating "Power Off" message (MarlinFirmware#26755) commit 6f00f4e Author: Keith Bennett <[email protected]> Date: Tue Jan 30 21:00:02 2024 -0800 🐛 Fix I/J/K chopper timing (MarlinFirmware#26736) Followup to MarlinFirmware#19112 commit 5ef8ccc Author: Keith Bennett <[email protected]> Date: Tue Jan 30 20:58:06 2024 -0800 📝 Biqu => BIQU (MarlinFirmware#26735) commit 4a0b539 Author: Scott Lahteine <[email protected]> Date: Sun Mar 26 17:24:40 2023 -0500 🔧 Clarify axis disable / timeout (MarlinFirmware#25571) commit ee08814 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 22:19:06 2024 -0600 ♻️ Remove LOOP macros commit 244c257 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 22:07:06 2024 -0600 🚸 Thermistor updates commit 20ee8dd Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 21:57:20 2024 -0600 ♻️ FOLDER_SORTING => SDSORT_FOLDERS commit 73ed511 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 21:51:08 2024 -0600 ♻️ BTT_MINI_12864_V1 => BTT_MINI_12864 commit 41d78a2 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 19:38:57 2024 -0600 ♻️ TMC_SW_* => TMC_SPI_* commit 5febc39 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 19:33:27 2024 -0600 ♻️ BTT_MANTA_M4P_V1_0 => BTT_MANTA_M4P_V2_1 commit 1b406a3 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 19:30:23 2024 -0600 🔥 Remove VAkE 403D commit d0fbc94 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 19:08:57 2024 -0600 ♻️ FAN_PIN => FAN0_PIN commit 5e8c7b3 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 18:44:30 2024 -0600 ♻️ LCD_PINS_ENABLE => LCD_PINS_EN commit d403352 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 17:42:33 2024 -0600 ♻️ SDSUPPORT => HAS_MEDIA commit 2e4b037 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 17:16:33 2024 -0600 ♻️ EITHER/BOTH => ANY/ALL commit fa85e9e Author: Scott Lahteine <[email protected]> Date: Sat Jan 27 12:30:18 2024 -0600 🐛 Fix G38_PROBE_TARGET commit 631f719 Author: Scott Lahteine <[email protected]> Date: Mon Dec 11 15:20:31 2023 -0600 🩹 Fix LONG_FILENAME_WRITE_SUPPORT typo commit 4f21ace Author: Scott Lahteine <[email protected]> Date: Fri Dec 8 21:31:07 2023 -0600 🔨 Specify versions in INI commit 7a653f9 Author: Scott Lahteine <[email protected]> Date: Tue Nov 21 21:41:33 2023 -0600 🩹 Fix ProUI compile commit 60cd1ec Author: Scott Lahteine <[email protected]> Date: Sat Oct 7 01:08:19 2023 -0500 🩹 Fix G33 output See MarlinFirmware#26299
1 parent cf7c601 commit 6f65b95

Some content is hidden

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

50 files changed

+144
-163
lines changed

Marlin/Configuration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*
3636
* Advanced settings can be found in Configuration_adv.h
3737
*/
38-
#define CONFIGURATION_H_VERSION 02010202
38+
#define CONFIGURATION_H_VERSION 02010204
3939

4040
//===========================================================================
4141
//============================= Getting Started =============================

Marlin/Configuration_adv.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*
3131
* Basic settings can be found in Configuration.h
3232
*/
33-
#define CONFIGURATION_ADV_H_VERSION 02010202
33+
#define CONFIGURATION_ADV_H_VERSION 02010204
3434

3535
// @section develop
3636

@@ -3187,8 +3187,8 @@
31873187
//#define U_STALL_SENSITIVITY 8
31883188
//#define V_STALL_SENSITIVITY 8
31893189
//#define W_STALL_SENSITIVITY 8
3190-
//#define SPI_ENDSTOPS // TMC2130 only
3191-
#define IMPROVE_HOMING_RELIABILITY
3190+
//#define SPI_ENDSTOPS // TMC2130/TMC5160 only
3191+
//#define IMPROVE_HOMING_RELIABILITY
31923192
#endif
31933193

31943194
// @section tmc/config
@@ -4085,7 +4085,7 @@
40854085
* Extras for an ESP32-based motherboard with WIFISUPPORT
40864086
* These options don't apply to add-on WiFi modules based on ESP32 WiFi101.
40874087
*/
4088-
#if ENABLED(WIFISUPPORT)
4088+
#if ANY(WIFISUPPORT, ESP3D_WIFISUPPORT)
40894089
//#define WEBSUPPORT // Start a webserver (which may include auto-discovery) using SPIFFS
40904090
//#define OTASUPPORT // Support over-the-air firmware updates
40914091
//#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host

Marlin/Version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* Marlin release version identifier
3030
*/
31-
//#define SHORT_BUILD_VERSION "2.1.2.2"
31+
//#define SHORT_BUILD_VERSION "2.1.2.4"
3232

3333
/**
3434
* Verbose version identifier which should contain a reference to the location
@@ -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 "2024-02-08"
44+
//#define STRING_DISTRIBUTION_DATE "2024-05-29"
4545

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

Marlin/src/HAL/AVR/fast_pwm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
150150
else {
151151
if (p == 32 || p == 128) continue; // Skip TIMER2 specific prescalers when not TIMER2
152152
const uint16_t rft = (F_CPU) / (p * f_desired);
153-
DEBUG_ECHOLNPGM("(Not Timer 2) F_CPU=" STRINGIFY(F_CPU), " prescaler=", p, " f_desired=", f_desired);
153+
DEBUG_ECHOLNPGM("(Not Timer 2) F_CPU=", STRINGIFY(F_CPU), " prescaler=", p, " f_desired=", f_desired);
154154
res_fast_temp = rft - 1;
155155
res_pc_temp = rft / 2;
156156
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
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
3030
* Analog Input : 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
31-
*
32-
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
33-
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
3431
*/
3532

3633
#include "../fastio.h"

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
*
2727
* Logical Pin: 38 39 40 41 42 43 44 45 16 10 11 12 06 07 08 09 30 31 32 33 34 35 36 37 17 18 19 20 21 22 23 24 00 01 13 05 02 03 14 15 46 47 48 49 50 51 52 53 25 26 27 28 29 04
2828
* Port: A0 A1 A2 A3 A4 A5 A6 A7 B0 B1 B2 B3 B4 B5 B6 B7 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 E2 E3 E4 E5 E6 E7 F0 F1 F2 F3 F4 F5 F6 F7 G0 G1 G2 G3 G4 G5
29-
*
30-
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
31-
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
3229
*/
3330

3431
#include "../fastio.h"

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
*
2727
* Logical Pin: 08 09 10 11 12 13 14 15 16 17 18 19 20 21 00 01 02 03 04 05 06 07
2828
* Port: B0 B1 B2 B3 B4 B5 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7
29-
*
30-
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
31-
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
3229
*/
3330

3431
#include "../fastio.h"

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
*
2727
* 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
2828
* Port: B0 B1 B2 B3 B4 B5 B6 B7 D0 D1 D2 D3 D4 D5 D6 D7 C0 C1 C2 C3 C4 C5 C6 C7 A7 A6 A5 A4 A3 A2 A1 A0
29-
*
30-
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
31-
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
3229
*/
3330

3431
/** ATMega644

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
* Logical Pin: 28 29 30 31 32 33 34 35 20 21 22 23 24 25 26 27 10 11 12 13 14 15 16 17 00 01 02 03 04 05 06 07 08 09(46*47)36 37 18 19 38 39 40 41 42 43 44 45
2828
* Port: A0 A1 A2 A3 A4 A5 A6 A7 B0 B1 B2 B3 B4 B5 B6 B7 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 E2 E3 E4 E5 E6 E7 F0 F1 F2 F3 F4 F5 F6 F7
2929
* The logical pins 46 and 47 are not supported by Teensyduino, but are supported below as E2 and E3
30-
*
31-
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
32-
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
3330
*/
3431

3532
#include "../fastio.h"

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,15 @@
6868
* Usually the hardware SPI pins are only available to the LCD. This makes the DUE hard SPI used at the same time
6969
* as the TMC2130 soft SPI the most common setup.
7070
*/
71-
#define _IS_HW_SPI(P) (defined(TMC_SPI_##P) && (TMC_SPI_##P == SD_MOSI_PIN || TMC_SPI_##P == SD_MISO_PIN || TMC_SPI_##P == SD_SCK_PIN))
72-
7371
#if HAS_MEDIA && HAS_DRIVER(TMC2130)
74-
#if ENABLED(TMC_USE_SW_SPI)
75-
#if DISABLED(DUE_SOFTWARE_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
76-
#error "DUE hardware SPI is required but is incompatible with TMC2130 software SPI. Either disable TMC_USE_SW_SPI or use separate pins for the two SPIs."
77-
#endif
78-
#elif ENABLED(DUE_SOFTWARE_SPI)
72+
#define _IS_HW_SPI(P) (defined(TMC_SPI_##P) && (TMC_SPI_##P == SD_MOSI_PIN || TMC_SPI_##P == SD_MISO_PIN || TMC_SPI_##P == SD_SCK_PIN))
73+
#if DISABLED(DUE_SOFTWARE_SPI) && ENABLED(TMC_USE_SW_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
74+
#error "DUE hardware SPI is required but is incompatible with TMC2130 software SPI. Either disable TMC_USE_SW_SPI or use separate pins for the two SPIs."
75+
#endif
76+
#if ENABLED(DUE_SOFTWARE_SPI) && DISABLED(TMC_USE_SW_SPI)
7977
#error "DUE software SPI is required but is incompatible with TMC2130 hardware SPI. Enable TMC_USE_SW_SPI to fix."
8078
#endif
79+
#undef _IS_HW_SPI
8180
#endif
8281

8382
#if ENABLED(FAST_PWM_FAN) || SPINDLE_LASER_FREQUENCY

0 commit comments

Comments
 (0)