From 85d0a16480794c27caf30dae4c4d447bddfc2bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Garc=C3=AAs?= Date: Sun, 20 Jun 2021 11:52:39 +0100 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 0700a3d9a387649ef6de41c4e307d80f324d4035 Author: Emanuel Garcês Date: Sat Jun 12 23:39:16 2021 +0100 Increase bed probing speed commit 2d8be4d29f54d0303d6ed0ee38ef15f5b5c7fa64 Author: Emanuel Garcês Date: Sat Jun 12 22:36:51 2021 +0100 Bed PID Values commit 97dacdf53367b8241e687d7088e83e4d7f168750 Author: Emanuel Garcês Date: Sat Jun 12 19:27:43 2021 +0100 Enable PID Bed commit 360babe127269193324725479b1a64b6be37537e Author: Emanuel Garcês Date: Sat Jun 12 17:51:42 2021 +0100 Increase probing speed commit e858fb1f2856feb22e32cf6676054cc3e8ae5769 Merge: d44de6b89c 6131d2c5a6 Author: Emanuel Garcês Date: Sat Jun 12 17:48:40 2021 +0100 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into P3Steel-Bugfix commit d44de6b89c051ca8952f45f935aef242b458c334 Author: Emanuel Garcês Date: Sun May 16 18:11:22 2021 +0100 Can't enable both restore and enable leveling after g28 commit cb7e49bd1eb3ee9d282453111d40b7f4b1a31ee5 Merge: bca0621c5c 533ba2ac96 Author: Emanuel Garcês Date: Sun May 16 18:03:26 2021 +0100 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into P3Steel-Bugfix commit bca0621c5c5b1f2fb3e6558dc4d90d3c86b7ff39 Merge: 1bea497a04 376f0be5da Author: Emanuel Garcês Date: Sat May 15 12:30:52 2021 +0100 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into P3Steel-Bugfix commit 1bea497a040724c23f0ccf8676b4e8a052161d80 Merge: b2d69224b7 05c25b8cdb Author: Emanuel Garcês Date: Sun May 2 01:46:22 2021 +0100 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into P3Steel-Bugfix commit b2d69224b7a2605001dca8000ab90e17dbab091e Merge: 598713ff51 2e0a1f1aff Author: Emanuel Garcês Date: Wed Apr 28 19:28:27 2021 +0100 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into P3Steel-Bugfix commit 598713ff51fa05b12c7998b3101ff3f060e1636a Merge: 9cf1a89bca ba2cadb479 Author: Emanuel Garcês Date: Mon Jan 4 15:44:36 2021 +0000 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into P3Steel-Bugfix commit 9cf1a89bcae70be06837d9eeb3e42f8017191629 Merge: 765affa15c 0d080cea83 Author: Emanuel Garcês Date: Tue Dec 1 18:17:56 2020 +0000 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into P3Steel-Bugfix commit 765affa15caa2e2ba9fee5c486a370594a9dc0a9 Author: Emanuel Garcês Date: Wed Nov 25 09:51:58 2020 +0000 Fixes commit 0af91b7bd6acb06e65beb162d093885abaa7bcc2 Merge: 19c518c94c 04c4c6004e Author: Emanuel Garcês Date: Wed Nov 25 09:49:08 2020 +0000 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into P3Steel-Bugfix commit 19c518c94c5e891b835804b6cac8819224bce6fa Author: Emanuel Garcês Date: Wed Nov 25 09:07:40 2020 +0000 Fix for no longer being able to compile commit e9de4af1fc2d9af0135f942ea8f8cbb21f19d8a8 Merge: de254ee5b2 65983b4288 Author: Emanuel Garcês Date: Tue Nov 24 23:59:55 2020 +0000 Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing commit de254ee5b29528a7a64e08b3b61b72d7559627a1 Author: Emanuel Garcês Date: Tue Nov 24 23:58:25 2020 +0000 Revert "Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing" This reverts commit d3d3db6a640eda3a19612909fafe0e359094b535, reversing changes made to 3b7ae51636255062fc997796e700d416d7f704f7. commit 65983b42886e08e29f6281e243a0f33923487a93 Author: ellensp Date: Wed Nov 25 11:14:22 2020 +1300 Set "lcd_move_e" index to fix the label (#20263) commit d3d3db6a640eda3a19612909fafe0e359094b535 Merge: 3b7ae51636 1d631b7280 Author: Emanuel Garcês Date: Sun Nov 22 16:44:17 2020 +0000 Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing commit 1d631b72801174b29e2d5cb2115022a194ed303b Author: Simone Primarosa Date: Sat Nov 21 02:53:04 2020 +0100 Fix bad SET_FAST_PWM_FREQ calls (#20227) commit 072b15784f79c51cf4aed9b6272dfdba8160b452 Author: phcay <58492957+phcay@users.noreply.github.com> Date: Sat Nov 14 02:24:08 2020 +0100 Fix extraneous Linear Advance DIR change (#20131) commit 3b7ae51636255062fc997796e700d416d7f704f7 Merge: 8cc5b8d903 ba2939b1dc Author: Emanuel Garcês Date: Fri Oct 30 21:42:34 2020 +0000 Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing commit ba2939b1dc55c04f879ce96e9af990287b4468d2 Author: thinkyhead Date: Fri Oct 30 00:10:04 2020 +0000 Fix bilinear_line_to_destination definition See #19431 commit 8cc5b8d90349349d75493a0870be91d083cf167b Merge: 9d21742a4a ee7476a0bf Author: Emanuel Garcês Date: Wed Oct 28 09:11:20 2020 +0000 Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing commit ee7476a0bfcfd9c894fe99398f456a4fe2426209 Author: Jason Smith Date: Tue Oct 27 15:48:06 2020 -0700 Update "Bug Report" template (#19906) commit 88a2ac92d5792de3de005b3b97d7bb561946c148 Author: Scott Lahteine Date: Wed Oct 14 23:55:20 2020 -0500 Marlin 2.0.7.2 commit 3ccb3801f2117f94f3d0f99db10d29679efa03ac Author: Jason Smith Date: Fri Oct 16 14:04:51 2020 -0700 Fix SAMD Serial name macro (#19765) commit cc7fbabc96f06bda089a5b2f467f028fbe8a72e7 Author: Serhiy-K <52166448+Serhiy-K@users.noreply.github.com> Date: Sat Oct 17 00:21:21 2020 +0300 Fix HAL/STM32 FastIO for analog pins (#19735) commit 28a9708ddb33233a87d4882c4c9d126474aa3fbc Author: Scott Lahteine Date: Wed Oct 21 18:08:57 2020 -0500 Don't define IS_ULTIPANEL empty commit 9d21742a4a49a5df8e3785bd9f96b495de451354 Merge: 0a2462f558 0a0f211cb9 Author: Emanuel Garcês Date: Sat Oct 17 11:58:32 2020 +0100 Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing commit d896dedf9b6d557229ee14e477b6f5c36c4e4965 Author: Jason Smith Date: Tue Oct 13 16:03:09 2020 -0700 Add NUCLEO-F767ZI dev board (#19373) Co-authored-by: Lorenzo Delana commit 0a0f211cb9faa9213abff3ec45b3c21b4b0d499a Author: Jason Smith Date: Fri Oct 16 14:04:51 2020 -0700 Fix SAMD Serial name macro (#19765) commit 00709017e205cd5698b9f50f74d9cb188ae2f129 Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Tue Oct 13 16:13:25 2020 -0700 If needed, home before G34 (#19713) commit 86cb0797eb9249ab567e04ea8e1aea53cbe0cd98 Author: Serhiy-K <52166448+Serhiy-K@users.noreply.github.com> Date: Sat Oct 17 00:21:21 2020 +0300 Fix HAL/STM32 FastIO for analog pins (#19735) commit 1b4d038efaa3dfc0b06b0e9d32e637fdb821368e Author: Scott Lahteine Date: Wed Oct 14 23:55:20 2020 -0500 Marlin 2.0.7.2 commit b7d9b059520a32fe1ddb7ae3f0ce224841e9b21d Author: Victor Oliveira Date: Tue Oct 13 13:58:50 2020 -0300 TFT followup fixes (#19710) commit f7f1224941ef0220603106f4a1b6b4ceabdfd196 Author: Victor Oliveira Date: Tue Oct 13 20:12:34 2020 -0300 Watchdog Refresh for LVGL Asset Load (#19724) commit fd8d83b7c84bf6e0121eba10e697b058ac7b858d Author: Jason Smith Date: Wed Oct 14 11:43:36 2020 -0700 Fix mega2560ext environment (#19730) commit 52fc0b896d182b14545c5f4557105cc9768b2294 Author: thinkyhead Date: Thu Oct 15 00:15:10 2020 +0000 [cron] Bump distribution date (2020-10-15) commit ba045d68522ba4b71c8c067ae8ab29f9a62dad71 Author: thinkyhead Date: Wed Oct 14 00:15:03 2020 +0000 [cron] Bump distribution date (2020-10-14) commit 54bdcb46912a8feb92d186aa3efcbd9c5e9cef0b Author: Jason Smith Date: Wed Oct 14 11:50:03 2020 -0700 Fix SET_SOFT_ENDSTOP_LOOSE w/out soft endstops (#19734) commit 2a2666326bc460e3aca04bfddbcbf4f099ea096d Author: Scott Lahteine Date: Tue Oct 13 14:54:56 2020 -0500 Simple bool in soft_endstops_t commit 3bba5d55bfa1ab062cbdc92980918fd6706c8970 Author: thinkyhead Date: Tue Oct 13 00:15:19 2020 +0000 [cron] Bump distribution date (2020-10-13) commit 5d07d83e78ded40f9e23449cbd702beeac2b0e8f Author: thinkyhead Date: Mon Oct 12 00:15:08 2020 +0000 [cron] Bump distribution date (2020-10-12) commit 37f97bc013326b78e18956a6ad680a6ff017d933 Author: Jason Smith Date: Sun Oct 11 17:06:57 2020 -0700 Fix various errors, warnings in example config builds (#19686) Co-authored-by: Scott Lahteine commit 6d31bbe2bfe313b7fd4fe97a9e5c850f9af1e184 Author: thinkyhead Date: Sun Oct 11 00:15:24 2020 +0000 [cron] Bump distribution date (2020-10-11) commit e2e1776a147547199d14cf59eb595f125582eb7c Author: Victor Oliveira Date: Sat Oct 10 13:47:28 2020 -0300 Restore correct STM32 port-bits code (#19678) commit bd196e7efcf9b8c037f9b81d37166891f0618021 Author: Serhiy-K <52166448+Serhiy-K@users.noreply.github.com> Date: Sat Oct 10 13:01:46 2020 +0300 Fixes for TFTGLCD Panel, FastIO (#19614) commit dffe7b90727e9d5f589a594b9a33807254fd8ca2 Author: Earle F. Philhower, III Date: Mon Oct 12 14:48:04 2020 -0700 Add loose soft endstop state, apply to UBL fine-tune (#19681) Co-authored-by: Scott Lahteine commit 2b326ebc843c7951e7953b6036a6102e5013ab27 Author: Jason Smith Date: Mon Oct 12 14:39:31 2020 -0700 Add D100 Watchdog Test (#19697) commit f4ff6a673f4036c9bffb18fb0788057d70f7ccc6 Author: Jason Smith Date: Sun Oct 11 22:40:39 2020 -0700 Allow MAX31865 resistance values configuration (#19695) commit cc915a25ed9af89684d398e72153d6abb24253b2 Author: qwewer0 <57561110+qwewer0@users.noreply.github.com> Date: Mon Oct 12 04:30:18 2020 +0200 Add REPORT_TRAMMING_MM option (#19682) Co-authored-by: Scott Lahteine commit 600870f22b24b0ca7c880d445a5be6f72def512a Author: Jason Smith Date: Sun Oct 11 17:42:50 2020 -0700 Fix motion compile w/out probe-oriented settings (#19684) commit 04882e2f34cc494457be9ad39bcdadb398d0111a Author: Jason Smith Date: Sun Oct 11 17:23:23 2020 -0700 Fix I2C_ADDRESS sign warning (#19685) commit c6cf3da2761d5402608184fdc1fb88518c1f9492 Author: Jason Smith Date: Sun Oct 11 17:06:57 2020 -0700 Fix various errors, warnings in example config builds (#19686) Co-authored-by: Scott Lahteine commit 8a5c3782b8c74900c4943648f6eec3bb57ef161f Author: Jason Smith Date: Sun Oct 11 16:13:01 2020 -0700 Fix at90usb1286 build (#19687) * Skip check for USBCON during dependency detection * Ignore incompatible Teensy_ADC library, which requires Teensy >= 3 * Add IS_AT90USB Co-authored-by: Scott Lahteine commit beb17d88552b4d25b6f51f01bbfa90da8ca3d51b Author: Scott Lahteine Date: Sun Oct 11 14:58:35 2020 -0500 Digipots refactor / cleanup (#19690) commit 4ee717f7c43a22bab05797c6bbe60aa1ef1d7b94 Author: Scott Lahteine Date: Sat Oct 10 12:07:00 2020 -0500 Save PLR on resume from pause (#19676) Co-Authored-By: shahab <32130261+SHBnik@users.noreply.github.com> commit e680196c59dadfa1187a18db43da42db55844ffb Author: Victor Oliveira Date: Sat Oct 10 13:47:28 2020 -0300 Restore correct STM32 port-bits code (#19678) commit ce92abfe4789c42123c171eaab410fd7c2f13e70 Author: Serhiy-K <52166448+Serhiy-K@users.noreply.github.com> Date: Sat Oct 10 13:01:46 2020 +0300 Fixes for TFTGLCD Panel, FastIO (#19614) commit 50410aaeaa351ca0d18dd8a6bf1960f340db8c88 Author: Victor Oliveira Date: Mon Oct 12 20:01:03 2020 -0300 Fix UTF8 handling for Color UI (#19708) commit 35c40bc376f0a684ec47baf69b7f787b16a6cca9 Author: Victor Oliveira Date: Sun Oct 11 21:26:16 2020 -0300 Implement wait_for_user for Color UI (#19694) commit aae644c5072c70c4774102a5545a156a8f228ae3 Author: Victor Oliveira Date: Sun Oct 11 21:31:21 2020 -0300 Option to prevent (extra) Watchdog init on STM32 (#19693) commit ce830f8a710b92ed999c2f2d55fb860f0571e88f Author: Scott Lahteine Date: Mon Oct 12 00:59:30 2020 -0500 Fix screen click reading too often (#19696) Co-authored-by: andreibobirica <39415547+andreibobirica@users.noreply.github.com> commit d3d423a322eb781822cb25a93287f05d563e21fa Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Mon Oct 12 14:52:56 2020 -0700 Sanity-check mutually-exclusive G34 features (#19706) commit 8b060a3902f6c05c9079c1919eea80558c7fe4f1 Author: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Sun Oct 11 22:34:27 2020 -0400 G34 Mechanical Gantry Calibration (like Prusa M915) (#18972) Co-authored-by: Scott Lahteine commit faae9007475ac5367a297500516acf03658c72d8 Author: Victor Oliveira Date: Mon Oct 12 18:38:07 2020 -0300 TFT Refactoring (#19192) * split tft folder in two: tft for color ui; tft_io for shared tft code * after the files got moved, now the code was moved to the right place * classic ui using TFT IO init lcd codes * feature to compile tft_io when enabled * compiling fix * lvgl spi tft working with tft io init codes * there is no need for separeted fsmc and spi class in lvgl anymore, as tft io handle everything * remove debug * base for TFT rotation and mirroring API, and ILI9488 support * ST7796S rotate and mirror support * ST7789V rotate and mirror support * ST7735 rotate and mirror support * ILI9341 rotate and mirror support * ILI9328 rotate and mirror support * R61505 rotate and mirror support * MKS TFT definitions * more configs for mks tfts * update config * naming typo * to configure the user interface * ANYCUBIC_TFT35 * tft configs * support for SSD1963 * tft display types * updated conditionals lcd; first board fully working with the new code - all 3 ui! * compatiblity * changed name * move classic ui file name * rename TURN -> ROTATE * GRAPHICAL_TFT_ROTATE_180 deprecated * first fsmc board fully working - chitu v5 * mks robin nano v1.2 + tft 35 ok! * right pin name * anycubic tft tested in a TRIGORILLA_PRO * chitu v6 * nano 32 tft orientation * mks tft43 * mks tft43 rotation * fixed LONGER LK tft setup * GRAPHICAL_TFT_UPSCALE defined by the display type * better offsets defaults * Update Configuration.h * Update tft_fsmc.cpp * Update Conditionals_LCD.h * Tweak comments * update nano tests * Revert "update nano tests" This reverts commit a071ebbfad30e28855a4a5695ec8a726542a1a65. * default tft * outdated comments * to not break non-vscode builds * upscale tft 35 * support tft 180 rotation for color ui * Each TFT Driver is responsible for its default color mode. * use auto detect in mks displays, because some of them could be shipped with diferent drivers * extra s * unused code * wrong -1 * missing mirror options * Smaller regex pattern * Comment updates * Clean up old defines * Apply pins formatting * GRAPHICAL_TFT_ROTATE_180 => TFT_ROTATE_180 * MKS_ROBIN_TFT_V1_1R * merge fix * correct resolution * auto is default, dont need be there, and it will allow the user to configure it even for named displays * to not use rotation with MKS_ROBIN_TFT_V1_1R * i like () in macros * avoid sleepy commits * default for st7789 is rgb * nano follow up * to allow ili9328 rotation * default is rgb * boards merge follow up * to match bootloader orientation * HAS_TOUCH_XPT2046 is not hal specific anymore * lets not forget LPC * 180 rotation for ili9328 and R61505 * Clean up whitespace Co-authored-by: Scott Lahteine Co-authored-by: Scott Lahteine commit 11662bf2b65e0762e7ed7c95522a15477215c013 Author: Scott Lahteine Date: Sat Oct 10 01:17:34 2020 -0500 Marlin 2.0.7.1 commit 887e2637c020c3f9422471c7b7d09c44507a4317 Author: Serhiy-K <52166448+Serhiy-K@users.noreply.github.com> Date: Sat Oct 10 13:01:46 2020 +0300 Fixes for TFTGLCD Panel, FastIO (#19614) commit 958f05e4b4cb82f16b1981c5659177312c3a63da Author: ellensp Date: Sat Oct 10 22:39:12 2020 +1300 HAS_CHARACTER_LCD => HAS_MARLINUI_HD44780 (#19673) commit 9126a2e654df0bbea7bd511b6a993a5a24e0f0f6 Author: thinkyhead Date: Sat Oct 10 00:14:40 2020 +0000 [cron] Bump distribution date (2020-10-10) commit 5070fae231d5019249f37e882c25f1e1d7f5761b Author: Scott Lahteine Date: Fri Oct 9 16:50:17 2020 -0500 Batch appercase hex values commit 454f9d631986b19add31ea172552e5567bac856e Author: Scott Lahteine Date: Fri Oct 9 16:42:23 2020 -0500 Optional `M42`/`M226`; Add more features filters (#19664) commit 59b6b32e6e8b3746843ddc94390b9e6c80d993f3 Author: Victor Oliveira Date: Fri Oct 9 08:25:23 2020 -0300 Support for Debug Codes - Dnnn (#19225) Co-authored-by: Scott Lahteine commit 6d9709e20de11d874b567ab24fb02f17163537da Author: 石立枫 <49380822+FLYmaker@users.noreply.github.com> Date: Fri Oct 9 19:09:27 2020 +0800 Support for FLY MINI (#19185) commit 7a484959d52f4835d40eddbfc3bf54c51a6b6952 Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Fri Oct 9 00:52:06 2020 -0700 Fix touch ifndefs (#19661) commit 78060f55e653b118dd27ab29f71d698720d0fe4c Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com> Date: Fri Oct 9 09:51:25 2020 +0200 Update Italian language (#19654) commit 3fca19fbab92766f57f27b13a76af711b661b843 Author: thinkyhead Date: Fri Oct 9 00:14:12 2020 +0000 [cron] Bump distribution date (2020-10-09) commit b8700e0aa801a016a66ff1d268871c458aa4f47b Author: Samantaz Fox Date: Fri Oct 9 01:40:54 2020 +0200 Fix and improve Makefile / CMake (#19640) commit d66bc5cec2ac4844809bb50995e05a0d074240df Author: Scott Lahteine Date: Thu Oct 8 16:59:54 2020 -0500 Permit touch calibration override commit fb28c6041ad219416e13564e86228c1ba12a79db Author: Scott Lahteine Date: Thu Oct 8 15:17:19 2020 -0500 Use 0xFF (not 'ff') for byte transfer commit 0f9d57e03ad0032d7a307b3fb826761c50ceb8d7 Author: ellensp Date: Thu Oct 8 20:30:31 2020 +1300 Apply env:mega2560ext to relevant boards (#19624) commit 32377849da8230f88d395a5d6b60321cbbd69f39 Author: qwewer0 <57561110+qwewer0@users.noreply.github.com> Date: Thu Oct 8 03:43:08 2020 +0200 Update PROBE_OFFSET_WIZARD comment (#19652) commit 0975c487f0e636e7279864f2e81990cd58378e50 Author: thinkyhead Date: Thu Oct 8 00:12:06 2020 +0000 [cron] Bump distribution date (2020-10-08) commit d07ad63016b0e1d58a767a531fd578e85b42f9cf Author: qwewer0 <57561110+qwewer0@users.noreply.github.com> Date: Wed Oct 7 20:01:01 2020 +0200 More accessible PROBE_OFFSET_WIZARD (#19647) commit 1a5a3cf2538618c4a7ff16bef4e6f1700ca7afcb Author: ellensp Date: Thu Oct 8 07:00:08 2020 +1300 Restore ° to 6x9 small info font (#19645) commit 6f6901180c46033d8b5948b3932c08320336a606 Author: Scott Lahteine Date: Tue Oct 6 19:42:03 2020 -0500 Chamber vent/fan followup commit 9cc6297292ac8eda0b3ad884b8cb7f8c61db5a50 Author: Scott Lahteine Date: Tue Oct 6 19:17:18 2020 -0500 Fix small font section directive, mixer warning commit cf53bc2dd281330cbb0946a395fd1e1da4a954fd Author: thinkyhead Date: Wed Oct 7 00:14:42 2020 +0000 [cron] Bump distribution date (2020-10-07) commit f4f4ea05e1a366345c7c1431417e7f0cbcff6b7f Author: Scott Lahteine Date: Tue Oct 6 01:28:08 2020 -0500 Update language fonts commit 2b845e5a756da015c427d8bd64a412472bec60ba Author: ladismrkolj Date: Wed Oct 7 01:36:01 2020 +0200 Add Chamber servo vent, auto fan (#19519) commit 6fcbf114541a336038a83026024b6503680da0b7 Author: signetica <66766598+signetica@users.noreply.github.com> Date: Tue Oct 6 15:58:28 2020 -0600 Fix Ender-3 V2 DWIN Stop SD Print (#19642) Co-authored-by: Scott Lahteine commit 8a69147adfc8bd64f998c3f92c6467e2500ce11b Author: Scott Lahteine Date: Tue Oct 6 02:59:51 2020 -0500 Improve retract / unretract labels commit f8ceedea5cfbc717198b3fa8b1118b5cbcb0b85f Author: thinkyhead Date: Tue Oct 6 00:14:30 2020 +0000 [cron] Bump distribution date (2020-10-06) commit a4e4226578eb02eb9636317094db3dca941d3e1c Author: Scott Lahteine Date: Mon Oct 5 01:09:32 2020 -0500 Trailing whitespace commit e76fd6bd33a5e8a8554e1e1e080987921a99eae8 Author: Scott Lahteine Date: Mon Oct 5 01:07:41 2020 -0500 Sync config to examples commit 437bee418bff550a59738a6b4c9b5e7eddf0fc2a Author: Mathew Winters Date: Mon Oct 5 18:31:20 2020 +1300 Z Probe Offset Wizard (#18866) commit 31238de93740870c6a5c2ac212ba931f0ebe39f5 Author: Cory Ory Date: Mon Oct 5 01:51:21 2020 +0100 Allow bypass for cold E movement (#19606) commit cb8c99c4f889508486ab72990fd688830837b1a2 Author: thinkyhead Date: Mon Oct 5 00:14:33 2020 +0000 [cron] Bump distribution date (2020-10-05) commit 2fe81d0cb2de37408e5391311204cdf2bd7476d6 Author: Ryan V1 <55478432+V1EngineeringInc@users.noreply.github.com> Date: Sun Oct 4 15:41:41 2020 -0700 Fix Archim1 stepper timing (with new variant) (#19596) commit fb7d7ee7b41fc609aac4a892dc4a77a066f50ccd Author: Scott Lahteine Date: Sun Oct 4 17:29:12 2020 -0500 Add HAS_FAST_MOVES commit d99fdcf526dac82a15a4e8520750d28a2d113485 Author: ellensp Date: Mon Oct 5 10:47:06 2020 +1300 Fix Z_AFTER_HOMING without probe (#19607) commit e4d2234a04378b26f80c27829b96e5a67465738e Author: Scott Lahteine Date: Sun Oct 4 15:45:13 2020 -0500 Move SF_ARC_FIX option commit bea919da6eaebe84c7a3071888e797b76a0ae7c1 Author: Speaka <48431623+Speaka@users.noreply.github.com> Date: Sun Oct 4 21:50:12 2020 +0200 Fix German translation purging/unloading (#19615) commit 2fb22cc11613388f7f46242fba2de57e4eb6d277 Author: Scott Lahteine Date: Sun Oct 4 14:46:55 2020 -0500 Shared singlenozzle item commit d4b6542ce117da15a9f40e8d19d467e801d0f710 Author: Scott Lahteine Date: Sun Oct 4 14:29:02 2020 -0500 Fix Tune/Fan edit items - Fixes #19617 - Followup to #18400 commit 7d47ee732e568ea382a185f87cfed2ecf223ddbd Author: thinkyhead Date: Sun Oct 4 00:14:30 2020 +0000 [cron] Bump distribution date (2020-10-04) commit 6ceacd62f9c3bf1e590e139f70a385bebb33dc42 Author: thinkyhead Date: Sat Oct 3 00:14:05 2020 +0000 [cron] Bump distribution date (2020-10-03) commit 2ce6741731cb93f5300bf9a29753256e0c29a3c3 Author: Ryan V1 <55478432+V1EngineeringInc@users.noreply.github.com> Date: Fri Oct 2 15:31:33 2020 -0700 Fix 'bossac' upload on Windows (#19545) commit 2213eb33172009c53deb2d8e959c9acd60d4561d Author: Marcio T Date: Fri Oct 2 16:30:32 2020 -0600 Touch UI support for X2, Y2 and Z2 (#19538) commit b9475900822a4c60f1f9635799a5c1c7f733b478 Author: ellensp Date: Sat Oct 3 11:28:08 2020 +1300 Fix wrappers on HAL/STM32F1 .cpp files (#19581) Co-authored-by: Scott Lahteine commit 20bcaa78f6467b26acf70e0ec448860cd729fb6a Author: ellensp Date: Sat Oct 3 11:19:43 2020 +1300 Fix TEMP_ADC_PROBE support for STM32F1 (#19582) Co-authored-by: ellensp commit 9834a36a178be6b0b0469c4dd4d94480b5d32f16 Author: ellensp Date: Sat Oct 3 11:12:17 2020 +1300 Fix compile of MMU2 with S-mode disabled (#19584) commit 90801f8815bb0512836e3191af6e614f18db2522 Author: bilsef Date: Fri Oct 2 15:08:50 2020 -0700 Fix onboard SD card support for Teensy 3.6 & 4.1 (#19593) commit 4d1357e318dbfd420646449a82d584136eb18e6d Author: Scott Lahteine Date: Fri Oct 2 17:05:45 2020 -0500 Adjust HAL platform defines, comments commit 8d090cbdbb17d7729e9ca43db0651a8719f2796a Author: Scott Lahteine Date: Fri Oct 2 17:04:23 2020 -0500 Replace tabs with spaces commit ec5b78d18b1dbf941456b10a20816ec453423beb Author: Victor Oliveira Date: Thu Oct 1 22:52:42 2020 -0300 Minor SPI fixes, systick_callback for STM32F1 HAL compatibility (#19565) commit d33317eadb3df9d2d314533412a30e262391eb97 Author: thinkyhead Date: Fri Oct 2 00:13:10 2020 +0000 [cron] Bump distribution date (2020-10-02) commit f8375a3ea2eaafc4483e79eb483afed8cb206071 Author: swissnorp <67485708+swissnorp@users.noreply.github.com> Date: Fri Oct 2 01:17:11 2020 +0200 G35 workaround for Pronterface "feature" (#19577) commit 5a02959d181648d9e733458d0cf9291bc8309de7 Author: Stéphane <43587190+stef-ladefense@users.noreply.github.com> Date: Fri Oct 2 01:09:39 2020 +0200 Fix Anycubic i3 Mega target temperature display (#19572) Also includes a workaround for missing (probably un-fetched) long name in file listing commit cc123bc6579d3b114664e349c4dc185befd43501 Author: Ilya Date: Thu Oct 1 15:51:11 2020 -0700 No move on Park = No move on Resume (#19569) commit 4f6a0605bf10e93318036fcbdad7a2eb5bd15254 Author: Roman Moravčík Date: Fri Oct 2 00:47:24 2020 +0200 Update Slovak language (#19561) commit b89700ed3571121a755e347f9c54b1689bd719f0 Author: Victor Oliveira Date: Wed Sep 30 22:14:19 2020 -0300 Fix Buzzer (pin) init for uninitialized FastIO (#19559) commit ca853fbe19eff2f73e5f953b25e1b567bb363c96 Author: Victor Oliveira Date: Wed Sep 30 22:06:32 2020 -0300 Fix Move Screen with disabled Touch (#19558) commit 1ba2548fb256777209431b4425fe6109671e7919 Author: thinkyhead Date: Thu Oct 1 00:14:15 2020 +0000 [cron] Bump distribution date (2020-10-01) commit 1332be77a5540aa89839c08f6ac4f0b5307e312c Author: thinkyhead Date: Wed Sep 30 00:13:59 2020 +0000 [cron] Bump distribution date (2020-09-30) commit 0a2462f5583a7d81a2cfaa3fc91fe1a3beb0dfd2 Author: Emanuel Garcês Date: Sat Oct 10 21:28:59 2020 +0100 Enable probe offset wizard commit 6c2c7b751a7f7ea8d51eab504ce734f41a5e3c27 Merge: 3bb416929e e4c23f85d3 Author: Emanuel Garcês Date: Sat Oct 10 21:20:09 2020 +0100 Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing commit 3bb416929eeefbb8fa1e734f1b101178b14748bf Author: Emanuel Garcês Date: Sat Oct 10 21:13:18 2020 +0100 Revert "Fully disabled software endstops" This reverts commit f92825084ad130554c866e1f2e06389367d32e6b. commit e4c23f85d39228cf6386d80927e33af0769e751e Author: Scott Lahteine Date: Sat Oct 10 01:17:34 2020 -0500 Marlin 2.0.7.1 commit a14e26c095c5d13835597cb5112c6c1d8ce05cb4 Author: Serhiy-K <52166448+Serhiy-K@users.noreply.github.com> Date: Sat Oct 10 13:01:46 2020 +0300 Fixes for TFTGLCD Panel, FastIO (#19614) commit f92825084ad130554c866e1f2e06389367d32e6b Author: Emanuel Garcês Date: Sat Oct 10 19:37:13 2020 +0100 Fully disabled software endstops commit d1d9c398b1e59dc11fda9afe88301c7938875fe6 Merge: 642eadb9e6 e8177735a0 Author: Emanuel Garcês Date: Sat Oct 10 19:36:09 2020 +0100 Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing commit 9ab7c051cbbf7c836f7499b23bd76c8460011c25 Author: ellensp Date: Sat Oct 10 22:39:12 2020 +1300 HAS_CHARACTER_LCD => HAS_MARLINUI_HD44780 (#19673) commit 23da765310160052966445515b24762efb78bfcd Merge: a7f334387c 8e03a4cb93 Author: Scott Lahteine Date: Sat Oct 10 00:26:40 2020 -0500 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x commit a7f334387c98a0209433d98c44269fdb0356ab54 Author: Victor Oliveira Date: Sat Oct 10 01:35:41 2020 -0300 Keep HAL tasks running during PID Autotune (#19671) commit e8177735a00d1d7bb20b439544d3324fe01cfe7e Author: Scott Lahteine Date: Mon Sep 28 21:02:09 2020 -0500 Marlin 2.0.7 commit aac0326f7fa928ae9b0dc6cd68888c1f1d3ddbfa Merge: a52afd2aeb 41774ec9de Author: Scott Lahteine Date: Mon Sep 28 20:59:49 2020 -0500 Merge bugfix-2.0.x into 2.0.x commit a52afd2aebeb1029f80f175489e66a310de4197d Author: Jason Smith Date: Thu Sep 17 04:35:10 2020 -0700 Update stale issue message and parameters (#19412) * Update stale issue bot * Update close-stale.yml * Update close-stale.yml Co-authored-by: Scott Lahteine commit 642eadb9e6c36d7269c01a917022425d0396632b Merge: b331993571 9913333c33 Author: Emanuel Garcês Date: Fri Sep 4 15:57:52 2020 +0100 Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing commit 9913333c33d234264a9072630e8b5ffbf07bad7e Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Thu Sep 3 21:27:59 2020 -0700 Auto-label Feature Requests (#19258) commit b3319935712a555f0e876cd77e145c5bc85d1a6e Author: Emanuel Garcês Date: Tue Sep 1 09:37:58 2020 +0100 More fixes commit dbeb1e2c0bd072d7688420b61f94bf2ca3f57579 Merge: e62d5a89af ca194ca52e Author: Emanuel Garcês Date: Fri Aug 28 10:02:28 2020 +0100 Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing commit ca194ca52ee63fe319305a79e396b8b013b4c935 Author: Scott Lahteine Date: Thu Aug 27 22:19:41 2020 -0500 Version 2.0.6.1 commit b90e7c421f2ed0629fd1f389a639bba61c5b4c25 Merge: 96e29cd7e5 6ac8f5abb7 Author: Scott Lahteine Date: Thu Aug 27 22:17:50 2020 -0500 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x commit e62d5a89af8c6109d119d13038ce80cca6d2a5b9 Author: Emanuel Garcês Date: Wed Aug 26 23:06:45 2020 +0100 Change homing commit a40bf602577bf815954dab75e3f37307166db693 Merge: 218234a071 96e29cd7e5 Author: Emanuel Garcês Date: Sun Aug 16 11:35:29 2020 +0100 Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing commit 96e29cd7e5aa91fad72788251caf6ffd38df4624 Author: Julius Mumme Date: Sun Aug 16 05:50:28 2020 +0200 Fix IS_PROBE_PIN macro (#19024) commit 218234a0713ceff839b1a7563eccaad5d5357e99 Author: Emanuel Garcês Date: Thu Aug 13 12:34:59 2020 +0100 P3Steel Probing fix commit 128e24fb4a31f0000559d398e21cc27b6ba80617 Author: Emanuel Garcês Date: Sat Aug 8 16:37:38 2020 +0100 Changed Z-Endstop to optical commit 9e1f8062d4ed19c167f284c92d66cb28973455cd Author: Emanuel Garcês Date: Sat Aug 8 10:21:39 2020 +0100 Disable min software endstop for usage with nozzle probe commit 92f6530f38f96a75c1a0a9979deb1a6202e93e42 Merge: 674f3e8b81 fd9c6983d3 Author: Emanuel Garcês Date: Sat Aug 8 10:20:50 2020 +0100 Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing commit fd9c6983d30f70171d9d9a9c55962689fa4cdd85 Author: ellensp Date: Sat Aug 8 10:59:09 2020 +1200 HW PWM sanity checks for SPINDLE_LASER_FREQUENCY (#18947) commit da144dcf3b7f79e143837384bb54af3d8523dc8b Author: Roman Moravčík Date: Tue Aug 4 07:32:47 2020 +0200 Update Slovak language (#18884) commit 1d92badecddb91b2b2952b77aecda854239647cb Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com> Date: Tue Aug 4 07:32:25 2020 +0200 Update Italian language (#18886) commit 242064fa994275c69147d1fd6da2cecb7977da08 Author: swissnorp <67485708+swissnorp@users.noreply.github.com> Date: Thu Aug 6 05:38:23 2020 +0200 Move Cancel Object menu, fix canceled item index (#18930) commit ad2d1b6e31de9d5ea08be61f7f323a1758c3e76a Author: cbaugher Date: Fri Aug 7 18:06:25 2020 -0500 Fix Z height after tool change (#18951) commit 674f3e8b81c549521912112ec8de01665a1da373 Merge: ba6ec79e92 978e0e49c7 Author: Emanuel Garcês Date: Wed Aug 5 12:50:33 2020 +0100 Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing commit 978e0e49c715f41024406fd7795e753986e81e20 Author: Claus Näveke Date: Mon Aug 3 03:17:43 2020 +0200 No mks_robin extra_scripts in Trigorilla build (#18872) commit 02a500dc937da09595d10612e77b05d87a4a099f Author: ellensp Date: Mon Aug 3 13:16:12 2020 +1200 Fix Spindle/Laser PWM DC (#18871) commit fa5ca8678cced97fe63ece21bb01c169afdf4c71 Author: FLYmaker <49380822+FLYmaker@users.noreply.github.com> Date: Mon Aug 3 09:13:57 2020 +0800 Fix FLYF407ZG pins (#18865) commit 01359cff6b5884873114e4cff4322fedee73d848 Author: Sebastien Andrivet Date: Mon Aug 3 03:10:16 2020 +0200 Fix Duplicator i3 Plus pin diagram (#18862) commit 37b56d6347e2b53751a80eb9892ffda3b2c59ee3 Author: Scott Lahteine Date: Thu Jul 30 02:07:29 2020 -0500 Add monitor_flags commit ad59adfe24e57b242408e0de4e567512559c1bea Author: Scott Lahteine Date: Tue Jul 28 18:13:20 2020 -0500 Update include_tree commit 121cd42c41f3208327c93d84fa32a95f27dde227 Author: Scott Lahteine Date: Wed Jul 29 20:50:10 2020 -0500 In G28 Z is sort-of known commit cf1c57a04d36f91a30ba32449f02c04ad87183a5 Author: Scott Lahteine Date: Wed Jul 29 20:43:35 2020 -0500 Fix UNKNOWN_Z_NO_RAISE in G28 Bug introduced in 73fc0778b86 commit 5804761b5d18b9e99abd705d0f14306e7a94b93a Author: swissnorp <67485708+swissnorp@users.noreply.github.com> Date: Wed Jul 29 04:28:58 2020 +0200 Fix Cancel Objects index display (zero-based) (#18841) commit 3dd21a2770d14555bb5f5a0b44dc1dbc3ae276c0 Author: natemason Date: Wed Jul 29 09:18:02 2020 +0800 Add TEMP_PROBE_PIN for Einsy Rambo (#18823) commit b160e8b93f610e4c3b2da620815fdc3f69c43e06 Author: MoellerDi Date: Wed Jul 29 03:19:12 2020 +0200 Fix NEOPIXEL_LED compile w/out PRINTER_EVENT_LEDS (#18824) commit de37196760e1c41489293d23fbb826e51dd4f163 Author: Victor Oliveira Date: Tue Jul 28 23:15:17 2020 -0300 DISABLE_DEBUG required to free Robin nano Z_DIR_PIN (#18832) commit ba6ec79e9288692464a4ae29f24f1b6e5e9dd74e Merge: 7648242ce5 84b96d3d47 Author: Emanuel Garcês Date: Tue Jul 28 14:59:29 2020 +0100 Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing commit 84b96d3d4743567c5c24d0434e16dc053e6cca3f Merge: 92076c6560 5d14c3712f Author: Scott Lahteine Date: Mon Jul 27 20:16:34 2020 -0500 Hotfix for first round of post-release hiccups commit 92076c65601de5fdfe0facf32dd60c57aab05747 Author: Scott Lahteine Date: Sun Jul 26 20:03:06 2020 -0500 Marlin Release 2.0.6 commit 5e5daf1ff2b0d33fa2742f9a4f164fe8b5fd50b2 Merge: 8b637e436c de68b3753f Author: Scott Lahteine Date: Sun Jul 26 20:01:40 2020 -0500 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into release_206 commit 7648242ce552e5fb75458e32b0c210513484932b Merge: dd57745403 8b637e436c Author: Emanuel Garcês Date: Sat Jul 25 11:34:44 2020 +0100 Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing commit 8b637e436c775c7566820eb1defd00bb209d06b4 Author: Scott Lahteine Date: Thu Jul 23 20:59:43 2020 -0500 Update links, README, contributing, etc. commit dd5774540350bd7c4b852fd6dee8090a030fbf8b Merge: 94aba287aa b73ac40fa3 Author: Emanuel Garcês Date: Thu Jul 16 17:06:35 2020 +0100 Merge branch '2.0.x' into P3Steel-Testing commit 94aba287aaf9bc940de686ac7e15fb91c56d5ad9 Author: Emanuel Garcês Date: Thu Jul 16 16:45:42 2020 +0100 P3Steel Settings commit b73ac40fa3abde7a10eb9d2708cd8d01b83d9de3 Author: Chris Pepper Date: Tue Jul 14 15:15:19 2020 +0100 LPC fix NeoPixel fork commit 7ed66d06a086d326c77fa4ae968167dda5ec5e17 Author: Scott Lahteine Date: Sun Jul 12 22:35:13 2020 -0500 LiquidCrystal@1.0.0 for LPC commit c1b237920430c0944df9db6c9050977211745820 Author: Scott Lahteine Date: Sat Jul 11 07:38:19 2020 -0500 Specify supported library versions commit 5e0958edbf8abab0588ed9db866952f67c2dd4fc Author: Scott Lahteine Date: Sat Jul 11 07:14:54 2020 -0500 Fix pid_debug_flag commit 5513e67512481024e0d571d84487f7c636996803 Author: Scott Lahteine Date: Wed Jul 8 19:36:09 2020 -0500 2.0.5.4 : Use ststm32 < 6.2 commit 354a9e5970c4a873a5b32d825da177d072df6b61 Author: Scott Lahteine Date: Wed Jul 8 04:38:35 2020 -0500 Lock threads updated commit ee4910c5d7e1ef66afb5a99eb9f1a6b6f6255a9a Author: Scott Lahteine Date: Sun Jul 5 19:56:33 2020 -0500 Temporarily use patched lock-threads commit 697ef2636e561f89d941b5c1e1f6a76c7868eabf Author: Scott Lahteine Date: Sun Jul 5 15:45:14 2020 -0500 Add CI for pushed commits Co-Authored-By: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com> commit 481b8ff2d91d8c1fb66ed3975a3a054c81b77425 Author: Scott Lahteine Date: Sun Jul 5 15:23:07 2020 -0500 Limit actions to main commit 7bf89f2b9f9e55b518d6b18841a860321711aaf1 Author: Scott Lahteine Date: Sat Jul 4 17:28:23 2020 -0500 Two lock-closed per day commit ed7110838e60379835d537e620006020fbae2513 Author: Scott Lahteine Date: Thu Jul 2 18:10:33 2020 -0500 Patch Bad PR action commit 842dea4bd5c35a5b2774f2687c8a021bb81f6ac9 Author: Scott Lahteine Date: Tue Jun 30 18:18:58 2020 -0500 Updated lock / unlock actions commit a73e61078de06599b3bd58a4b1f705c7b6f72b24 Author: Scott Lahteine Date: Tue Jun 23 19:58:00 2020 -0500 Add Close / Lock actions commit c352aeb32ea80f628755f2d28ad6fde6f1cb7be9 Author: Daniel Aléxis Date: Tue Jun 9 21:27:57 2020 +0100 Remove "dev" branch reference (for now) (#18242) commit e4d8336175ee09b28d23220f446d07451ca3de43 Author: Mathias Gartner <36887952+MathiasGartner@users.noreply.github.com> Date: Sat May 2 23:15:49 2020 +0200 Fix XYZ types multiplication/division (#17826) commit 0518dec60d0931745efa2812fa388f33d68cfa29 Author: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com> Date: Wed Apr 1 12:16:01 2020 -0700 Correct link to Configurations (#17370) commit 015c4e6fbdd28f5c4cb5fc987d4f4ae513b1c13d Author: Scott Lahteine Date: Tue Mar 31 14:40:06 2020 -0500 Version 2.0.5.3 commit 0f9a14dfda3814953c0e10e8afce4321e2311564 Merge: 7124b2164d e7f020f3f2 Author: Scott Lahteine Date: Tue Mar 31 14:43:42 2020 -0500 Merge latest patches commit 7124b2164d5c863ed1013df57a424739420003fc Author: Scott Lahteine Date: Tue Mar 24 16:22:12 2020 -0500 Version 2.0.5.2 commit efc19260a73c317124d4e7575f1aa9330a8ab927 Merge: d37bfa3b4e 68face848a Author: Scott Lahteine Date: Tue Mar 24 17:10:53 2020 -0500 Merge patches from bugfix-2.0.x commit d37bfa3b4e4e95804f942b69831dc36b54c53215 Author: Scott Lahteine Date: Mon Mar 16 17:52:41 2020 -0500 Version 2.0.5.1 Release commit 129b1bb8d4eadf6e24b19ed4ef7f50e45a95e508 Merge: 8dbbcfd382 f6e80d576d Author: Scott Lahteine Date: Mon Mar 16 17:50:43 2020 -0500 Merge nightly patches commit 8dbbcfd382356eb5d16b8bfa75c713bbc1de1631 Author: Scott Lahteine Date: Sat Mar 14 00:49:12 2020 -0500 Version 2.0.5 Release commit fa48fbb9b8825ac0e51a43b931e6637a9f25b52c Merge: d6e767e36b 8b2d55e345 Author: Scott Lahteine Date: Sat Mar 14 00:35:11 2020 -0500 Merge bugfix-2.0.x into 2.0.x commit d6e767e36be5852a32526c08d9ade974b18f6546 Author: Scott Lahteine Date: Wed Feb 26 13:00:26 2020 -0600 Version 2.0.4.4 Release commit b29aae6c0c9e133b09f33fda2eb730d2d8480e54 Merge: 1955eea1b8 9f8ee31144 Author: Scott Lahteine Date: Thu Feb 27 04:14:33 2020 -0600 Merge 'bugfix-2.0.x' into 2.0.x commit 1955eea1b8f13697259e0e2403d47279d2d1ac6a Author: Scott Lahteine Date: Mon Feb 24 06:13:18 2020 -0600 Version 2.0.4.3 Release commit 42fa9fc57041b5b1bc00fc2dca5ab1075af2e9cc Author: Scott Lahteine Date: Mon Feb 24 10:58:54 2020 -0600 Fix card_eof error commit 130d0395d069c2b68537342ce3e4a781002749bf Author: Marcio T Date: Mon Feb 24 09:42:12 2020 -0700 Restore tabs in Makefile (#16944) commit c5f1ff9ee16017350f545292dca681a742eb3e65 Author: Marcio T Date: Mon Feb 24 09:40:12 2020 -0700 Allow Z_SAFE_HOMING_POINT outside bed (#16945) commit 089cc68a04087a07ea6b08187d332b24b65b3abe Merge: 2b759b9e8d a254354e68 Author: Scott Lahteine Date: Mon Feb 24 06:12:15 2020 -0600 Merge nightly patches commit 2b759b9e8d950179ae8bde5596946aeb00739724 Author: Scott Lahteine Date: Sat Feb 22 19:26:52 2020 -0600 Suppress "packed member" warning commit 5f27f7de47191c5cd2a6f4c2f0b65748ef13c268 Author: Scott Lahteine Date: Sat Feb 22 18:49:59 2020 -0600 Version 2.0.4.2 Release commit 282f4678cd98f77fbe807571d3cfeba47391e4f8 Merge: c41f3f8582 2471a8bb91 Author: Scott Lahteine Date: Sat Feb 22 18:47:09 2020 -0600 Merge nightly patches commit c41f3f8582735603959c433edd14956a1bfcb9bc Author: Scott Lahteine Date: Sat Feb 22 02:58:05 2020 -0600 Version 2.0.4.1 Release commit 8670df08a299a322f64a7ae259c34c6acd6ef85e Author: Scott Lahteine Date: Sat Feb 22 02:52:59 2020 -0600 CoreXY Babystepping hotfix commit 730690ea03f61db2f35baf4095b50b4abf1b83bb Author: Scott Lahteine Date: Sat Feb 22 02:52:21 2020 -0600 Hotfix for Babystepping commit 3543873da72fe00e23ceb73cde24186e649768d3 Author: Scott Lahteine Date: Fri Feb 21 07:24:58 2020 -0600 Use moves_free in ok_to_send commit c505626c4215d3aa90a561a55465d06ebb27ed9e Author: thinkyhead Date: Sat Feb 22 00:03:47 2020 +0000 [cron] Bump distribution date (2020-02-22) commit 7e8505fc119543e8de6322e79fed239272aa1c6e Author: Scott Lahteine Date: Fri Feb 21 08:38:14 2020 -0600 Version 2.0.4 Release commit f9aec2685cd4ad81e6a21ba3eff0f5ee9dfb465f Merge: dd6a7ca197 5d16497bed Author: Scott Lahteine Date: Fri Feb 21 08:37:02 2020 -0600 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x commit dd6a7ca197cf07a9ce7c4df9ddf55b885b1e2151 Author: Scott Lahteine Date: Mon Feb 10 16:33:21 2020 -0600 Fix out-of-order M0 after SD printing Fixes #14774 Co-Authored-By: tol2cj commit 62b9d7dc73e34437ebfe52ad7324b37698569275 Author: Scott Lahteine Date: Wed Feb 5 00:47:24 2020 -0600 Direct link to version configs commit d83382eb55043806655b85f8a33e1db545440d4f Author: Scott Lahteine Date: Tue Feb 4 09:41:26 2020 -0600 Add "PR Bad Target" workflow action commit 4c76314c26bed103d3976affb2e4bfcf419aac50 Author: Scott Lahteine Date: Mon Feb 3 19:31:41 2020 -0600 Scheduled action to bump the date on bugfix-2.0.x commit 64ab254f26c03f48fe2252f3deea8b7ff39ecde0 Author: Scott Lahteine Date: Mon Feb 3 18:06:04 2020 -0600 Use a different Configurations branch for CI commit e6a7be922b300bc68030a5d301743ac30d6d1834 Author: Scott Lahteine Date: Thu Jan 30 18:18:46 2020 -0600 Version 2.0.3 commit 1525c2530ec8c952978b9a5a313bab8812b6f43b Merge: 016e4c0193 dabf393920 Author: Scott Lahteine Date: Fri Jan 31 04:23:45 2020 -0600 Merge commit 'dabf3939209fd8ea7f6a6327d764c16743aa22aa' into look_at_201 commit 016e4c01934b78672af3552b8bf2d655aa23752d Author: Scott Lahteine Date: Mon Jan 27 05:34:56 2020 -0600 Version 2.0.2 commit be642610ae7829f24a08cb2cb53603a9a7049a2f Merge: ee17051933 8bd6b60a01 Author: Scott Lahteine Date: Fri Jan 31 04:22:09 2020 -0600 Merge commit '8bd6b60a0141fa892984f2d5b61f06eadbbf9a5f' into look_at_201 commit ee170519334d4e2c2aed28437dd94ca298923a18 Author: Scott Lahteine Date: Tue Dec 24 00:06:32 2019 -0600 Version 2.0.1 commit 0673f335e121a588d4cf074126b5e0d8cd527426 Merge: ac7ee4b94a 1c9ccce520 Author: Scott Lahteine Date: Tue Dec 24 00:05:04 2019 -0600 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x commit ac7ee4b94a200590a566fd6979f4738976de12b6 Author: Scott Lahteine Date: Sun Dec 1 13:56:18 2019 -0600 Release version 2.0.0 --- .github/ISSUE_TEMPLATE/bug_report.md | 59 ++++++++ .github/ISSUE_TEMPLATE/config.yml | 17 +++ .github/ISSUE_TEMPLATE/feature_request.md | 35 +++++ .github/workflows/bump-date.yml | 35 +++++ .github/workflows/check-pr.yml | 33 +++++ .github/workflows/close-stale.yml | 27 ++++ .github/workflows/lock-closed.yml | 32 +++++ .github/workflows/unlock-reopened.yml | 22 +++ Marlin/Configuration.h | 165 ++++++++++------------ Marlin/Configuration_adv.h | 62 ++++---- Marlin/src/pins/ramps/pins_RAMPS.h | 2 +- 11 files changed, 370 insertions(+), 119 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/workflows/bump-date.yml create mode 100644 .github/workflows/check-pr.yml create mode 100644 .github/workflows/close-stale.yml create mode 100644 .github/workflows/lock-closed.yml create mode 100644 .github/workflows/unlock-reopened.yml diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000000000..6e735974a921a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,59 @@ +--- +name: Bug report +about: Report a bug in Marlin +title: "[BUG] (short description)" +labels: '' +assignees: '' + +--- + + + +### Bug Description + + + +### Configuration Files + +**Required:** Include a ZIP file containing `Configuration.h` and `Configuration_adv.h`. + +If you've made any other modifications describe them in detail here. + +### Steps to Reproduce + + + +1. [First Step] +2. [Second Step] +3. [and so on...] + +**Expected behavior:** + + + +**Actual behavior:** + + + +#### Additional Information + +* Provide pictures or links to videos that clearly demonstrate the issue. +* See [Contributing to Marlin](https://github.com/MarlinFirmware/Marlin/blob/2.0.x/.github/contributing.md) for additional guidelines. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000000000..4b283d26005c8 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,17 @@ +blank_issues_enabled: false +contact_links: + - name: Marlin Documentation + url: http://marlinfw.org/ + about: Lots of documentation on installing and using Marlin. + - name: MarlinFirmware Facebook group + url: https://www.facebook.com/groups/1049718498464482 + about: Please ask and answer questions here. + - name: Marlin on Discord + url: https://discord.gg/n5NJ59y + about: Join the Discord server for support and discussion. + - name: Marlin Discussion Forum + url: http://forums.reprap.org/list.php?415 + about: A searchable web forum hosted by RepRap dot org. + - name: Marlin Videos on YouTube + url: https://www.youtube.com/results?search_query=marlin+firmware + about: Tutorials and more from Marlin users all around the world. Great for new users! diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000000000..24de8d01419b9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,35 @@ +--- +name: Feature request +about: Request a Feature +title: "[FR] (feature request title)" +labels: 'T: Feature Request' +assignees: '' + +--- + + + +### Description + + + +### Feature Workflow + + + +1. [First Action] +2. [Second Action] +3. [and so on...] + +#### Additional Information + +* Provide pictures or links that demonstrate a similar feature or concept. +* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines. diff --git a/.github/workflows/bump-date.yml b/.github/workflows/bump-date.yml new file mode 100644 index 0000000000000..54902da8c908d --- /dev/null +++ b/.github/workflows/bump-date.yml @@ -0,0 +1,35 @@ +# +# bump-date.yml +# Bump the distribution date once per day +# + +name: Bump Distribution Date + +on: + schedule: + - cron: '0 0 * * *' + +jobs: + bump_date: + name: Bump Distribution Date + if: github.repository == 'MarlinFirmware/Marlin' + + runs-on: ubuntu-latest + + steps: + + - name: Check out bugfix-2.0.x + uses: actions/checkout@v2 + with: + ref: bugfix-2.0.x + + - name: Bump Distribution Date + run: | + # Inline Bump Script + DIST=$( date +"%Y-%m-%d" ) + eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \ + git config user.name "${GITHUB_ACTOR}" && \ + git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \ + git add . && \ + git commit -m "[cron] Bump distribution date ($DIST)" && \ + git push diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml new file mode 100644 index 0000000000000..aa4a2c59c9a4d --- /dev/null +++ b/.github/workflows/check-pr.yml @@ -0,0 +1,33 @@ +# +# check-pr.yml +# Close PRs directed at release branches +# + +name: PR Bad Target + +on: + pull_request: + branches: + - 1.0.x + - 1.1.x + - 2.0.x + +jobs: + bad_target: + name: PR Bad Target + if: github.repository == 'MarlinFirmware/Marlin' + + runs-on: ubuntu-latest + + steps: + - uses: peter-evans/close-pull@v1 + with: + delete-branch: false + comment: > + Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases. + + Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR. + + It may help to set your fork's default branch to `bugfix-2.0.x`. + + See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions. diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml new file mode 100644 index 0000000000000..89d5d65351d93 --- /dev/null +++ b/.github/workflows/close-stale.yml @@ -0,0 +1,27 @@ +# +# close-stale.yml +# Close open issues after a period of inactivity +# + +name: Close Stale Issues + +on: + schedule: + - cron: "22 1 * * *" + +jobs: + stale: + name: Close Stale Issues + if: github.repository == 'MarlinFirmware/Marlin' + + runs-on: ubuntu-latest + + steps: + - uses: actions/stale@v3 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + stale-issue-message: 'This issue has had no activity in the last 30 days. Please add a reply if you want to keep this issue active, otherwise it will be automatically closed within 7 days.' + days-before-stale: 30 + days-before-close: 7 + stale-issue-label: 'stale-closing-soon' + exempt-issue-labels: 'T: Feature Request' diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml new file mode 100644 index 0000000000000..8cdcd7a8369e7 --- /dev/null +++ b/.github/workflows/lock-closed.yml @@ -0,0 +1,32 @@ +# +# lock-closed.yml +# Lock closed issues after a period of inactivity +# + +name: Lock Closed Issues + +on: + schedule: + - cron: '0 1/13 * * *' + +jobs: + lock: + name: Lock Closed Issues + if: github.repository == 'MarlinFirmware/Marlin' + + runs-on: ubuntu-latest + + steps: + - uses: dessant/lock-threads@v2 + with: + github-token: ${{ github.token }} + process-only: 'issues' + issue-lock-inactive-days: '60' + issue-exclude-created-before: '' + issue-exclude-labels: 'no-locking' + issue-lock-labels: '' + issue-lock-comment: > + This issue has been automatically locked since there + has not been any recent activity after it was closed. + Please open a new issue for related bugs. + issue-lock-reason: '' diff --git a/.github/workflows/unlock-reopened.yml b/.github/workflows/unlock-reopened.yml new file mode 100644 index 0000000000000..614ef3fab297f --- /dev/null +++ b/.github/workflows/unlock-reopened.yml @@ -0,0 +1,22 @@ +# +# unlock-reopened.yml +# Unlock an issue whenever it is re-opened +# + +name: "Unlock reopened issue" + +on: + issues: + types: [reopened] + +jobs: + unlock: + name: Unlock Reopened + if: github.repository == 'MarlinFirmware/Marlin' + + runs-on: ubuntu-latest + + steps: + - uses: OSDKDev/unlock-issues@v1.1 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 717cdd9236b95..7fc619ee9108f 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -5,7 +5,7 @@ * Based on Sprinter and grbl. * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm * - * This program is free software: you can redistribute it and/or modify + * This program is free software: you can redistributse it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. @@ -69,7 +69,7 @@ // @section info // Author info of this build printed to the host during boot and M115 -#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "(xadow, 15/07/2020)" // Who made the changes. //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) /** @@ -115,7 +115,7 @@ * * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ -#define BAUDRATE 250000 +#define BAUDRATE 115200 //#define BAUD_RATE_GCODE // Enable G-code M575 to set the baud rate /** @@ -143,7 +143,7 @@ #endif // Name displayed in the LCD "Ready" message and Info menu -//#define CUSTOM_MACHINE_NAME "3D Printer" +#define CUSTOM_MACHINE_NAME "P3Steel" // Printer's unique ID, used by some programs to differentiate between machines. // Choose your own or use a service like https://www.uuidgenerator.net/version4 @@ -460,7 +460,7 @@ * 998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below. * 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below. */ -#define TEMP_SENSOR_0 1 +#define TEMP_SENSOR_0 5 #define TEMP_SENSOR_1 0 #define TEMP_SENSOR_2 0 #define TEMP_SENSOR_3 0 @@ -468,7 +468,7 @@ #define TEMP_SENSOR_5 0 #define TEMP_SENSOR_6 0 #define TEMP_SENSOR_7 0 -#define TEMP_SENSOR_BED 0 +#define TEMP_SENSOR_BED 1 #define TEMP_SENSOR_PROBE 0 #define TEMP_SENSOR_CHAMBER 0 #define TEMP_SENSOR_COOLER 0 @@ -534,7 +534,7 @@ // Above this temperature the heater will be switched off. // This can protect components from overheating, but NOT from shorts and failures. // (Use MINTEMP for thermistor short/failure protection.) -#define HEATER_0_MAXTEMP 275 +#define HEATER_0_MAXTEMP 295 #define HEATER_1_MAXTEMP 275 #define HEATER_2_MAXTEMP 275 #define HEATER_3_MAXTEMP 275 @@ -542,7 +542,7 @@ #define HEATER_5_MAXTEMP 275 #define HEATER_6_MAXTEMP 275 #define HEATER_7_MAXTEMP 275 -#define BED_MAXTEMP 150 +#define BED_MAXTEMP 130 #define CHAMBER_MAXTEMP 60 /** @@ -567,8 +567,8 @@ #define PID_K1 0.95 // Smoothing factor within any PID loop #if ENABLED(PIDTEMP) - //#define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM) - //#define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM) + #define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM) + #define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM) //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders) // Set/get with gcode: M301 E[extruder number, 0-2] @@ -579,9 +579,9 @@ #define DEFAULT_Ki_LIST { 1.08, 1.08 } #define DEFAULT_Kd_LIST { 114.00, 114.00 } #else - #define DEFAULT_Kp 22.20 - #define DEFAULT_Ki 1.08 - #define DEFAULT_Kd 114.00 + #define DEFAULT_Kp 24.81 + #define DEFAULT_Ki 3.19 + #define DEFAULT_Kd 48.27 #endif #endif // PIDTEMP @@ -602,7 +602,7 @@ * heater. If your configuration is significantly different than this and you don't understand * the issues involved, don't use bed PID until someone else verifies that your hardware works. */ -//#define PIDTEMPBED +#define PIDTEMPBED //#define BED_LIMIT_SWITCHING @@ -620,9 +620,9 @@ // 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) // from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) - #define DEFAULT_bedKp 10.00 - #define DEFAULT_bedKi .023 - #define DEFAULT_bedKd 305.4 + #define DEFAULT_bedKp 130.11 + #define DEFAULT_bedKi 24.82 + #define DEFAULT_bedKd 454.79 // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. #endif // PIDTEMPBED @@ -798,7 +798,7 @@ // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). #define X_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. -#define Y_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. +#define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define I_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define J_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. @@ -806,10 +806,7 @@ #define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define Z_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. -#define I_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. -#define J_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. -#define K_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. -#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe. +#define Z_MIN_PROBE_ENDSTOP_INVERTING true // Set to true to invert the logic of the probe. /** * Stepper Drivers @@ -829,18 +826,15 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ -#define X_DRIVER_TYPE A4988 -#define Y_DRIVER_TYPE A4988 -#define Z_DRIVER_TYPE A4988 +#define X_DRIVER_TYPE TMC2208_STANDALONE +#define Y_DRIVER_TYPE TMC2208_STANDALONE +#define Z_DRIVER_TYPE TMC2208_STANDALONE //#define X2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988 //#define Z3_DRIVER_TYPE A4988 //#define Z4_DRIVER_TYPE A4988 -//#define I_DRIVER_TYPE A4988 -//#define J_DRIVER_TYPE A4988 -//#define K_DRIVER_TYPE A4988 -#define E0_DRIVER_TYPE A4988 +#define E0_DRIVER_TYPE LV8729 //#define E1_DRIVER_TYPE A4988 //#define E2_DRIVER_TYPE A4988 //#define E3_DRIVER_TYPE A4988 @@ -895,18 +889,18 @@ * Override with M92 * X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 500 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 402.5 } /** * Default Max Feed Rate (mm/s) * Override with M203 * X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 } +#define DEFAULT_MAX_FEEDRATE { 400, 400, 20, 120 } -//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2 +#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2 #if ENABLED(LIMITED_MAX_FR_EDITING) - #define MAX_FEEDRATE_EDIT_VALUES { 600, 600, 10, 50 } // ...or, set your own edit limits + #define MAX_FEEDRATE_EDIT_VALUES { 400, 400, 50, 80 } // ...or, set your own edit limits #endif /** @@ -915,7 +909,7 @@ * Override with M201 * X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 } +#define DEFAULT_MAX_ACCELERATION { 2000, 2000, 100, 2000 } //#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 #if ENABLED(LIMITED_MAX_ACCEL_EDITING) @@ -930,9 +924,9 @@ * M204 R Retract Acceleration * M204 T Travel Acceleration */ -#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves -#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts -#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves +#define DEFAULT_ACCELERATION 2000 // X, Y, Z and E acceleration for printing moves +#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts +#define DEFAULT_TRAVEL_ACCELERATION 2000 // X, Y, Z acceleration for travel (non printing) moves /** * Default Jerk limits (mm/s) @@ -942,7 +936,7 @@ * When changing speed and direction, if the difference is less than the * value set here, it may happen instantaneously. */ -//#define CLASSIC_JERK +#define CLASSIC_JERK #if ENABLED(CLASSIC_JERK) #define DEFAULT_XJERK 10.0 #define DEFAULT_YJERK 10.0 @@ -998,7 +992,7 @@ * The probe replaces the Z-MIN endstop and is used for Z homing. * (Automatically enables USE_PROBE_FOR_Z_HOMING.) */ -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN // Force the use of the probe for Z-axis homing //#define USE_PROBE_FOR_Z_HOMING @@ -1018,7 +1012,7 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. */ -//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default +#define Z_MIN_PROBE_PIN 19 // Pin 32 is the RAMPS default /** * Probe Type @@ -1038,7 +1032,7 @@ * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. * (e.g., an inductive probe or a nozzle-based probe-switch.) */ -//#define FIX_MOUNTED_PROBE +#define FIX_MOUNTED_PROBE /** * Use the nozzle as the probe, as with a conductive @@ -1147,7 +1141,7 @@ * | [-] | * O-- FRONT --+ */ -#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } +#define NOZZLE_TO_PROBE_OFFSET { 0, 0, -0.4 } // Most probes should stay away from the edges of the bed, but // with NOZZLE_AS_PROBE this can be negative for a wider probing area. @@ -1198,7 +1192,7 @@ * A total of 2 does fast/slow probes with a weighted average. * A total of 3 or more adds more slow probes, taking the average. */ -//#define MULTIPLE_PROBING 2 +#define MULTIPLE_PROBING 2 //#define EXTRA_PROBING 1 /** @@ -1215,22 +1209,22 @@ * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_DEPLOY_PROBE 50 // Z Clearance for Deploy/Stow #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points #define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes //#define Z_AFTER_PROBING 5 // Z position after probing is done -#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping +#define Z_PROBE_LOW_POINT -5 // Farthest distance below the trigger-point to go before stopping // For M851 give a range for adjusting the Z probe offset -#define Z_PROBE_OFFSET_RANGE_MIN -20 -#define Z_PROBE_OFFSET_RANGE_MAX 20 +#define Z_PROBE_OFFSET_RANGE_MIN -10 +#define Z_PROBE_OFFSET_RANGE_MAX 10 // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST // Before deploy/stow pause for user confirmation -//#define PAUSE_BEFORE_DEPLOY_STOW +#define PAUSE_BEFORE_DEPLOY_STOW #if ENABLED(PAUSE_BEFORE_DEPLOY_STOW) //#define PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED // For Manual Deploy Allenkey Probe #endif @@ -1288,17 +1282,14 @@ // @section machine // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. -#define INVERT_X_DIR false -#define INVERT_Y_DIR true -#define INVERT_Z_DIR false -//#define INVERT_I_DIR false -//#define INVERT_J_DIR false -//#define INVERT_K_DIR false +#define INVERT_X_DIR true +#define INVERT_Y_DIR false +#define INVERT_Z_DIR true // @section extruder // For direct drive extruder v9 set to true, for geared extruder set to false. -#define INVERT_E0_DIR false +#define INVERT_E0_DIR true #define INVERT_E1_DIR false #define INVERT_E2_DIR false #define INVERT_E3_DIR false @@ -1319,10 +1310,10 @@ */ //#define Z_IDLE_HEIGHT Z_HOME_POS -//#define Z_HOMING_HEIGHT 4 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ... +#define Z_HOMING_HEIGHT 1 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ... // Be sure to have this much clearance over your Z_MAX_POS to prevent grinding. -//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z +#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z // Direction of endstops when homing; 1=MAX, -1=MIN // :[-1,1] @@ -1363,7 +1354,7 @@ */ // Min software endstops constrain movement within minimum coordinate bounds -#define MIN_SOFTWARE_ENDSTOPS +//#define MIN_SOFTWARE_ENDSTOPS #if ENABLED(MIN_SOFTWARE_ENDSTOPS) #define MIN_SOFTWARE_ENDSTOP_X #define MIN_SOFTWARE_ENDSTOP_Y @@ -1385,7 +1376,7 @@ #endif #if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS) - //#define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD + #define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD #endif /** @@ -1401,7 +1392,7 @@ * RAMPS-based boards use SERVO3_PIN for the first runout sensor. * For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc. */ -//#define FILAMENT_RUNOUT_SENSOR +#define FILAMENT_RUNOUT_SENSOR #if ENABLED(FILAMENT_RUNOUT_SENSOR) #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500. #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. @@ -1504,7 +1495,7 @@ //#define AUTO_BED_LEVELING_3POINT //#define AUTO_BED_LEVELING_LINEAR //#define AUTO_BED_LEVELING_BILINEAR -//#define AUTO_BED_LEVELING_UBL +#define AUTO_BED_LEVELING_UBL //#define MESH_BED_LEVELING /** @@ -1512,16 +1503,16 @@ * these options to restore the prior leveling state or to always enable * leveling immediately after G28. */ -//#define RESTORE_LEVELING_AFTER_G28 +#define RESTORE_LEVELING_AFTER_G28 //#define ENABLE_LEVELING_AFTER_G28 /** * Auto-leveling needs preheating */ -//#define PREHEAT_BEFORE_LEVELING +#define PREHEAT_BEFORE_LEVELING #if ENABLED(PREHEAT_BEFORE_LEVELING) - #define LEVELING_NOZZLE_TEMP 120 // (°C) Only applies to E0 at this time - #define LEVELING_BED_TEMP 50 + //#define LEVELING_NOZZLE_TEMP 120 // (°C) Only applies to E0 at this time + #define LEVELING_BED_TEMP 70 #endif /** @@ -1554,7 +1545,7 @@ /** * Enable the G26 Mesh Validation Pattern tool. */ - //#define G26_MESH_VALIDATION + #define G26_MESH_VALIDATION #if ENABLED(G26_MESH_VALIDATION) #define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle. #define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for G26. @@ -1602,7 +1593,7 @@ //#define MESH_EDIT_GFX_OVERLAY // Display a graphics overlay while editing the mesh - #define MESH_INSET 1 // Set Mesh bounds as an inset region of the bed + #define MESH_INSET 10 // Set Mesh bounds as an inset region of the bed #define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited. #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X @@ -1634,7 +1625,7 @@ * Add a bed leveling sub-menu for ABL or MBL. * Include a guided procedure if manual probing is enabled. */ -//#define LCD_BED_LEVELING +#define LCD_BED_LEVELING #if ENABLED(LCD_BED_LEVELING) #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. @@ -1643,7 +1634,7 @@ #endif // Add a menu item to move between bed corners for manual bed adjustment -//#define LEVEL_BED_CORNERS +#define LEVEL_BED_CORNERS #if ENABLED(LEVEL_BED_CORNERS) #define LEVEL_CORNERS_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets @@ -1706,15 +1697,15 @@ // - Move the Z probe (or nozzle) to a defined XY point before Z Homing. // - Prevent Z homing when the Z probe is outside bed area. // -//#define Z_SAFE_HOMING +#define Z_SAFE_HOMING #if ENABLED(Z_SAFE_HOMING) #define Z_SAFE_HOMING_X_POINT X_CENTER // X point for Z homing - #define Z_SAFE_HOMING_Y_POINT Y_CENTER // Y point for Z homing + #define Z_SAFE_HOMING_Y_POINT Y_CENTER // Y point for Z homing #endif // Homing speeds (mm/min) -#define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (4*60) } +#define HOMING_FEEDRATE_MM_M { (40*60), (40*60), (10*60) } // Validate that endstops are triggered on homing moves #define VALIDATE_HOMING_ENDSTOPS @@ -1791,7 +1782,7 @@ * M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes) * M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.) */ -//#define EEPROM_SETTINGS // Persistent storage with M500 and M501 +#define EEPROM_SETTINGS // Persistent storage with M500 and M501 //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! #define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. #define EEPROM_BOOT_SILENT // Keep M503 quiet and only give errors during first load @@ -1825,14 +1816,14 @@ // Preheat Constants - Up to 5 are supported without changes // #define PREHEAT_1_LABEL "PLA" -#define PREHEAT_1_TEMP_HOTEND 180 -#define PREHEAT_1_TEMP_BED 70 +#define PREHEAT_1_TEMP_HOTEND 200 +#define PREHEAT_1_TEMP_BED 60 #define PREHEAT_1_TEMP_CHAMBER 35 #define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 -#define PREHEAT_2_LABEL "ABS" -#define PREHEAT_2_TEMP_HOTEND 240 -#define PREHEAT_2_TEMP_BED 110 +#define PREHEAT_2_LABEL "PET" +#define PREHEAT_2_TEMP_HOTEND 220 +#define PREHEAT_2_TEMP_BED 70 #define PREHEAT_2_TEMP_CHAMBER 35 #define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 @@ -1847,11 +1838,11 @@ * P1 Raise the nozzle always to Z-park height. * P2 Raise the nozzle by Z-park amount, limited to Z_MAX_POS. */ -//#define NOZZLE_PARK_FEATURE +#define NOZZLE_PARK_FEATURE #if ENABLED(NOZZLE_PARK_FEATURE) // Specify a park position as { X, Y, Z_raise } - #define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 } + #define NOZZLE_PARK_POINT { 0, 0, 10 } //#define NOZZLE_PARK_X_ONLY // X move only is required to park //#define NOZZLE_PARK_Y_ONLY // Y move only is required to park #define NOZZLE_PARK_Z_RAISE_MIN 2 // (mm) Always raise Z by at least this distance @@ -1973,7 +1964,7 @@ * * View the current statistics with M78. */ -//#define PRINTCOUNTER +#define PRINTCOUNTER #if ENABLED(PRINTCOUNTER) #define PRINTCOUNTER_SAVE_INTERVAL 60 // (minutes) EEPROM save interval during print #endif @@ -2064,14 +2055,14 @@ * SD Card support is disabled by default. If your controller has an SD slot, * you must uncomment the following option or it won't work. */ -//#define SDSUPPORT +#define SDSUPPORT /** * SD CARD: ENABLE CRC * * Use CRC checks and retries on the SD communication. */ -//#define SD_CHECK_AND_RETRY +#define SD_CHECK_AND_RETRY /** * LCD Menu Items @@ -2088,13 +2079,13 @@ // This option overrides the default number of encoder pulses needed to // produce one step. Should be increased for high-resolution encoders. // -//#define ENCODER_PULSES_PER_STEP 4 +#define ENCODER_PULSES_PER_STEP 4 // // Use this option to override the number of step signals required to // move between next/prev menu items. // -//#define ENCODER_STEPS_PER_MENU_ITEM 1 +#define ENCODER_STEPS_PER_MENU_ITEM 1 /** * Encoder Direction Options @@ -2111,7 +2102,7 @@ // // Set this option if CLOCKWISE causes values to DECREASE // -//#define REVERSE_ENCODER_DIRECTION +#define REVERSE_ENCODER_DIRECTION // // This option reverses the encoder direction for navigating LCD menus. @@ -2323,7 +2314,7 @@ // RepRapDiscount FULL GRAPHIC Smart Controller // https://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER +#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // // K.3D Full Graphic Smart Controller diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 7b642cc3556dd..36079b3fc2d75 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1089,7 +1089,7 @@ * vibration and surface artifacts. The algorithm adapts to provide the best possible step smoothing at the * lowest stepping frequencies. */ -//#define ADAPTIVE_STEP_SMOOTHING +#define ADAPTIVE_STEP_SMOOTHING /** * Custom Microstepping @@ -1190,7 +1190,7 @@ // Add Probe Z Offset calibration to the Z Probe Offsets menu #if HAS_BED_PROBE - //#define PROBE_OFFSET_WIZARD + #define PROBE_OFFSET_WIZARD #if ENABLED(PROBE_OFFSET_WIZARD) // // Enable to init the Probe Z-Offset when starting the Wizard. @@ -1205,7 +1205,7 @@ #endif // Include a page of printer information in the LCD Main Menu - //#define LCD_INFO_MENU + #define LCD_INFO_MENU #if ENABLED(LCD_INFO_MENU) //#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages #endif @@ -1252,23 +1252,23 @@ //#define LCD_TIMEOUT_TO_STATUS 15000 #if ENABLED(SHOW_BOOTSCREEN) - #define BOOTSCREEN_TIMEOUT 4000 // (ms) Total Duration to display the boot screen(s) + #define BOOTSCREEN_TIMEOUT 2000 // (ms) Total Duration to display the boot screen(s) #if EITHER(HAS_MARLINUI_U8GLIB, TFT_COLOR_UI) #define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving lots of flash) #endif #endif // Scroll a longer status message into view - //#define STATUS_MESSAGE_SCROLLING + #define STATUS_MESSAGE_SCROLLING // On the Info Screen, display XY with one decimal place when possible //#define LCD_DECIMAL_SMALL_XY // Add an 'M73' G-code to set the current percentage - //#define LCD_SET_PROGRESS_MANUALLY + #define LCD_SET_PROGRESS_MANUALLY // Show the E position (filament used) during printing - //#define LCD_SHOW_E_TOTAL + #define LCD_SHOW_E_TOTAL #endif #if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY) && ANY(HAS_MARLINUI_U8GLIB, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL, EXTENSIBLE_UI) @@ -1413,10 +1413,10 @@ //#define UTF_FILENAME_SUPPORT // This allows hosts to request long names for files and folders with M33 - //#define LONG_FILENAME_HOST_SUPPORT + #define LONG_FILENAME_HOST_SUPPORT // Enable this option to scroll long filenames in the SD card menu - //#define SCROLL_LONG_FILENAMES + #define SCROLL_LONG_FILENAMES // Leave the heaters on after Stop Print (not recommended!) //#define SD_ABORT_NO_COOLDOWN @@ -1433,7 +1433,7 @@ * On print completion the LCD Menu will open with the file selected. * You can just click to start the print, or navigate elsewhere. */ - //#define SD_REPRINT_LAST_SELECTED_FILE + #define SD_REPRINT_LAST_SELECTED_FILE /** * Auto-report SdCard status with M27 S @@ -1544,7 +1544,7 @@ */ #if HAS_MARLINUI_U8GLIB // Show SD percentage next to the progress bar - //#define DOGM_SD_PERCENT + #define DOGM_SD_PERCENT // Save many cycles by drawing a hollow frame or no frame on the Info Screen //#define XYZ_NO_FRAME @@ -1822,18 +1822,18 @@ * * Warning: Does not respect endstops! */ -//#define BABYSTEPPING +#define BABYSTEPPING #if ENABLED(BABYSTEPPING) //#define INTEGRATED_BABYSTEPPING // EXPERIMENTAL integration of babystepping into the Stepper ISR //#define BABYSTEP_WITHOUT_HOMING - //#define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement). + #define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement). //#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA! #define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way //#define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps #define BABYSTEP_MULTIPLICATOR_Z 1 // (steps or mm) Steps or millimeter distance for each Z babystep #define BABYSTEP_MULTIPLICATOR_XY 1 // (steps or mm) Steps or millimeter distance for each XY babystep - //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. + #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds. // Note: Extra time may be added to mitigate controller latency. @@ -1845,10 +1845,10 @@ //#define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28 - //#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping + #define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping #if ENABLED(BABYSTEP_ZPROBE_OFFSET) //#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets - //#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor + #define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor #endif #endif @@ -1869,10 +1869,10 @@ * * See https://marlinfw.org/docs/features/lin_advance.html for full instructions. */ -//#define LIN_ADVANCE +#define LIN_ADVANCE #if ENABLED(LIN_ADVANCE) //#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants - #define LIN_ADVANCE_K 0.22 // Unit: mm compression per 1mm/s extruder speed + #define LIN_ADVANCE_K 0 // Unit: mm compression per 1mm/s extruder speed //#define LA_DEBUG // If enabled, this will generate debug information output over USB. //#define EXPERIMENTAL_SCURVE // Enable this option to permit S-Curve Acceleration #endif @@ -2170,7 +2170,7 @@ * Currently handles M108, M112, M410, M876 * NOTE: Not yet implemented for all platforms. */ -//#define EMERGENCY_PARSER +#define EMERGENCY_PARSER /** * Realtime Reporting (requires EMERGENCY_PARSER) @@ -2347,23 +2347,23 @@ * * Enable PARK_HEAD_ON_PAUSE to add the G-code M125 Pause and Park. */ -//#define ADVANCED_PAUSE_FEATURE +#define ADVANCED_PAUSE_FEATURE #if ENABLED(ADVANCED_PAUSE_FEATURE) - #define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate. + #define PAUSE_PARK_RETRACT_FEEDRATE 40 // (mm/s) Initial retract feedrate. #define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract. // This short retract is done immediately, before parking the nozzle. - #define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10 // (mm/s) Unload filament feedrate. This can be pretty fast. - #define FILAMENT_CHANGE_UNLOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate. + #define FILAMENT_CHANGE_UNLOAD_FEEDRATE 50 // (mm/s) Unload filament feedrate. This can be pretty fast. + #define FILAMENT_CHANGE_UNLOAD_ACCEL 10 // (mm/s^2) Lower acceleration may allow a faster feedrate. #define FILAMENT_CHANGE_UNLOAD_LENGTH 100 // (mm) The length of filament for a complete unload. // For Bowden, the full length of the tube and nozzle. // For direct drive, the full length of the nozzle. // Set to 0 for manual unloading. - #define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE 6 // (mm/s) Slow move when starting load. - #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 0 // (mm) Slow length, to allow time to insert material. + #define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE 2 // (mm/s) Slow move when starting load. + #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 10 // (mm) Slow length, to allow time to insert material. // 0 to disable start loading and skip to fast load only - #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 6 // (mm/s) Load filament feedrate. This can be pretty fast. + #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 5 // (mm/s) Load filament feedrate. This can be pretty fast. #define FILAMENT_CHANGE_FAST_LOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate. - #define FILAMENT_CHANGE_FAST_LOAD_LENGTH 0 // (mm) Load length of filament, from extruder gear to nozzle. + #define FILAMENT_CHANGE_FAST_LOAD_LENGTH 40 // (mm) Load length of filament, from extruder gear to nozzle. // For Bowden, the full length of the tube and nozzle. // For direct drive, the full length of the nozzle. //#define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted. @@ -2379,7 +2379,7 @@ #define FILAMENT_UNLOAD_PURGE_RETRACT 13 // (mm) Unload initial retract length. #define FILAMENT_UNLOAD_PURGE_DELAY 5000 // (ms) Delay for the filament to cool after retract. #define FILAMENT_UNLOAD_PURGE_LENGTH 8 // (mm) An unretract is done, then this length is purged. - #define FILAMENT_UNLOAD_PURGE_FEEDRATE 25 // (mm/s) feedrate to purge before unload + #define FILAMENT_UNLOAD_PURGE_FEEDRATE 45 // (mm/s) feedrate to purge before unload #define PAUSE_PARK_NOZZLE_TIMEOUT 45 // (seconds) Time limit before the nozzle is turned off for safety. #define FILAMENT_CHANGE_ALERT_BEEPS 10 // Number of alert beeps to play when a response is needed. @@ -2388,7 +2388,7 @@ //#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change. //#define HOME_BEFORE_FILAMENT_CHANGE // If needed, home before parking for filament change - //#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu. + #define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu. //#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302) #endif @@ -3784,9 +3784,9 @@ * Host Prompt Support enables Marlin to use the host for user prompts so * filament runout and other processes can be managed from the host side. */ -//#define HOST_ACTION_COMMANDS +#define HOST_ACTION_COMMANDS #if ENABLED(HOST_ACTION_COMMANDS) - //#define HOST_PROMPT_SUPPORT + #define HOST_PROMPT_SUPPORT //#define HOST_START_MENU_ITEM // Add a menu item that tells the host to start #endif diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h index c2d4dbeb3f812..8490cfb88b5c3 100644 --- a/Marlin/src/pins/ramps/pins_RAMPS.h +++ b/Marlin/src/pins/ramps/pins_RAMPS.h @@ -252,7 +252,7 @@ // RAMPS 1.4 DIO 4 on the servos connector #ifndef FIL_RUNOUT_PIN - #define FIL_RUNOUT_PIN 4 + #define FIL_RUNOUT_PIN 2 #endif #ifndef PS_ON_PIN