Skip to content

Commit 5fd68b3

Browse files
committed
Squashed commit of the following:
commit d59d9b5 Author: Tanguy Pruvot <[email protected]> Date: Sun Sep 1 11:10:35 2019 +0200 Alfawise - LK1/LK2/LK4 and BLTouch (MarlinFirmware#15118) commit ee240d2 Author: weakset <[email protected]> Date: Sun Sep 1 12:04:40 2019 +0300 Use Flash-based EEPROM on SKR mini-E3 (MarlinFirmware#15126) commit be051c8 Author: Jason Smith <[email protected]> Date: Sun Sep 1 02:00:20 2019 -0700 Fix Z_STEPPER_ALIGN_[XY] sanity error (MarlinFirmware#15124) commit ee444d7 Author: Tanguy Pruvot <[email protected]> Date: Sun Sep 1 04:10:50 2019 +0200 Fix SKRmini test required serial port(s) (MarlinFirmware#15117) commit c8e0967 Author: ETE-Design <[email protected]> Date: Sun Sep 1 03:54:36 2019 +0200 Gantry: Enable Filament Change (MarlinFirmware#15122) commit 8778e12 Author: Scott Lahteine <[email protected]> Date: Sat Aug 31 20:49:02 2019 -0500 Fix some missed misspellings commit 2747ab7 Author: thisiskeithb <[email protected]> Date: Sat Aug 31 18:46:10 2019 -0700 Ender-3 default TMC currents (MarlinFirmware#15115) commit 586b334 Author: Scott Lahteine <[email protected]> Date: Sat Aug 31 19:44:45 2019 -0500 Split up stepper indirection (MarlinFirmware#15111) commit 87b16ed Author: Scott Lahteine <[email protected]> Date: Sat Aug 31 07:03:36 2019 -0500 Bring Configuration.h up to date commit 8fca850 Author: Scott Lahteine <[email protected]> Date: Sat Aug 31 07:00:35 2019 -0500 Patch early env rename commit 25cf7de Author: thisiskeithb <[email protected]> Date: Fri Aug 30 23:40:52 2019 -0700 Disable Tevo Tarantula Pro PIDTEMPBED (MarlinFirmware#15089) commit 66f1da7 Author: Scott Lahteine <[email protected]> Date: Sat Aug 31 01:06:22 2019 -0500 Use 'ui.' where possible commit 26fa085 Author: Robby Candra <[email protected]> Date: Sat Aug 31 10:49:24 2019 +0700 Add RGB565 Color Definitions for TFT (MarlinFirmware#15099) commit 9449201 Author: Scott Lahteine <[email protected]> Date: Sun Aug 18 23:29:59 2019 -0500 Add more platform Travis tests commit 0f4d3e1 Author: Scott Lahteine <[email protected]> Date: Thu Aug 29 18:16:50 2019 -0500 Fix ESP32 "DISABLED" name conflict commit 1eeef30 Author: Scott Lahteine <[email protected]> Date: Fri Aug 30 19:14:43 2019 -0500 A single generate_click lambda commit c014f8d Author: Tanguy Pruvot <[email protected]> Date: Sat Aug 31 01:15:04 2019 +0200 Fix STM32F1 SPI warning (gcc 8.2.1) (MarlinFirmware#15104) commit d068470 Author: Tanguy Pruvot <[email protected]> Date: Sat Aug 31 00:46:09 2019 +0200 Prevent Linux min/max error (MarlinFirmware#15107) commit ba91bca Author: Bob Kuhn <[email protected]> Date: Fri Aug 30 17:39:45 2019 -0500 TMC SPI daisy chain support (experimental) (MarlinFirmware#15081) commit 0bcb644 Author: Scott Lahteine <[email protected]> Date: Fri Aug 30 16:09:57 2019 -0500 Revert _BV testing commit This reverts commit 9223261. commit 05ef9b2 Author: Scott Lahteine <[email protected]> Date: Fri Aug 30 14:44:39 2019 -0500 [cron] Bump distribution date commit 2aef83d Author: Scott Lahteine <[email protected]> Date: Tue Aug 27 20:28:42 2019 -0500 Add a PlatformIO hook to alter CXXFLAGS commit 23cffb2 Author: Scott Lahteine <[email protected]> Date: Tue Aug 27 20:50:48 2019 -0500 Add an env to get the Include Tree commit 9223261 Author: Scott Lahteine <[email protected]> Date: Thu Aug 29 17:50:16 2019 -0500 Only define _BV in Marduino.h commit d25231a Author: Scott Lahteine <[email protected]> Date: Thu Aug 29 17:06:18 2019 -0500 Spacing, defined(), #include tweaks commit 7ebfae2 Author: Karl Andersson <[email protected]> Date: Fri Aug 30 00:00:01 2019 +0200 Fix HAL_STM32 SPI regression (MarlinFirmware#15093) Reference: 0b47558 commit f5a1fab Author: thisiskeithb <[email protected]> Date: Thu Aug 29 14:57:56 2019 -0700 Clarify TMC2209 Sensitivity vs. Others (MarlinFirmware#15092) commit 3f77d6a Author: Ludy <[email protected]> Date: Thu Aug 29 23:05:22 2019 +0200 Fix expire_status warning (MarlinFirmware#15094) commit 38983fd Author: Robby Candra <[email protected]> Date: Thu Aug 29 13:19:07 2019 +0700 Add 'Back' Button for Touch TFT 320x240 (MarlinFirmware#15060) commit 8196ced Author: Scott Lahteine <[email protected]> Date: Thu Aug 29 00:54:42 2019 -0500 Leave LCD_PINS_Dn defined for other uses Fix MarlinFirmware#14998 commit 0ebaea9 Author: AlexandrZloy <[email protected]> Date: Thu Aug 29 12:15:31 2019 +0700 Add stallGuard threshold for X2 (MarlinFirmware#15042) commit e1d65b8 Author: Scott Lahteine <[email protected]> Date: Thu Aug 29 00:00:03 2019 -0500 [cron] Bump distribution date commit ca5da02 Author: Tanguy Pruvot <[email protected]> Date: Thu Aug 29 06:49:51 2019 +0200 dogm: u8g prototypes cleanup (MarlinFirmware#15082) commit a61c91a Author: Scott Lahteine <[email protected]> Date: Wed Aug 28 21:28:21 2019 -0500 Use 'bugfix' branch of U8glib-HAL commit 1d8ad7c Author: Scott Lahteine <[email protected]> Date: Wed Aug 28 21:21:38 2019 -0500 Safe changes from HAL cleanup commit 9596312 Author: Scott Lahteine <[email protected]> Date: Wed Aug 28 08:12:18 2019 -0500 Patch a u8g include commit 7b99c26 Author: Scott Lahteine <[email protected]> Date: Mon Aug 26 17:52:11 2019 -0500 Fix FTDI_EVE_LIB platform includes commit 3ac76f0 Author: Scott Lahteine <[email protected]> Date: Wed Aug 28 07:40:18 2019 -0500 Invariant Marlin bootscreen (MarlinFirmware#15057) commit b2a4b6f Author: Scott Lahteine <[email protected]> Date: Sun Aug 25 19:07:13 2019 -0500 Don't use board url as override commit b8e4b99 Author: Scott Lahteine <[email protected]> Date: Sun Aug 25 18:57:32 2019 -0500 Separate board website URL commit 6341aef Author: Scott Lahteine <[email protected]> Date: Sun Aug 25 19:05:03 2019 -0500 Info menu tweak style commit 0f386d0 Author: Marcio Teixeira <[email protected]> Date: Wed Aug 28 03:23:13 2019 -0600 Followup fixes to ExtUI (MarlinFirmware#15068) commit 081e450 Author: Luu Lac <[email protected]> Date: Wed Aug 28 04:20:28 2019 -0500 Fix G53 as prefix, G28 with CNC_COORDINATE_SYSTEMS (MarlinFirmware#15069) commit ca084dc Author: Robby Candra <[email protected]> Date: Wed Aug 28 14:49:21 2019 +0700 Switch col vs row variable name (MarlinFirmware#15072) commit 604bdf0 Author: Giuliano Zaro <[email protected]> Date: Wed Aug 28 09:46:21 2019 +0200 Update Italian language (MarlinFirmware#15076) commit b7796bc Author: InsanityAutomation <[email protected]> Date: Wed Aug 28 01:51:01 2019 -0400 Disable steppers on M112 (MarlinFirmware#15065) And change verbiage to not refer to "Emergency Stop." commit 318356b Author: Scott Lahteine <[email protected]> Date: Mon Aug 26 00:00:07 2019 -0500 [cron] Bump distribution date commit d2f211c Author: Scott Lahteine <[email protected]> Date: Sun Aug 25 20:52:07 2019 -0500 Gantry followup commit 9d12788 Author: ETE-Design <[email protected]> Date: Mon Aug 26 03:51:06 2019 +0200 ADIMLab Gantry - Spelling Correction (MarlinFirmware#15043) commit 1769f43 Author: thisiskeithb <[email protected]> Date: Sun Aug 25 02:47:02 2019 -0700 Fix CR-10/10S/Mini/5S Bed Thermistor Types (MarlinFirmware#15040) commit f218405 Author: InsanityAutomation <[email protected]> Date: Sun Aug 25 05:46:02 2019 -0400 Fix ExtUI invalid speed, timer (MarlinFirmware#15031) commit 1557656 Author: Daniel Callander <[email protected]> Date: Sun Aug 25 10:43:53 2019 +0100 Add warning when trying to use JD with kinematic systems (MarlinFirmware#15032) commit 7183a58 Author: Scott Lahteine <[email protected]> Date: Sat Aug 24 07:46:30 2019 -0500 Add EZBOARD PT100 pin commit c7825e6 Author: Scott Lahteine <[email protected]> Date: Sun Aug 25 04:30:02 2019 -0500 Contrast over 63 assume 255 max This is closer to the prior behavior. commit 1461ee4 Author: Tim Moore <[email protected]> Date: Sun Aug 25 02:25:07 2019 -0700 Make LCD_CONTRAST_MAX >= _LCD_CONTRAST_INIT (MarlinFirmware#15046) commit 9e9e578 Author: Scott Lahteine <[email protected]> Date: Sun Aug 25 00:00:03 2019 -0500 [cron] Bump distribution date commit 8033bc8 Author: Tim Moore <[email protected]> Date: Sat Aug 24 17:50:04 2019 -0700 Turbo-back Info menu items (MarlinFirmware#15049) commit d6a1652 Author: Scott Lahteine <[email protected]> Date: Sat Aug 24 03:40:28 2019 -0500 New Language: Vietnamese (MarlinFirmware#13892) commit f6b604f Author: Scott Lahteine <[email protected]> Date: Sat Aug 24 02:10:50 2019 -0500 Helper Script tweaks commit 7fbf40c Author: Scott Lahteine <[email protected]> Date: Sat Aug 24 02:02:31 2019 -0500 Add command-check to get-bdf2u8g.sh commit da601d5 Author: Marcio Teixeira <[email protected]> Date: Sat Aug 24 00:47:19 2019 -0600 Update USB_FLASH_DRIVE_SUPPORT (MarlinFirmware#15021) commit 20fc66f Merge: 7502569 334777c Author: Scott Lahteine <[email protected]> Date: Sat Aug 24 01:45:11 2019 -0500 ADIMLab Granty v1 / v2 (MarlinFirmware#15017) * # This is a combination of 18 commits. # This is the 1st commit message: Add Support for ADIMLab Granty # The commit message MarlinFirmware#2 will be skipped: # Update Configuration.h # The commit message MarlinFirmware#3 will be skipped: # Add files via upload # # Add Support for ADIMLab Granty # The commit message MarlinFirmware#4 will be skipped: # Create Configuration.h # The commit message MarlinFirmware#5 will be skipped: # Delete Configuration.h # The commit message MarlinFirmware#6 will be skipped: # Create Test.h # The commit message MarlinFirmware#7 will be skipped: # Add files via upload # The commit message MarlinFirmware#8 will be skipped: # Delete Test.h # The commit message MarlinFirmware#9 will be skipped: # Delete Configuration.h # The commit message MarlinFirmware#10 will be skipped: # Delete Configuration_adv.h # The commit message MarlinFirmware#11 will be skipped: # Add files via upload # # Add ADIMLab Pins # The commit message MarlinFirmware#12 will be skipped: # Add files via upload # # Add Bootscreen # The commit message MarlinFirmware#13 will be skipped: # Update Configuration.h # # Add Bootscreen # The commit message MarlinFirmware#14 will be skipped: # Update pins.h # # Add ADIMLab Board # The commit message MarlinFirmware#15 will be skipped: # Update boards.h # # Add ADIMLab Granty # The commit message MarlinFirmware#16 will be skipped: # Update Makefile # # Add ADIMLab Granty # The commit message MarlinFirmware#17 will be skipped: # Update boards.h # The commit message MarlinFirmware#18 will be skipped: # Update Makefile * Add Support for ADIMLab Granty * Optimize bootscreen * Update Makefile Updated Description * Update boards.h Updated Description * Update pins_HJC2560C_REV2.h Updated Description * Update Configuration.h Added Author + Custom_Machine_Name * Create _Bootscreen.h Add Bootscreen * Add files via upload Add ADIMLab Granty v1 * Update boards.h Add ADIMLab Granty v1 * Update Makefile Add ADIMLab Granty v1 * Update pins_HJC2560C_REV2.h * Consolidate Granty configs * config updates commit 7502569 Author: Scott Lahteine <[email protected]> Date: Sat Aug 24 01:42:38 2019 -0500 Apply #ifdef commit d527c46 Author: Scott Lahteine <[email protected]> Date: Sat Aug 24 01:42:28 2019 -0500 Delta: Reduce default MIN_STEPS_PER_SEGMENT commit 848dd74 Author: BigTreeTech <[email protected]> Date: Sat Aug 24 14:33:16 2019 +0800 Fix STM32F1 ADC read temperature error (MarlinFirmware#15026) …after USB CDC connect. commit 04a9962 Author: Scott Lahteine <[email protected]> Date: Sat Aug 24 00:57:50 2019 -0500 Fix: Contrast override in pins files Move contrast handling to `Conditionals_post.h` so pins files can override the LCD defaults. commit 334777c Author: Scott Lahteine <[email protected]> Date: Sat Aug 24 00:24:48 2019 -0500 config updates commit 8c73017 Author: Scott Lahteine <[email protected]> Date: Sat Aug 24 00:00:04 2019 -0500 [cron] Bump distribution date commit 62d2a65 Author: Scott Lahteine <[email protected]> Date: Fri Aug 23 23:49:30 2019 -0500 Consolidate Granty configs commit 09ee5a5 Merge: 9d8e3d4 f2ad1ce Author: Scott Lahteine <[email protected]> Date: Fri Aug 23 23:45:37 2019 -0500 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bf2_granty_fix_15017 commit efeea9b Author: Tim Moore <[email protected]> Date: Fri Aug 23 20:30:11 2019 -0700 pca9632_buzz fix (MarlinFirmware#15020) commit e61e54a Author: Marcio Teixeira <[email protected]> Date: Fri Aug 23 21:29:00 2019 -0600 Fix TURBO_BACK_MENU_ITEM compile error (MarlinFirmware#15019) commit 0a280f0 Author: Tanguy Pruvot <[email protected]> Date: Sat Aug 24 05:21:30 2019 +0200 Flag unused variables without buzzer (MarlinFirmware#15016) commit f2ad1ce Author: Scott Lahteine <[email protected]> Date: Fri Aug 23 20:59:37 2019 -0500 Update PT-BR commit 9c87786 Author: ManuelMcLure <[email protected]> Date: Fri Aug 23 18:55:41 2019 -0700 Change default Re-ARM UART pin order (MarlinFirmware#15037) commit fdef32c Author: Scott Lahteine <[email protected]> Date: Thu Aug 22 18:17:13 2019 -0500 Shorten Website URLs commit 7924e0d Author: Scott Lahteine <[email protected]> Date: Thu Aug 22 19:36:18 2019 -0500 Add print at position shortcuts commit 5c0e5c5 Author: Scott Lahteine <[email protected]> Date: Thu Aug 22 18:01:10 2019 -0500 Fix boot screen warning commit dd6efe9 Author: Scott Lahteine <[email protected]> Date: Thu Aug 22 18:56:59 2019 -0500 Restore documented M503 behavior commit 6429b8b Author: Scott Lahteine <[email protected]> Date: Thu Aug 22 17:38:23 2019 -0500 Fix EZBoard platform test commit e604f76 Author: Tanguy Pruvot <[email protected]> Date: Thu Aug 22 01:56:39 2019 +0200 Enable contrast via LCD_CONTRAST_INIT (MarlinFirmware#15006) commit 9d8e3d4 Author: ETE-Design <[email protected]> Date: Wed Aug 21 17:38:08 2019 +0200 Update pins_HJC2560C_REV2.h commit 2526e2d Author: ETE-Design <[email protected]> Date: Wed Aug 21 17:36:15 2019 +0200 Update Makefile Add ADIMLab Granty v1 commit d858f44 Author: ETE-Design <[email protected]> Date: Wed Aug 21 17:34:44 2019 +0200 Update boards.h Add ADIMLab Granty v1 commit c3d1671 Author: ETE-Design <[email protected]> Date: Wed Aug 21 17:30:17 2019 +0200 Add files via upload Add ADIMLab Granty v1 commit 778466a Author: ETE-Design <[email protected]> Date: Wed Aug 21 17:29:25 2019 +0200 Create _Bootscreen.h Add Bootscreen commit 42f3549 Author: ETE-Design <[email protected]> Date: Wed Aug 21 16:33:36 2019 +0200 Update Configuration.h Added Author + Custom_Machine_Name commit 0309a5f Author: ETE-Design <[email protected]> Date: Wed Aug 21 16:30:08 2019 +0200 Update pins_HJC2560C_REV2.h Updated Description commit 9434b81 Author: ETE-Design <[email protected]> Date: Wed Aug 21 16:27:45 2019 +0200 Update boards.h Updated Description commit 6b35951 Author: ETE-Design <[email protected]> Date: Wed Aug 21 16:26:25 2019 +0200 Update Makefile Updated Description commit 012f577 Author: Tanguy Pruvot <[email protected]> Date: Wed Aug 21 13:22:23 2019 +0200 STM32F1: Import (rogerclarkmelbourne) SPI class (MarlinFirmware#15002) commit 4be9822 Author: ETE-Design <[email protected]> Date: Wed Aug 21 12:33:17 2019 +0200 ADIMLab Granty pins/config (MarlinFirmware#14919) commit 1fb3c40 Author: Scott Lahteine <[email protected]> Date: Wed Aug 21 05:30:33 2019 -0500 Optimize bootscreen commit f7aac7a Author: Scott Lahteine <[email protected]> Date: Wed Aug 21 05:05:44 2019 -0500 Add Support for ADIMLab Granty commit de122c9 Author: ETE-Design <[email protected]> Date: Sat Aug 10 18:18:27 2019 +0200 # This is a combination of 18 commits. # This is the 1st commit message: Add Support for ADIMLab Granty # The commit message MarlinFirmware#2 will be skipped: # Update Configuration.h # The commit message MarlinFirmware#3 will be skipped: # Add files via upload # # Add Support for ADIMLab Granty # The commit message MarlinFirmware#4 will be skipped: # Create Configuration.h # The commit message MarlinFirmware#5 will be skipped: # Delete Configuration.h # The commit message MarlinFirmware#6 will be skipped: # Create Test.h # The commit message MarlinFirmware#7 will be skipped: # Add files via upload # The commit message MarlinFirmware#8 will be skipped: # Delete Test.h # The commit message MarlinFirmware#9 will be skipped: # Delete Configuration.h # The commit message MarlinFirmware#10 will be skipped: # Delete Configuration_adv.h # The commit message MarlinFirmware#11 will be skipped: # Add files via upload # # Add ADIMLab Pins # The commit message MarlinFirmware#12 will be skipped: # Add files via upload # # Add Bootscreen # The commit message MarlinFirmware#13 will be skipped: # Update Configuration.h # # Add Bootscreen # The commit message MarlinFirmware#14 will be skipped: # Update pins.h # # Add ADIMLab Board # The commit message MarlinFirmware#15 will be skipped: # Update boards.h # # Add ADIMLab Granty # The commit message MarlinFirmware#16 will be skipped: # Update Makefile # # Add ADIMLab Granty # The commit message MarlinFirmware#17 will be skipped: # Update boards.h # The commit message MarlinFirmware#18 will be skipped: # Update Makefile commit 4581957 Author: Scott Lahteine <[email protected]> Date: Wed Aug 21 05:15:31 2019 -0500 Clean up some pins commit bd1ced1 Author: Marcio Teixeira <[email protected]> Date: Wed Aug 21 03:48:06 2019 -0600 LulzBot Touch UI Followup (MarlinFirmware#15007) commit 8c2cfaa Author: Scott Lahteine <[email protected]> Date: Tue Aug 20 23:45:38 2019 -0500 Fix BigTree_Btt002 build commit 69641f1 Author: Marcio Teixeira <[email protected]> Date: Wed Aug 21 03:15:37 2019 -0600 Fix incompatible types error (MarlinFirmware#15009) commit 825c2c3 Author: Marcio Teixeira <[email protected]> Date: Wed Aug 21 02:49:43 2019 -0600 Fix fan speed encoder scaling (MarlinFirmware#15010) commit f1942f6 Author: Scott Lahteine <[email protected]> Date: Wed Aug 21 00:00:04 2019 -0500 [cron] Bump distribution date commit 5e77760 Author: Scott Lahteine <[email protected]> Date: Tue Aug 20 19:37:03 2019 -0500 Add TURBO_BACK_MENU_ITEM option (MarlinFirmware#14991) commit 0cc524b Author: Scott Lahteine <[email protected]> Date: Tue Aug 20 19:08:58 2019 -0500 Prevent BOARD_NAME conflict with env commit 33f6d77 Author: InsanityAutomation <[email protected]> Date: Tue Aug 20 04:44:52 2019 -0400 Adjust homing backoff feedrate (MarlinFirmware#14972) commit 5a7c021 Author: InsanityAutomation <[email protected]> Date: Tue Aug 20 04:44:17 2019 -0400 Misc. ExtUI fixes (MarlinFirmware#14971) commit 6039893 Author: InsanityAutomation <[email protected]> Date: Tue Aug 20 04:42:30 2019 -0400 Creality pins updates (MarlinFirmware#14979) commit 8664b8e Author: MaukCC <[email protected]> Date: Tue Aug 20 10:40:48 2019 +0200 Adding HMS434 machine (MarlinFirmware#14931) commit 5c6e827 Author: Scott Lahteine <[email protected]> Date: Tue Aug 20 03:11:18 2019 -0500 Followup to STM32F407 commit 0b47558 Author: chzj333 <[email protected]> Date: Tue Aug 20 16:05:12 2019 +0800 New board STM32F407 (MarlinFirmware#14994) commit bb4a252 Author: BigTreeTech <[email protected]> Date: Tue Aug 20 16:02:52 2019 +0800 Fix Bigtreetech STM32F40x variants ADC (MarlinFirmware#14996) commit 67f8ba6 Author: Tim Moore <[email protected]> Date: Tue Aug 20 00:40:44 2019 -0700 Allow pullup/downs on power loss pin (MarlinFirmware#14986) commit 19e21a8 Author: thisiskeithb <[email protected]> Date: Tue Aug 20 00:38:31 2019 -0700 Wanhao Duplicator i3 Mini config updates (MarlinFirmware#14908) commit 05995d1 Author: Ludy <[email protected]> Date: Tue Aug 20 09:01:37 2019 +0200 Unify buzz methods as MarlinUI::buzz (MarlinFirmware#14803) commit 29c1290 Author: Scott Lahteine <[email protected]> Date: Mon Aug 19 02:28:12 2019 -0500 Minor HAL patches commit 1432d44 Author: Scott Lahteine <[email protected]> Date: Mon Aug 19 01:30:28 2019 -0500 Patch circleci config commit 94397db Author: Scott Lahteine <[email protected]> Date: Mon Aug 19 00:00:07 2019 -0500 [cron] Bump distribution date commit 17cd1a4 Author: Scott Lahteine <[email protected]> Date: Wed Aug 14 00:03:12 2019 -0500 Tweak TOUCH_MI_DEPLOY_XPOS block commit dfcd437 Author: Scott Lahteine <[email protected]> Date: Wed Aug 14 00:00:46 2019 -0500 Base HAS_LCD_CONTRAST on display type commit 3f678b0 Author: Scott Lahteine <[email protected]> Date: Sun Aug 18 23:37:15 2019 -0500 Remove some extra F4 conditions commit 4d1a662 Author: Scott Lahteine <[email protected]> Date: Sun Aug 18 23:24:55 2019 -0500 Fix STM32F7 STEPPER_ENABLE_PIN commit 08434b3 Author: Scott Lahteine <[email protected]> Date: Sun Aug 18 20:49:33 2019 -0500 Add TMC26XStepper, not ignore commit cd09e35 Author: Tim Moore <[email protected]> Date: Sun Aug 18 19:17:00 2019 -0700 Remove extra M503 "M412" report (MarlinFirmware#14985) commit c5be59d Author: InsanityAutomation <[email protected]> Date: Sun Aug 18 22:11:33 2019 -0400 Fix runout trigger on "inactive" sensor (MarlinFirmware#14990) commit af5a7a2 Author: InsanityAutomation <[email protected]> Date: Sun Aug 18 22:03:26 2019 -0400 Add missing ExtUI user confirmation (MarlinFirmware#14992) commit 33d54c0 Author: Robby Candra <[email protected]> Date: Mon Aug 19 09:00:21 2019 +0700 Remove extra defines (MarlinFirmware#14983) commit 403eefd Author: Scott Lahteine <[email protected]> Date: Sun Aug 18 20:17:25 2019 -0500 Delete _Bootscreen.h commit bc93ac5 Author: Scott Lahteine <[email protected]> Date: Sun Aug 18 19:51:37 2019 -0500 Fix #define typo in configs commit d2072f9 Author: Scott Lahteine <[email protected]> Date: Sun Aug 18 19:36:14 2019 -0500 Clean up PlatformIO lib_ignore (MarlinFirmware#14988) Originally from MarlinFirmware#14832. Users may need to delete platformio work folders before building. commit c8e476a Author: Scott Lahteine <[email protected]> Date: Sun Aug 18 18:33:56 2019 -0500 Embed some items in HAS_LCD_MENU commit 9a3ee3b Author: Scott Lahteine <[email protected]> Date: Sun Aug 18 00:00:04 2019 -0500 [cron] Bump distribution date commit 9d9e2de Author: Scott Lahteine <[email protected]> Date: Sat Aug 17 20:14:14 2019 -0500 Tweak UBL G29 status print commit 823178c Author: Robby Candra <[email protected]> Date: Sun Aug 18 07:58:38 2019 +0700 Use u8g int type for screen coordinates (MarlinFirmware#14965) commit 6715fd1 Author: Ludy <[email protected]> Date: Sun Aug 18 01:40:01 2019 +0200 Animated Marlin boot screen (MarlinFirmware#14961) commit 9e49f15 Author: Scott Lahteine <[email protected]> Date: Sat Aug 17 15:47:17 2019 -0500 [cron] Bump distribution date commit 8bdb3d9 Author: Marcio Teixeira <[email protected]> Date: Fri Aug 16 20:57:19 2019 -0600 Add CONTROLLERFAN_SPEED_Z_ONLY (MarlinFirmware#14956) commit 587d4a6 Author: AnHardt <[email protected]> Date: Sat Aug 17 04:17:10 2019 +0200 Repair display throttling (MarlinFirmware#14960) commit fecf808 Author: J.C. Nelson <[email protected]> Date: Fri Aug 16 19:15:27 2019 -0700 Fix lambda missing capture (MarlinFirmware#14969) commit 66bfad3 Author: Bob Kuhn <[email protected]> Date: Fri Aug 16 20:06:32 2019 -0500 Fix missing U8glib.h include (MarlinFirmware#14966) commit 1bcc5c9 Author: J.C. Nelson <[email protected]> Date: Fri Aug 16 18:02:35 2019 -0700 MalyanLCD: Pause, resume, more ExtUI (MarlinFirmware#14852) commit c3ff53a Author: Scott Lahteine <[email protected]> Date: Fri Aug 16 18:47:51 2019 -0500 STM32 u8g defines Suggested by MarlinFirmware#14742 (comment) commit 4575978 Author: Tim Moore <[email protected]> Date: Fri Aug 16 16:42:24 2019 -0700 Fix auto power for chamber fan (MarlinFirmware#14922) commit 274934a Author: Marcio Teixeira <[email protected]> Date: Fri Aug 16 17:34:13 2019 -0600 Add LULZBOT_TOUCH_UI (MarlinFirmware#14967) commit 179d6c4 Author: Marcio Teixeira <[email protected]> Date: Wed Aug 14 20:05:15 2019 -0600 Add STARTUP_SCRIPT option. M17 parity with M18. (MarlinFirmware#14953) commit 36dfbae Author: Marcio Teixeira <[email protected]> Date: Wed Aug 14 16:52:57 2019 -0600 Add missing function declaration (MarlinFirmware#14955) commit 263d7d3 Author: Marcio Teixeira <[email protected]> Date: Wed Aug 14 16:52:14 2019 -0600 "SD card" => "Media" (MarlinFirmware#14951) commit 24ce8be Author: Scott Lahteine <[email protected]> Date: Wed Aug 14 00:00:11 2019 -0500 [cron] Bump distribution date commit 4cc1039 Author: Tanguy Pruvot <[email protected]> Date: Wed Aug 14 06:41:17 2019 +0200 Alfawise Flash EEPROM, Z Servo Probe (MarlinFirmware#14877) commit 0fbb26c Author: Joseph Bozarth <[email protected]> Date: Tue Aug 13 23:38:45 2019 -0500 M16 - Expected Printer Check (MarlinFirmware#14924) commit a26b57a Author: Scott Lahteine <[email protected]> Date: Tue Aug 13 19:38:54 2019 -0500 Minor pins cleanup commit 059f575 Author: Acenotass <[email protected]> Date: Wed Aug 14 06:19:44 2019 +0600 Update Russian language (MarlinFirmware#14940) commit a67830b Author: Timothy Hoogland <[email protected]> Date: Tue Aug 13 00:03:42 2019 -0500 TH3D EZBoard is LPC1769 (MarlinFirmware#14936) commit 03df3f4 Author: Tanguy Pruvot <[email protected]> Date: Tue Aug 13 02:50:34 2019 +0200 Fix Python scripts unhandled quotes (MarlinFirmware#14926) commit c6be989 Author: Tanguy Pruvot <[email protected]> Date: Tue Aug 13 02:48:46 2019 +0200 Store EEPROM config in flash (MarlinFirmware#14923) Avoid confusion between the 2 possible SDs... commit 13d8dc0 Author: Marcio Teixeira <[email protected]> Date: Sat Aug 10 18:25:30 2019 -0600 Fix incorrect print stat in ExtUI (MarlinFirmware#14881) commit dc21e2e Author: Marcio Teixeira <[email protected]> Date: Sat Aug 10 18:24:41 2019 -0600 Increase XY nozzle offset range (MarlinFirmware#14882) commit fa53384 Author: Marcio Teixeira <[email protected]> Date: Sat Aug 10 18:23:37 2019 -0600 Bury easter egg deeper (MarlinFirmware#14883) commit af4bcb6 Author: Giuliano Zaro <[email protected]> Date: Sun Aug 11 02:22:48 2019 +0200 SAMD51 typo fix (MarlinFirmware#14885) commit d7172a4 Author: Ludy <[email protected]> Date: Sun Aug 11 02:22:18 2019 +0200 Cleanup and conditions (MarlinFirmware#14886) commit 03dbe16 Author: Johnny Eshak <[email protected]> Date: Sun Aug 11 02:20:40 2019 +0200 Compiling M43 on invalid conversion (MarlinFirmware#14897) commit f085199 Author: Giuliano Zaro <[email protected]> Date: Sun Aug 11 02:19:52 2019 +0200 SAMD51: Some LCD pin fixes (MarlinFirmware#14915) commit d78086c Author: Giuliano Zaro <[email protected]> Date: Sun Aug 11 02:18:32 2019 +0200 SAMD51: Neopixel pin mapping (MarlinFirmware#14913) commit 9c5086e Author: Eric Ptak <[email protected]> Date: Sun Aug 11 02:14:31 2019 +0200 [STM32F1] Simpler Flash EEPROM (MarlinFirmware#14829) commit 0745d48 Author: Tanguy Pruvot <[email protected]> Date: Sun Aug 11 01:22:11 2019 +0200 Fix build with and without TOUCH_BUTTONS (MarlinFirmware#14912) commit e7aba49 Author: thisiskeithb <[email protected]> Date: Fri Aug 9 23:53:55 2019 -0700 Update PB5 to correct pin number (MarlinFirmware#14891) commit 5ea5d71 Author: thisiskeithb <[email protected]> Date: Fri Aug 9 23:52:26 2019 -0700 Tevo Michelangelo config updates (MarlinFirmware#14895) commit 5d2519e Author: Tanguy Pruvot <[email protected]> Date: Sat Aug 10 08:45:36 2019 +0200 Allow use of Fysetc SoftwareSerialM (MarlinFirmware#14893) commit d2d71ca Author: Robby Candra <[email protected]> Date: Sat Aug 10 13:42:52 2019 +0700 Clean up Touch pins. Better up/down touch response. (MarlinFirmware#14900) commit 8cc0b4b Author: Tanguy Pruvot <[email protected]> Date: Sat Aug 10 07:58:21 2019 +0200 Revert "Edit STEPS_PER_MM integer only" (MarlinFirmware#14909) This reverts commit 2d98bb3. commit 3129fd0 Author: Giuliano Zaro <[email protected]> Date: Sat Aug 10 07:56:55 2019 +0200 SAMD51: Update LCD pins (MarlinFirmware#14907) commit 9479ec3 Author: Ludy <[email protected]> Date: Sat Aug 10 07:53:26 2019 +0200 Fix Service Menu compile error (MarlinFirmware#14903) commit a7f1021 Author: Giuliano Zaro <[email protected]> Date: Sat Aug 10 00:00:20 2019 +0200 Fix SPI_ENDSTOPS compile error (MarlinFirmware#14906)
1 parent ad22ce1 commit 5fd68b3

File tree

787 files changed

+73549
-8747
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

787 files changed

+73549
-8747
lines changed

.circleci/config.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,12 @@ jobs:
242242
echo testing STM32F1 targets...
243243
export TEST_PLATFORM="-e STM32F1"
244244
restore_configs
245-
echo use_example_configs STM32F10
246-
use_example_configs STM32F10
245+
echo use_example_configs STM32/STM32F10
246+
use_example_configs STM32/STM32F10
247247
build_marlin_pio ./ ${TEST_PLATFORM}
248248
restore_configs
249-
echo use_example_configs stm32f103ret6
250-
use_example_configs stm32f103ret6
249+
echo use_example_configs STM32/stm32f103ret6
250+
use_example_configs STM32/stm32f103ret6
251251
build_marlin_pio ./ ${TEST_PLATFORM}
252252
restore_configs
253253

.travis.yml

+25-6
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,37 @@ notifications:
99
email: false
1010

1111
env:
12-
- TEST_PLATFORM="megaatmega2560"
12+
- TEST_PLATFORM="ARMED"
13+
#- TEST_PLATFORM="at90usb1286_cdc"
14+
#- TEST_PLATFORM="at90usb1286_dfu"
1315
- TEST_PLATFORM="DUE"
16+
- TEST_PLATFORM="esp32"
17+
- TEST_PLATFORM="fysetc_f6_13"
18+
- TEST_PLATFORM="jgaurora_a5s_a1"
19+
- TEST_PLATFORM="linux_native"
1420
- TEST_PLATFORM="LPC1768"
1521
- TEST_PLATFORM="LPC1769"
22+
#- TEST_PLATFORM="malyanm200"
23+
- TEST_PLATFORM="megaatmega1280"
24+
- TEST_PLATFORM="megaatmega2560"
25+
#- TEST_PLATFORM="mks_robin"
26+
#- TEST_PLATFORM="mks_robin_lite"
27+
#- TEST_PLATFORM="mks_robin_mini"
28+
#- TEST_PLATFORM="mks_robin_nano"
29+
- TEST_PLATFORM="rambo"
30+
- TEST_PLATFORM="adafruit_grandcentral_m4"
31+
- TEST_PLATFORM="sanguino_atmega1284p"
32+
- TEST_PLATFORM="sanguino_atmega644p"
1633
- TEST_PLATFORM="STM32F1"
17-
- TEST_PLATFORM="teensy31"
18-
- TEST_PLATFORM="teensy35"
19-
- TEST_PLATFORM="linux_native"
20-
- TEST_PLATFORM="esp32"
34+
- TEST_PLATFORM="BIGTREE_SKR_MINI"
35+
#- TEST_PLATFORM="fysetc_STM32F1"
2136
- TEST_PLATFORM="alfawise_U20"
37+
#- TEST_PLATFORM="STM32F4"
2238
- TEST_PLATFORM="black_stm32f407ve"
23-
- TEST_PLATFORM="adafruit_grandcentral_m4"
39+
- TEST_PLATFORM="BIGTREE_SKR_PRO"
40+
#- TEST_PLATFORM="STM32F7"
41+
- TEST_PLATFORM="teensy31"
42+
- TEST_PLATFORM="teensy35"
2443

2544
before_install:
2645
#

Marlin/Configuration.h

+27-13
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,9 @@
7070

7171
// @section info
7272

73-
// User-specified version info of this build to display in [Pronterface, etc] terminal window during
74-
// startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
75-
// build by the user have been successfully uploaded into firmware.
73+
// Author info of this build printed to the host during boot and M115
7674
#define STRING_CONFIG_H_AUTHOR "(V1 Engineering, Ryan, 402)" // Who made the changes.
77-
//#define SHOW_BOOTSCREEN
78-
#define STRING_SPLASH_LINE1 "402 " SHORT_BUILD_VERSION // will be shown during bootup in line 1
79-
#define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2
75+
8076

8177
/**
8278
* *** VENDORS PLEASE READ ***
@@ -89,10 +85,13 @@
8985
* respectfully request that you retain the unmodified Marlin boot screen.
9086
*/
9187

92-
// Enable to show the bitmap in Marlin/_Bootscreen.h on startup.
88+
// Show the Marlin bootscreen on startup. ** ENABLE FOR PRODUCTION **
89+
#define SHOW_BOOTSCREEN
90+
91+
// Show the bitmap in Marlin/_Bootscreen.h on startup.
9392
//#define SHOW_CUSTOM_BOOTSCREEN
9493

95-
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
94+
// Show the bitmap in Marlin/_Statusscreen.h on the status screen.
9695
//#define CUSTOM_STATUS_SCREEN_IMAGE
9796

9897
// @section machine
@@ -372,6 +371,7 @@
372371
* -1 : thermocouple with AD595
373372
* 0 : not used
374373
* 1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
374+
* 331 : (3.3V scaled thermistor 1 table)
375375
* 2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
376376
* 3 : Mendel-parts thermistor (4.7k pullup)
377377
* 4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
@@ -410,7 +410,7 @@
410410
* 998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
411411
* 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
412412
*
413-
* :{ '0': "Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '501':"100K Zonestar (Tronxy X3A)", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '20':"PT100 (Ultimainboard V2.x)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '61':"100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup", '66':"Dyze Design 4.7M High Temperature thermistor", '67':"Slice Engineering 450C High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-4':"Thermocouple + AD8495", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595",'998':"Dummy 1", '999':"Dummy 2" }
413+
* :{ '0':"Not used", '1':"100k / 4.7k - EPCOS", '331':"(3.3V thermistor 1)", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '501':"100K Zonestar (Tronxy X3A)", '512':"100k RPW-Ultra hotend thermistor", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '18':"ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327" '20':"Pt100 (Ultimainboard V2.x)", '201':"Pt100 (Overlord)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '61':"100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup", '66':"Dyze Design 4.7M High Temperature thermistor", '67':"Slice Engineering 450C High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-4':"Thermocouple + AD8495", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595", '998':"Dummy 1", '999':"Dummy 2", '1000':"Custom thermistor params" }
414414
*/
415415
#define TEMP_SENSOR_0 999
416416
#define TEMP_SENSOR_1 0
@@ -1574,10 +1574,10 @@
15741574
*
15751575
* Select the language to display on the LCD. These languages are available:
15761576
*
1577-
* en, an, bg, ca, cz, da, de, el, el-gr, es, eu, fi, fr, gl, hr, it,
1578-
* jp-kana, ko_KR, nl, pl, pt, pt-br, ru, sk, tr, uk, zh_CN, zh_TW, test
1577+
* en, an, bg, ca, cz, da, de, el, el-gr, es, eu, fi, fr, gl, hr, it, jp-kana,
1578+
* ko_KR, nl, pl, pt, pt-br, ru, sk, tr, uk, vi, zh_CN, zh_TW, test
15791579
*
1580-
* :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'jp-kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'ru':'Russian', 'sk':'Slovak', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)', 'test':'TEST' }
1580+
* :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'jp-kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'ru':'Russian', 'sk':'Slovak', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)', 'test':'TEST' }
15811581
*/
15821582
#define LCD_LANGUAGE en
15831583

@@ -2002,14 +2002,28 @@
20022002
// packaged with Marlin. Source code for the user interface will need to
20032003
// be placed in "src/lcd/extensible_ui/lib"
20042004
//
2005+
// Touch-screen LCD for Malyan M200 printers
2006+
//
2007+
//#define MALYAN_LCD
2008+
2009+
//
2010+
// LulzBot Color Touch UI for FTDI EVE (FT800/FT810) displays
2011+
// See Configuration_adv.h for all configuration options.
2012+
//
2013+
//#define LULZBOT_TOUCH_UI
2014+
2015+
//
2016+
// Third-party or vendor-customized controller interfaces.
2017+
// Sources should be installed in 'src/lcd/extensible_ui'.
2018+
//
20052019
//#define EXTENSIBLE_UI
20062020

20072021
//=============================================================================
20082022
//=============================== Graphical TFTs ==============================
20092023
//=============================================================================
20102024

20112025
//
2012-
// MKS Robin 320x240 color display
2026+
// FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
20132027
//
20142028
//#define MKS_ROBIN_TFT
20152029

0 commit comments

Comments
 (0)