commit96c1807b76Merge:4b9fce2e85e0f75d4f06Author: Sergey <sergey@terentiev.me> Date: Mon Jan 10 12:18:37 2022 +0300 Merge branch '2.0.x' into vanilla_fb_2.0.x commite0f75d4f06Author: David Ross Smith <5095074+DragRedSim@users.noreply.github.com> Date: Fri Jan 7 22:44:44 2022 +1100 🚑️ Fix preheat target bug Fixes Jyers/Marlin#1651 commit42449b8683Author: Scott Lahteine <github@thinkyhead.com> Date: Sun Jan 9 04:39:15 2022 -0600 🌐 Update auto home axis strings commite23c696566Author: Roman Moravčík <roman.moravcik@gmail.com> Date: Sun Jan 9 10:51:16 2022 +0100 🌐 Update Slovak language (#23475) commit035f9b8e13Author: Scott Lahteine <github@thinkyhead.com> Date: Sun Jan 9 03:48:17 2022 -0600 🔨 Rename (not copy) with board_build.rename commit49f8171f7aAuthor: Miguel Risco-Castillo <mriscoc@users.noreply.github.com> Date: Sun Jan 9 03:37:09 2022 -0500 🚸 BLTouch HS menu item for DWIN Enhanced UI (#23480) commit75d0e94d5bAuthor: ClockeNessMnstr <locke.dftc@gmail.com> Date: Sat Jan 8 15:09:25 2022 -0500 🚸 Do G34 "Z Backoff" at full current commit915f610782Author: jdegenstein <jdegenstein@users.noreply.github.com> Date: Thu Jan 6 19:03:02 2022 -0600 📌 LCD_FOR_MELZI for BTT E3 RRF (#23453) commit2231e00b2cAuthor: Lefteris Garyfalakis <46350667+lefterisgar@users.noreply.github.com> Date: Thu Jan 6 13:30:41 2022 +0200 🌐 Localize E3V2 Enhanced UI (#23424) commit63f2b15396Author: Anson Liu <ansonl@users.noreply.github.com> Date: Thu Jan 6 06:26:12 2022 -0500 📺 Tune ULTI_CONTROLLER encoder, enable PCA9632 (#23461) commitf503722c45Author: Kyle Hu <kyle.hu.gz@gmail.com> Date: Thu Jan 6 15:54:04 2022 +0800 🐛 Fix Artillery Ruby (startup code, build flags) (#23446) commit4fd1de7fb7Author: Mike La Spina <mike.laspina@shaw.ca> Date: Wed Jan 5 06:14:40 2022 -0600 🐛 Define required endstop enums (#23425) commit93126c0d02Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Wed Jan 5 01:48:18 2022 -0600 🔨 Strip CR in mftest > awk commit80f77ea807Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Wed Jan 5 01:52:02 2022 -0600 🐛 Fix strlen_P parameter error Fixes #23447 commit9ff8220b8aAuthor: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Mon Jan 3 09:18:10 2022 -0600 🩹 Fix RADDS+RRD encoder button commit7754860289Author: hwmland <12407423+hwmland@users.noreply.github.com> Date: Mon Jan 3 06:54:12 2022 +0100 🩹 RAMPS FET order overridable, E + Laser (#23428) commit4efe4788afAuthor: Jason Smith <jason.inet@gmail.com> Date: Sun Jan 2 21:27:22 2022 -0800 ⬆️ Assert newer GCC in PIO via atmelavr@~3.4 (#23432) commit2faf4e2a99Author: Jason Smith <jason.inet@gmail.com> Date: Sun Jan 2 19:17:19 2022 -0800 💚 Fix Teensy CI test (#23433) commit9956e62674Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Sun Jan 2 09:22:36 2022 -0600 🧑💻 Apply axis conditionals commita732427329Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Sun Jan 2 09:22:06 2022 -0600 🚨 Fix M906 warning commit974883d2f6Author: Mike La Spina <mike.laspina@shaw.ca> Date: Sun Jan 2 02:23:55 2022 -0600 🔧 Normal FET layout with Spindle/Laser (#23409) commit1170ed995eAuthor: Jason Smith <jason.inet@gmail.com> Date: Sun Jan 2 00:19:10 2022 -0800 🔧 Update deprecated auto_build.py (#23427) commit24f9c3a777Author: Johannes Hörmann <johannes.hoermann@t-online.de> Date: Sun Jan 2 06:46:55 2022 +0100 🔨 Upload to Optiboot at 115200 (#23403) commit5ec384f40cAuthor: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Sat Jan 1 22:54:27 2022 -0600 ✨ M919 : Chopper Timing (#23400) commit6d7ffa6addAuthor: Jason Smith <jason.inet@gmail.com> Date: Fri Dec 31 12:32:28 2021 -0800 🔧 Only warn about enabled CONFIGURATION_EMBEDDING (#23408) commitdadd7516b5Author: Scott Lahteine <github@thinkyhead.com> Date: Fri Dec 31 07:42:07 2021 -0600 🚑️ Fix thermal conditionals, structure commitf99732ba75Author: Robby Candra <robbycandra.mail@gmail.com> Date: Fri Dec 31 15:22:49 2021 +0700 🔧 DWIN_MARLINUI sanity checks (#23399) commit5a9635aa58Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Wed Dec 29 04:17:41 2021 -0600 🩺 Assert FAN_SOFT_PWM where required (#23383, #23477) commit1552c6d2a5Author: Lefteris Garyfalakis <46350667+lefterisgar@users.noreply.github.com> Date: Wed Dec 29 05:22:01 2021 +0200 🎨 E3V2 corner leveling => tramming (#23375) commit06c2ed3c99Author: Miguel Risco-Castillo <mriscoc@users.noreply.github.com> Date: Tue Dec 28 00:23:50 2021 -0500 🚸 DWIN Enhanced improve, fix, and extend (#23240) - Offset icon change to show mesh leveling status - Reset extruder position when enter to Move menu - New live end-stop diagnostic page - Editable firmware retracts settings for Tune and filament settings menu - Print Statistics page accessible from the Advanced Settings menu - Reset printer draws the boot image - Adds individual axes homing menu - Adds probe deploy/stow to Probe Settings menu - Updates lock screen - Rebuilds main buttons to support text caption in other languages - Increases probe offset limits to 60 mm - Fix M303 PID variable update - Fix Resume/Pause button update - Fix redraw of print done - Fix very large file name bug - Fix bug in bed manual leveling commit430c5da54cAuthor: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Tue Dec 28 18:29:05 2021 -0600 🚚 Rename L6470 G-code file commit5b9f3bd4b1Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Tue Dec 28 02:57:24 2021 -0600 🧑💻 Remove extraneous 'inline' hints commitccc66a8528Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Tue Dec 21 22:15:48 2021 -0600 🎨 Misc. cleanup commit8abe314b18Author: Scott Lahteine <github@thinkyhead.com> Date: Sun Jan 9 01:06:19 2022 -0600 🔨 Get FIRMWARE_BIN from env commitdc470eb10fAuthor: Miguel Risco-Castillo <mriscoc@users.noreply.github.com> Date: Sun Jan 9 02:29:36 2022 -0500 🐛 Fix EEPROM_INIT_NOW build hash test (#23479) commit4c5e57ae89Author: Miguel Risco-Castillo <mriscoc@users.noreply.github.com> Date: Sun Jan 9 02:24:56 2022 -0500 🩹 Reset DWIN CrealityUI print progress on start (#23481) commit5d7328df46Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Tue Dec 28 05:02:40 2021 -0600 🧑💻 Add AXIS_COLLISION to catch broken parameters \ commit99c237e05eAuthor: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Tue Dec 28 05:43:10 2021 -0600 🚸 Refine stepper-driver-related G-codes (#23372) commit56adbc3ebfAuthor: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Mon Dec 27 20:52:43 2021 -0600 📝 Consistent pin header orientation commit4cfe812c18Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Mon Dec 27 17:40:53 2021 -0600 📌 Define MKS Monster8 pins for MKS_MINI_12864 Fixes #23324 commit27d2471ea3Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Mon Dec 27 14:28:59 2021 -0600 🐛 Fix mffp usage commit61b9248c35Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Sun Dec 26 03:20:29 2021 -0600 🎨 Pins and SDIO cleanup commitc9561a8826Author: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com> Date: Sun Dec 26 09:46:13 2021 +0300 🔧 Check Chiron LCD requirements (#23353) Co-Authored-By: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com> commit58c84f17baAuthor: Scott Lahteine <github@thinkyhead.com> Date: Wed Dec 29 03:41:28 2021 -0600 🎨 Simplify some debug echos commit73b8320e9cAuthor: Scott Lahteine <github@thinkyhead.com> Date: Sat Jan 1 20:01:24 2022 -0600 🔨 Add .vscode/extensions.json commit1c3f2498b1Author: ellensp <530024+ellensp@users.noreply.github.com> Date: Thu Dec 30 20:35:22 2021 +1300 🐛 Fix RRW Keypad & Zonestar buttons (#23388) commit4202baa409Author: GHGiampy <83699429+GHGiampy@users.noreply.github.com> Date: Thu Dec 30 05:37:07 2021 +0100 🩹 Fix Enhanced UI max E speed (#23387) commitf471eab1a2Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Sat Dec 25 22:13:20 2021 -0600 🔖 Marlin 2.0.9.3 commit4b9fce2e85Merge:ecb08b15bee17d710c5cAuthor: Sergey <sergey@terentiev.me> Date: Mon Dec 27 16:47:22 2021 +0300 Merge branch '2.0.x' into vanilla_fb_2.0.x commit9b13ae2399Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Sat Dec 25 19:41:01 2021 -0800 🐛 Fix MKS Robin E3 NeoPixel pin default (#23350) commite17d710c5cAuthor: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Sat Dec 25 22:13:20 2021 -0600 🔖 Marlin 2.0.9.3 commit06f36dc746Author: kaidegit <60053077+kaidegit@users.noreply.github.com> Date: Sun Dec 26 10:12:20 2021 +0800 🐛 Fix open for bin rename (#23351) commit98eca9cb23Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Sat Dec 25 03:27:45 2021 -0600 🔧 Move MOTHERBOARD closer to top commit6268795003Author: fflosi <34758322+fflosi@users.noreply.github.com> Date: Sat Dec 25 05:57:07 2021 -0300 ✨ Per-axis TMC hold multiplier (#23345) commitb4f0922a7cAuthor: Sola <42537573+solawc@users.noreply.github.com> Date: Fri Dec 24 14:03:32 2021 +0800 ✨ MKS TinyBee board support (#23340) Co-Authored-By: Sola <42537573+solawc@users.noreply.github.com> commitaef613acd3Author: Robby Candra <robbycandra.mail@gmail.com> Date: Thu Dec 23 15:19:39 2021 +0700 🔧 Group FAST_PWM_FAN.options (#23331) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commit9ecfa1d252Author: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Tue Dec 21 23:09:55 2021 -0500 ✨ BLTouch High Speed mode runtime configuration (#22916, #23337) Co-Authored-By: Scott Lahteine <thinkyhead@users.noreply.github.com> commite0bed1e344Author: ellensp <530024+ellensp@users.noreply.github.com> Date: Wed Dec 22 15:44:04 2021 +1300 ✨ Option to reset EEPROM on first run (#23276) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commitd21fa25ab8Author: Spencer Owen <owenspencer@gmail.com> Date: Sat Dec 18 18:58:46 2021 -0700 ✨ Creality3D V4.2.3 / Ender-2 Pro board (#23307) commit0dc1a58b24Author: X-Ryl669 <boite.pour.spam@gmail.com> Date: Tue Dec 14 07:22:06 2021 +0100 ✨ Configurations embed and retrieve (#21321, #23303) commitf2ca70e232Author: John Lagonikas <39417467+zeleps@users.noreply.github.com> Date: Wed Dec 8 20:55:09 2021 +0200 🐛 Fix and improve MAX31865 (#23215) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commita6bed22839Author: BigTreeTech <38851044+bigtreetech@users.noreply.github.com> Date: Sat Dec 11 03:38:03 2021 +0800 ✨ BigTreeTech SKR mini E3 V3.0 (STM32G0B1RET6) (#23283) commitefd67cf80dAuthor: Giuseppe499 <giuseppe499@live.it> Date: Tue Dec 7 02:53:51 2021 +0100 ✨ X Twist Compensation & Calibration (#23238) commit15204470a8Author: ladismrkolj <ladismrkolj@gmail.com> Date: Sun Dec 5 22:41:39 2021 +0100 🔧 Chamber Fan index option (#23262) commit48358d6a5cAuthor: Mike La Spina <mike.laspina@shaw.ca> Date: Fri Dec 3 12:48:48 2021 -0600 🏗️ Fix Maple HAL/STM32F1 PWM (#23211) commitd7abb891cdAuthor: Tanguy Pruvot <tpruvot@users.noreply.github.com> Date: Fri Dec 3 19:31:48 2021 +0100 🏗️ Rework STM32 timer frequency protection (#23187) commit52a44eb200Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Tue Nov 30 15:04:05 2021 -0600 🐛 Fix STM32 FastPWM commit9b1c0a75e1Author: Scott Lahteine <github@thinkyhead.com> Date: Sat Nov 27 18:33:32 2021 -0600 🎨 Rename HAL timer elements commitd75e7784e5Author: schmttc <89831403+schmttc@users.noreply.github.com> Date: Wed Nov 24 08:52:18 2021 +1100 ✨ EasyThreeD ET4000+ board and UI (#23080) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commit0e60c8b7e0Author: John Robertson <john@cirtech.co.uk> Date: Tue Nov 23 21:24:24 2021 +0000 ✨ MarkForged YX kinematics (#23163) commit018c7b1cf4Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Sun Nov 21 11:25:06 2021 -0800 ✨ BigTreeTech Mini 12864 V1.0 (#23130) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commitaf1d603374Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com> Date: Tue Nov 23 21:01:53 2021 +0100 ✨ Fan tachometer support (#23086, #23180, #23199) Co-Authored-By: Scott Lahteine <github@thinkyhead.com> commit884308f964Author: Scott Lahteine <github@thinkyhead.com> Date: Tue Nov 16 08:54:30 2021 -0600 🔧 SOUND_MENU_ITEM for E3V2 commit7269990413Author: Miguel Risco-Castillo <mriscoc@users.noreply.github.com> Date: Wed Nov 10 11:31:35 2021 -0500 🚸 Expose sub-options for E3V2 Enhanced (#23099) commit2a90d93b17Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Wed Nov 17 09:33:42 2021 -0800 📌 Overridable probe-related pins (#23107) commit6e284f8823Author: BigTreeTech <38851044+bigtreetech@users.noreply.github.com> Date: Wed Nov 10 23:56:10 2021 +0800 ✨ Support for BIQU B1-SE-Plus strain gauge probe (#23101) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commita2349fc411Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Fri Dec 24 23:47:52 2021 -0600 🔨 Configurable firmware bin filename Configuration.h > FIRMWARE_BIN commita3964b2b40Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Fri Dec 24 20:59:28 2021 -0600 🔨 Ignore more generated files commit226ee7c1f3Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Fri Dec 24 01:46:51 2021 -0600 🔧 Sanity check MMU2_MENUS commit2c12171f46Author: Attila BODY <attila.body@gmail.com> Date: Fri Dec 24 06:57:20 2021 +0100 🐛 Fix Robin Nano v3 filament runout pins (#23344) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commitd034a9c295Author: MrAlvin <umo-testing@3iii.dk> Date: Thu Dec 23 10:47:52 2021 +0100 🚸 Show mm'ss during first hour (#23335) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commitd2c7104bb3Author: Robby Candra <robbycandra.mail@gmail.com> Date: Wed Dec 15 07:51:19 2021 +0700 🚸 Change "SD" to "Media" or "SD/FD" (#23297) commit570c7e8638Author: ellensp <530024+ellensp@users.noreply.github.com> Date: Wed Dec 22 13:48:38 2021 +1300 🐛 Fix Chitu Z_STOP_PIN (#23330) commitcc4578a3d3Author: Tanguy Pruvot <tpruvot@users.noreply.github.com> Date: Thu Dec 23 07:49:15 2021 +0100 🩹 Fix settings G21 report (#23338) commit1db84be66aAuthor: Mike La Spina <mike.laspina@shaw.ca> Date: Tue Dec 21 01:26:31 2021 -0600 🚑️ FAST_PWM_FAN default 1KHz base freq. (#23326) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commit77c9668fe2Author: ellensp <530024+ellensp@users.noreply.github.com> Date: Tue Dec 14 19:25:28 2021 +1300 🐛 Fix LCD_BED_LEVELING compile (#23298) commit22cf9b444eAuthor: GHGiampy <83699429+GHGiampy@users.noreply.github.com> Date: Mon Dec 20 09:44:43 2021 +0100 🧑💻 Option allowing > 127 Neopixels (#23322) commit97798d1e47Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Thu Jul 8 01:33:49 2021 -0500 🎨 Update SKR V2 pins commitf4b808456aAuthor: Giuliano Zaro <3684609+GMagician@users.noreply.github.com> Date: Tue Dec 14 01:47:57 2021 +0100 🚸 Use M600 for disabled MMU (#21865) commit6264736968Author: Tanguy Pruvot <tpruvot@users.noreply.github.com> Date: Tue Dec 14 01:41:21 2021 +0100 🐛 Fix TFT_COLOR_UI Release Media issue (#23123) commit7a5f103bcfAuthor: John Lagonikas <39417467+zeleps@users.noreply.github.com> Date: Sat Dec 18 01:31:10 2021 +0200 🔧 Warning for IGNORE_THERMOCOUPLE_ERRORS (#23312) commit1a8307b196Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Sat Dec 18 17:38:29 2021 -0600 📝 Fix a config comment commit13a1c86ae8Author: ellensp <530024+ellensp@users.noreply.github.com> Date: Tue Dec 14 13:18:24 2021 +1300 ✨ M115 flag EXTENDED_M20 (#22941) commit15656201d2Author: ellensp <530024+ellensp@users.noreply.github.com> Date: Tue Dec 14 13:13:34 2021 +1300 ✏️ Clean up duplicate defs (#23182) commitf3e372cb4cAuthor: Robby Candra <robbycandra.mail@gmail.com> Date: Tue Dec 14 07:11:52 2021 +0700 🩹 Init fan speed at boot (#23181) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commitc781ecc437Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Mon Dec 13 16:15:46 2021 -0600 🔧 Fix unknown board test commitdaa8fff6c6Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Sun Dec 12 16:16:40 2021 -0600 🩹 SD abort requires open file See #22566 commitd481bba327Author: ellensp <530024+ellensp@users.noreply.github.com> Date: Sun Dec 12 11:06:45 2021 +1300 🐛 Fix MARLIN_F103Rx variant SCK / MOSI pins (#23282) commit32b08ae04cAuthor: Scott Alfter <scott@alfter.us> Date: Wed Dec 8 23:18:04 2021 -0800 Fix Endstops::report_states (#23280) Fix regression 4d45fdf0eb commitf00a0356c7Author: Scott Lahteine <github@thinkyhead.com> Date: Wed Dec 8 18:36:08 2021 -0600 🎨 Misc. probe / endstop cleanup commit9871800874Author: Sola <42537573+solawc@users.noreply.github.com> Date: Thu Dec 9 03:37:45 2021 +0800 🐛 Fix MKS LVGL UI retraction (#23267) commit39c2c038beAuthor: Robby Candra <robbycandra.mail@gmail.com> Date: Thu Dec 9 02:15:31 2021 +0700 🩹 Coerce pin_t in set_pwm_duty macros (#23273) commit285d6488a3Author: Jason Smith <jason.inet@gmail.com> Date: Wed Dec 8 11:10:37 2021 -0800 🐛 Fix ACTION_ITEM with nullptr (#23195) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commiteecbd09a46Author: Robby Candra <robbycandra.mail@gmail.com> Date: Thu Dec 9 01:57:50 2021 +0700 🚸 Onboard SD for SKR 2.0 / SKR PRO (#23274) commit8d4e4ac115Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Wed Dec 8 12:40:23 2021 -0600 🎨 Rename MAX31865 elements commitb77a5d4c8dAuthor: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Mon Dec 6 20:18:50 2021 -0600 ✏️ MAX31856 => MAX31865 commitc3b8b3e7e6Author: Mike La Spina <mike.laspina@shaw.ca> Date: Mon Dec 6 15:52:18 2021 -0600 🩹 Fix non-PWM cutter compile (#23169) commit7123b15801Author: Stuart Pittaway <1201909+stuartpittaway@users.noreply.github.com> Date: Mon Dec 6 21:40:18 2021 +0000 🐛 Fix TWIBus Wire.begin call (#23183) commit8a2f13d657Author: Chris Pepper <p3p@p3psoft.co.uk> Date: Sun Dec 5 22:18:02 2021 +0000 🐛 HAL_reboot for native HAL (#23246) commit251d9fc1d7Author: tommywienert <53783769+tommywienert@users.noreply.github.com> Date: Sun Dec 5 23:16:23 2021 +0100 🐛 Fix env:chitu_f103 (#23225) commit5eeb9650b5Author: ellensp <530024+ellensp@users.noreply.github.com> Date: Mon Dec 6 10:42:56 2021 +1300 📌 More Longer3D LKx Pro serial tests (#23260) commitc0addd1d33Author: Stuart Pittaway <1201909+stuartpittaway@users.noreply.github.com> Date: Sat Dec 4 23:44:10 2021 +0000 ✨ M3426 to read i2c MCP3426 ADC (#23184) commit05b57278d4Author: Scott Lahteine <github@thinkyhead.com> Date: Sat Dec 4 17:17:10 2021 -0600 🔧 Cutter pins for SKR 2.0 commitaa3ec2fbfdAuthor: Robby Candra <robbycandra.mail@gmail.com> Date: Sun Dec 5 05:14:19 2021 +0700 🚸 Park nozzle on "loud kill" (#23172) commit4468516aa2Author: ellensp <530024+ellensp@users.noreply.github.com> Date: Sun Dec 5 11:10:29 2021 +1300 ✨ BigTree SKR 2 with F429 (#23177) commit95d006b406Author: ellensp <530024+ellensp@users.noreply.github.com> Date: Sat Dec 4 09:48:54 2021 +1300 🐛 Fix TIMER_TONE for ZM3E4 (#23212) commit5b057b4bcfAuthor: Jiri Jirus <jiri.jirus@cloudaper.com> Date: Tue Nov 30 21:46:48 2021 +0100 🩹 Assume 4K EEPROM for RUMBA32 BTT (#23205) commit77af48e547Author: Scott Lahteine <github@thinkyhead.com> Date: Tue Nov 30 13:03:31 2021 -0600 🐛 Fix STM32 FastPWM commit0f7f709aadAuthor: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Sat Nov 27 14:59:32 2021 -0800 ✏️ Fix Unicode (#23186) commita8c0e11cb1Author: Jason Smith <jason.inet@gmail.com> Date: Sat Nov 27 13:54:39 2021 -0800 🩹 Handle nullptr in CardReader::printLongPath (#23197) commit0556da85b0Author: Anson Liu <ansonl@users.noreply.github.com> Date: Sat Nov 27 17:58:05 2021 -0500 🩹 UM2 extruder cooling fan on PJ6 (#23194) commit93652e5c6fAuthor: George Fu <nailao_5918@163.com> Date: Sun Nov 28 03:26:53 2021 +0800 ✨ FYSETC Spider v2.2 (#23208) commitf3fc1d15a3Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com> Date: Tue Nov 23 22:33:33 2021 +0100 🩹 Fix include path (#23150) commit3148060550Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Tue Nov 23 13:54:31 2021 -0800 📌 Biqu BX temporary framework workaround (#23131) commit5f08864d1fAuthor: Mike La Spina <mike.laspina@shaw.ca> Date: Tue Nov 23 14:05:50 2021 -0600 🐛 Fix STM32 set_pwm_duty (#23125) commit184fc36a08Author: Tanguy Pruvot <tpruvot@users.noreply.github.com> Date: Sun Nov 21 20:13:01 2021 +0100 🐛 Fix TFT backlight sleep/wake (#23153) commit281ed99868Author: Tanguy Pruvot <tpruvot@users.noreply.github.com> Date: Sat Nov 20 02:44:53 2021 +0100 ⚡️ Reduce calls to set fan PWM (#23149) commit2cc4a1b326Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Wed Nov 17 13:01:44 2021 -0600 🎨 Misc formatting commitc5bd08755cAuthor: BigTreeTech <38851044+bigtreetech@users.noreply.github.com> Date: Thu Nov 18 01:35:28 2021 +0800 🐛 Init PROBE_ENABLE_PIN (#23133) commit99f58f63f2Author: luzpaz <luzpaz@users.noreply.github.com> Date: Wed Nov 17 12:09:01 2021 -0500 🎨 Fix misspelling (#23137) commitc2a674d2c1Author: espr14 <espr14@gmail.com> Date: Wed Nov 17 18:07:11 2021 +0100 🏗️ Planner::busy() (#23145) commitfeffc19867Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Tue Nov 16 14:06:36 2021 -0600 🐛 Fix fast PWM WGM code Followup to #23102 commitf637e1c501Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Tue Nov 16 12:49:25 2021 -0600 🔨 Bring Makefile up to date commit78240a279bAuthor: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com> Date: Tue Nov 16 19:32:43 2021 +0300 🔨 Ignore sim flashdrive file (#23129) commit656034d2d9Author: Luc Van Daele <lvd@sound-silence.com> Date: Tue Nov 16 16:24:53 2021 +0100 🐛 Fix G33, Delta radii, reachable (#22795) commit39a81d167eAuthor: Mikhail Basov <github@basov.net> Date: Mon Nov 15 07:46:34 2021 +0300 🚸 LCD_SHOW_E_TOTAL for TFT_COLOR_UI (#23127) commitcb1570d162Author: Scott Lahteine <github@thinkyhead.com> Date: Sun Nov 14 17:19:57 2021 -0600 🐛 Fix SENSORLESS_HOMING for 6-axis commit8cb646cc20Author: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com> Date: Mon Nov 15 00:15:07 2021 +0300 🚸 Simplify touchscreen calibration for SimUI (#23124) commit3cccb21dc9Author: Miguel Risco-Castillo <mriscoc@users.noreply.github.com> Date: Wed Nov 10 11:55:20 2021 -0500 🚸 Fix up E3V2 Enhanced (#23100) commit7f4a49cc44Author: Scott Lahteine <github@thinkyhead.com> Date: Fri Oct 22 13:21:26 2021 -0500 🎨 Misc. issue review patches commite0c439fe91Author: Mike La Spina <mike.laspina@shaw.ca> Date: Sun Nov 14 05:55:31 2021 -0600 ⚡️ Controller Fan software PWM (etc.) (#23102) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commit49e233e06fAuthor: Tanguy Pruvot <tpruvot@users.noreply.github.com> Date: Fri Nov 12 21:26:19 2021 +0100 🎨 MPX ARM Mini pins cleanup (#23113) commitb662dd1f92Author: Mike La Spina <mike.laspina@shaw.ca> Date: Fri Nov 12 12:14:28 2021 -0600 🐛 [LCP1768] Init PWM in set_pwm_duty (#23110) commit700cae43abAuthor: Skruppy <skruppy@onmars.eu> Date: Fri Nov 12 15:57:24 2021 +0100 🩹 Fix RGB case light compile (#23108) commit1c74c6e7acAuthor: George Fu <nailao_5918@163.com> Date: Wed Nov 10 23:58:20 2021 +0800 🐛 Fix FYSETC Cheetah 2.0 pins for production (#23104) commit757a9477dbAuthor: Minims <github@minims.fr> Date: Sun Oct 10 01:10:21 2021 +0200 🩹 Adjust GTR 1.0 ST7920 display delay (#22904) commit59d43408f6Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Sat Dec 25 00:57:30 2021 -0600 fix breaks in F() resolution commit1d8941d008Author: Scott Lahteine <github@thinkyhead.com> Date: Tue Oct 5 21:35:31 2021 -0500 🔨 Port libsdl2_net required for macOS simulator commit17f853d99cAuthor: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Tue Nov 9 08:30:02 2021 -0800 ⚡️ BTT002 (STM32F407VET6) variant, MK3_FAN_PINS flag (#23093) commit6f9f25dbb2Author: Scott Lahteine <github@thinkyhead.com> Date: Sun Nov 7 01:11:51 2021 -0600 🎨 Misc. code cleanup commit0273a68587Author: VragVideo <91742261+VragVideo@users.noreply.github.com> Date: Sun Oct 3 06:12:51 2021 +0300 ✨ WYH L12864 LCD (Alfawise Ex8) (#22863) commit58a26fcaacAuthor: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Sat Nov 6 23:09:15 2021 -0700 🚸 Indicate Preheating for probe / leveling (#23088) commit489aca03ffAuthor: Evgeniy Zhabotinskiy <evg-zhabotinsky@users.noreply.github.com> Date: Sun Nov 7 07:16:18 2021 +0300 🩹 Fix M503 report (#23084) commitf32e19e1c6Author: Jin <3448324+jinhong-@users.noreply.github.com> Date: Sun Nov 7 11:53:36 2021 +0800 🍻 Preliminary fix for Max31865 SPI (#22682) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commit57bd04b6ceAuthor: dwzg <50058606+dwzg@users.noreply.github.com> Date: Sun Nov 7 04:48:00 2021 +0100 🐛 Fix JyersUI scrolling filename, etc. (#23082) Co-authored-by: Scott Lahteine <github@thinkyhead.com> commit396df93220Author: ellensp <530024+ellensp@users.noreply.github.com> Date: Sun Nov 7 15:27:53 2021 +1300 🐛 Fix DGUS Reloaded status message (#23090) commit9b76b58b79Author: Scott Lahteine <github@thinkyhead.com> Date: Thu Nov 4 12:18:23 2021 -0500 🍻 Get/clear reset source earlier Followup to #23075 commit9fffed7160Author: Skruppy <skruppy@onmars.eu> Date: Thu Nov 4 18:11:57 2021 +0100 🐛 Prevent AVR watchdogpile (#23075) commitfd136d5501Author: Tanguy Pruvot <tpruvot@users.noreply.github.com> Date: Thu Nov 4 18:04:04 2021 +0100 🐛 Fix TFT backlight [STM32] (#23062) commit89ec1c71f0Author: BigTreeTech <38851044+bigtreetech@users.noreply.github.com> Date: Thu Nov 4 18:54:38 2021 +0800 🐛 Fix Octopus-Pro Max31865 / SPI (#23072) commitfc2020c6ecAuthor: Robby Candra <robbycandra.mail@gmail.com> Date: Thu Nov 4 17:28:42 2021 +0700 🔨 Fix IntelliSense / PIO conflicts (#23058) Co-authored-by: Scott Lahteine <github@thinkyhead.com> commitf97635de36Author: ellensp <530024+ellensp@users.noreply.github.com> Date: Thu Nov 4 14:04:06 2021 +1300 📌 'STOP' auto-assign, some Chitu V9 pins (#22889) Co-authored-by: Scott Lahteine <github@thinkyhead.com> commita0a57406a2Author: Scott Lahteine <github@thinkyhead.com> Date: Wed Nov 3 07:06:31 2021 -0500 🔨 Script 'mfprep' finds pending commits commit5efef86cfaAuthor: Scott Lahteine <github@thinkyhead.com> Date: Wed Nov 3 07:02:21 2021 -0500 🔨 Update git helper scripts commit20c747753dAuthor: Scott Lahteine <github@thinkyhead.com> Date: Tue Nov 2 01:28:00 2021 -0500 🔨 Support ABM in mf scripts commit08a9c61587Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Mon Nov 1 23:15:29 2021 -0700 📌 Default NeoPixel pin for MKS Robin E3/E3D (#23060) commit0d91b07797Author: Andrei M <22990561+andrei-moraru@users.noreply.github.com> Date: Tue Nov 2 01:47:16 2021 -0400 ⚗️ Use pwm_set_duty over analogWrite to set PWM (#23048) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commitb033da1782Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Mon Nov 1 22:43:40 2021 -0700 🔧 Endstop / DIAG homing conflict warning (#23050) commit4dcd872be5Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Mon Nov 1 21:23:54 2021 -0700 ✨ Allow Low EJERK with LA, optional (#23054) commit7e9e2a7435Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Mon Nov 1 20:23:24 2021 -0700 ✨ Artillery Ruby (STM32F401RCT6) (#23029) commit0b84194127Author: tombrazier <68918209+tombrazier@users.noreply.github.com> Date: Mon Nov 1 23:03:50 2021 +0000 🚸 More flexible Probe Temperature Compensation (#23033) commitefd9329c81Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Thu Jul 8 01:17:16 2021 -0500 📝 Tweak EXP comments commit5cbb820e29Author: Scott Lahteine <github@thinkyhead.com> Date: Sat Oct 30 23:43:19 2021 -0500 🔨 Help for GDB remote debugging commit5a0166489eAuthor: Scott Lahteine <github@thinkyhead.com> Date: Sat Oct 30 22:43:02 2021 -0500 🩹 Fix linker error (transfer_port_index) commit692c9a6312Author: Scott Lahteine <github@thinkyhead.com> Date: Sat Oct 30 04:16:37 2021 -0500 💚 Update Ender-3 V2 config path MarlinFirmware/Configurations#600 commit545d14f9a5Author: Scott Lahteine <github@thinkyhead.com> Date: Sat Oct 30 01:39:33 2021 -0500 🎨 Adjust Ender-3 V2 DWIN options commit7b9e01eb2bAuthor: aalku <aalku7@gmail.com> Date: Sat Oct 30 07:17:20 2021 +0200 ✨ Shutdown Host Action (#22908) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commit8562f0ec44Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Fri Oct 29 20:46:55 2021 -0500 ✨ "Rutilea" ESP32 board (#22880) commit6f59d8171fAuthor: Scott Lahteine <github@thinkyhead.com> Date: Fri Oct 29 20:42:52 2021 -0500 🔧 Configuration version 02000903 commitd29a9014f2Author: Scott Lahteine <github@thinkyhead.com> Date: Wed Oct 27 21:36:06 2021 -0500 🎨 Standard 'cooldown' method commit205d867e4bAuthor: Scott Lahteine <github@thinkyhead.com> Date: Wed Oct 27 20:01:44 2021 -0500 🎨 Standard material presets behavior commit84f9490149Author: Scott Lahteine <github@thinkyhead.com> Date: Wed Oct 27 21:15:58 2021 -0500 🎨 Define HAS_PREHEAT conditional commit1fd4258423Author: tome9111991 <57866234+tome9111991@users.noreply.github.com> Date: Sat Oct 30 00:49:12 2021 +0200 🐛 Fix E3V2 (CrealityUI) Tune/Prepare > Zoffset (#23040) commite8a55972a7Author: Scott Lahteine <github@thinkyhead.com> Date: Thu Oct 28 19:22:35 2021 -0500 🐛 Fix EZBoard V2 board name commitaef413202eAuthor: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Thu Oct 28 03:26:05 2021 -0700 🐛 Fix MKS Robin E3/E3D Z Stop/Probe pins (#23034) commitcbc7dadf42Author: Scott Lahteine <github@thinkyhead.com> Date: Tue Oct 26 21:54:43 2021 -0500 🎨 Apply HAS_MULTI_HOTEND conditional commitc508ecc414Author: Zlopi <zlopi.ru@gmail.com> Date: Wed Oct 27 23:10:46 2021 +0300 🚸 Scroll long filename on MKS TFT (#23031) commit384a31765fAuthor: ellensp <530024+ellensp@users.noreply.github.com> Date: Thu Oct 28 09:06:06 2021 +1300 🩹 Retain LCD pins with motor expansion (#23024) commit0f2c4fc40bAuthor: somehibs <hibs@circuitco.de> Date: Wed Oct 27 21:00:02 2021 +0100 🐛 Fix serial PORT_RESTORE (and BUFFER_MONITORING) (#23022) commit66a274452cAuthor: tome9111991 <57866234+tome9111991@users.noreply.github.com> Date: Wed Oct 27 21:58:32 2021 +0200 🐛 Fix E3V2 (CrealityUI) position display (#23023) Followup to #23005, #22778 commit12f8168d1eAuthor: Scott Lahteine <github@thinkyhead.com> Date: Tue Oct 26 19:36:16 2021 -0500 🚸 Tweaks to UBL G29 Q commit2142e1dae4Author: woisy00 <spam@bergermeier.info> Date: Wed Oct 27 01:05:34 2021 +0200 🐛 Fix AUTOTEMP bug (thermal runaway) (#23025) Regression from9823a37commit8d21ea55a2Author: tombrazier <68918209+tombrazier@users.noreply.github.com> Date: Mon Oct 25 06:33:40 2021 +0100 🐛 Add USE_TEMP_EXT_COMPENSATION options (#23007) commita0da7e8a1fAuthor: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Sun Oct 24 23:33:27 2021 -0500 🔧 Fewer alerts about Z_SAFE_HOMING commite2452d6c57Author: tome9111991 <57866234+tome9111991@users.noreply.github.com> Date: Fri Oct 22 18:16:07 2021 +0200 🐛 Fix SHOW_REMAINING_TIME option for JyersUI (#22999) commit5173a3140dAuthor: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Fri Oct 22 08:52:31 2021 -0700 ✨ BigTreeTech TFT35 SPI V1.0 (#22986) commite44f2b7d2dAuthor: Mike La Spina <mike.laspina@shaw.ca> Date: Tue Oct 19 06:05:23 2021 -0500 🩹 Fix pragma ignored for older GCC (#22978) commited78f7f4e6Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Tue Oct 19 05:59:48 2021 -0500 🎨 Refactor MOSFET pins layout (#22983) commitaa198e41ddAuthor: Scott Lahteine <github@thinkyhead.com> Date: Tue Oct 19 05:52:41 2021 -0500 🎨 Pragma GCC cleanup commit18b38fb58aAuthor: Jason Smith <jason.inet@gmail.com> Date: Mon Oct 18 01:11:16 2021 -0700 🐛 Fix max chamber fan speed (#22977) commit5d79d8fad6Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Mon Oct 18 00:57:54 2021 -0700 🐛 Fix I2C EEPROM SDA/SCL aliases with SKR Mini E3 V2 (#22955) commite7a746966dAuthor: ellensp <530024+ellensp@users.noreply.github.com> Date: Mon Oct 18 20:54:20 2021 +1300 🐛 Fix MMU1 compile (#22965) commit555f35d46fAuthor: Mike La Spina <mike.laspina@shaw.ca> Date: Mon Oct 18 02:40:47 2021 -0500 🎨 Suppress type warning (#22976) commitde77dfcbbdAuthor: Scott Lahteine <github@thinkyhead.com> Date: Sun Oct 17 22:10:08 2021 -0500 🎨 Add MKS UI goto_previous_ui commitaf08f16efcAuthor: Scott Lahteine <github@thinkyhead.com> Date: Sun Oct 17 20:24:41 2021 -0500 🚸 Tweak MKS UI G-code console commit01a0f3a8cfAuthor: Scott Lahteine <github@thinkyhead.com> Date: Sun Oct 17 18:11:16 2021 -0500 🎨 Fix up MKS UI defines commitf80bcdcc5cAuthor: Scott Lahteine <github@thinkyhead.com> Date: Fri Oct 15 00:24:08 2021 -0500 🎨 Refactor Host Actions as singleton commit1ead7ce681Author: ellensp <530024+ellensp@users.noreply.github.com> Date: Fri Oct 15 14:38:03 2021 +1300 🔧 Add, update TFT sanity checks (#22928) commitdffa56463eAuthor: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Tue Oct 12 23:19:05 2021 -0400 ⚡️ Formbot ST7920 delays, intentional X2 pins (#22915) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commitae98d2e5eaAuthor: Dmytro <svetotled@gmail.com> Date: Wed Oct 13 05:45:00 2021 +0300 🎨 Update MKS UI for no bed, extruder (#22938) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> commit5b1ef638eeAuthor: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Tue Oct 12 19:40:56 2021 -0400 🐛 Fix IDEX + DISABLE_INACTIVE_EXTRUDER (#22925) commitf3be03da20Author: Stuart Pittaway <1201909+stuartpittaway@users.noreply.github.com> Date: Mon Oct 11 23:42:29 2021 +0100 ✨ M261 S I2C output format (#22890) Co-authored-by: Scott Lahteine <github@thinkyhead.com> commit64128a5bcbAuthor: Tanguy Pruvot <tpruvot@users.noreply.github.com> Date: Sun Oct 10 01:05:24 2021 +0200 🐛 Queue string followup (#22900) commit0018c94a79Author: Pyro-Fox <36782094+Pyro-Fox@users.noreply.github.com> Date: Sat Oct 9 15:09:50 2021 -0700 🐛 LCD string followup (#22892) commitd48cb11537Author: Scott Lahteine <github@thinkyhead.com> Date: Tue Oct 5 21:19:28 2021 -0500 🐛 Followup to F() in config_line Followup to 1dafd1887e commitd9f7de7a24Author: Scott Lahteine <github@thinkyhead.com> Date: Mon Oct 4 19:50:14 2021 -0500 🐛 ExtUI F() followups Followup to 12b5d997a2 commit3d102a77caAuthor: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Tue Sep 28 20:15:52 2021 -0500 🎨 Apply F() to kill / sendinfoscreen commit492d70424dAuthor: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Tue Sep 28 19:28:29 2021 -0500 🎨 Apply F() to MKS UI errors, assets commit24dbeceb45Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Mon Sep 27 13:46:42 2021 -0500 🎨 Apply F() to various reports commitcabd538fddAuthor: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Mon Sep 27 13:40:01 2021 -0500 🎨 Apply F() to G-code report header commit9cf1c3cf05Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Sat Sep 25 23:52:41 2021 -0500 🎨 Apply F() to UTF-8/MMU2 string put commitc3ae221a10Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Sat Sep 25 22:11:48 2021 -0500 🎨 Apply F() to some ExtUI functions commit7626d859a6Author: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Mon Sep 27 11:55:08 2021 -0500 🎨 Apply F() to Host Actions strings commit360311f232Author: Scott Lahteine <github@thinkyhead.com> Date: Sat Sep 25 17:05:11 2021 -0500 🎨 Apply F() to status message commit433eedd50fAuthor: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Mon Sep 27 11:03:07 2021 -0500 🎨 Apply F() to serial macros commit46c53f6730Author: Scott Lahteine <github@thinkyhead.com> Date: Sat Sep 25 21:11:31 2021 -0500 🎨 Apply F() to G-code suite and queue commit2b9ae0cc33Author: Scott Lahteine <github@thinkyhead.com> Date: Sat Sep 25 18:43:52 2021 -0500 🎨 Apply F() to G-code subcommands commit433a27e475Author: Scott Lahteine <github@thinkyhead.com> Date: Sat Sep 25 18:22:37 2021 -0500 🎨 Update F string declarations commit1de265ea5dAuthor: Scott Lahteine <thinkyhead@users.noreply.github.com> Date: Mon Oct 4 00:24:41 2021 -0500 🎨 Axis name string interpolation, with examples (#22879) commitecb08b15beMerge:798d12c2af854ce63358Author: Sergey <sergey@terentiev.me> Date: Wed Dec 22 11:58:28 2021 +0300 Merge branch '2.0.x' into vanilla_fb_2.0.x commit854ce63358Author: Robby Candra <robbycandra.mail@gmail.com> Date: Sun Dec 19 05:33:21 2021 +0700 🐛 Fix loud_kill heater disable (#23314) commit170f77fadaAuthor: lukrow80 <64228214+lukrow80@users.noreply.github.com> Date: Tue Nov 23 22:30:13 2021 +0100 🐛 Fix homing current for extra axes (#23152) Followup to #19112 commit72b99bf1baAuthor: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Sat Oct 9 19:13:19 2021 -0400 🐛 Fix IDEX Duplication Mode Positioning (#22914) Fixing #22538 commit1a8583f4fcAuthor: Robby Candra <robbycandra.mail@gmail.com> Date: Wed Nov 24 04:19:32 2021 +0700 🐛 Fix serial_data_available (#23160)
327 lines
10 KiB
Bash
Executable File
327 lines
10 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
#
|
|
# mftest Select a test to apply and build
|
|
# mftest -b [#] Build the auto-detected environment
|
|
# mftest -u [#] Upload the auto-detected environment
|
|
# mftest [name] [index] [-y] Set config options and optionally build a test
|
|
#
|
|
|
|
[[ -d Marlin/src ]] || { echo "Please 'cd' to the Marlin repo root." ; exit 1 ; }
|
|
|
|
perror() { echo -e "$0: \033[0;31m$1 -- $2\033[0m" ; }
|
|
errout() { echo -e "\033[0;31m$1\033[0m" ; }
|
|
bugout() { ((DEBUG)) && echo -e "\033[0;32m$1\033[0m" ; }
|
|
|
|
usage() {
|
|
echo "
|
|
Usage: mftest [-t|--env=<env|index>] [-n|--num=<num>] [-m|--make] [-y|--build=<Y|n>]
|
|
mftest [-a|--autobuild]
|
|
mftest [-r|--rebuild]
|
|
mftest [-u|--autoupload] [-n|--num=<num>]
|
|
|
|
OPTIONS
|
|
-t --env The environment to apply / run, or the menu index number.
|
|
-n --num The index of the test to run. (In file order.)
|
|
-m --make Use the make / Docker method for the build.
|
|
-y --build Skip 'Do you want to build this test?' and assume YES.
|
|
-h --help Print this help.
|
|
-a --autobuild PIO Build using the MOTHERBOARD environment.
|
|
-u --autoupload PIO Upload using the MOTHERBOARD environment.
|
|
-v --verbose Extra output for debugging.
|
|
-s --silent Silence build output from PlatformIO.
|
|
|
|
env shortcuts: tree due esp lin lpc|lpc8 lpc9 m128 m256|mega stm|f1 f4 f7 s6 teensy|t31|t32 t35|t36 t40|t41
|
|
"
|
|
}
|
|
|
|
TESTPATH=buildroot/tests
|
|
|
|
STATE_FILE="./.pio/.mftestrc"
|
|
SED=$(which gsed sed | head -n1)
|
|
|
|
shopt -s extglob nocasematch
|
|
|
|
# Matching patterns
|
|
ISNUM='^[0-9]+$'
|
|
ISCMD='^(restore|opt|exec|use|pins|env)_'
|
|
ISEXEC='^exec_'
|
|
ISCONT='\\ *$'
|
|
|
|
# Get environment, test number, etc. from the command
|
|
TESTENV='-'
|
|
CHOICE=0
|
|
DEBUG=0
|
|
|
|
while getopts 'abhmruvyn:t:-:' OFLAG; do
|
|
case "${OFLAG}" in
|
|
a) AUTO_BUILD=1 ; bugout "Auto-Build target..." ;;
|
|
h) EXIT_USAGE=1 ;;
|
|
m) USE_MAKE=1 ; bugout "Using make with Docker..." ;;
|
|
n) case "$OPTARG" in
|
|
*[!0-9]*) perror "option requires a number" $OFLAG ; EXIT_USAGE=2 ;;
|
|
*) CHOICE="$OPTARG" ; bugout "Got a number: $CHOICE" ;;
|
|
esac
|
|
;;
|
|
r) REBUILD=1 ; bugout "Rebuilding previous..." ;;
|
|
s) SILENT_FLAG="-s" ;;
|
|
t) TESTENV="$OPTARG" ; bugout "Got a target: $TESTENV" ;;
|
|
u) AUTO_BUILD=2 ; bugout "Auto-Upload target..." ;;
|
|
v) DEBUG=1 ; bugout "Debug ON" ;;
|
|
y) BUILD_YES='Y' ; bugout "Build will initiate..." ;;
|
|
-) IFS="=" read -r ONAM OVAL <<< "$OPTARG"
|
|
case "$ONAM" in
|
|
help) [[ -z "$OVAL" ]] || perror "option can't take value $OVAL" $ONAM ; EXIT_USAGE=1 ;;
|
|
autobuild) AUTO_BUILD=1 ; bugout "Auto-Build target..." ;;
|
|
autoupload) AUTO_BUILD=2 ; bugout "Auto-Upload target..." ;;
|
|
env) case "$OVAL" in
|
|
'') perror "option requires a value" $ONAM ; EXIT_USAGE=2 ;;
|
|
*) TESTENV="$OVAL" ; bugout "Got a target: $TESTENV" ;;
|
|
esac
|
|
;;
|
|
num) case "$OVAL" in
|
|
[0-9]+) CHOICE="$OVAL" ; bugout "Got a number: $CHOICE" ;;
|
|
*) perror "option requires a value" $ONAM ; EXIT_USAGE=2 ;;
|
|
esac
|
|
;;
|
|
rebuild) REBUILD=1 ; bugout "Rebuilding previous..." ;;
|
|
make) USE_MAKE=1 ; bugout "Using make with Docker..." ;;
|
|
debug|verbose) DEBUG=1 ; bugout "Debug ON" ;;
|
|
build) case "$OVAL" in
|
|
''|y|yes) BUILD_YES='Y' ;;
|
|
n|no) BUILD_YES='N' ;;
|
|
*) perror "option value must be y, n, yes, or no" $ONAM ; EXIT_USAGE=2 ;;
|
|
esac
|
|
bugout "Build will initiate? ($BUILD_YES)"
|
|
;;
|
|
*) perror "Unknown flag" "$OPTARG" ; EXIT_USAGE=2 ;;
|
|
esac
|
|
;;
|
|
*) EXIT_USAGE=2 ;;
|
|
esac
|
|
done
|
|
|
|
((EXIT_USAGE)) && { usage ; let EXIT_USAGE-- ; exit $EXIT_USAGE ; }
|
|
|
|
if ((REBUILD)); then
|
|
bugout "Rebuilding previous..."
|
|
# Build with the last-built env
|
|
[[ -f "$STATE_FILE" ]] || { errout "No previous (-r) build state found." ; exit 1 ; }
|
|
read TESTENV <"$STATE_FILE"
|
|
pio run $SILENT_FLAG -d . -e $TESTENV
|
|
exit 0
|
|
fi
|
|
|
|
case $TESTENV in
|
|
tree) pio run -d . -e include_tree ; exit 1 ;;
|
|
due) TESTENV='DUE' ;;
|
|
esp) TESTENV='esp32' ;;
|
|
lin*) TESTENV='linux_native' ;;
|
|
lp8|lpc8) TESTENV='LPC1768' ;;
|
|
lp9|lpc9) TESTENV='LPC1769' ;;
|
|
m128) TESTENV='mega1280' ;;
|
|
m256) TESTENV='mega2560' ;;
|
|
mega) TESTENV='mega2560' ;;
|
|
stm) TESTENV='STM32F103RE' ;;
|
|
f1) TESTENV='STM32F103RE' ;;
|
|
f4) TESTENV='STM32F4' ;;
|
|
f7) TESTENV='STM32F7' ;;
|
|
s6) TESTENV='FYSETC_S6' ;;
|
|
teensy) TESTENV='teensy31' ;;
|
|
t31) TESTENV='teensy31' ;;
|
|
t32) TESTENV='teensy31' ;;
|
|
t35) TESTENV='teensy35' ;;
|
|
t36) TESTENV='teensy35' ;;
|
|
t40) TESTENV='teensy41' ;;
|
|
t41) TESTENV='teensy41' ;;
|
|
[1-9]|[1-9][0-9]) TESTNUM=$TESTENV ; TESTENV=- ;;
|
|
esac
|
|
|
|
if ((AUTO_BUILD)); then
|
|
#
|
|
# List environments that apply to the current MOTHERBOARD.
|
|
#
|
|
case $(uname | tr '[:upper:]' '[:lower:]') in
|
|
darwin) SYS='mac' ;;
|
|
*linux) SYS='lin' ;;
|
|
win*) SYS='win' ;;
|
|
msys*) SYS='win' ;;
|
|
cygwin*) SYS='win' ;;
|
|
mingw*) SYS='win' ;;
|
|
*) SYS='uni' ;;
|
|
esac
|
|
echo ; echo -n "Auto " ; ((AUTO_BUILD == 2)) && echo "Upload..." || echo "Build..."
|
|
MB=$( grep -E "^\s*#define MOTHERBOARD" Marlin/Configuration.h | awk '{ print $3 }' | $SED 's/BOARD_//;s/\r//' )
|
|
[[ -z $MB ]] && { echo "Error - Can't read MOTHERBOARD setting." ; exit 1 ; }
|
|
BLINE=$( grep -E "define\s+BOARD_$MB\b" Marlin/src/core/boards.h )
|
|
BNUM=$( $SED -E 's/^.+BOARD_[^ ]+ +([0-9]+).+$/\1/' <<<"$BLINE" )
|
|
BDESC=$( $SED -E 's/^.+\/\/ *(.+)$/\1/' <<<"$BLINE" )
|
|
[[ -z $BNUM ]] && { echo "Error - Can't find BOARD_$MB in core/boards.h." ; exit 1 ; }
|
|
ENVS=( $( grep -EA1 "MB\(.*\b$MB\b.*\)" Marlin/src/pins/pins.h | grep -E "#include.+//.+(env|$SYS):[^ ]+" | grep -oE "(env|$SYS):[^ ]+" | $SED -E "s/(env|$SYS)://" ) )
|
|
[[ -z $ENVS ]] && { errout "Error - Can't find target(s) for $MB ($BNUM)." ; exit 1 ; }
|
|
ECOUNT=${#ENVS[*]}
|
|
|
|
if [[ $ECOUNT == 1 ]]; then
|
|
TARGET=$ENVS
|
|
else
|
|
if [[ $CHOICE == 0 ]]; then
|
|
# List env names and numbers. Get selection.
|
|
echo "Available targets for \"$BDESC\" | $MB ($BNUM):"
|
|
|
|
IND=0 ; for ENV in "${ENVS[@]}"; do let IND++ ; echo " $IND) $ENV" ; done
|
|
|
|
if [[ $ECOUNT > 1 ]]; then
|
|
for (( ; ; ))
|
|
do
|
|
read -p "Select a target for '$MB' (1-$ECOUNT) : " CHOICE
|
|
[[ -z "$CHOICE" ]] && { echo '(canceled)' ; exit 1 ; }
|
|
[[ $CHOICE =~ $ISNUM ]] && ((CHOICE >= 1 && CHOICE <= ECOUNT)) && break
|
|
errout ">>> Invalid environment choice '$CHOICE'."
|
|
done
|
|
echo
|
|
fi
|
|
else
|
|
echo "Detected \"$BDESC\" | $MB ($BNUM)."
|
|
[[ $CHOICE > $ECOUNT ]] && { echo "Environment selection out of range." ; exit 1 ; }
|
|
fi
|
|
TARGET="${ENVS[$CHOICE-1]}"
|
|
echo "Selected $TARGET"
|
|
fi
|
|
|
|
echo "$TARGET" >"$STATE_FILE"
|
|
|
|
if ((AUTO_BUILD == 2)); then
|
|
echo "Uploading environment $TARGET for board $MB ($BNUM)..." ; echo
|
|
pio run $SILENT_FLAG -t upload -e $TARGET
|
|
else
|
|
echo "Building environment $TARGET for board $MB ($BNUM)..." ; echo
|
|
pio run $SILENT_FLAG -e $TARGET
|
|
fi
|
|
exit 0
|
|
fi
|
|
|
|
#
|
|
# List available tests and ask for selection
|
|
#
|
|
|
|
if [[ $TESTENV == '-' ]]; then
|
|
IND=0
|
|
NAMES=()
|
|
MENU=()
|
|
BIGLEN=0
|
|
for FILE in $( ls -1 $TESTPATH/* | sort -f )
|
|
do
|
|
let IND++
|
|
TNAME=${FILE/$TESTPATH\//}
|
|
NAMES+=($TNAME)
|
|
IFS=""
|
|
ITEM=$( printf "%2i) %s" $IND $TNAME )
|
|
MENU+=($ITEM)
|
|
[[ ${#ITEM} -gt $BIGLEN ]] && BIGLEN=${#ITEM}
|
|
done
|
|
|
|
(( BIGLEN += 2 ))
|
|
THIRD=$(( (${#MENU[@]} + 2) / 3 ))
|
|
for ((i = 0; i < $THIRD; i++))
|
|
do
|
|
COL1=$i ; COL2=$(( $i + $THIRD )) ; COL3=$(( $i + 2 * $THIRD ))
|
|
FMT="%-${BIGLEN}s"
|
|
printf "${FMT}${FMT}${FMT}\n" ${MENU[$COL1]} ${MENU[$COL2]} ${MENU[$COL3]}
|
|
done
|
|
|
|
echo
|
|
for (( ; ; ))
|
|
do
|
|
if [[ $TESTNUM -gt 0 ]]; then
|
|
NAMEIND=$TESTNUM
|
|
else
|
|
read -p "Select a test to apply (1-$IND) : " NAMEIND
|
|
fi
|
|
[[ -z $NAMEIND ]] && { errout "(canceled)" ; exit 1 ; }
|
|
TESTENV=${NAMES[$NAMEIND-1]}
|
|
[[ $TESTNUM -gt 0 ]] && { echo "Preselected test $TESTNUM ... ($TESTENV)" ; TESTNUM='' ; }
|
|
[[ $NAMEIND =~ $ISNUM ]] && ((NAMEIND >= 1 && NAMEIND <= IND)) && { TESTENV=${NAMES[$NAMEIND-1]} ; echo ; break ; }
|
|
errout "Invalid selection."
|
|
done
|
|
fi
|
|
|
|
# Get the contents of the test file
|
|
OUT=$( cat $TESTPATH/$TESTENV 2>/dev/null ) || { errout "Can't find test '$TESTENV'." ; exit 1 ; }
|
|
|
|
# Count up the number of tests
|
|
TESTCOUNT=$( awk "/$ISEXEC/{a++}END{print a}" <<<"$OUT" )
|
|
|
|
# User entered a number?
|
|
(( CHOICE && CHOICE > TESTCOUNT )) && { errout "Invalid test selection '$CHOICE' (1-$TESTCOUNT)." ; exit 1 ; }
|
|
|
|
if [[ $CHOICE == 0 ]]; then
|
|
#
|
|
# List test descriptions with numbers and get selection
|
|
#
|
|
echo "Available '$TESTENV' tests:" ; echo "$OUT" | {
|
|
IND=0
|
|
while IFS= read -r LINE
|
|
do
|
|
if [[ $LINE =~ $ISEXEC ]]; then
|
|
DESC=$( "$SED" -E 's/^exec_test \$1 \$2 "([^"]+)".*$/\1/g' <<<"$LINE" )
|
|
(( ++IND < 10 )) && echo -n " "
|
|
echo " $IND) $DESC"
|
|
fi
|
|
done
|
|
}
|
|
CHOICE=1
|
|
if [[ $TESTCOUNT > 1 ]]; then
|
|
for (( ; ; ))
|
|
do
|
|
read -p "Select a '$TESTENV' test (1-$TESTCOUNT) : " CHOICE
|
|
[[ -z "$CHOICE" ]] && { errout "(canceled)" ; exit 1 ; }
|
|
[[ $CHOICE =~ $ISNUM ]] && ((CHOICE >= 1 && CHOICE <= TESTCOUNT)) && break
|
|
errout ">>> Invalid test selection '$CHOICE'."
|
|
done
|
|
fi
|
|
fi
|
|
|
|
#
|
|
# Run the specified test lines
|
|
#
|
|
echo -ne "\033[0;33m"
|
|
echo "$OUT" | {
|
|
IND=0
|
|
GOTX=0
|
|
CMD=""
|
|
while IFS= read -r LINE
|
|
do
|
|
if [[ $LINE =~ $ISCMD || $GOTX == 1 ]]; then
|
|
((!IND)) && let IND++
|
|
if [[ $LINE =~ $ISEXEC ]]; then
|
|
((IND++ > CHOICE)) && break
|
|
else
|
|
((!HEADER)) && {
|
|
HEADER=1
|
|
echo -e "\n#\n# Test $TESTENV ($CHOICE) $DESC\n#"
|
|
}
|
|
((IND == CHOICE)) && {
|
|
GOTX=1
|
|
[[ $CMD == "" ]] && CMD="$LINE" || CMD=$( echo -e "$CMD$LINE" | $SED -e 's/\\//g' | $SED -E 's/ +/ /g' )
|
|
[[ $LINE =~ $ISCONT ]] || { echo "$CMD" ; eval "$CMD" ; CMD="" ; }
|
|
}
|
|
fi
|
|
fi
|
|
done
|
|
}
|
|
echo -ne "\033[0m"
|
|
|
|
# Make clear it's a TEST
|
|
opt_set CUSTOM_MACHINE_NAME "\"Test $TESTENV ($CHOICE)\""
|
|
|
|
# Build the test too?
|
|
if [[ -z "$BUILD_YES" ]]; then
|
|
echo
|
|
read -p "Build $TESTENV test #$CHOICE (y/N) ? " BUILD_YES
|
|
fi
|
|
|
|
[[ $BUILD_YES == 'Y' || $BUILD_YES == 'Yes' ]] && {
|
|
((USE_MAKE)) && make tests-single-local TEST_TARGET=$TESTENV ONLY_TEST=$CHOICE
|
|
((USE_MAKE)) || pio run $SILENT_FLAG -d . -e $TESTENV
|
|
echo "$TESTENV" >"$STATE_FILE"
|
|
}
|