Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 9e879a5
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sun Feb 11 00:22:45 2024 +0000

    [cron] Bump distribution date (2024-02-11)

commit 9974327
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sun Feb 11 03:28:37 2024 +1300

    extend uart checks

commit 4eba643
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sat Feb 10 06:17:34 2024 +0000

    [cron] Bump distribution date (2024-02-10)

commit 8d7be79
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Feb 9 19:11:56 2024 -0600

    👷 Improve BIGTREE_GTR_V1_0 tests

commit 76b5688
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Feb 9 19:11:37 2024 -0600

    🚸 Optional encoder multipliers

commit 1e8fbb7
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Fri Feb 9 00:20:11 2024 +0000

    [cron] Bump distribution date (2024-02-09)

commit 20c6a62
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Feb 8 16:49:13 2024 -0600

    🧑‍💻 HC32 endstop interrupts for X2/Y2/Z4

commit 1d295f7
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 7 23:44:55 2024 -0600

    🔥 Clean up SCARA/TPARA

commit 669814d
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 7 23:40:54 2024 -0600

    ✨ MARLIN_SMALL_BUILD option (MarlinFirmware#26775)

commit 4aa48be
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 7 18:25:13 2024 -0600

    🚸 Adjust encoder multiplier

commit 371fb5a
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Thu Feb 8 00:20:32 2024 +0000

    [cron] Bump distribution date (2024-02-08)

commit 0829a51
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 7 18:09:36 2024 -0600

    🧑‍💻 "static_warning"

commit a3c78c4
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 7 14:00:29 2024 -0600

    🎨 Delete old FTDI Eve bootscreen

commit a321125
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 7 13:58:01 2024 -0600

    🩹 Fix FTDI Eve Touch UI M84

commit 2c8e7bd
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 7 12:07:15 2024 +0000

    [cron] Bump distribution date (2024-02-07)

commit 005d687
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Wed Feb 7 19:33:54 2024 +1300

    🔧 Restore probe XY edit defaults, remove arbitrary Z limit (MarlinFirmware#26774)

commit 3dd2234
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Feb 6 06:06:16 2024 +0000

    [cron] Bump distribution date (2024-02-06)

commit e61a84a
Author: Scott Mikutsky <smikutsky@gmail.com>
Date:   Tue Feb 6 00:37:29 2024 -0500

    🚸 Keep Filament Change near the top (MarlinFirmware#26172)

commit d8e73d3
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon Feb 5 00:21:40 2024 +0000

    [cron] Bump distribution date (2024-02-05)

commit b12340b
Author: Robherc <68039049+robherc@users.noreply.github.com>
Date:   Sun Feb 4 17:10:11 2024 -0500

    🔧 Fix extraneous DIAG warnings (MarlinFirmware#26694)

commit ec46a59
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Feb 4 16:06:43 2024 -0600

    🧑‍💻 Fix uncrustify config

commit 5003681
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Sun Feb 4 10:14:49 2024 -0800

    🩹 Fix HOTEND_IDLE_TIMEOUT with no heated bed (MarlinFirmware#26746)

commit d939692
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Sun Feb 4 10:13:03 2024 -0800

    🩹 Update BTT GTR v1.0 DIAG jumper/pin (MarlinFirmware#26764)

commit 1dee4d9
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Feb 4 12:09:08 2024 -0600

    🔧 TOUCH_IDLE_SLEEP_MINS => DISPLAY_SLEEP_MINUTES

    Follow up to MarlinFirmware#26517

commit 9364cbb
Author: Smokey Pell <brentpell81@gmail.com>
Date:   Sun Feb 4 09:37:32 2024 -0600

    🚸 Tronxy V10 w/ TFT_TRONXY_X5SA + MKS_ROBIN_TFT43 (MarlinFirmware#26747)

commit 755b661
Author: Taylor Talkington <taylor.talkington@gmail.com>
Date:   Sun Feb 4 10:03:08 2024 -0500

    🔧 Fix USE_Z_MIN conditions (MarlinFirmware#26762)

commit 7f4792e
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sun Feb 4 00:22:42 2024 +0000

    [cron] Bump distribution date (2024-02-04)

commit e6837b2
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Sat Feb 3 15:19:19 2024 -0800

    🩹 Fix STM32 HW Serial 6 (MarlinFirmware#26763)

    Followup to MarlinFirmware#26328

commit 9e21330
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sat Feb 3 00:20:49 2024 +0000

    [cron] Bump distribution date (2024-02-03)

commit c476e62
Author: Davide Rombolà <davide.rombola@gmail.com>
Date:   Fri Feb 2 02:31:39 2024 +0100

    🩹 Fix STM32 HW Serial (MarlinFirmware#26531)

    Followup to MarlinFirmware#26328

commit 4c5d783
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Fri Feb 2 00:20:22 2024 +0000

    [cron] Bump distribution date (2024-02-02)

commit 9a5cfb3
Author: Abdullah YILMAZ <h.abdullahyilmaz@hotmail.com>
Date:   Thu Feb 1 05:11:08 2024 +0300

    🌐 Turkish language update (MarlinFirmware#26739)

commit 5a87bea
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 d62f45b
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Thu Feb 1 00:21:39 2024 +0000

    [cron] Bump distribution date (2024-02-01)

commit f9d5ee0
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Thu Feb 1 07:33:42 2024 +1300

    🩹 Patch STM32 serial UUID (MarlinFirmware#26737)

    Followup to MarlinFirmware#26715

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

commit ef04680
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Wed Jan 31 06:06:35 2024 +0000

    [cron] Bump distribution date (2024-01-31)

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

    📝 Biqu => BIQU (MarlinFirmware#26735)

commit 610ea0a
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Wed Jan 31 17:56:46 2024 +1300

    🔨 No strlcpy in Windows (MarlinFirmware#26748)

commit 70d942a
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 06:06:23 2024 +0000

    [cron] Bump distribution date (2024-01-30)

commit 5639237
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 29 20:38:03 2024 -0600

    🎨 Misc. cleanup 29-01

commit 541bd26
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 29 00:21:02 2024 +0000

    [cron] Bump distribution date (2024-01-29)

commit 7a4d601
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Sun Jan 28 14:13:23 2024 -0800

    🩹 Temp constraints followup (MarlinFirmware#26744)

    Followup to cb291e8

commit bf8675b
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sun Jan 28 00:22:35 2024 +0000

    [cron] Bump distribution date (2024-01-28)

commit ebea672
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jan 27 11:45:54 2024 -0600

    🐛 Protect EEPROM bytes 916-926

    Followup to MarlinFirmware#26729

    Ender-3S1 STM32F401 Bootloader

commit ce8535f
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Jan 26 15:18:38 2024 -0600

    🧑‍💻 Fix warning, adjust tests

commit 0ba4cd2
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sat Jan 27 00:19:36 2024 +0000

    [cron] Bump distribution date (2024-01-27)

commit afc2dd6
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Jan 25 22:09:06 2024 -0600

    🎨 Misc. cleanup 25-01

commit 5768b42
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Jan 25 22:06:09 2024 -0600

    Add Conditionals_type.h

commit ee8630c
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Fri Jan 26 00:42:39 2024 +0000

    [cron] Bump distribution date (2024-01-26)

commit 01094ea
Author: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date:   Thu Jan 25 19:18:49 2024 -0500

    ✨🔨 EEPROM exclusion zone (MarlinFirmware#26729)

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

commit 6c1fd1f
Author: qwertymodo <qwertymodo@qwertymodo.com>
Date:   Thu Jan 25 16:16:32 2024 -0800

    🩹 Fix single Neo strip M150 K (MarlinFirmware#26709)

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

commit 4f65466
Author: sargonphin <85966195+sargonphin@users.noreply.github.com>
Date:   Fri Jan 26 00:48:06 2024 +0100

    🔧 HYBRID_THRESHOLD sanity checks (MarlinFirmware#26681)

commit 9b31193
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Fri Jan 26 12:39:09 2024 +1300

    🩹 Followup to EDITABLE_STEPS_PER_UNIT (MarlinFirmware#26677)

    Followup to MarlinFirmware#26618

commit 8594e94
Author: ejhoness <72996067+ejhoness@users.noreply.github.com>
Date:   Thu Jan 25 20:37:35 2024 -0300

    ✏️ Fix draw_dialog.cpp typo (MarlinFirmware#26684)

commit 16acb57
Author: Cesar Guillermo Montiel <cesarweb@hotmail.com>
Date:   Thu Jan 25 20:12:49 2024 -0300

    ✨ Creality v2.4.S4_170 (Ender 2 Pro, HC32F460KCTA) (MarlinFirmware#26730)

commit 04c8a31
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Jan 25 15:07:34 2024 -0600

    🎨 Misc. LCD pins comments

commit 3856037
Author: engrenage <32837871+petaflot@users.noreply.github.com>
Date:   Thu Jan 25 21:24:57 2024 +0100

    🔧 Allow float Z_PROBE_LOW_POINT (MarlinFirmware#26711)

commit ffbf4a6
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Jan 25 13:41:39 2024 -0600

    🩹 Fix IA Creality IDEX case

commit a215bc2
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Thu Jan 25 00:28:09 2024 +0000

    [cron] Bump distribution date (2024-01-25)

commit cbc674f
Author: minding-myown-business <jyoung12345.accounts@skiff.com>
Date:   Thu Jan 25 00:24:25 2024 +0000

    📝 Fix dead LCD link (MarlinFirmware#26669)

commit 97546bf
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Thu Jan 25 09:33:02 2024 +1300

    🚸 PLR recover chamber temp (MarlinFirmware#26696)

commit ed1391e
Author: Vovodroid <vovodroid@users.noreply.github.com>
Date:   Wed Jan 24 22:21:00 2024 +0200

    🔧 Wrap POWER_LOSS_RETRACT_LEN (MarlinFirmware#26695)

commit 7fbd9ec
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Wed Jan 24 10:55:59 2024 -0800

    🔧 Allow RAMPS FAN1_PIN override (MarlinFirmware#26725)

commit 6398902
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Wed Jan 24 10:54:37 2024 -0800

    🔧 Update SKR_MINI_SCREEN_ADAPTER error (MarlinFirmware#26726)

commit e668d5a
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Thu Jan 25 07:50:48 2024 +1300

    🔧 STM32 UID followup (MarlinFirmware#26727)

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

commit a222827
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Wed Jan 24 00:22:20 2024 +0000

    [cron] Bump distribution date (2024-01-24)

commit 3ef192e
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 23 16:05:41 2024 -0600

    🎨 Cosmetic cleanup 23-01

commit 5fea79f
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 23 16:02:33 2024 -0600

    🔧 Fix ROTATIONAL_AXIS_GANG

    Co-Authored-By: DerAndere <26200979+DerAndere1@users.noreply.github.com>

commit 18e65f5
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 23 15:55:13 2024 -0600

    🩹 Fix _U and other conflicts

    Fix MarlinFirmware#26220

commit 5ed6bf6
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 23 15:44:51 2024 -0600

    🔧 Allow for no STOP pin

    Co-Authored-By: DerAndere <26200979+DerAndere1@users.noreply.github.com>

commit d79bcef
Author: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date:   Tue Jan 23 21:09:31 2024 +0100

    🔧 Sanity check Z_CLEARANCE_FOR_HOMING (MarlinFirmware#26721)

commit f1a5340
Author: Anson Liu <ansonl@users.noreply.github.com>
Date:   Tue Jan 23 08:24:49 2024 -0800

    🚸 DOGM active extruder indicator (MarlinFirmware#26152)

commit 4309e6a
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 22 23:31:04 2024 -0600

    🧑‍💻 Fix build_all_examples

commit 0c3d1cf
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 23 00:50:39 2024 +0000

    [cron] Bump distribution date (2024-01-23)

commit aa7d571
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 22 17:32:01 2024 -0600

    ♻️ LCD pins migration precursor (MarlinFirmware#26719)

    Preliminary changes for MarlinFirmware#25650

commit 604d3e8
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 22 16:38:08 2024 -0600

    🎨 Move EXIT_M303

commit 22fc07d
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Jun 2 15:03:02 2023 -0500

    🧑‍💻 ExtUI::onPlayTone optional duration

commit dd3b5a1
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Jan 21 22:00:37 2024 -0600

    Misc. aesthetic adjustments

    Co-Authored-By: Andrew <18502096+classicrocker883@users.noreply.github.com>

commit 416f94f
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 22 00:23:03 2024 +0000

    [cron] Bump distribution date (2024-01-22)

commit 204de72
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Sun Jan 21 04:01:25 2024 -0800

    ✨ BIQU MicroProbe (MarlinFirmware#26527)

commit 80cd89d
Author: Vovodroid <vovodroid@users.noreply.github.com>
Date:   Sun Jan 21 13:11:03 2024 +0200

    🩹 Fix M592 report (MarlinFirmware#26680)

commit 624226c
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Mon Jan 22 00:09:36 2024 +1300

    🩹 Fix STM32 CPU serial UUID (MarlinFirmware#26715)

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

commit 3adf73a
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Sat Jan 20 21:47:26 2024 -0800

    🔥 Remove ALLOW_LOW_EJERK (MarlinFirmware#26712)

commit eb7b207
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sun Jan 21 00:24:10 2024 +0000

    [cron] Bump distribution date (2024-01-21)

commit d7e4536
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sat Jan 20 19:24:30 2024 +1300

    🔨 Fix POLAR build (MarlinFirmware#26687)

commit 388c701
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sat Jan 20 00:21:13 2024 +0000

    [cron] Bump distribution date (2024-01-20)

commit da96607
Author: Vovodroid <vovodroid@users.noreply.github.com>
Date:   Sat Jan 20 00:38:25 2024 +0200

    🔧 Adjust DEFAULT_EJERK settings (MarlinFirmware#26665)

commit fb49645
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sat Jan 20 08:49:35 2024 +1300

    📝 Fix Anet pins typo (MarlinFirmware#26660)

commit 7d751a2
Author: German Borisov <Borisov.German@gmail.com>
Date:   Fri Jan 19 22:17:36 2024 +0300

    ✨ Status Screen flow adjustment (MarlinFirmware#26627)

commit 9f7d5bb
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Fri Jan 19 00:22:09 2024 +0000

    [cron] Bump distribution date (2024-01-19)

commit 0df25b1
Author: Abdullah YILMAZ <h.abdullahyilmaz@hotmail.com>
Date:   Fri Jan 19 03:00:43 2024 +0300

    🌐 Update Turkish language (MarlinFirmware#26676)

commit cef623b
Author: engrenage <32837871+petaflot@users.noreply.github.com>
Date:   Fri Jan 19 00:57:46 2024 +0100

    🔧 Clarify M600 sanity-check (MarlinFirmware#26702)

commit 12434e7
Author: Andrew <18502096+classicrocker883@users.noreply.github.com>
Date:   Thu Jan 18 18:55:37 2024 -0500

    🔨 Improve CMakeLists.txt (MarlinFirmware#26700)

commit 2200607
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Wed Jan 17 06:06:41 2024 +0000

    [cron] Bump distribution date (2024-01-17)

commit c313811
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 16 23:15:04 2024 -0600

    ✨ Minor Orca update

    Followup to MarlinFirmware#26534

commit 76dce41
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 16 06:06:41 2024 +0000

    [cron] Bump distribution date (2024-01-16)

commit 1f1ca34
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 15 22:22:08 2024 -0600

    🧑‍💻 Tweak limit_and_warn

commit 8d4ab15
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 15 21:36:15 2024 -0600

    🧑‍💻 Tweak planner debug

commit 7455776
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 15 00:22:58 2024 +0000

    [cron] Bump distribution date (2024-01-15)

commit 3019af1
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jan 13 18:30:43 2024 -0600

    🔨 Make / pins-format patches

commit 8916e6f
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sun Jan 14 00:24:03 2024 +0000

    [cron] Bump distribution date (2024-01-14)

commit b2fd631
Author: Robherc <68039049+robherc@users.noreply.github.com>
Date:   Fri Jan 12 23:03:34 2024 -0500

    🔧 Fix SD connection defaults (MarlinFirmware#26666)

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

commit cadef64
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sat Jan 13 00:21:34 2024 +0000

    [cron] Bump distribution date (2024-01-13)

commit ab34971
Author: ThomasToka <117008525+ThomasToka@users.noreply.github.com>
Date:   Fri Jan 12 06:56:45 2024 +0100

    🐛 Fix PLR pos/sdpos (MarlinFirmware#26365)

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

commit 46f370a
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Fri Jan 12 00:21:50 2024 +0000

    [cron] Bump distribution date (2024-01-12)

commit 0f43ac7
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Jan 10 18:25:17 2024 -0600

    ⏪️ Revert encoder changes

    Reverts MarlinFirmware#26501

commit ef92b6c
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Thu Jan 11 00:21:50 2024 +0000

    [cron] Bump distribution date (2024-01-11)

commit f44f9eb
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Jan 10 14:49:28 2024 -0600

    🎨 Misc. style adjustments

commit 854f331
Author: plampix <plampix@users.noreply.github.com>
Date:   Wed Jan 10 07:33:54 2024 +0100

    ✨ EDITABLE_STEPS_PER_UNIT (MarlinFirmware#26618)

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

commit 1d46e67
Author: Vovodroid <vovodroid@users.noreply.github.com>
Date:   Wed Jan 10 07:13:10 2024 +0200

    ✨ PLR_BED_THRESHOLD (MarlinFirmware#26649)

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

commit 85ded0b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 9 22:41:54 2024 -0600

    🩹 Clarify servo µs min/max

commit cb291e8
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 9 22:41:00 2024 -0600

    🩹 Fix some temp constraints

commit 25caae1
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Wed Jan 10 15:55:20 2024 +1300

    🩹 Fix PID / MPC tune background tasks (MarlinFirmware#26652)

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

commit 12d7995
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 9 18:45:17 2024 -0600

    🎨 Minor temp / UI refactor

commit 320b7a9
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Wed Jan 10 00:21:58 2024 +0000

    [cron] Bump distribution date (2024-01-10)

commit a533e9e
Author: Vovodroid <vovodroid@users.noreply.github.com>
Date:   Tue Jan 9 23:42:08 2024 +0200

    🩹 Fix edit Z jerk step size (MarlinFirmware#26650)

    Followup to MarlinFirmware#25514

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

commit f6ecdae
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Wed Jan 10 10:19:47 2024 +1300

    🔧 Base NUM_SERVO_PLUGS on SERVO PINS (MarlinFirmware#26640)

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

commit 477b70e
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 9 00:22:16 2024 +0000

    [cron] Bump distribution date (2024-01-09)

commit b2dd2dc
Author: narno2202 <130909513+narno2202@users.noreply.github.com>
Date:   Mon Jan 8 05:26:34 2024 +0100

    🚸 FT Motion M493 report less precision (MarlinFirmware#26643)

commit b106f59
Author: narno2202 <130909513+narno2202@users.noreply.github.com>
Date:   Mon Jan 8 05:17:43 2024 +0100

    🐛 Refine FT Motion, I2S Stepping (MarlinFirmware#26628)

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

commit 38f483c
Author: mikemerryguy <57319047+mikemerryguy@users.noreply.github.com>
Date:   Sun Jan 7 23:14:24 2024 -0500

    🩹 Skip post-G28 XY move for untrusted X or Y (MarlinFirmware#26644)

    Followup to MarlinFirmware#26469

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

commit f4eafed
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Jan 7 21:59:25 2024 -0600

    🔧 Z_PROBE_END_SCRIPT => EVENT_GCODE_AFTER_G29

commit 5987a54
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Jan 7 19:34:34 2024 -0600

    🎨 Use float CEIL/FLOOR

commit 3a888e9
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 8 00:30:52 2024 +0000

    [cron] Bump distribution date (2024-01-08)

commit 4cddc61
Author: Alexander Gavrilenko <jmz52@users.noreply.github.com>
Date:   Mon Jan 8 03:18:18 2024 +0300

    🐛 Fix SPI TFT for STM32F1/F4 (MarlinFirmware#26052)

commit 2a8c00b
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sat Jan 6 00:21:22 2024 +0000

    [cron] Bump distribution date (2024-01-06)

commit 4ae2a76
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Jan 5 12:34:50 2024 -0600

    🎨 Clean up ws

commit a5d097a
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Jan 4 18:50:23 2024 -0600

    ✏️ Fix CTC_A10S_A13 typo

    Followup to MarlinFirmware#26514

commit 5e0a8d2
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Fri Jan 5 00:21:26 2024 +0000

    [cron] Bump distribution date (2024-01-05)

commit 994aa9f
Author: plampix <plampix@users.noreply.github.com>
Date:   Fri Jan 5 00:09:53 2024 +0100

    ⚡️ Slimmer null T command (MarlinFirmware#26615)

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

commit 6e67ad5
Author: Andrew <18502096+classicrocker883@users.noreply.github.com>
Date:   Thu Jan 4 18:07:53 2024 -0500

    🎨 Followup to optional M111/M115 (MarlinFirmware#26626)

    Followup to MarlinFirmware#26603

commit 52693f7
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Jan 4 13:01:45 2024 -0600

    🎨 Clean up some checks & includes

commit 991f433
Author: Jason Smith <jason.inet@gmail.com>
Date:   Wed Jan 3 19:14:17 2024 -0800

    🐛 Fix hangs in DUE native USB (MarlinFirmware#26572)

commit 54b7da1
Author: Taylor Talkington <taylor.talkington@gmail.com>
Date:   Wed Jan 3 21:45:50 2024 -0500

    🩹 Fix Bed PID Autotune output (MarlinFirmware#26606)

    Followup to MarlinFirmware#25928

commit f8771e9
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Thu Jan 4 00:21:47 2024 +0000

    [cron] Bump distribution date (2024-01-04)

commit be1dee7
Author: Orel <37673727+0r31@users.noreply.github.com>
Date:   Wed Jan 3 21:02:20 2024 +0100

    🎨 Clean up old #includes (MarlinFirmware#26621)

commit 68b7802
Author: narno2202 <130909513+narno2202@users.noreply.github.com>
Date:   Wed Jan 3 20:19:19 2024 +0100

    📝 Update M493 (FT_MOTION) comments (MarlinFirmware#26620)

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

commit 6d40776
Author: plampix <plampix@users.noreply.github.com>
Date:   Wed Jan 3 16:43:18 2024 +0100

    🔧 CONFIGURE_FILAMENT_CHANGE - Optional M603 (MarlinFirmware#26613)

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

commit 4a9e102
Author: I3DBeeTech <129617321+I3DBeeTech@users.noreply.github.com>
Date:   Wed Jan 3 06:23:41 2024 +0530

    📺 I3DBEE TECH Beez Mini 12864 (MarlinFirmware#26596)

commit 1ac6428
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Wed Jan 3 13:52:12 2024 +1300

    🔪 Options to slim M111, remove M115 (MarlinFirmware#26603)

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

commit 7c159a2
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Wed Jan 3 00:21:14 2024 +0000

    [cron] Bump distribution date (2024-01-03)

commit 5b74e25
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Tue Jan 2 20:25:26 2024 +1300

    🔨 BSD string workaround (MarlinFirmware#26532)

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

commit f02fa63
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 2 00:21:06 2024 +0000

    [cron] Bump distribution date (2024-01-02)

commit 3b6f1bf
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 1 00:50:46 2024 -0600

    🧑‍💻 Update pinsformat

commit 1d61571
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Dec 31 03:30:53 2023 -0600

    🧑‍💻 Python version of pins formatting script

commit 99c5702
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 1 00:24:20 2024 +0000

    [cron] Bump distribution date (2024-01-01)

commit 13e82fa
Author: nagubash <40751501+nagendras176@users.noreply.github.com>
Date:   Mon Jan 1 02:33:04 2024 +0530

    🔨 Fix formatting issue in Makefile (MarlinFirmware#26599)

commit 95878df
Author: narno2202 <130909513+narno2202@users.noreply.github.com>
Date:   Sun Dec 31 22:00:57 2023 +0100

    🐛 Fix homing with FT_MOTION (MarlinFirmware#26595)

commit 5d1ede0
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sun Dec 31 22:54:26 2023 +1300

    ✨ CTC_A10S_A13 (MarlinFirmware#26514)
  • Loading branch information
@smiksky
smiksky committed Feb 16, 2024
1 parent 3f864d7 commit 68a305c
Show file tree
Hide file tree
Showing 76 changed files with 355 additions and 201 deletions.
26 changes: 12 additions & 14 deletions Marlin/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1006,9 +1006,6 @@
// Radius around the center where the arm cannot reach
#define MIDDLE_DEAD_ZONE_R 0 // (mm)

#define THETA_HOMING_OFFSET 0 // Calculated from Calibration Guide and M360 / M114. See https://www.morgan3dp.com/morgan-calibration-guide/
#define PSI_HOMING_OFFSET 0 // Calculated from Calibration Guide and M364 / M114. See https://www.morgan3dp.com/morgan-calibration-guide/

#elif ENABLED(MP_SCARA)

#define SCARA_OFFSET_THETA1 12 // degrees
Expand All @@ -1027,23 +1024,19 @@
#define DEFAULT_SEGMENTS_PER_SECOND 200

// Length of inner and outer support arms. Measure arm lengths precisely.
#define TPARA_LINKAGE_1 120 // (mm)
#define TPARA_LINKAGE_2 120 // (mm)
#define TPARA_LINKAGE_1 120 // (mm)
#define TPARA_LINKAGE_2 120 // (mm)

// SCARA tower offset (position of Tower relative to bed zero position)
// This needs to be reasonably accurate as it defines the printbed position in the SCARA space.
#define TPARA_OFFSET_X 0 // (mm)
#define TPARA_OFFSET_Y 0 // (mm)
#define TPARA_OFFSET_Z 0 // (mm)
// TPARA tower offset (position of Tower relative to bed zero position)
// This needs to be reasonably accurate as it defines the printbed position in the TPARA space.
#define TPARA_OFFSET_X 0 // (mm)
#define TPARA_OFFSET_Y 0 // (mm)
#define TPARA_OFFSET_Z 0 // (mm)

#define FEEDRATE_SCALING // Convert XY feedrate from mm/s to degrees/s on the fly

// Radius around the center where the arm cannot reach
#define MIDDLE_DEAD_ZONE_R 0 // (mm)

// Calculated from Calibration Guide and M360 / M114. See https://www.morgan3dp.com/morgan-calibration-guide/
#define THETA_HOMING_OFFSET 0
#define PSI_HOMING_OFFSET 0
#endif

// @section polar
Expand Down Expand Up @@ -1241,6 +1234,11 @@
*/
#define EDITABLE_STEPS_PER_UNIT

/**
* Enable support for M92. Disable to save at least ~530 bytes of flash.
*/
#define EDITABLE_STEPS_PER_UNIT

/**
* Default Max Feed Rate (linear=mm/s, rotational=°/s)
* Override with M203
Expand Down
3 changes: 3 additions & 0 deletions Marlin/Configuration_adv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4531,3 +4531,6 @@

// Report uncleaned reset reason from register r2 instead of MCUSR. Supported by Optiboot on AVR.
//#define OPTIBOOT_RESET_REASON

// Shrink the build for smaller boards by sacrificing some serial feedback
//#define MARLIN_SMALL_BUILD
2 changes: 1 addition & 1 deletion Marlin/Version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-04"
//#define STRING_DISTRIBUTION_DATE "2024-02-11"

/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
Expand Down
20 changes: 19 additions & 1 deletion Marlin/src/HAL/HC32/endstop_interrupts.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,15 @@ void endstopIRQHandler() {
CHECK(X_MAX);
CHECK(X_MIN);

CHECK(X2_MAX);
CHECK(X2_MIN);

CHECK(Y_MAX);
CHECK(Y_MIN);

CHECK(Y2_MAX);
CHECK(Y2_MIN);

CHECK(Z_MAX);
CHECK(Z_MIN);

Expand All @@ -52,6 +58,9 @@ void endstopIRQHandler() {
CHECK(Z3_MAX);
CHECK(Z3_MIN);

CHECK(Z4_MAX);
CHECK(Z4_MIN);

CHECK(Z_MIN_PROBE);

// Update endstops
Expand All @@ -69,9 +78,15 @@ void setup_endstop_interrupts() {
SETUP(X_MAX);
SETUP(X_MIN);

SETUP(X2_MAX);
SETUP(X2_MIN);

SETUP(Y_MAX);
SETUP(Y_MIN);

SETUP(Y2_MAX);
SETUP(Y2_MIN);

SETUP(Z_MAX);
SETUP(Z_MIN);

Expand All @@ -81,14 +96,17 @@ void setup_endstop_interrupts() {
SETUP(Z3_MAX);
SETUP(Z3_MIN);

SETUP(Z4_MAX);
SETUP(Z4_MIN);

SETUP(Z_MIN_PROBE);

#undef SETUP
}

// Ensure 1 - 10 IRQs are registered
// Disable some endstops if you encounter this error
#define ENDSTOPS_INTERRUPTS_COUNT COUNT_ENABLED(USE_X_MAX, USE_X_MIN, USE_Y_MAX, USE_Y_MIN, USE_Z_MAX, USE_Z_MIN, USE_Z2_MAX, USE_Z2_MIN, USE_Z3_MAX, USE_Z3_MIN, USE_Z_MIN_PROBE)
#define ENDSTOPS_INTERRUPTS_COUNT COUNT_ENABLED(USE_X_MAX, USE_X_MIN, USE_X2_MAX, USE_X2_MIN, USE_Y_MAX, USE_Y_MIN, USE_Y2_MAX, USE_Y2_MIN, USE_Z_MAX, USE_Z_MIN, USE_Z2_MAX, USE_Z2_MIN, USE_Z3_MAX, USE_Z3_MIN, USE_Z4_MAX, USE_Z4_MIN, USE_Z_MIN_PROBE)
#if ENDSTOPS_INTERRUPTS_COUNT > 10
#error "Too many endstop interrupts! HC32F460 only supports 10 endstop interrupts."
#elif ENDSTOPS_INTERRUPTS_COUNT == 0
Expand Down
5 changes: 3 additions & 2 deletions Marlin/src/HAL/STM32/inc/SanityCheck.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@
* Check for common serial pin conflicts
*/
#define _CHECK_SERIAL_PIN(N) (( \
BTN_EN1 == N || DOGLCD_CS == N || HEATER_BED_PIN == N || FAN0_PIN == N || \
SDIO_D2_PIN == N || SDIO_D3_PIN == N || SDIO_CK_PIN == N || SDIO_CMD_PIN == N \
BTN_EN1 == N || BTN_EN2 == N ||DOGLCD_CS == N || HEATER_BED_PIN == N || FAN0_PIN == N || \
SDIO_D2_PIN == N || SDIO_D3_PIN == N || SDIO_CK_PIN == N || SDIO_CMD_PIN == N || \
Y_STEP_PIN == N || Y_ENABLE_PIN == N || E0_ENABLE_PIN == N || POWER_LOSS_PIN == N \
))
#define CHECK_SERIAL_PIN(T,N) defined(UART##N##_##T##_PIN) && _CHECK_SERIAL_PIN(UART##N##_##T##_PIN)
#if SERIAL_IN_USE(1)
Expand Down
15 changes: 9 additions & 6 deletions Marlin/src/core/drivers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@
#define HAS_TMC220x 1
#endif

#if HAS_DRIVER(TMC26X)
#define HAS_TMC26X 1
#endif

#define AXIS_IS_TMC(A) ( AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
|| AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) \
|| AXIS_DRIVER_TYPE(A,TMC2660) \
Expand Down Expand Up @@ -184,10 +188,9 @@
#if ANY_AXIS_HAS(SPI)
#define HAS_TMC_SPI 1
#endif

//
// TMC26XX Stepper Drivers
//
#if HAS_DRIVER(TMC26X)
#define HAS_TMC26X 1
#if HAS_STALLGUARD || HAS_DRIVER(TMC2160_STANDALONE) || HAS_DRIVER(TMC2130_STANDALONE) \
|| HAS_DRIVER(TMC2209_STANDALONE) || HAS_DRIVER(TMC26X) \
|| HAS_DRIVER(TMC26X_STANDALONE) || HAS_DRIVER(TMC2660_STANDALONE) \
|| HAS_DRIVER(TMC5130_STANDALONE) || HAS_DRIVER(TMC5160_STANDALONE)
#define HAS_DIAG_PINS 1
#endif
6 changes: 6 additions & 0 deletions Marlin/src/feature/fwretract.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ void FWRetract::M207() {
}

void FWRetract::M207_report() {
TERN_(MARLIN_SMALL_BUILD, return);

SERIAL_ECHOLNPGM_P(
PSTR(" M207 S"), LINEAR_UNIT(settings.retract_length)
, PSTR(" W"), LINEAR_UNIT(settings.swap_retract_length)
Expand All @@ -237,6 +239,8 @@ void FWRetract::M208() {
}

void FWRetract::M208_report() {
TERN_(MARLIN_SMALL_BUILD, return);

SERIAL_ECHOLNPGM(
" M208 S", LINEAR_UNIT(settings.retract_recover_extra)
, " W", LINEAR_UNIT(settings.swap_retract_recover_extra)
Expand All @@ -258,6 +262,8 @@ void FWRetract::M208_report() {
}

void FWRetract::M209_report() {
TERN_(MARLIN_SMALL_BUILD, return);

SERIAL_ECHOLNPGM(" M209 S", AS_DIGIT(autoretract_enabled));
}

Expand Down
24 changes: 12 additions & 12 deletions Marlin/src/gcode/bedlevel/G26.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ void GcodeSuite::G26() {

if (bedtemp) {
if (!WITHIN(bedtemp, 40, BED_MAX_TARGET)) {
SERIAL_ECHOLNPGM("?Specified bed temperature not plausible (40-", BED_MAX_TARGET, "C).");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified bed temperature not plausible (40-", BED_MAX_TARGET, "C)."));
return;
}
g26.bed_temp = bedtemp;
Expand All @@ -543,7 +543,7 @@ void GcodeSuite::G26() {
if (parser.seenval('L')) {
g26.layer_height = parser.value_linear_units();
if (!WITHIN(g26.layer_height, 0.0, 2.0)) {
SERIAL_ECHOLNPGM("?Specified layer height not plausible.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified layer height not plausible."));
return;
}
}
Expand All @@ -552,20 +552,20 @@ void GcodeSuite::G26() {
if (parser.has_value()) {
g26.retraction_multiplier = parser.value_float();
if (!WITHIN(g26.retraction_multiplier, 0.05, 15.0)) {
SERIAL_ECHOLNPGM("?Specified Retraction Multiplier not plausible.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified Retraction Multiplier not plausible."));
return;
}
}
else {
SERIAL_ECHOLNPGM("?Retraction Multiplier must be specified.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Retraction Multiplier must be specified."));
return;
}
}

if (parser.seenval('S')) {
g26.nozzle = parser.value_float();
if (!WITHIN(g26.nozzle, 0.1, 2.0)) {
SERIAL_ECHOLNPGM("?Specified nozzle size not plausible.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified nozzle size not plausible."));
return;
}
}
Expand All @@ -575,15 +575,15 @@ void GcodeSuite::G26() {
#if HAS_MARLINUI_MENU
g26.prime_flag = -1;
#else
SERIAL_ECHOLNPGM("?Prime length must be specified when not using an LCD.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Prime length must be specified when not using an LCD."));
return;
#endif
}
else {
g26.prime_flag++;
g26.prime_length = parser.value_linear_units();
if (!WITHIN(g26.prime_length, 0.0, 25.0)) {
SERIAL_ECHOLNPGM("?Specified prime length not plausible.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified prime length not plausible."));
return;
}
}
Expand All @@ -592,7 +592,7 @@ void GcodeSuite::G26() {
if (parser.seenval('F')) {
g26.filament_diameter = parser.value_linear_units();
if (!WITHIN(g26.filament_diameter, 1.0, 4.0)) {
SERIAL_ECHOLNPGM("?Specified filament size not plausible.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified filament size not plausible."));
return;
}
}
Expand All @@ -616,7 +616,7 @@ void GcodeSuite::G26() {
// If any preset or temperature was specified
if (noztemp) {
if (!WITHIN(noztemp, 165, thermalManager.hotend_max_target(active_extruder))) {
SERIAL_ECHOLNPGM("?Specified nozzle temperature not plausible.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified nozzle temperature not plausible."));
return;
}
g26.hotend_temp = noztemp;
Expand All @@ -637,20 +637,20 @@ void GcodeSuite::G26() {
if (parser.seen('R'))
g26_repeats = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS + 1;
else {
SERIAL_ECHOLNPGM("?(R)epeat must be specified when not using an LCD.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("(R)epeat must be specified when not using an LCD."));
return;
}
#endif
if (g26_repeats < 1) {
SERIAL_ECHOLNPGM("?(R)epeat value not plausible; must be at least 1.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("(R)epeat value not plausible; must be at least 1."));
return;
}

// Set a position with 'X' and/or 'Y'. Default: current_position
g26.xy_pos.set(parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position.x,
parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position.y);
if (!position_is_reachable(g26.xy_pos)) {
SERIAL_ECHOLNPGM("?Specified X,Y coordinate out of bounds.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Specified X,Y coordinate out of bounds."));
return;
}

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/bedlevel/G35.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void GcodeSuite::G35() {

const uint8_t screw_thread = parser.byteval('S', TRAMMING_SCREW_THREAD);
if (!WITHIN(screw_thread, 30, 51) || screw_thread % 10 > 1) {
SERIAL_ECHOLNPGM("?(S)crew thread must be 30, 31, 40, 41, 50, or 51.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("(S)crew thread must be 30, 31, 40, 41, 50, or 51."));
return;
}

Expand Down
9 changes: 5 additions & 4 deletions Marlin/src/gcode/bedlevel/M420.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,12 @@ void GcodeSuite::M420() {
const int16_t a = settings.calc_num_meshes();

if (!a) {
SERIAL_ECHOLNPGM("?EEPROM storage not available.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("EEPROM storage not available."));
return;
}

if (!WITHIN(storage_slot, 0, a - 1)) {
SERIAL_ECHOLNPGM("?Invalid storage slot.");
SERIAL_ECHOLNPGM("?Use 0 to ", a - 1);
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Invalid storage slot. Use 0 to ", a - 1));
return;
}

Expand All @@ -120,7 +119,7 @@ void GcodeSuite::M420() {

#else

SERIAL_ECHOLNPGM("?EEPROM storage not available.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("EEPROM storage not available."));
return;

#endif
Expand Down Expand Up @@ -245,6 +244,8 @@ void GcodeSuite::M420() {
}

void GcodeSuite::M420_report(const bool forReplay/*=true*/) {
TERN_(MARLIN_SMALL_BUILD, return);

report_heading_etc(forReplay, F(
TERN(MESH_BED_LEVELING, "Mesh Bed Leveling", TERN(AUTO_BED_LEVELING_UBL, "Unified Bed Leveling", "Auto Bed Leveling"))
));
Expand Down
8 changes: 4 additions & 4 deletions Marlin/src/gcode/bedlevel/abl/G29.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ G29_TYPE GcodeSuite::G29() {

abl.verbose_level = parser.intval('V');
if (!WITHIN(abl.verbose_level, 0, 4)) {
SERIAL_ECHOLNPGM("?(V)erbose level implausible (0-4).");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("(V)erbose level implausible (0-4)."));
G29_RETURN(false, false);
}

Expand All @@ -365,11 +365,11 @@ G29_TYPE GcodeSuite::G29() {
if (parser.seenval('P')) abl.grid_points.x = abl.grid_points.y = parser.value_int();

if (!WITHIN(abl.grid_points.x, 2, GRID_MAX_POINTS_X)) {
SERIAL_ECHOLNPGM("?Probe points (X) implausible (2-" STRINGIFY(GRID_MAX_POINTS_X) ").");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Probe points (X) implausible (2-" STRINGIFY(GRID_MAX_POINTS_X) ")."));
G29_RETURN(false, false);
}
if (!WITHIN(abl.grid_points.y, 2, GRID_MAX_POINTS_Y)) {
SERIAL_ECHOLNPGM("?Probe points (Y) implausible (2-" STRINGIFY(GRID_MAX_POINTS_Y) ").");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG("Probe points (Y) implausible (2-" STRINGIFY(GRID_MAX_POINTS_Y) ")."));
G29_RETURN(false, false);
}

Expand Down Expand Up @@ -404,7 +404,7 @@ G29_TYPE GcodeSuite::G29() {
DEBUG_ECHOLNPGM("G29 L", abl.probe_position_lf.x, " R", abl.probe_position_rb.x,
" F", abl.probe_position_lf.y, " B", abl.probe_position_rb.y);
}
SERIAL_ECHOLNPGM("? (L,R,F,B) out of bounds.");
SERIAL_ECHOLNPGM(GCODE_ERR_MSG(" (L,R,F,B) out of bounds."));
G29_RETURN(false, false);
}

Expand Down
Loading

0 comments on commit 68a305c

Please sign in to comment.