Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit a942c93
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Mon May 27 05:09:18 2024 +1200

    🩹 Longer3D LK has ONBOARD_SDIO (MarlinFirmware#27129)

commit fff0d70
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jun 15 20:37:43 2024 -0500

    🔖 Version 2.1.2.4

commit 53392f3
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sun Jun 16 13:14:46 2024 +1200

    🐛 Mount media early for POWER_LOSS_RECOVERY (MarlinFirmware#27177)

commit 1f8587d
Author: Mihai <299015+mh-dm@users.noreply.github.com>
Date:   Sun Jun 16 02:01:36 2024 +0300

    🧑‍💻 Adjust pulse_phase_isr code guards (MarlinFirmware#27112)

commit aa778c3
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jun 8 17:13:20 2024 -0500

    🚸 Prefer friendly Power Off over Auto-unalive

commit af8747e
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Jun 9 17:38:55 2024 -0500

    📝 "Boards Manager"

commit e6787f7
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jun 8 17:12:07 2024 -0500

    🔧 Assume RAMPS_CREALITY is not CR2020

commit 4f146ef
Author: TheRaf974 <rpm.boyer@gmail.com>
Date:   Sat Jun 8 23:45:51 2024 +0200

    🔧 Overridable SUICIDE_PIN for RAMPS_CREALITY (MarlinFirmware#27143)

commit c674f01
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jun 8 14:52:11 2024 -0500

    🎨 Misc. SPI cleanup

commit f7680f3
Author: Mihai <299015+mh-dm@users.noreply.github.com>
Date:   Sat Jun 8 21:33:08 2024 +0300

    ⚡️ Optimize LPC176x pin toggle (MarlinFirmware#27149)

commit 3430543
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sat Jun 8 13:38:44 2024 +1200

    ✏️ Fix comma typo (MarlinFirmware#27138)

commit 23fda5b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Jun 7 17:20:15 2024 -0500

    📝 Remove dead video links

commit 1d13aaa
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue May 28 18:49:32 2024 -0500

    🔨 Update SAMD51 build deps

commit 9e02be4
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sat Jun 15 03:41:21 2024 +1200

    🩹 Fix broken STEPTEST

commit 798284a
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue May 28 23:56:26 2024 -0500

    🔖 Version 2.1.2.3

commit 7c48553
Author: Mihai <299015+mh-dm@users.noreply.github.com>
Date:   Wed May 29 02:22:39 2024 +0300

    🐛 Prevent 'EVAL' macro collision (MarlinFirmware#27132)

commit 63fba61
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon May 6 19:10:38 2024 -0500

    🩹 Fix serial temp error language

commit fe9e890
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon May 6 15:50:41 2024 -0700

    🐛 Fix bool operator for XYval, etc. (MarlinFirmware#27026)

    Co-authored-by: sjasonsmith <20053467+sjasonsmith@users.noreply.github.com>

commit 1289141
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon May 6 15:49:02 2024 -0700

    🩹 Fix ESP3D WiFi, bump config version (MarlinFirmware#27025)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 18288ce
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon May 6 15:46:41 2024 -0700

    🩹 Fix missing HAS_DUAL_Y_STEPPERS (MarlinFirmware#27024)

    Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com>

commit 5b0c818
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon May 6 15:45:44 2024 -0700

    🩹 Update preheat end time var (MarlinFirmware#27023)

    Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com>
    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit ece37ba
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon May 6 15:41:47 2024 -0700

    🩹 Fix broken ENDSTOPPULLUP_ZMIN_PROBE (MarlinFirmware#27022)

    Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com>

commit 80071ea
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon May 6 15:40:33 2024 -0700

    🩹 Fix missing EXTENSIBLE_UI include (MarlinFirmware#27021)

    Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com>

commit d3cc44a
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon May 6 15:33:26 2024 -0700

    🩹 Fix missing MSG_ATTACH_SD_MEDIA define (MarlinFirmware#27020)

    Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com>

commit 5170d27
Author: Jordan Stocker <Pvthaggard@gmail.com>
Date:   Thu Mar 28 06:14:03 2024 +1030

    🔨 Fix binary upload firmware path (MarlinFirmware#26909)

commit 3f3d1f0
Author: Ikko Eltociear Ashimine <eltociear@gmail.com>
Date:   Mon Mar 25 03:49:25 2024 +0900

    📝 Fix Cutter.md typo (MarlinFirmware#26901)

commit 7616d0e
Author: John Robertson <john@cirtech.co.uk>
Date:   Sat Mar 23 00:57:23 2024 +0000

    🐛 Fix ESP32 laser M4 exception (MarlinFirmware#26884)

commit e81b3fe
Author: Sophist <3001893+Sophist-UK@users.noreply.github.com>
Date:   Sat Mar 23 00:27:13 2024 +0000

    🚸 Hide auto-run as needed (MarlinFirmware#26853)

commit cb62e14
Author: Holger Mößinger <hm2dev@users.noreply.github.com>
Date:   Fri Mar 22 22:36:42 2024 +0100

    ✏️ Fix stepper MS pin typos (MarlinFirmware#26891)

commit 7efc5cb
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Mar 16 15:40:45 2024 -0500

    👷 Minor signature.py adjustments

commit 11ea940
Author: Sophist <3001893+Sophist-UK@users.noreply.github.com>
Date:   Sat Mar 16 20:00:16 2024 +0000

    📝 Fix M201 typos (MarlinFirmware#26854)

commit 2378a7f
Author: janenen <janenen@users.noreply.github.com>
Date:   Sat Mar 16 20:52:14 2024 +0100

    🐛 Fix DETECT_BROKEN_ENDSTOP on IDEX (MarlinFirmware#26790)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 9755d8e
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Sat Mar 16 11:34:02 2024 -0700

    📝 Remove Flattr Link (MarlinFirmware#26796)

commit b691178
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 7 21:11:55 2024 -0600

    🔖 Version 2.1.2.2

commit af6dac3
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 18:36:32 2024 -0600

    🧑‍💻 Other code patches

commit 108f0b0
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 29 22:31:49 2024 -0600

    🧑‍💻 LCD Code patches

commit 6b65665
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Dec 18 19:12:10 2023 -0600

    🧑‍💻 SD card

commit 8753015
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Dec 16 02:40:51 2023 -0600

    🧑‍💻 HAL Patches

commit 550a303
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Dec 15 18:47:34 2023 -0600

    🔨 Better build, envs, tests

commit a53ad3b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Dec 16 23:52:22 2023 -0600

    🧑‍💻 Pins updates

commit cbaff4b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 7 21:11:33 2024 -0600

    🔧 Config updates

commit a18045a
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Dec 15 17:37:36 2023 -0600

    🧑‍💻 Support files updates

commit 5f84e7f
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Feb 5 23:34:27 2024 -0600

    🚸 Fix Filament Change item position

commit 580a35b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Mar 30 15:12:56 2023 -0500

    🎨 Misc. probe-related cleanup

commit 39e42eb
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Dec 16 23:22:38 2023 -0600

    🎨 Cosmetic and comments

commit a3101a0
Author: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
Date:   Wed Jan 31 20:24:08 2024 -0500

    🚸 Fix repeating "Power Off" message (MarlinFirmware#26755)

commit 6f00f4e
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
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 <13375512+thisiskeithb@users.noreply.github.com>
Date:   Tue Jan 30 20:58:06 2024 -0800

    📝 Biqu => BIQU (MarlinFirmware#26735)

commit 4a0b539
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Mar 26 17:24:40 2023 -0500

    🔧 Clarify axis disable / timeout (MarlinFirmware#25571)

commit ee08814
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 22:19:06 2024 -0600

    ♻️ Remove LOOP macros

commit 244c257
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 22:07:06 2024 -0600

    🚸 Thermistor updates

commit 20ee8dd
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 21:57:20 2024 -0600

    ♻️ FOLDER_SORTING => SDSORT_FOLDERS

commit 73ed511
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 21:51:08 2024 -0600

    ♻️ BTT_MINI_12864_V1 => BTT_MINI_12864

commit 41d78a2
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 19:38:57 2024 -0600

    ♻️ TMC_SW_* => TMC_SPI_*

commit 5febc39
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 19:33:27 2024 -0600

    ♻️ BTT_MANTA_M4P_V1_0 => BTT_MANTA_M4P_V2_1

commit 1b406a3
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 19:30:23 2024 -0600

    🔥 Remove VAkE 403D

commit d0fbc94
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 19:08:57 2024 -0600

    ♻️ FAN_PIN => FAN0_PIN

commit 5e8c7b3
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 18:44:30 2024 -0600

    ♻️ LCD_PINS_ENABLE => LCD_PINS_EN

commit d403352
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 17:42:33 2024 -0600

    ♻️ SDSUPPORT => HAS_MEDIA

commit 2e4b037
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 17:16:33 2024 -0600

    ♻️ EITHER/BOTH => ANY/ALL

commit fa85e9e
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jan 27 12:30:18 2024 -0600

    🐛 Fix G38_PROBE_TARGET

commit 631f719
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Dec 11 15:20:31 2023 -0600

    🩹 Fix LONG_FILENAME_WRITE_SUPPORT typo

commit 4f21ace
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Dec 8 21:31:07 2023 -0600

    🔨 Specify versions in INI

commit 7a653f9
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Nov 21 21:41:33 2023 -0600

    🩹 Fix ProUI compile

commit 60cd1ec
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Oct 7 01:08:19 2023 -0500

    🩹 Fix G33 output

    See MarlinFirmware#26299
  • Loading branch information
@alrtprogrammer
alrtprogrammer committed Jul 22, 2024
1 parent cf7c601 commit 6f65b95
Show file tree
Hide file tree
Showing 50 changed files with 144 additions and 163 deletions.
2 changes: 1 addition & 1 deletion Marlin/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*
* Advanced settings can be found in Configuration_adv.h
*/
#define CONFIGURATION_H_VERSION 02010202
#define CONFIGURATION_H_VERSION 02010204

//===========================================================================
//============================= Getting Started =============================
Expand Down
8 changes: 4 additions & 4 deletions Marlin/Configuration_adv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* Basic settings can be found in Configuration.h
*/
#define CONFIGURATION_ADV_H_VERSION 02010202
#define CONFIGURATION_ADV_H_VERSION 02010204

// @section develop

Expand Down Expand Up @@ -3187,8 +3187,8 @@
//#define U_STALL_SENSITIVITY 8
//#define V_STALL_SENSITIVITY 8
//#define W_STALL_SENSITIVITY 8
//#define SPI_ENDSTOPS // TMC2130 only
#define IMPROVE_HOMING_RELIABILITY
//#define SPI_ENDSTOPS // TMC2130/TMC5160 only
//#define IMPROVE_HOMING_RELIABILITY
#endif

// @section tmc/config
Expand Down Expand Up @@ -4085,7 +4085,7 @@
* Extras for an ESP32-based motherboard with WIFISUPPORT
* These options don't apply to add-on WiFi modules based on ESP32 WiFi101.
*/
#if ENABLED(WIFISUPPORT)
#if ANY(WIFISUPPORT, ESP3D_WIFISUPPORT)
//#define WEBSUPPORT // Start a webserver (which may include auto-discovery) using SPIFFS
//#define OTASUPPORT // Support over-the-air firmware updates
//#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host
Expand Down
4 changes: 2 additions & 2 deletions Marlin/Version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* Marlin release version identifier
*/
//#define SHORT_BUILD_VERSION "2.1.2.2"
//#define SHORT_BUILD_VERSION "2.1.2.4"

/**
* Verbose version identifier which should contain a reference to the location
Expand All @@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
//#define STRING_DISTRIBUTION_DATE "2024-02-08"
//#define STRING_DISTRIBUTION_DATE "2024-05-29"

/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/AVR/fast_pwm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
else {
if (p == 32 || p == 128) continue; // Skip TIMER2 specific prescalers when not TIMER2
const uint16_t rft = (F_CPU) / (p * f_desired);
DEBUG_ECHOLNPGM("(Not Timer 2) F_CPU=" STRINGIFY(F_CPU), " prescaler=", p, " f_desired=", f_desired);
DEBUG_ECHOLNPGM("(Not Timer 2) F_CPU=", STRINGIFY(F_CPU), " prescaler=", p, " f_desired=", f_desired);
res_fast_temp = rft - 1;
res_pc_temp = rft / 2;
}
Expand Down
3 changes: 0 additions & 3 deletions Marlin/src/HAL/AVR/fastio/fastio_1280.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
* 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
* 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
* Analog Input : 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
*
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
*/

#include "../fastio.h"
Expand Down
3 changes: 0 additions & 3 deletions Marlin/src/HAL/AVR/fastio/fastio_1281.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
*
* 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
* 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
*
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
*/

#include "../fastio.h"
Expand Down
3 changes: 0 additions & 3 deletions Marlin/src/HAL/AVR/fastio/fastio_168.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
*
* Logical Pin: 08 09 10 11 12 13 14 15 16 17 18 19 20 21 00 01 02 03 04 05 06 07
* Port: B0 B1 B2 B3 B4 B5 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7
*
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
*/

#include "../fastio.h"
Expand Down
3 changes: 0 additions & 3 deletions Marlin/src/HAL/AVR/fastio/fastio_644.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
*
* 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
* 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
*
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
*/

/** ATMega644
Expand Down
3 changes: 0 additions & 3 deletions Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
* 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
* 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
* The logical pins 46 and 47 are not supported by Teensyduino, but are supported below as E2 and E3
*
* Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
* AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
*/

#include "../fastio.h"
Expand Down
13 changes: 6 additions & 7 deletions Marlin/src/HAL/DUE/inc/SanityCheck.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,15 @@
* Usually the hardware SPI pins are only available to the LCD. This makes the DUE hard SPI used at the same time
* as the TMC2130 soft SPI the most common setup.
*/
#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))

#if HAS_MEDIA && HAS_DRIVER(TMC2130)
#if ENABLED(TMC_USE_SW_SPI)
#if DISABLED(DUE_SOFTWARE_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
#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."
#endif
#elif ENABLED(DUE_SOFTWARE_SPI)
#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))
#if DISABLED(DUE_SOFTWARE_SPI) && ENABLED(TMC_USE_SW_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
#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."
#endif
#if ENABLED(DUE_SOFTWARE_SPI) && DISABLED(TMC_USE_SW_SPI)
#error "DUE software SPI is required but is incompatible with TMC2130 hardware SPI. Enable TMC_USE_SW_SPI to fix."
#endif
#undef _IS_HW_SPI
#endif

#if ENABLED(FAST_PWM_FAN) || SPINDLE_LASER_FREQUENCY
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/spi_pins.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/**
* Define SPI Pins: SCK, MISO, MOSI, SS
*
* Available chip select pins for HW SPI are 4 10 52 77
* Available chip select pins for HW SPI are 4 10 52 77 87
*/
#if SDSS == 4 || SDSS == 10 || SDSS == 52 || SDSS == 77 || SDSS == 87
#if SDSS == 4
Expand Down
6 changes: 0 additions & 6 deletions Marlin/src/HAL/LINUX/spi_pins.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@
// spiBeginTransaction.
#endif

// Onboard SD
//#define SD_SCK_PIN P0_07
//#define SD_MISO_PIN P0_08
//#define SD_MOSI_PIN P0_09
//#define SD_SS_PIN P0_06

// External SD
#ifndef SD_SCK_PIN
#define SD_SCK_PIN 50
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/LPC1768/fastio.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
#define _WRITE(IO,V) WRITE_PIN(IO,V)

/// toggle a pin
#define _TOGGLE(IO) _WRITE(IO, !READ(IO))
#define _TOGGLE(IO) LPC176x::gpio_toggle(IO)

/// set pin as input
#define _SET_INPUT(IO) SET_DIR_INPUT(IO)
Expand Down
13 changes: 7 additions & 6 deletions Marlin/src/HAL/LPC1768/spi_pins.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@
// spiBeginTransaction.
#endif

/** onboard SD card */
//#define SD_SCK_PIN P0_07
//#define SD_MISO_PIN P0_08
//#define SD_MOSI_PIN P0_09
//#define SD_SS_PIN P0_06
/** external */
// Onboard SD
//#define SD_SCK_PIN P0_07
//#define SD_MISO_PIN P0_08
//#define SD_MOSI_PIN P0_09
//#define SD_SS_PIN P0_06

// External SD
#ifndef SD_SCK_PIN
#define SD_SCK_PIN P0_15
#endif
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/MarlinCore.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,7 @@ void setup() {
#endif
#endif

#if ALL(HAS_MEDIA, SDCARD_EEPROM_EMULATION)
#if HAS_MEDIA && ANY(SDCARD_EEPROM_EMULATION, POWER_LOSS_RECOVERY)
SETUP_RUN(card.mount()); // Mount media with settings before first_load
#endif

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/core/macros.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@
#define DEFER4(M) M EMPTY EMPTY EMPTY EMPTY()()()()

// Force define expansion
#define EVAL EVAL16
#define EVAL(V...) EVAL16(V)
#define EVAL4096(V...) EVAL2048(EVAL2048(V))
#define EVAL2048(V...) EVAL1024(EVAL1024(V))
#define EVAL1024(V...) EVAL512(EVAL512(V))
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/core/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ struct XYval {
// Length reduced to one dimension
FI constexpr T magnitude() const { return (T)sqrtf(x*x + y*y); }
// Pointer to the data as a simple array
FI operator T* () { return pos; }
explicit FI operator T* () { return pos; }
// If any element is true then it's true
FI constexpr operator bool() const { return x || y; }
// Smallest element
Expand Down Expand Up @@ -601,7 +601,7 @@ struct XYZval {
// Length reduced to one dimension
FI constexpr T magnitude() const { return (T)TERN(HAS_X_AXIS, sqrtf(NUM_AXIS_GANG(x*x, + y*y, + z*z, + i*i, + j*j, + k*k, + u*u, + v*v, + w*w)), 0); }
// Pointer to the data as a simple array
FI operator T* () { return pos; }
explicit FI operator T* () { return pos; }
// If any element is true then it's true
FI constexpr operator bool() const { return 0 NUM_AXIS_GANG(|| x, || y, || z, || i, || j, || k, || u, || v, || w); }
// Smallest element
Expand Down Expand Up @@ -749,7 +749,7 @@ struct XYZEval {
// Length reduced to one dimension
FI constexpr T magnitude() const { return (T)sqrtf(LOGICAL_AXIS_GANG(+ e*e, + x*x, + y*y, + z*z, + i*i, + j*j, + k*k, + u*u, + v*v, + w*w)); }
// Pointer to the data as a simple array
FI operator T* () { return pos; }
explicit FI operator T* () { return pos; }
// If any element is true then it's true
FI constexpr operator bool() const { return 0 LOGICAL_AXIS_GANG(|| e, || x, || y, || z, || i, || j, || k, || u, || v, || w); }
// Smallest element
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/feature/powerloss.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
#include "powerloss.h"
#include "../core/macros.h"

#if ENABLED(EXTENSIBLE_UI)
#include "../lcd/extui/ui_api.h"
#endif

bool PrintJobRecovery::enabled; // Initialized by settings.load()

MediaFile PrintJobRecovery::file;
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/gcode/control/M80_M81.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ void GcodeSuite::M81() {
return;
}

#if HAS_SUICIDE
suicide();
#elif ENABLED(PSU_CONTROL)
#if ENABLED(PSU_CONTROL)
powerManager.power_off_soon();
#elif HAS_SUICIDE
suicide();
#endif
}
1 change: 1 addition & 0 deletions Marlin/src/inc/Conditionals_LCD.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@
#endif
#ifdef Y2_DRIVER_TYPE
#define HAS_Y2_STEPPER 1
#define HAS_DUAL_Y_STEPPERS 1
#endif

/**
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/inc/Conditionals_post.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2852,7 +2852,7 @@
#ifndef PROBE_OFFSET_YMAX
#define PROBE_OFFSET_YMAX 50
#endif
#if ALL(ENDSTOPPULLUPS, USE_Z_MIN_PROBE)
#if ALL(ENDSTOPPULLUPS, HAS_Z_MIN_PROBE_PIN)
#define ENDSTOPPULLUP_ZMIN_PROBE
#endif
#ifndef XY_PROBE_FEEDRATE
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/inc/SanityCheck.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3679,11 +3679,11 @@ static_assert(_PLUS_TEST(3), "DEFAULT_MAX_ACCELERATION values must be positive."
#if !(defined(WIFI_SSID) && defined(WIFI_PWD))
#error "ESP32 motherboard with WIFISUPPORT requires WIFI_SSID and WIFI_PWD."
#endif
#elif ENABLED(WIFI_CUSTOM_COMMAND)
#elif ENABLED(WIFI_CUSTOM_COMMAND) && NONE(ESP3D_WIFISUPPORT, WIFISUPPORT)
#error "WIFI_CUSTOM_COMMAND requires an ESP32 motherboard and WIFISUPPORT."
#elif ENABLED(OTASUPPORT)
#elif ENABLED(OTASUPPORT) && NONE(ESP3D_WIFISUPPORT, WIFISUPPORT)
#error "OTASUPPORT requires an ESP32 motherboard and WIFISUPPORT."
#elif defined(WIFI_SSID) || defined(WIFI_PWD)
#elif (defined(WIFI_SSID) || defined(WIFI_PWD)) && NONE(ESP3D_WIFISUPPORT, WIFISUPPORT)
#error "WIFI_SSID and WIFI_PWD only apply to ESP32 motherboard with WIFISUPPORT."
#endif

Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/inc/Version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Release version. Leave the Marlin version or apply a custom scheme.
*/
#ifndef SHORT_BUILD_VERSION
#define SHORT_BUILD_VERSION "2.1.2.2"
#define SHORT_BUILD_VERSION "2.1.2.4"
#endif

/**
Expand All @@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2024-02-08"
#define STRING_DISTRIBUTION_DATE "2024-06-16"
#endif

/**
Expand All @@ -52,7 +52,7 @@
* to alert users to major changes.
*/

#define MARLIN_HEX_VERSION 02010202
#define MARLIN_HEX_VERSION 02010204
#ifndef REQUIRED_CONFIGURATION_H_VERSION
#define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
#endif
Expand Down
1 change: 1 addition & 0 deletions Marlin/src/lcd/language/language_en.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ namespace Language_en {
#else
LSTR MSG_ATTACH_MEDIA = _UxGT("Attach ") MEDIA_TYPE_EN;
#endif
LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Attach SD Card");
LSTR MSG_CHANGE_MEDIA = _UxGT("Change ") MEDIA_TYPE_EN;
LSTR MSG_RELEASE_MEDIA = _UxGT("Release ") MEDIA_TYPE_EN;
LSTR MSG_ZPROBE_OUT = _UxGT("Z Probe Past Bed");
Expand Down
13 changes: 7 additions & 6 deletions Marlin/src/module/stepper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ xyze_int8_t Stepper::count_direction{0};
#define MINDIR(A) (count_direction[_AXIS(A)] < 0)
#define MAXDIR(A) (count_direction[_AXIS(A)] > 0)

#define STEPTEST(A,M,I) TERN0(HAS_ ##A## ##I## _ ##M, !(TEST(endstops.state(), A## ##I## _ ##M) && M## DIR(A)) && !locked_ ##A## ##I## _motor)
#define STEPTEST(A,M,I) TERN0(USE_##A##I##_##M, !(TEST(endstops.state(), A##I##_##M) && M## DIR(A)) && !locked_ ##A##I##_motor)

#define DUAL_ENDSTOP_APPLY_STEP(A,V) \
if (separate_multi_axis) { \
Expand Down Expand Up @@ -1610,7 +1610,7 @@ void Stepper::isr() {
#if MINIMUM_STEPPER_PULSE || MAXIMUM_STEPPER_RATE
#define ISR_PULSE_CONTROL 1
#endif
#if ISR_PULSE_CONTROL && DISABLED(I2S_STEPPER_STREAM)
#if ISR_PULSE_CONTROL && MULTISTEPPING_LIMIT > 1 && DISABLED(I2S_STEPPER_STREAM)
#define ISR_MULTI_STEPS 1
#endif

Expand Down Expand Up @@ -1655,10 +1655,11 @@ void Stepper::pulse_phase_isr() {
// Just update the value we will get at the end of the loop
step_events_completed += events_to_do;

// Take multiple steps per interrupt (For high speed moves)
#if ISR_MULTI_STEPS
TERN_(ISR_PULSE_CONTROL, USING_TIMED_PULSE());

// Take multiple steps per interrupt. For high speed moves.
#if ENABLED(ISR_MULTI_STEPS)
bool firstStep = true;
USING_TIMED_PULSE();
#endif
xyze_bool_t step_needed{0};

Expand Down Expand Up @@ -1944,7 +1945,7 @@ void Stepper::pulse_phase_isr() {
TERN_(I2S_STEPPER_STREAM, i2s_push_sample());

// TODO: need to deal with MINIMUM_STEPPER_PULSE over i2s
#if ISR_MULTI_STEPS
#if ISR_PULSE_CONTROL
START_TIMED_PULSE();
AWAIT_HIGH_PULSE();
#endif
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/module/temperature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ volatile bool Temperature::raw_temps_ready = false;
#endif

#if MILLISECONDS_PREHEAT_TIME > 0
millis_t Temperature::preheat_end_ms_hotend[HOTENDS]; // = { 0 };
millis_t Temperature::preheat_end_ms_hotend[HOTENDS]; // = { 0 }
#endif
#if HAS_HEATED_BED && PREHEAT_TIME_BED_MS > 0
millis_t Temperature::preheat_end_ms_bed = 0;
Expand Down Expand Up @@ -1814,7 +1814,7 @@ void Temperature::mintemp_error(const heater_id_t heater_id) {
// Make sure temperature is decreasing
if (watch_cooler.elapsed(ms)) { // Time to check the cooler?
if (degCooler() > watch_cooler.target) // Failed to decrease enough?
_temp_error(H_COOLER, GET_TEXT_F(MSG_COOLING_FAILED), GET_TEXT_F(MSG_COOLING_FAILED));
_temp_error(H_COOLER, GET_EN_TEXT_F(MSG_COOLING_FAILED), GET_TEXT_F(MSG_COOLING_FAILED));
else
start_watching_cooler(); // Start again if the target is still far off
}
Expand Down Expand Up @@ -2442,7 +2442,7 @@ void Temperature::updateTemperaturesFromRawValues() {
/**
// DEBUG PREHEATING TIME
SERIAL_ECHOLNPGM("\nExtruder = ", e, " Preheat On/Off = ", is_preheating(e));
const float test_is_preheating = (preheat_end_time[HOTEND_INDEX] - millis()) * 0.001f;
const float test_is_preheating = (preheat_end_ms_hotend[HOTEND_INDEX] - millis()) * 0.001f;
if (test_is_preheating < 31) SERIAL_ECHOLNPGM("Extruder = ", e, " Preheat remaining time = ", test_is_preheating, "s", "\n");
//*/

Expand Down
Loading

0 comments on commit 6f65b95

Please sign in to comment.