Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 0a30fac
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue May 16 14:01:35 2023 -0500

    🔖 Version 2.1.2.1

commit cbdc01e
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon May 29 19:23:21 2023 -0500

    🩹 Prevent Z drop with G28 X/Y

commit 2dffa39
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun May 21 08:41:01 2023 -0500

    🩹 Fix TFT LVGL compile error (MarlinFirmware#25865)

    Fixes regression from MarlinFirmware#24302

commit 09247e7
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri May 19 23:30:48 2023 -0500

    🚸 Improve EEPROM validation (MarlinFirmware#25860)

commit 62a7bba
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu May 18 19:53:03 2023 -0500

    🩹 Fix null pwm_details

commit ce38260
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue May 16 01:28:04 2023 -0500

    🩹 Improve edit menu rounding

commit 3ad9c0b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue May 2 18:15:23 2023 -0500

    🧑‍💻 ftdi_language

commit a0fd588
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun May 14 18:08:33 2023 -0500

    📌 TH3D EZBoard SD_DETECT_PIN 27

commit 876f996
Author: Chris Bagwell <chris@cnpbagwell.com>
Date:   Wed May 10 05:59:28 2023 -0500

    🔧 Fix SHAPING_MIN_FREQ check (MarlinFirmware#25358)

commit dba521a
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun May 14 18:32:59 2023 -0500

    🧑‍💻 M43 updates

commit 50ad323
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Tue May 9 22:52:59 2023 +0200

    🔧 Move SOFT_PWM_SCALE fallback to cpp (MarlinFirmware#25800)

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

commit 03149b9
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat May 6 17:37:47 2023 -0500

    🚸 Faster default Marlin feedrate

commit 6e91f36
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Mon May 8 23:54:46 2023 +1200

    🔨 MKS Robin2 PIO Env (MarlinFirmware#25792)

commit 0708275
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu May 4 18:05:56 2023 -0500

    🎨 Move G28O inside ProUI

commit a2040ba
Author: Scott Mikutsky <smikutsky@gmail.com>
Date:   Mon May 1 02:10:46 2023 -0400

    🐛 Fix STM32 USB disconnect behavior (MarlinFirmware#25762)

commit b6c27fb
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 30 18:12:13 2023 -0500

    🔧 Fix X2/Y2 axis pins check

commit b2acd51
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Apr 28 11:03:38 2023 -0500

    🔧 Move MMU section

commit 6d46a49
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon May 1 18:15:31 2023 -0500

    🩹 Fix TFT sanity error

commit d959e3b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 30 18:12:21 2023 -0500

    🧑‍💻 Use NUM_AXIS_ARRAY

commit f48467b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Apr 26 14:39:56 2023 -0500

    🔨 Servo Timer 1 with STM32F103RC_fysetc (MarlinFirmware#25741)

commit a9c476c
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue May 16 18:43:44 2023 -0500

    🔧 Update config.ini script

commit 61d1ce7
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Apr 26 14:29:21 2023 -0500

    🧑‍💻 Change HAL_PATH macro for easier HAL relocation (MarlinFirmware#25743)

commit 3c9e8e1
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Apr 26 02:57:53 2023 -0500

    🔧 Extra axis endstop defaults

commit d554855
Author: Anson Liu <ansonl@users.noreply.github.com>
Date:   Mon Apr 24 22:07:12 2023 -0400

    🔨 Prevent SlowSoftWire + Wire name conflict (MarlinFirmware#25707)

commit 44b06d7
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Apr 24 05:24:10 2023 -0500

    📝 Developer note in boards.h

commit ffe47a0
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 23 03:17:55 2023 -0500

    🚸 Improve PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED (MarlinFirmware#25681)

commit 6a12937
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 23 02:07:42 2023 -0500

    🩹 Fix UBL safe measure move with extra axes

    Followup to 7e79fc5

commit 00c96dc
Author: Alexey D. Filimonov <alexey@filimonic.net>
Date:   Sat Apr 22 12:06:19 2023 +0300

    🎨 Clean up TFT Color UI display items (MarlinFirmware#25712)

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

commit 7fb92f4
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Wed Apr 19 17:21:53 2023 -0700

    🚸 Permit G38 with Core (MarlinFirmware#25713)

commit a93b3c1
Author: Jay Robson <45777442+jsrobson10@users.noreply.github.com>
Date:   Thu Apr 20 06:58:42 2023 +1000

    🐛 Fix G38 with Z, support 9 axes (MarlinFirmware#25691)

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

commit d75e016
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Wed Apr 19 14:53:11 2023 -0700

    🔧 Check renamed LIN_ADVANCE_K (MarlinFirmware#25710)

commit 5426759
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Wed Apr 19 12:50:11 2023 +1200

    🩹 Correctly add JSON to mc.zip (MarlinFirmware#25706)

commit a5b5db4
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Apr 16 19:11:56 2023 -0500

    🧑‍💻 Minor SpindleLaser::set_enabled tweak

commit 15671a4
Author: Alexey D. Filimonov <alexey@filimonic.net>
Date:   Mon Apr 17 02:38:12 2023 +0300

    🩹 Fix Spindle/Laser ENA pin test (MarlinFirmware#25622)

commit f62d47a
Author: Bob Kuhn <bob.kuhn@att.net>
Date:   Sun Apr 16 18:35:13 2023 -0500

    🩹 Fix laser with no PWM compile (MarlinFirmware#25290)

commit 5b8be44
Author: Dennis Lawler <4824647+drawlerr@users.noreply.github.com>
Date:   Sat Apr 15 22:50:26 2023 -0600

    🚸 Echo G30 out-of-bounds (MarlinFirmware#25671)

commit df7d13a
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Tue Apr 18 10:40:13 2023 +0200

    🩹 Bail on 'mc.zip' write error (MarlinFirmware#25695)

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

commit 8592035
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Tue Apr 18 07:51:25 2023 +1200

    🔨 Fix, clean up STM32F1 envs (MarlinFirmware#25697)

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

commit 5a38066
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Sun Apr 16 03:26:08 2023 +0200

    🐛 Fix Configuration Embedding (MarlinFirmware#25688)

commit 0ece7ca
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sun Apr 23 08:59:51 2023 +1200

    🩹 Status / Host Prompt followup (MarlinFirmware#25720)

    Followup to MarlinFirmware#25679

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

commit 2fb47af
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Apr 14 18:06:56 2023 -0500

    🧑‍💻 HostUI::continue_prompt method

commit d2e84e8
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Apr 14 17:51:45 2023 -0500

    🧑‍💻 Status Message cleanup

commit 3340491
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Apr 14 18:00:25 2023 -0500

    🧑‍💻 JyersUI code cleanup

commit d399101
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Apr 14 18:09:16 2023 -0500

    🧑‍💻 Apply simplified ?:

commit 02178bd
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Apr 14 22:22:07 2023 -0500

    🔧 Trigorilla / Chiron updates

    Followup to c3f34e4

commit 8bc6f77
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Apr 13 04:06:35 2023 -0500

    🔨 Improve runout script check

commit 141cfdd
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Apr 13 04:05:56 2023 -0500

    🩹 Fix AUTOFAN_CASE

    Followup to MarlinFirmware#25554

commit 4781d57
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Apr 11 21:28:21 2023 -0500

    🔧 Move FIL_RUNOUT_PIN for Chiron + GLCD

commit 6ebbfa8
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Apr 11 18:43:18 2023 -0500

    🧑‍💻 Clarify G28 R / R0

commit cbbcc01
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Apr 11 21:26:46 2023 -0500

    🚸 Minor M43 improvements

commit b5ccd65
Author: David Fries <David@Fries.net>
Date:   Mon Apr 10 04:38:38 2023 -0500

    ⚡️ Skip a redundant BLTouch::command (MarlinFirmware#25656)

commit cf1f56f
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Mar 26 20:26:18 2023 -0500

    🔧 Move TFT sanity checks

commit 1e2de0e
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Apr 7 01:49:27 2023 -0500

    🎨 Detab some build files

commit cf28f48
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Apr 7 01:33:03 2023 -0500

    🎨 Apply const (MarlinFirmware#25643)

commit 69e8f2e
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Fri Apr 7 18:32:25 2023 +1200

    🚸 Support CoreXY without Z (MarlinFirmware#25630)

commit 2be9f98
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Apr 6 17:24:32 2023 -0500

    📝 Update Ender # labels

commit c2c1ff8
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Apr 6 16:58:12 2023 -0500

    🧑‍💻 Update pinsformat.js

commit e240874
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Apr 4 20:46:46 2023 -0500

    🐛 Ensure root for 'M503 C'

commit 6412950
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Sat Apr 1 06:19:48 2023 +0200

    🌐 Update Italian language (MarlinFirmware#25587)

commit 466ce0b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Aug 16 13:44:00 2021 -0500

    🩹 Fix displayed mix percentages

commit 59a2cb0
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Mar 29 21:50:04 2023 -0500

    🩹 Fix Ender-3 V2 with no fan

commit 85e28f3
Author: Chris Pepper <p3p@p3psoft.co.uk>
Date:   Wed Mar 29 05:45:22 2023 +0100

    🔨 MarlinSimUI updates (MarlinFirmware#25589)

commit bbb75ab
Author: John Unland <junland.foss@gmail.com>
Date:   Tue Mar 28 23:23:27 2023 -0500

    🔨 Improve Docker local tests support (MarlinFirmware#25583)

commit 637cd95
Author: Andrew <18502096+classicrocker883@users.noreply.github.com>
Date:   Wed Mar 29 00:20:52 2023 -0400

    🎨 Remove unused ProUI : UBLValidMesh (MarlinFirmware#25591)

commit d04b3ff
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Mar 28 16:14:37 2023 -0500

    🔧 Fix up WiFi options (MarlinFirmware#25586)

commit 51b33cc
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Mar 24 03:01:09 2023 -0500

    🔨 INI Updates

    Co-Authored-By: Martin Turski <turningtides@outlook.de>

commit f452df0
Author: Eduard Sukharev <sukharev.eh@gmail.com>
Date:   Mon Mar 27 21:55:56 2023 +0300

    🐛 Fix M23 long filename support (MarlinFirmware#25540)

commit cd0bfcd
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Mar 26 04:36:12 2023 -0500

    🧑‍💻 Auto Fan / Cooler Fan updates (MarlinFirmware#25554)

commit bcf3098
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Sun Mar 26 02:09:27 2023 -0700

    🩹 Fix Touch Calibration first point (MarlinFirmware#25298)

commit a40e17d
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Mar 25 20:17:54 2023 -0500

    🎨 Timer tweaks

commit d66f4ba
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sat Mar 25 17:14:21 2023 +1300

    🩹 Fix Chitu3D V6 default probe pin (MarlinFirmware#25552)

commit 26cb2d5
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Mar 24 18:43:53 2023 -0500

    🩹 Update TRONXY_V10 SPI_FLASH pins

commit 376e940
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Mar 24 02:43:20 2023 -0500

    🎨 LPC_SOFTWARE_SPI => SOFTWARE_SPI

    Co-Authored-By: Martin Turski <turningtides@outlook.de>

commit ebe3fe0
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Mar 24 02:40:29 2023 -0500

    🎨 Pins header comments

    Co-Authored-By: Martin Turski <turningtides@outlook.de>

commit 0d7e30b
Author: Martin Turski <turningtides@outlook.de>
Date:   Fri Mar 24 05:08:28 2023 +0100

    🩹 Reset touch screen calibration on failure (MarlinFirmware#25334)

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

commit accfab8
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Mar 23 17:19:20 2023 -0500

    🎨 calibration_stage => stage

commit d68ad9e
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Mar 18 21:57:06 2023 -0500

    🩹 Fix a serial_ternary

commit 70c8859
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sun Mar 19 13:17:21 2023 +1300

    🩹 Fix Ender 2 stock LCD (MarlinFirmware#25538)

commit 980fba8
Author: George Fu <nailao_5918@163.com>
Date:   Sat Mar 18 17:47:54 2023 +0800

    🐛 Fix FYSETC Cheetah v2.0 Servo/Probe pins (MarlinFirmware#24635)

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

commit d0bdb9c
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Mar 18 17:13:06 2023 -0500

    ⚡️ Misc. optimizations

commit 821d796
Author: Davide Rombolà <davide.rombola@gmail.com>
Date:   Sat Mar 18 07:35:54 2023 +0100

    🎨 Suppress warning (MarlinFirmware#25529)

commit dcbba65
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Mar 18 01:22:50 2023 -0500

    🧑‍💻 More IntelliSense-friendly declares

commit 5c3dd46
Author: Michael Hill <mhill@hillsoftware.com>
Date:   Sat Mar 18 01:56:07 2023 -0400

    ✨ Sovol v1.3.1 (Sovol SV06) (MarlinFirmware#25267)

commit e50980e
Author: dwzg <50058606+dwzg@users.noreply.github.com>
Date:   Thu Mar 16 01:15:54 2023 +0100

    🩹 Fix DWIN MarlinUI Fan/E/XY (MarlinFirmware#25502)

commit c3b037e
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Mar 15 19:13:09 2023 -0500

    🩹 Fan Menu / Status fixes

    Followup to MarlinFirmware#21888

commit 71e6f70
Author: Abdullah YILMAZ <h.abdullahyilmaz@hotmail.com>
Date:   Mon Mar 6 01:29:43 2023 +0300

    🌐 Update Turkish language (MarlinFirmware#25447)

commit 7f9f922
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Fri Mar 3 21:27:15 2023 +0100

    🌐 Update Italian language (MarlinFirmware#25454)

commit 197b319
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Mar 3 13:42:46 2023 -0600

    📝 Fix a comment

commit e03dfb8
Author: jamespearson04 <jamespearson04@hotmail.co.uk>
Date:   Fri Mar 3 20:26:38 2023 +0000

    🐛 Fix UBL 'G29 J' mesh tilt (MarlinFirmware#25453)

    Fix regression from MarlinFirmware#24214

commit cba3b2c
Author: Marcio T <mlt4356-github@yahoo.com>
Date:   Wed Mar 1 21:07:23 2023 -0700

    🚸 Improve CocoaPress Touch UI (MarlinFirmware#25446)

commit a9a6d1f
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Mon Feb 27 15:27:58 2023 +1300

    📝 Link to archived RA Control Panel page (MarlinFirmware#25424)

commit 61ccd45
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Tue Jan 31 06:07:51 2023 +0100

    🌐 Update Italian language (MarlinFirmware#25309)

commit bab8478
Author: Roman Moravčík <roman.moravcik@gmail.com>
Date:   Tue Jan 31 06:07:03 2023 +0100

    🌐 Update Slovak language (MarlinFirmware#25305)

commit 0110877
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Tue Feb 28 06:11:53 2023 +1300

    🧑‍💻 Add IA_CREALITY CI test (MarlinFirmware#25434)

commit b7ee06b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue May 16 19:52:36 2023 -0500

    🔨 Use 'build_src_filter'

commit 5f8df0a
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Mar 26 17:49:51 2023 -0500

    🔨 Fix thread-unsafe deque iteration

commit b338159
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Wed May 17 06:50:57 2023 +1200

    🐛 Fix MKS Robin Nano 1.3 F4 pin collision (MarlinFirmware#25838)

commit 2399a24
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Mon Apr 10 22:17:50 2023 +1200

    🔧 Update thermocouple 2 pin sanity check (MarlinFirmware#25627)

commit d05acb7
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Mon Apr 10 21:16:52 2023 +1200

    🩹 Fix MARLIN_F446Zx_TRONXY variant (MarlinFirmware#25659)

    Followup to 9be1554

commit 81d4f8f
Author: Chris Pepper <p3p@p3psoft.co.uk>
Date:   Sat Apr 8 02:55:10 2023 +0100

    🩹 Fix SD partitionTable packing (MarlinFirmware#25648)

commit b0c3db6
Author: Jason Smith <jason.inet@gmail.com>
Date:   Fri Apr 7 18:52:33 2023 -0700

    🎨 Suppress M122 sign warning (MarlinFirmware#25613)

commit ea6430d
Author: Eduard Sukharev <sukharev.eh@gmail.com>
Date:   Wed Mar 15 00:49:49 2023 +0300

    🐛 Fix long filename read/report (MarlinFirmware#25509)

commit ccb4d11
Author: John Robertson <john@cirtech.co.uk>
Date:   Sat Mar 18 10:33:15 2023 +0000

    🔧 Sanity-check PRINTCOUNTER_SAVE_INTERVAL + ESP32 I2S Exp (MarlinFirmware#25527)

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

commit 176ecf4
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Sat Mar 11 00:08:07 2023 -0800

    🐛 Fix Anet ET4 SD_SS_PIN (MarlinFirmware#25492)

commit 3ec5d6d
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Mar 11 19:17:25 2023 -0600

    ⚡️ Exit from ISR on AVR already does sei

    Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com>

commit 75aa880
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Fri Mar 10 15:56:33 2023 -0800

    ✨ BTT Octopus Max EZ 1.0, SKR 3.0 / 3.0 EZ (MarlinFirmware#25387, MarlinFirmware#25495, MarlinFirmware#25535)

commit a50ff5d
Author: Sion Williams <sion5@hotmail.co.uk>
Date:   Thu Mar 9 08:45:01 2023 +0000

    🔨 VSCode + Devcontainer support (MarlinFirmware#22420)

commit 504f09f
Author: alextrical <35117191+alextrical@users.noreply.github.com>
Date:   Sun Mar 5 22:28:50 2023 +0000

    🐛 Fix Flash EEPROM for STM32G0B1CB (MarlinFirmware#25469)

commit aae1102
Author: Hans-Christian Ebke <ebke@cs.rwth-aachen.de>
Date:   Sun Mar 5 23:25:11 2023 +0100

    🐛 Fix apply_power for SPINDLE_SERVO (MarlinFirmware#25465)

commit a40ff13
Author: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date:   Wed Mar 1 00:16:27 2023 +0000

    🐛 Fix LA retract/feedrate edge case (MarlinFirmware#25445)

    Followup to MarlinFirmware#25442

commit dfd1fb7
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Feb 28 17:50:06 2023 -0600

    🔨 Improve config.ini example fetch

commit 6d8c9f6
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Mar 1 20:06:47 2023 -0600

    🌐 Regenerate language data

commit db0c8b3
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Mar 5 19:15:22 2023 -0600

    🧑‍💻 Script to make non-accented languages

commit 0e3d951
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Mar 1 19:07:47 2023 -0600

    🔨 Update font scripts

commit 22e6365
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Tue Feb 28 16:16:11 2023 +1300

    🔧 Fix Sensorless Probe sanity-check err (MarlinFirmware#25417)

commit abd710b
Author: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date:   Mon Feb 27 23:00:13 2023 +0000

    🐛 Fix Linear Advance E position tracking (MarlinFirmware#25442)

    Fix regression from MarlinFirmware#24951

commit d5c312c
Author: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date:   Fri Mar 3 20:37:10 2023 +0000

    🐛 Fix ISR_SHAPING_LOOP_CYCLES (MarlinFirmware#25335)

commit 64f9c17
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sat Mar 4 09:32:04 2023 +1300

    🔨 Fix 'step' type in createTemperatureLookupMarlin.py (MarlinFirmware#25455)

commit bac334c
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Sun Feb 26 19:03:28 2023 -0800

    🔨 Fix env STM32G0B1RE_btt, add …_manta_btt (MarlinFirmware#25431)

commit 071d54e
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Feb 23 21:38:11 2023 -0600

    🎨 Use LIMIT macro

commit c4ac8a2
Author: Guðni Már Gilbert <gudni.m.g@gmail.com>
Date:   Fri Feb 24 03:29:47 2023 +0000

    ⚡️ Reduce edit_screen code size (MarlinFirmware#25420)

commit 53698b8
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 22 14:30:02 2023 -0600

    🔧 Fix Einsy Rambo TMC driver check

commit d5d497f
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Feb 21 18:22:16 2023 -0600

    🔨 Fix marlin_custom.* without lib_deps

commit e65e38a
Author: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date:   Tue Feb 21 22:37:11 2023 +0000

    🐛 Fix AVR maths used by Stepper (MarlinFirmware#25338)

commit 9d56b7f
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Wed Feb 22 11:27:47 2023 +1300

    🔨 Encrypt some MKS Robin (MarlinFirmware#25349)

commit 1748abd
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Feb 21 15:08:25 2023 -0600

    🧑‍💻 Fix preheat tests (nested macro limit ~256)

    Followup to MarlinFirmware#25407

commit 7afd823
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Tue Feb 21 15:25:22 2023 +1300

    🔧 Sanity-check hotend max / preheat temps (MarlinFirmware#25407)

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

commit 4a1cbff
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Tue Feb 21 13:58:40 2023 +1300

    📺 Update Re-ARM VIKI2 SPI pins (MarlinFirmware#25411)

commit 94780bb
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Feb 17 22:12:11 2023 -0600

    🚸 Interruptible PLR (MarlinFirmware#25395)

commit 838df37
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Thu Feb 16 12:58:51 2023 +1300

    🐛 Fix FastPWM calculations (MarlinFirmware#25343)

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

commit 7a8c984
Author: Trevin Small <trevincub03@gmail.com>
Date:   Wed Feb 15 19:00:10 2023 -0500

    ✏️ Fix README typo (MarlinFirmware#25388)

commit 50f4e6b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Feb 14 22:29:47 2023 -0600

    🎨 Tweak VALIDATE_MESH_TILT

commit db8f501
Author: Frederik Kemner <stuff+github@fredo.org>
Date:   Wed Feb 15 05:25:47 2023 +0100

    🚸 SPI endstops for X/Y Dual and Core (MarlinFirmware#25371)

commit 255bc3c
Author: Radek <46979052+radek8@users.noreply.github.com>
Date:   Wed Feb 15 04:57:39 2023 +0100

    📝 Fix BTT_MINI_12864_V1 comment (MarlinFirmware#25366)

commit 38c4c7f
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Feb 11 21:29:32 2023 -0600

    🔨 Suppress native build warnings

commit fecb667
Author: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date:   Thu Feb 9 06:46:02 2023 +0300

    🔨 Adjust INI comments (MarlinFirmware#25183)

commit f7485ce
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 8 20:31:02 2023 -0600

    🩹 Extra axis min home with Delta Sensorless Probe

commit a49d286
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 8 20:29:37 2023 -0600

    🩹 Extra axes for Tool Change

commit 59c8857
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 8 20:28:56 2023 -0600

    🩹 Various simple fixes

commit 6e38ec3
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 8 20:26:59 2023 -0600

    🩹 Safe Bed Leveling updates

commit 93c61b1
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 8 20:19:12 2023 -0600

    🩹 Misc. extra axis updates

commit 87d7449
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 8 19:39:21 2023 -0600

    🩹 Use 'M205 D' when 'B' is an axis

commit 98c9ecd
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 8 19:37:10 2023 -0600

    🔧 Add a test for extra axes

commit 8976bc5
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Tue Feb 7 22:39:09 2023 -0800

    ✨ BigTreeTech Manta M4P, M5P, M8P V1.0 / 1.1, E3 EZ (MarlinFirmware#25001)

commit e3cff7a
Author: Victor Oliveira <rhapsodyv@gmail.com>
Date:   Sat Feb 4 05:10:26 2023 -0300

    🧑‍💻 General 'MediaFile' type alias (MarlinFirmware#24424)

commit 4000db2
Author: vyacheslav-shubin <shubin-vv@krista.ru>
Date:   Sat Feb 4 10:36:07 2023 +0300

    🧑‍💻 Add SD Card 'hide' method for dev usage (MarlinFirmware#22425)

commit f9621e2
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Thu Feb 2 17:41:46 2023 -0800

    📝 Fix Z*_ENDSTOP_ADJUSTMENT comments (MarlinFirmware#25295)

commit 1a184e5
Author: kg333 <matthew@kyengineer.com>
Date:   Wed Feb 1 19:02:26 2023 -0500

    📺 Melzi v4 with BTT SKR Mini E3 (MarlinFirmware#25321)

commit 6e42735
Author: Martin Turski <quiret@vfemail.net>
Date:   Fri Feb 3 04:01:22 2023 +0100

    🔨 Fix test build path with spaces (MarlinFirmware#25329)

commit 79e2375
Author: Bob Kuhn <bob.kuhn@att.net>
Date:   Wed Feb 1 01:51:11 2023 -0600

    🔧 Fix SD sorting sanity checks (MarlinFirmware#25318)

commit 858de4f
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 30 22:11:50 2023 -0600

    🔧 Fix build with no Y axis (MarlinFirmware#25311)

commit bac0b35
Author: Bob Kuhn <bob.kuhn@att.net>
Date:   Mon Jan 30 21:57:36 2023 -0600

    🩹 Fix G61 axis parameters with no offset (MarlinFirmware#25312)

commit 60f3857
Author: Darren Garnier <dgarnier@reinrag.net>
Date:   Mon Jan 30 23:00:49 2023 -0500

    🔨 Fix config.ini URL fetch (MarlinFirmware#25313)

commit b3c004e
Author: avionix-g <63542699+avionix-g@users.noreply.github.com>
Date:   Wed Jan 25 23:14:52 2023 -0500

    🐛 Fix MKS board Ultipanel support (MarlinFirmware#25278)

commit 9e755a2
Author: xBiohazardx <36756950+xBiohazardx@users.noreply.github.com>
Date:   Fri Jan 27 01:05:04 2023 +0100

    ✏️ Fix probe invert flag (MarlinFirmware#25282)

commit 0d83118
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Jan 25 21:37:10 2023 -0600

    🔧 Refine Input Shaping check (MarlinFirmware#25280)

commit 0ed083a
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Jan 20 21:17:13 2023 -0600

    SDIO retry, hsd clock, etc.

commit 2c39f84
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 24 02:21:02 2023 -0600

    🔧 Overridable Stepper EN init

commit b7e4216
Author: Bob Kuhn <bob.kuhn@att.net>
Date:   Mon Jan 23 01:37:35 2023 -0600

    🐛 Fix Ender-2 Stock Display with Melzi (MarlinFirmware#25258)

commit 536e8a7
Author: MarkMan0 <38912829+MarkMan0@users.noreply.github.com>
Date:   Sun Dec 18 06:48:33 2022 +0100

    🐛 Fix, Refactor PID scaling (MarlinFirmware#25096)

commit 8c34258
Author: John Robertson <john@cirtech.co.uk>
Date:   Tue Jan 17 23:53:39 2023 +0000

    🐛 Fix potential I2S buffer overwrite (MarlinFirmware#25113)

commit dd892c6
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 16 22:11:49 2023 -0600

    🎨 Heading cleanup

commit 947a9cb
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Jan 15 06:48:17 2023 -0600

    🎨 Language / menu cleanup

commit 62487c6
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jan 14 07:44:57 2023 -0600

    ✏️  ProUI followup

commit 6cf085d
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Jan 15 01:11:49 2023 -0600

    🔧 Added MOTHERBOARD error text

commit c3c6432
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Mar 14 16:48:17 2023 -0500

    🎨 Misc. formatting
  • Loading branch information
@Infobitas
Infobitas committed May 31, 2023
1 parent 1ed20ef commit 1f55345
Show file tree
Hide file tree
Showing 558 changed files with 42,429 additions and 30,341 deletions.
29 changes: 29 additions & 0 deletions .devcontainer/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.187.0/containers/python-3/.devcontainer/base.Dockerfile

# [Choice] Python version: 3, 3.9, 3.8, 3.7, 3.6
ARG VARIANT="3.9.0-buster"
FROM python:${VARIANT}

# [Option] Install Node.js
ARG INSTALL_NODE="true"
ARG NODE_VERSION="lts/*"
RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi

# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
# COPY requirements.txt /tmp/pip-tmp/
# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
# && rm -rf /tmp/pip-tmp

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>

# [Optional] Uncomment this line to install global node packages.
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1


RUN pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
RUN platformio update
# To get the test platforms
RUN pip install PyYaml
#ENV PATH /code/buildroot/bin/:/code/buildroot/tests/:${PATH}
51 changes: 51 additions & 0 deletions .devcontainer/devcontainer.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.187.0/containers/python-3
{
"name": "Python 3",
"build": {
"dockerfile": "Dockerfile",
"context": "..",
"args": {
// Update 'VARIANT' to pick a Python version: 3, 3.6, 3.7, 3.8, 3.9
"VARIANT": "3.9.0-buster",
// Options
"INSTALL_NODE": "false",
"NODE_VERSION": "lts/*"
}
},

// Set *default* container specific settings.json values on container create.
"settings": {
"python.pythonPath": "/usr/local/bin/python",
"python.languageServer": "Pylance",
"python.linting.enabled": true,
"python.linting.pylintEnabled": true,
"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-python.python",
"ms-python.vscode-pylance",
"platformio.platformio-ide",
"marlinfirmware.auto-build",
"editorconfig.editorconfig"
],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "pip3 install --user -r requirements.txt",

// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
// "remoteUser": "vscode"
}
21 changes: 14 additions & 7 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
SCRIPTS_DIR := buildroot/share/scripts
CONTAINER_RT_BIN := docker
CONTAINER_RT_OPTS := --rm -v $(PWD):/code -v platformio-cache:/root/.platformio
CONTAINER_IMAGE := marlin-dev

help:
@echo "Tasks for local development:"
@echo "* tests-single-ci: Run a single test from inside the CI"
@echo "* tests-single-local: Run a single test locally"
@echo "* tests-single-local-docker: Run a single test locally, using docker-compose"
@echo "* tests-single-local-docker: Run a single test locally, using docker"
@echo "* tests-all-local: Run all tests locally"
@echo "* tests-all-local-docker: Run all tests locally, using docker-compose"
@echo "* setup-local-docker: Setup local docker-compose"
@echo "* tests-all-local-docker: Run all tests locally, using docker"
@echo "* setup-local-docker: Build the local docker image"
@echo ""
@echo "Options for testing:"
@echo " TEST_TARGET Set when running tests-single-*, to select the"
Expand Down Expand Up @@ -34,19 +39,21 @@ tests-single-local:

tests-single-local-docker:
@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local-docker" ; return 1; fi
docker-compose run --rm marlin $(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) ONLY_TEST="$(ONLY_TEST)"
@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) $(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) ONLY_TEST="$(ONLY_TEST)"
.PHONY: tests-single-local-docker

tests-all-local:
export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
&& export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
&& for TEST_TARGET in $$(./get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done
&& for TEST_TARGET in $$($(SCRIPTS_DIR)/get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done
.PHONY: tests-all-local

tests-all-local-docker:
docker-compose run --rm marlin $(MAKE) tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) $(MAKE) tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
.PHONY: tests-all-local-docker

setup-local-docker:
docker-compose build
$(CONTAINER_RT_BIN) build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .
.PHONY: setup-local-docker
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"
//#define SHORT_BUILD_VERSION "2.1.2.1"

/**
* 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 "2022-12-17"
//#define STRING_DISTRIBUTION_DATE "2023-05-16"

/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
Expand Down
27 changes: 22 additions & 5 deletions Marlin/src/HAL/AVR/fast_pwm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@

#include "../../inc/MarlinConfig.h"

//#define DEBUG_AVR_FAST_PWM
#define DEBUG_OUT ENABLED(DEBUG_AVR_FAST_PWM)
#include "../../core/debug_out.h"

struct Timer {
volatile uint8_t* TCCRnQ[3]; // max 3 TCCR registers per timer
volatile uint16_t* OCRnQ[3]; // max 3 OCR registers per timer
Expand Down Expand Up @@ -108,36 +112,45 @@ const Timer get_pwm_timer(const pin_t pin) {
}

void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
DEBUG_ECHOLNPGM("set_pwm_frequency(pin=", pin, ", freq=", f_desired, ")");
const Timer timer = get_pwm_timer(pin);
if (timer.isProtected || !timer.isPWM) return; // Don't proceed if protected timer or not recognized

const bool is_timer2 = timer.n == 2;
const uint16_t maxtop = is_timer2 ? 0xFF : 0xFFFF;

DEBUG_ECHOLNPGM("maxtop=", maxtop);

uint16_t res = 0xFF; // resolution (TOP value)
uint8_t j = CS_NONE; // prescaler index
uint8_t wgm = WGM_PWM_PC_8; // waveform generation mode

// Calculating the prescaler and resolution to use to achieve closest frequency
if (f_desired != 0) {
constexpr uint16_t prescaler[] = { 1, 8, (32), 64, (128), 256, 1024 }; // (*) are Timer 2 only
uint16_t f = (F_CPU) / (2 * 1024 * maxtop) + 1; // Start with the lowest non-zero frequency achievable (1 or 31)
uint16_t f = (F_CPU) / (uint32_t(maxtop) << 11) + 1; // Start with the lowest non-zero frequency achievable (for 16MHz, 1 or 31)

DEBUG_ECHOLNPGM("f=", f);
DEBUG_ECHOLNPGM("(prescaler loop)");
LOOP_L_N(i, COUNT(prescaler)) { // Loop through all prescaler values
const uint16_t p = prescaler[i];
const uint32_t p = prescaler[i]; // Extend to 32 bits for calculations
DEBUG_ECHOLNPGM("prescaler[", i, "]=", p);
uint16_t res_fast_temp, res_pc_temp;
if (is_timer2) {
#if ENABLED(USE_OCR2A_AS_TOP) // No resolution calculation for TIMER2 unless enabled USE_OCR2A_AS_TOP
const uint16_t rft = (F_CPU) / (p * f_desired);
res_fast_temp = rft - 1;
res_pc_temp = rft / 2;
DEBUG_ECHOLNPGM("(Timer2) res_fast_temp=", res_fast_temp, " res_pc_temp=", res_pc_temp);
#else
res_fast_temp = res_pc_temp = maxtop;
DEBUG_ECHOLNPGM("(Timer2) res_fast_temp=", maxtop, " res_pc_temp=", maxtop);
#endif
}
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);
res_fast_temp = rft - 1;
res_pc_temp = rft / 2;
}
Expand All @@ -147,23 +160,27 @@ void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {

// Calculate frequencies of test prescaler and resolution values
const uint16_t f_fast_temp = (F_CPU) / (p * (1 + res_fast_temp)),
f_pc_temp = (F_CPU) / (2 * p * res_pc_temp);
const int f_diff = _MAX(f, f_desired) - _MIN(f, f_desired),
f_pc_temp = (F_CPU) / ((p * res_pc_temp) << 1),
f_diff = _MAX(f, f_desired) - _MIN(f, f_desired),
f_fast_diff = _MAX(f_fast_temp, f_desired) - _MIN(f_fast_temp, f_desired),
f_pc_diff = _MAX(f_pc_temp, f_desired) - _MIN(f_pc_temp, f_desired);

DEBUG_ECHOLNPGM("f_fast_temp=", f_fast_temp, " f_pc_temp=", f_pc_temp, " f_diff=", f_diff, " f_fast_diff=", f_fast_diff, " f_pc_diff=", f_pc_diff);

if (f_fast_diff < f_diff && f_fast_diff <= f_pc_diff) { // FAST values are closest to desired f
// Set the Wave Generation Mode to FAST PWM
wgm = is_timer2 ? uint8_t(TERN(USE_OCR2A_AS_TOP, WGM2_FAST_PWM_OCR2A, WGM2_FAST_PWM)) : uint8_t(WGM_FAST_PWM_ICRn);
// Remember this combination
f = f_fast_temp; res = res_fast_temp; j = i + 1;
DEBUG_ECHOLNPGM("(FAST) updated f=", f);
}
else if (f_pc_diff < f_diff) { // PHASE CORRECT values are closes to desired f
// Set the Wave Generation Mode to PWM PHASE CORRECT
wgm = is_timer2 ? uint8_t(TERN(USE_OCR2A_AS_TOP, WGM2_PWM_PC_OCR2A, WGM2_PWM_PC)) : uint8_t(WGM_PWM_PC_ICRn);
f = f_pc_temp; res = res_pc_temp; j = i + 1;
DEBUG_ECHOLNPGM("(PHASE) updated f=", f);
}
}
} // prescaler loop
}

_SET_WGMnQ(timer, wgm);
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/HAL/AVR/fastio.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,11 @@ enum ClockSource2 : uint8_t {

#if HAS_MOTOR_CURRENT_PWM
#if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
#define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0 || P == MOTOR_CURRENT_PWM_E1 || P == MOTOR_CURRENT_PWM_Z || P == MOTOR_CURRENT_PWM_XY)
#define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E_PIN || P == MOTOR_CURRENT_PWM_E0_PIN || P == MOTOR_CURRENT_PWM_E1_PIN || P == MOTOR_CURRENT_PWM_Z_PIN || P == MOTOR_CURRENT_PWM_XY_PIN)
#elif PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
#define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0 || P == MOTOR_CURRENT_PWM_E1 || P == MOTOR_CURRENT_PWM_Z)
#define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E_PIN || P == MOTOR_CURRENT_PWM_E0_PIN || P == MOTOR_CURRENT_PWM_E1_PIN || P == MOTOR_CURRENT_PWM_Z_PIN)
#else
#define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0 || P == MOTOR_CURRENT_PWM_E1)
#define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E_PIN || P == MOTOR_CURRENT_PWM_E0_PIN || P == MOTOR_CURRENT_PWM_E1_PIN)
#endif
#else
#define PWM_CHK_MOTOR_CURRENT(P) false
Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/HAL/AVR/fastio/fastio_1280.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
* 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
* 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
*
* 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: 3 additions & 0 deletions Marlin/src/HAL/AVR/fastio/fastio_1281.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
*
* 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: 3 additions & 0 deletions Marlin/src/HAL/AVR/fastio/fastio_168.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
*
* 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: 3 additions & 0 deletions Marlin/src/HAL/AVR/fastio/fastio_644.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
*
* 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: 3 additions & 0 deletions Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
* 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
4 changes: 0 additions & 4 deletions Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,3 @@
*
*/
#pragma once

#if HAS_SPI_TFT || HAS_FSMC_TFT
#error "Sorry! TFT displays are not available for HAL/AVR."
#endif
4 changes: 4 additions & 0 deletions Marlin/src/HAL/AVR/inc/SanityCheck.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
* Test AVR-specific configuration values for errors at compile-time.
*/

#if HAS_SPI_TFT || HAS_FSMC_TFT
#error "Sorry! TFT displays are not available for HAL/AVR."
#endif

/**
* Check for common serial pin conflicts
*/
Expand Down
40 changes: 21 additions & 19 deletions Marlin/src/HAL/AVR/math.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@

// intRes = longIn1 * longIn2 >> 24
// uses:
// A[tmp] to store 0
// B[tmp] to store bits 16-23 of the 48bit result. The top bit is used to round the two byte result.
// note that the lower two bytes and the upper byte of the 48bit result are not calculated.
// this can cause the result to be out by one as the lower bytes may cause carries into the upper ones.
// B A are bits 24-39 and are the returned value
// C B A is longIn1
// D C B A is longIn2
// r1, r0 for the result of mul.
// [tmp1] to store 0.
// [tmp2] to store bits 16-23 of the 56 bit result. The top bit of [tmp2] is used for rounding.
// Note that the lower two bytes and the upper two bytes of the 56 bit result are not calculated.
// This can cause the result to be out by one as the lower bytes may cause carries into the upper ones.
// [intRes] (A B) is bits 24-39 and is the returned value.
// [longIn1] (C B A) is a 24 bit parameter.
// [longIn2] (D C B A) is a 32 bit parameter.
//
FORCE_INLINE static uint16_t MultiU24X32toH16(uint32_t longIn1, uint32_t longIn2) {
uint8_t tmp1;
Expand Down Expand Up @@ -66,11 +67,9 @@ FORCE_INLINE static uint16_t MultiU24X32toH16(uint32_t longIn1, uint32_t longIn2
A("add %[tmp2], r1")
A("adc %A[intRes], %[tmp1]")
A("adc %B[intRes], %[tmp1]")
A("lsr %[tmp2]")
A("adc %A[intRes], %[tmp1]")
A("adc %B[intRes], %[tmp1]")
A("mul %D[longIn2], %A[longIn1]")
A("add %A[intRes], r0")
A("lsl %[tmp2]")
A("adc %A[intRes], r0")
A("adc %B[intRes], r1")
A("mul %D[longIn2], %B[longIn1]")
A("add %B[intRes], r0")
Expand All @@ -85,22 +84,25 @@ FORCE_INLINE static uint16_t MultiU24X32toH16(uint32_t longIn1, uint32_t longIn2
return intRes;
}

// intRes = intIn1 * intIn2 >> 16
// intRes = intIn1 * intIn2 >> 8
// uses:
// r26 to store 0
// r27 to store the byte 1 of the 24 bit result
FORCE_INLINE static uint16_t MultiU16X8toH16(uint8_t charIn1, uint16_t intIn2) {
// r1, r0 for the result of mul. After the second mul, r0 holds bits 0-7 of the 24 bit result and
// the top bit of r0 is used for rounding.
// [tmp] to store 0.
// [intRes] (A B) is bits 8-15 and is the returned value.
// [charIn1] is an 8 bit parameter.
// [intIn2] (B A) is a 16 bit parameter.
//
FORCE_INLINE static uint16_t MultiU8X16toH16(uint8_t charIn1, uint16_t intIn2) {
uint8_t tmp;
uint16_t intRes;
__asm__ __volatile__ (
A("clr %[tmp]")
A("mul %[charIn1], %B[intIn2]")
A("movw %A[intRes], r0")
A("mul %[charIn1], %A[intIn2]")
A("add %A[intRes], r1")
A("adc %B[intRes], %[tmp]")
A("lsr r0")
A("adc %A[intRes], %[tmp]")
A("lsl r0")
A("adc %A[intRes], r1")
A("adc %B[intRes], %[tmp]")
A("clr r1")
: [intRes] "=&r" (intRes),
Expand Down
Loading

0 comments on commit 1f55345

Please sign in to comment.