Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 12c595c
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Mon Sep 2 12:45:02 2019 +0200

    SAMD51 LCD support (MarlinFirmware#15113)

commit 23bb40d
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Mon Sep 2 05:24:24 2019 -0500

    Fix MKS_MINI_12864 init

    See MarlinFirmware#13550

    Co-Authored-By: DrDitto <drditto@users.noreply.github.com>

commit 9958f5e
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Mon Sep 2 09:44:48 2019 +0200

    Home on G34 if steppers slept (MarlinFirmware#15127)

commit 59152f2
Author: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon Sep 2 00:42:11 2019 -0700

    Flash-based EEPROM on SKR Mini E3 DIP (MarlinFirmware#15128)

commit c981710
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date:   Mon Sep 2 09:40:33 2019 +0200

    Update French language (MarlinFirmware#15129)

commit e6a114b
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Mon Sep 2 09:39:40 2019 +0200

    Update Italian language (MarlinFirmware#15130)

commit b97bb14
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date:   Mon Sep 2 09:37:50 2019 +0200

    Full-featured Alfawise U20 config (MarlinFirmware#15131)

commit 5406982
Author: Gustavo Alvarez <462213+sl1pkn07@users.noreply.github.com>
Date:   Mon Sep 2 09:36:32 2019 +0200

    Update Spanish language (MarlinFirmware#15132)

commit f6505c8
Author: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon Sep 2 00:35:59 2019 -0700

    Fix Ender-3 Status Screen Y Offset (MarlinFirmware#15136)

commit 93dcc22
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Mon Sep 2 01:09:45 2019 -0500

    Drop extra call to get_available_commands

commit 451a942
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Mon Sep 2 01:04:00 2019 -0500

    Suspend queue during wait_for_hotend

commit b4715b2
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Mon Sep 2 00:00:04 2019 -0500

    [cron] Bump distribution date

commit 34b7342
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Sep 1 23:54:41 2019 -0500

    Apply #ifdef/#ifndef where possible

commit 4078f26
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Sep 1 23:43:38 2019 -0500

    Apply shorthand option macros

commit a2e412c
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Sep 1 20:21:11 2019 -0500

    Rename command buffer var

commit d59d9b5
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date:   Sun Sep 1 11:10:35 2019 +0200

    Alfawise - LK1/LK2/LK4 and BLTouch (MarlinFirmware#15118)

commit ee240d2
Author: weakset <esa.oikari@ejo.fi>
Date:   Sun Sep 1 12:04:40 2019 +0300

    Use Flash-based EEPROM on SKR mini-E3 (MarlinFirmware#15126)

commit be051c8
Author: Jason Smith <jason.inet@gmail.com>
Date:   Sun Sep 1 02:00:20 2019 -0700

    Fix Z_STEPPER_ALIGN_[XY] sanity error (MarlinFirmware#15124)

commit ee444d7
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date:   Sun Sep 1 04:10:50 2019 +0200

    Fix SKRmini test required serial port(s) (MarlinFirmware#15117)

commit c8e0967
Author: ETE-Design <Mikkel@MPEntreprise.Dk>
Date:   Sun Sep 1 03:54:36 2019 +0200

    Gantry: Enable Filament Change (MarlinFirmware#15122)

commit 8778e12
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sat Aug 31 20:49:02 2019 -0500

    Fix some missed misspellings

commit 2747ab7
Author: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date:   Sat Aug 31 18:46:10 2019 -0700

    Ender-3 default TMC currents (MarlinFirmware#15115)

commit 586b334
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Aug 31 19:44:45 2019 -0500

    Split up stepper indirection (MarlinFirmware#15111)

commit 87b16ed
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sat Aug 31 07:03:36 2019 -0500

    Bring Configuration.h up to date

commit 8fca850
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sat Aug 31 07:00:35 2019 -0500

    Patch early env rename

commit 25cf7de
Author: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date:   Fri Aug 30 23:40:52 2019 -0700

    Disable Tevo Tarantula Pro PIDTEMPBED (MarlinFirmware#15089)

commit 66f1da7
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sat Aug 31 01:06:22 2019 -0500

    Use 'ui.' where possible

commit 26fa085
Author: Robby Candra <robbycandra.mail@gmail.com>
Date:   Sat Aug 31 10:49:24 2019 +0700

    Add RGB565 Color Definitions for TFT (MarlinFirmware#15099)

commit 9449201
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Aug 18 23:29:59 2019 -0500

    Add more platform Travis tests

commit 0f4d3e1
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Thu Aug 29 18:16:50 2019 -0500

    Fix ESP32 "DISABLED" name conflict

commit 1eeef30
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Fri Aug 30 19:14:43 2019 -0500

    A single generate_click lambda

commit c014f8d
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date:   Sat Aug 31 01:15:04 2019 +0200

    Fix STM32F1 SPI warning (gcc 8.2.1) (MarlinFirmware#15104)

commit d068470
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date:   Sat Aug 31 00:46:09 2019 +0200

    Prevent Linux min/max error (MarlinFirmware#15107)

commit ba91bca
Author: Bob Kuhn <bob.kuhn@att.net>
Date:   Fri Aug 30 17:39:45 2019 -0500

    TMC SPI daisy chain support (experimental) (MarlinFirmware#15081)

commit 0bcb644
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Fri Aug 30 16:09:57 2019 -0500

    Revert _BV testing commit

    This reverts commit 9223261.

commit 05ef9b2
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Fri Aug 30 14:44:39 2019 -0500

    [cron] Bump distribution date

commit 2aef83d
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Tue Aug 27 20:28:42 2019 -0500

    Add a PlatformIO hook to alter CXXFLAGS

commit 23cffb2
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Tue Aug 27 20:50:48 2019 -0500

    Add an env to get the Include Tree

commit 9223261
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Thu Aug 29 17:50:16 2019 -0500

    Only define _BV in Marduino.h

commit d25231a
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Thu Aug 29 17:06:18 2019 -0500

    Spacing, defined(), #include tweaks

commit 7ebfae2
Author: Karl Andersson <karl@iaccess.se>
Date:   Fri Aug 30 00:00:01 2019 +0200

    Fix HAL_STM32 SPI regression (MarlinFirmware#15093)

    Reference: 0b47558

commit f5a1fab
Author: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date:   Thu Aug 29 14:57:56 2019 -0700

    Clarify TMC2209 Sensitivity vs. Others (MarlinFirmware#15092)

commit 3f77d6a
Author: Ludy <Ludy87@users.noreply.github.com>
Date:   Thu Aug 29 23:05:22 2019 +0200

    Fix expire_status warning (MarlinFirmware#15094)

commit 38983fd
Author: Robby Candra <robbycandra.mail@gmail.com>
Date:   Thu Aug 29 13:19:07 2019 +0700

    Add 'Back' Button for Touch TFT 320x240 (MarlinFirmware#15060)

commit 8196ced
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Thu Aug 29 00:54:42 2019 -0500

    Leave LCD_PINS_Dn defined for other uses

    Fix MarlinFirmware#14998

commit 0ebaea9
Author: AlexandrZloy <49792082+AlexandrZloy@users.noreply.github.com>
Date:   Thu Aug 29 12:15:31 2019 +0700

    Add stallGuard threshold for X2 (MarlinFirmware#15042)

commit e1d65b8
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Thu Aug 29 00:00:03 2019 -0500

    [cron] Bump distribution date

commit ca5da02
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date:   Thu Aug 29 06:49:51 2019 +0200

    dogm: u8g prototypes cleanup (MarlinFirmware#15082)

commit a61c91a
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Wed Aug 28 21:28:21 2019 -0500

    Use 'bugfix' branch of U8glib-HAL

commit 1d8ad7c
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Wed Aug 28 21:21:38 2019 -0500

    Safe changes from HAL cleanup

commit 9596312
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Wed Aug 28 08:12:18 2019 -0500

    Patch a u8g include

commit 7b99c26
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Mon Aug 26 17:52:11 2019 -0500

    Fix FTDI_EVE_LIB platform includes

commit 3ac76f0
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Aug 28 07:40:18 2019 -0500

    Invariant Marlin bootscreen (MarlinFirmware#15057)

commit b2a4b6f
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Aug 25 19:07:13 2019 -0500

    Don't use board url as override

commit b8e4b99
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Aug 25 18:57:32 2019 -0500

    Separate board website URL

commit 6341aef
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Aug 25 19:05:03 2019 -0500

    Info menu tweak style

commit 0f386d0
Author: Marcio Teixeira <marcio@alephobjects.com>
Date:   Wed Aug 28 03:23:13 2019 -0600

    Followup fixes to ExtUI (MarlinFirmware#15068)

commit 081e450
Author: Luu Lac <45380455+shitcreek@users.noreply.github.com>
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 <robbycandra.mail@gmail.com>
Date:   Wed Aug 28 14:49:21 2019 +0700

    Switch col vs row variable name (MarlinFirmware#15072)

commit 604bdf0
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Wed Aug 28 09:46:21 2019 +0200

    Update Italian language (MarlinFirmware#15076)

commit b7796bc
Author: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
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 <github@thinkyhead.com>
Date:   Mon Aug 26 00:00:07 2019 -0500

    [cron] Bump distribution date

commit d2f211c
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Aug 25 20:52:07 2019 -0500

    Gantry followup

commit 9d12788
Author: ETE-Design <Mikkel@MPEntreprise.Dk>
Date:   Mon Aug 26 03:51:06 2019 +0200

    ADIMLab Gantry - Spelling Correction (MarlinFirmware#15043)

commit 1769f43
Author: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date:   Sun Aug 25 02:47:02 2019 -0700

    Fix CR-10/10S/Mini/5S Bed Thermistor Types (MarlinFirmware#15040)

commit f218405
Author: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
Date:   Sun Aug 25 05:46:02 2019 -0400

    Fix ExtUI invalid speed, timer (MarlinFirmware#15031)

commit 1557656
Author: Daniel Callander <Knifa@users.noreply.github.com>
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 <github@thinkyhead.com>
Date:   Sat Aug 24 07:46:30 2019 -0500

    Add EZBOARD PT100 pin

commit c7825e6
Author: Scott Lahteine <github@thinkyhead.com>
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 <tim@youngmoores.com>
Date:   Sun Aug 25 02:25:07 2019 -0700

    Make LCD_CONTRAST_MAX >= _LCD_CONTRAST_INIT (MarlinFirmware#15046)

commit 9e9e578
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Aug 25 00:00:03 2019 -0500

    [cron] Bump distribution date

commit 8033bc8
Author: Tim Moore <tim@youngmoores.com>
Date:   Sat Aug 24 17:50:04 2019 -0700

    Turbo-back Info menu items (MarlinFirmware#15049)

commit d6a1652
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Aug 24 03:40:28 2019 -0500

    New Language: Vietnamese (MarlinFirmware#13892)

commit f6b604f
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sat Aug 24 02:10:50 2019 -0500

    Helper Script tweaks

commit 7fbf40c
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sat Aug 24 02:02:31 2019 -0500

    Add command-check to get-bdf2u8g.sh

commit da601d5
Author: Marcio Teixeira <marcio@alephobjects.com>
Date:   Sat Aug 24 00:47:19 2019 -0600

    Update USB_FLASH_DRIVE_SUPPORT (MarlinFirmware#15021)

commit 20fc66f
Merge: 7502569 334777c
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
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 <github@thinkyhead.com>
Date:   Sat Aug 24 01:42:38 2019 -0500

    Apply #ifdef

commit d527c46
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sat Aug 24 01:42:28 2019 -0500

    Delta: Reduce default MIN_STEPS_PER_SEGMENT

commit 848dd74
Author: BigTreeTech <38851044+bigtreetech@users.noreply.github.com>
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 <github@thinkyhead.com>
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 <github@thinkyhead.com>
Date:   Sat Aug 24 00:24:48 2019 -0500

    config updates

commit 8c73017
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sat Aug 24 00:00:04 2019 -0500

    [cron] Bump distribution date

commit 62d2a65
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Fri Aug 23 23:49:30 2019 -0500

    Consolidate Granty configs

commit 09ee5a5
Merge: 9d8e3d4 f2ad1ce
Author: Scott Lahteine <github@thinkyhead.com>
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 <tim@youngmoores.com>
Date:   Fri Aug 23 20:30:11 2019 -0700

    pca9632_buzz fix (MarlinFirmware#15020)

commit e61e54a
Author: Marcio Teixeira <marcio@alephobjects.com>
Date:   Fri Aug 23 21:29:00 2019 -0600

    Fix TURBO_BACK_MENU_ITEM compile error (MarlinFirmware#15019)

commit 0a280f0
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date:   Sat Aug 24 05:21:30 2019 +0200

    Flag unused variables without buzzer (MarlinFirmware#15016)

commit f2ad1ce
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Fri Aug 23 20:59:37 2019 -0500

    Update PT-BR

commit 9c87786
Author: ManuelMcLure <manuel@mclure.org>
Date:   Fri Aug 23 18:55:41 2019 -0700

    Change default Re-ARM UART pin order (MarlinFirmware#15037)

commit fdef32c
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Thu Aug 22 18:17:13 2019 -0500

    Shorten Website URLs

commit 7924e0d
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Thu Aug 22 19:36:18 2019 -0500

    Add print at position shortcuts

commit 5c0e5c5
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Thu Aug 22 18:01:10 2019 -0500

    Fix boot screen warning

commit dd6efe9
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Thu Aug 22 18:56:59 2019 -0500

    Restore documented M503 behavior

commit 6429b8b
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Thu Aug 22 17:38:23 2019 -0500

    Fix EZBoard platform test

commit e604f76
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date:   Thu Aug 22 01:56:39 2019 +0200

    Enable contrast via LCD_CONTRAST_INIT (MarlinFirmware#15006)

commit 9d8e3d4
Author: ETE-Design <Mikkel@MPEntreprise.Dk>
Date:   Wed Aug 21 17:38:08 2019 +0200

    Update pins_HJC2560C_REV2.h

commit 2526e2d
Author: ETE-Design <Mikkel@MPEntreprise.Dk>
Date:   Wed Aug 21 17:36:15 2019 +0200

    Update Makefile

    Add ADIMLab Granty v1

commit d858f44
Author: ETE-Design <Mikkel@MPEntreprise.Dk>
Date:   Wed Aug 21 17:34:44 2019 +0200

    Update boards.h

    Add ADIMLab Granty v1

commit c3d1671
Author: ETE-Design <Mikkel@MPEntreprise.Dk>
Date:   Wed Aug 21 17:30:17 2019 +0200

    Add files via upload

    Add ADIMLab Granty v1

commit 778466a
Author: ETE-Design <Mikkel@MPEntreprise.Dk>
Date:   Wed Aug 21 17:29:25 2019 +0200

    Create _Bootscreen.h

    Add Bootscreen

commit 42f3549
Author: ETE-Design <Mikkel@MPEntreprise.Dk>
Date:   Wed Aug 21 16:33:36 2019 +0200

    Update Configuration.h

    Added Author + Custom_Machine_Name

commit 0309a5f
Author: ETE-Design <Mikkel@MPEntreprise.Dk>
Date:   Wed Aug 21 16:30:08 2019 +0200

    Update pins_HJC2560C_REV2.h

    Updated Description

commit 9434b81
Author: ETE-Design <Mikkel@MPEntreprise.Dk>
Date:   Wed Aug 21 16:27:45 2019 +0200

    Update boards.h

    Updated Description

commit 6b35951
Author: ETE-Design <Mikkel@MPEntreprise.Dk>
Date:   Wed Aug 21 16:26:25 2019 +0200

    Update Makefile

    Updated Description

commit 012f577
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date:   Wed Aug 21 13:22:23 2019 +0200

    STM32F1: Import (rogerclarkmelbourne) SPI class (MarlinFirmware#15002)

commit 4be9822
Author: ETE-Design <Mikkel@MPEntreprise.Dk>
Date:   Wed Aug 21 12:33:17 2019 +0200

    ADIMLab Granty pins/config (MarlinFirmware#14919)

commit 1fb3c40
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Wed Aug 21 05:30:33 2019 -0500

    Optimize bootscreen

commit f7aac7a
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Aug 21 05:05:44 2019 -0500

    Add Support for ADIMLab Granty

commit de122c9
Author: ETE-Design <Mikkel@MPEntreprise.Dk>
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 <github@thinkyhead.com>
Date:   Wed Aug 21 05:15:31 2019 -0500

    Clean up some pins

commit bd1ced1
Author: Marcio Teixeira <marcio@alephobjects.com>
Date:   Wed Aug 21 03:48:06 2019 -0600

    LulzBot Touch UI Followup (MarlinFirmware#15007)

commit 8c2cfaa
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Tue Aug 20 23:45:38 2019 -0500

    Fix BigTree_Btt002 build

commit 69641f1
Author: Marcio Teixeira <marcio@alephobjects.com>
Date:   Wed Aug 21 03:15:37 2019 -0600

    Fix incompatible types error (MarlinFirmware#15009)

commit 825c2c3
Author: Marcio Teixeira <marcio@alephobjects.com>
Date:   Wed Aug 21 02:49:43 2019 -0600

    Fix fan speed encoder scaling (MarlinFirmware#15010)

commit f1942f6
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Wed Aug 21 00:00:04 2019 -0500

    [cron] Bump distribution date

commit 5e77760
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Aug 20 19:37:03 2019 -0500

    Add TURBO_BACK_MENU_ITEM option (MarlinFirmware#14991)

commit 0cc524b
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Tue Aug 20 19:08:58 2019 -0500

    Prevent BOARD_NAME conflict with env

commit 33f6d77
Author: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
Date:   Tue Aug 20 04:44:52 2019 -0400

    Adjust homing backoff feedrate (MarlinFirmware#14972)

commit 5a7c021
Author: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
Date:   Tue Aug 20 04:44:17 2019 -0400

    Misc. ExtUI fixes (MarlinFirmware#14971)

commit 6039893
Author: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
Date:   Tue Aug 20 04:42:30 2019 -0400

    Creality pins updates (MarlinFirmware#14979)

commit 8664b8e
Author: MaukCC <jos@mauk.cc>
Date:   Tue Aug 20 10:40:48 2019 +0200

    Adding HMS434 machine (MarlinFirmware#14931)

commit 5c6e827
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Tue Aug 20 03:11:18 2019 -0500

    Followup to STM32F407

commit 0b47558
Author: chzj333 <53591189+chzj333@users.noreply.github.com>
Date:   Tue Aug 20 16:05:12 2019 +0800

    New board STM32F407 (MarlinFirmware#14994)

commit bb4a252
Author: BigTreeTech <38851044+bigtreetech@users.noreply.github.com>
Date:   Tue Aug 20 16:02:52 2019 +0800

    Fix Bigtreetech STM32F40x variants ADC (MarlinFirmware#14996)

commit 67f8ba6
Author: Tim Moore <tim@youngmoores.com>
Date:   Tue Aug 20 00:40:44 2019 -0700

    Allow pullup/downs on power loss pin (MarlinFirmware#14986)

commit 19e21a8
Author: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date:   Tue Aug 20 00:38:31 2019 -0700

    Wanhao Duplicator i3 Mini config updates (MarlinFirmware#14908)

commit 05995d1
Author: Ludy <Ludy87@users.noreply.github.com>
Date:   Tue Aug 20 09:01:37 2019 +0200

    Unify buzz methods as MarlinUI::buzz (MarlinFirmware#14803)

commit 29c1290
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Mon Aug 19 02:28:12 2019 -0500

    Minor HAL patches

commit 1432d44
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Mon Aug 19 01:30:28 2019 -0500

    Patch circleci config

commit 94397db
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Mon Aug 19 00:00:07 2019 -0500

    [cron] Bump distribution date

commit 17cd1a4
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Wed Aug 14 00:03:12 2019 -0500

    Tweak TOUCH_MI_DEPLOY_XPOS block

commit dfcd437
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Wed Aug 14 00:00:46 2019 -0500

    Base HAS_LCD_CONTRAST on display type

commit 3f678b0
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Aug 18 23:37:15 2019 -0500

    Remove some extra F4 conditions

commit 4d1a662
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Aug 18 23:24:55 2019 -0500

    Fix STM32F7 STEPPER_ENABLE_PIN

commit 08434b3
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Aug 18 20:49:33 2019 -0500

    Add TMC26XStepper, not ignore

commit cd09e35
Author: Tim Moore <tim@youngmoores.com>
Date:   Sun Aug 18 19:17:00 2019 -0700

    Remove extra M503 "M412" report (MarlinFirmware#14985)

commit c5be59d
Author: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
Date:   Sun Aug 18 22:11:33 2019 -0400

    Fix runout trigger on "inactive" sensor (MarlinFirmware#14990)

commit af5a7a2
Author: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
Date:   Sun Aug 18 22:03:26 2019 -0400

    Add missing ExtUI user confirmation (MarlinFirmware#14992)

commit 33d54c0
Author: Robby Candra <robbycandra.mail@gmail.com>
Date:   Mon Aug 19 09:00:21 2019 +0700

    Remove extra defines (MarlinFirmware#14983)

commit 403eefd
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Aug 18 20:17:25 2019 -0500

    Delete _Bootscreen.h

commit bc93ac5
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Aug 18 19:51:37 2019 -0500

    Fix #define typo in configs

commit d2072f9
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
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 <github@thinkyhead.com>
Date:   Sun Aug 18 18:33:56 2019 -0500

    Embed some items in HAS_LCD_MENU

commit 9a3ee3b
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sun Aug 18 00:00:04 2019 -0500

    [cron] Bump distribution date

commit 9d9e2de
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sat Aug 17 20:14:14 2019 -0500

    Tweak UBL G29 status print

commit 823178c
Author: Robby Candra <robbycandra.mail@gmail.com>
Date:   Sun Aug 18 07:58:38 2019 +0700

    Use u8g int type for screen coordinates (MarlinFirmware#14965)

commit 6715fd1
Author: Ludy <Ludy87@users.noreply.github.com>
Date:   Sun Aug 18 01:40:01 2019 +0200

    Animated Marlin boot screen (MarlinFirmware#14961)

commit 9e49f15
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Sat Aug 17 15:47:17 2019 -0500

    [cron] Bump distribution date

commit 8bdb3d9
Author: Marcio Teixeira <marcio@alephobjects.com>
Date:   Fri Aug 16 20:57:19 2019 -0600

    Add CONTROLLERFAN_SPEED_Z_ONLY (MarlinFirmware#14956)

commit 587d4a6
Author: AnHardt <github@kitelab.de>
Date:   Sat Aug 17 04:17:10 2019 +0200

    Repair display throttling (MarlinFirmware#14960)

commit fecf808
Author: J.C. Nelson <32139633+xC0000005@users.noreply.github.com>
Date:   Fri Aug 16 19:15:27 2019 -0700

    Fix lambda missing capture (MarlinFirmware#14969)

commit 66bfad3
Author: Bob Kuhn <bob.kuhn@att.net>
Date:   Fri Aug 16 20:06:32 2019 -0500

    Fix missing U8glib.h include (MarlinFirmware#14966)

commit 1bcc5c9
Author: J.C. Nelson <32139633+xC0000005@users.noreply.github.com>
Date:   Fri Aug 16 18:02:35 2019 -0700

    MalyanLCD: Pause, resume, more ExtUI (MarlinFirmware#14852)

commit c3ff53a
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Fri Aug 16 18:47:51 2019 -0500

    STM32 u8g defines

    Suggested by MarlinFirmware#14742 (comment)

commit 4575978
Author: Tim Moore <tim@youngmoores.com>
Date:   Fri Aug 16 16:42:24 2019 -0700

    Fix auto power for chamber fan (MarlinFirmware#14922)

commit 274934a
Author: Marcio Teixeira <marcio@alephobjects.com>
Date:   Fri Aug 16 17:34:13 2019 -0600

    Add LULZBOT_TOUCH_UI (MarlinFirmware#14967)

commit 179d6c4
Author: Marcio Teixeira <marcio@alephobjects.com>
Date:   Wed Aug 14 20:05:15 2019 -0600

    Add STARTUP_SCRIPT option. M17 parity with M18. (MarlinFirmware#14953)

commit 36dfbae
Author: Marcio Teixeira <marcio@alephobjects.com>
Date:   Wed Aug 14 16:52:57 2019 -0600

    Add missing function declaration (MarlinFirmware#14955)

commit 263d7d3
Author: Marcio Teixeira <marcio@alephobjects.com>
Date:   Wed Aug 14 16:52:14 2019 -0600

    "SD card" => "Media" (MarlinFirmware#14951)

commit 24ce8be
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Wed Aug 14 00:00:11 2019 -0500

    [cron] Bump distribution date

commit 4cc1039
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date:   Wed Aug 14 06:41:17 2019 +0200

    Alfawise Flash EEPROM, Z Servo Probe (MarlinFirmware#14877)

commit 0fbb26c
Author: Joseph Bozarth <bozarjp@gmail.com>
Date:   Tue Aug 13 23:38:45 2019 -0500

    M16 - Expected Printer Check (MarlinFirmware#14924)

commit a26b57a
Author: Scott Lahteine <github@thinkyhead.com>
Date:   Tue Aug 13 19:38:54 2019 -0500

    Minor pins cleanup

commit 059f575
Author: Acenotass <44540957+Acenotass@users.noreply.github.com>
Date:   Wed Aug 14 06:19:44 2019 +0600

    Update Russian language (MarlinFirmware#14940)

commit a67830b
Author: Timothy Hoogland <houseofbugs@gmail.com>
Date:   Tue Aug 13 00:03:42 2019 -0500

    TH3D EZBoard is LPC1769 (MarlinFirmware#14936)

commit 03df3f4
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date:   Tue Aug 13 02:50:34 2019 +0200

    Fix Python scripts unhandled quotes (MarlinFirmware#14926)

commit c6be989
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
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 <marcio@alephobjects.com>
Date:   Sat Aug 10 18:25:30 2019 -0600

    Fix incorrect print stat in ExtUI (MarlinFirmware#14881)

commit dc21e2e
Author: Marcio Teixeira <marcio@alephobjects.com>
Date:   Sat Aug 10 18:24:41 2019 -0600

    Increase XY nozzle offset range (MarlinFirmware#14882)

commit fa53384
Author: Marcio Teixeira <marcio@alephobjects.com>
Date:   Sat Aug 10 18:23:37 2019 -0600

    Bury easter egg deeper (MarlinFirmware#14883)

commit af4bcb6
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Sun Aug 11 02:22:48 2019 +0200

    SAMD51 typo fix (MarlinFirmware#14885)

commit d7172a4
Author: Ludy <Ludy87@users.noreply.github.com>
Date:   Sun Aug 11 02:22:18 2019 +0200

    Cleanup and conditions (MarlinFirmware#14886)

commit 03dbe16
Author: Johnny Eshak <info@johnnytheone.com>
Date:   Sun Aug 11 02:20:40 2019 +0200

    Compiling M43 on invalid conversion (MarlinFirmware#14897)

commit f085199
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Sun Aug 11 02:19:52 2019 +0200

    SAMD51: Some LCD pin fixes (MarlinFirmware#14915)

commit d78086c
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Sun Aug 11 02:18:32 2019 +0200

    SAMD51: Neopixel pin mapping (MarlinFirmware#14913)

commit 9c5086e
Author: Eric Ptak <trouch@trouch.com>
Date:   Sun Aug 11 02:14:31 2019 +0200

    [STM32F1] Simpler Flash EEPROM (MarlinFirmware#14829)

commit 0745d48
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date:   Sun Aug 11 01:22:11 2019 +0200

    Fix build with and without TOUCH_BUTTONS (MarlinFirmware#14912)

commit e7aba49
Author: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date:   Fri Aug 9 23:53:55 2019 -0700

    Update PB5 to correct pin number (MarlinFirmware#14891)

commit 5ea5d71
Author: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
Date:   Fri Aug 9 23:52:26 2019 -0700

    Tevo Michelangelo config updates (MarlinFirmware#14895)

commit 5d2519e
Author: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date:   Sat Aug 10 08:45:36 2019 +0200

    Allow use of Fysetc SoftwareSerialM (MarlinFirmware#14893)

commit d2d71ca
Author: Robby Candra <robbycandra.mail@gmail.com>
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 <tpruvot@users.noreply.github.com>
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 <3684609+GMagician@users.noreply.github.com>
Date:   Sat Aug 10 07:56:55 2019 +0200

    SAMD51: Update LCD pins (MarlinFirmware#14907)

commit 9479ec3
Author: Ludy <Ludy87@users.noreply.github.com>
Date:   Sat Aug 10 07:53:26 2019 +0200

    Fix Service Menu compile error (MarlinFirmware#14903)

commit a7f1021
Author: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date:   Sat Aug 10 00:00:20 2019 +0200

    Fix SPI_ENDSTOPS compile error (MarlinFirmware#14906)
  • Loading branch information
@fmuntean
fmuntean committed Sep 3, 2019
1 parent 5fd68b3 commit 935bda2
Show file tree
Hide file tree
Showing 72 changed files with 369 additions and 335 deletions.
1 change: 0 additions & 1 deletion Marlin/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
// Author info of this build printed to the host during boot and M115
#define STRING_CONFIG_H_AUTHOR "(V1 Engineering, Ryan, 402)" // Who made the changes.


/**
* *** VENDORS PLEASE READ ***
*
Expand Down
10 changes: 5 additions & 5 deletions Marlin/Configuration_adv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@
*/
//#define USE_CONTROLLER_FAN //MFD: TODO find a good pin and enable it
#if ENABLED(USE_CONTROLLER_FAN)
#define CONTROLLERFAN_SPEED 255 // 255 == full speed
#define CONTROLLERFAN_SECS 60 // Duration in seconds for the fan to run after all motors are disabled
#define CONTROLLERFAN_SPEED 255 // 255 == full speed
//#define CONTROLLERFAN_SPEED_Z_ONLY 127 // Reduce noise on machines that keep Z enabled
#endif

Expand Down Expand Up @@ -726,9 +727,8 @@
#endif

#if HAS_LCD_MENU
// Include a page of printer information in the LCD Main Menu
#define LCD_INFO_MENU

// Include a page of printer information in the LCD Main 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
Expand Down Expand Up @@ -2171,7 +2171,7 @@
* - M206 and M428 are disabled.
* - G92 will revert to its behavior from Marlin 1.0.
*/
//#define NO_WORKSPACE_OFFSETS //MFD: we need this to have the G92 workign correctly with no home switches.
//#define NO_WORKSPACE_OFFSETS //MFD: we need this to have the G92 working correctly with no home switches.

/**
* Set the number of proportional font spaces required to fill up a typical character space.
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/HAL/HAL_DUE/usb/compiler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@

/* Define NO_INIT attribute */
#if 0 //ndef NO_INIT
#if defined ( __CC_ARM )
#ifdef __CC_ARM
# define NO_INIT __attribute__((zero_init))
#elif defined ( __ICCARM__ )
# define NO_INIT __no_init
Expand Down Expand Up @@ -262,7 +262,7 @@
//! @{
typedef unsigned char Bool; //!< Boolean.
#ifndef __cplusplus
#if !defined(__bool_true_false_are_defined)
#ifndef __bool_true_false_are_defined
typedef unsigned char bool; //!< Boolean.
#endif
#endif
Expand Down Expand Up @@ -443,7 +443,7 @@ typedef struct
#define DISABLE 0
#define ENABLE 1
#ifndef __cplusplus
#if !defined(__bool_true_false_are_defined)
#ifndef __bool_true_false_are_defined
#define false 0
#define true 1
#endif
Expand Down
10 changes: 5 additions & 5 deletions Marlin/src/HAL/HAL_DUE/usb/osc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,27 +61,27 @@ extern "C" {
* Below BOARD_XXX macros are related to the specific board, and
* should be defined by the board code, otherwise default value are used.
*/
#if !defined(BOARD_FREQ_SLCK_XTAL)
#ifndef BOARD_FREQ_SLCK_XTAL
# warning The board slow clock xtal frequency has not been defined.
# define BOARD_FREQ_SLCK_XTAL (32768UL)
#endif

#if !defined(BOARD_FREQ_SLCK_BYPASS)
#ifndef BOARD_FREQ_SLCK_BYPASS
# warning The board slow clock bypass frequency has not been defined.
# define BOARD_FREQ_SLCK_BYPASS (32768UL)
#endif

#if !defined(BOARD_FREQ_MAINCK_XTAL)
#ifndef BOARD_FREQ_MAINCK_XTAL
# warning The board main clock xtal frequency has not been defined.
# define BOARD_FREQ_MAINCK_XTAL (12000000UL)
#endif

#if !defined(BOARD_FREQ_MAINCK_BYPASS)
#ifndef BOARD_FREQ_MAINCK_BYPASS
# warning The board main clock bypass frequency has not been defined.
# define BOARD_FREQ_MAINCK_BYPASS (12000000UL)
#endif

#if !defined(BOARD_OSC_STARTUP_US)
#ifndef BOARD_OSC_STARTUP_US
# warning The board main clock xtal startup time has not been defined.
# define BOARD_OSC_STARTUP_US (15625UL)
#endif
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/HAL/HAL_DUE/usb/spc_protocol.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
* \asf_license_stop
*
*/

/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
*/
#ifndef _SPC_PROTOCOL_H_
#define _SPC_PROTOCOL_H_

#ifndef _SPC_PROTOCOL_H_
#define _SPC_PROTOCOL_H_

/**
* \ingroup usb_msc_protocol
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_DUE/usb/udi_cdc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
#include "udi.h"

// Check the number of port
#ifndef UDI_CDC_PORT_NB
#ifndef UDI_CDC_PORT_NB
# define UDI_CDC_PORT_NB 1
#endif
#if (UDI_CDC_PORT_NB < 1) || (UDI_CDC_PORT_NB > 7)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_DUE/usb/udi_cdc_conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#include "usb_protocol_cdc.h"
#include "conf_usb.h"

#ifndef UDI_CDC_PORT_NB
#ifndef UDI_CDC_PORT_NB
# define UDI_CDC_PORT_NB 1
#endif

Expand Down
8 changes: 8 additions & 0 deletions Marlin/src/HAL/HAL_SAMD51/HAL.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,11 @@ FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
#pragma GCC diagnostic ignored "-Wunused-function"
int freeMemory(void);
#pragma GCC diagnostic pop

#ifdef __cplusplus
extern "C" {
#endif
char *dtostrf(double __val, signed char __width, unsigned char __prec, char *__s);
#ifdef __cplusplus
}
#endif
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_STM32F1/SPI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
#define SPI_2XCLOCK_MASK 0x01 // SPI2X = bit 0 on SPSR
// define SPI_AVR_EIMSK for AVR boards with external interrupt pins
#if defined(EIMSK)
#ifdef EIMSK
#define SPI_AVR_EIMSK EIMSK
#elif defined(GICR)
#define SPI_AVR_EIMSK GICR
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/Marlin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,6 @@ void loop() {

#endif // SDSUPPORT

if (queue.length < BUFSIZE) queue.get_available_commands();
queue.advance();
endstops.event_handler();
}
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/power_loss_recovery.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ void PrintJobRecovery::save(const bool force/*=false*/, const bool save_queue/*=
// Commands in the queue
info.queue_length = save_queue ? queue.length : 0;
info.queue_index_r = queue.index_r;
COPY(info.queue_buffer, queue.buffer);
COPY(info.queue_buffer, queue.command_buffer);

// Elapsed print job time
info.print_job_elapsed = print_job_timer.duration();
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/calibrate/G34_M422.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ void GcodeSuite::G34() {
);

// Home before the alignment procedure
if (homing_needed()) home_all_axes();
if (!all_axes_known()) home_all_axes();

// Move the Z coordinate realm towards the positive - dirty trick
current_position[Z_AXIS] -= z_probe * 0.5;
Expand Down
7 changes: 3 additions & 4 deletions Marlin/src/gcode/gcode.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -707,8 +707,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 810: case 811: case 812: case 813: case 814:
case 815: case 816: case 817: case 818: case 819:
M810_819(); break; // M810-M819: Define/execute G-code macro
case 820:
M820(); //display macros
case 820: M820(); break; //display macros
#endif

#if ENABLED(LIN_ADVANCE)
Expand Down Expand Up @@ -814,7 +813,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
* This is called from the main loop()
*/
void GcodeSuite::process_next_command() {
char * const current_command = queue.buffer[queue.index_r];
char * const current_command = queue.command_buffer[queue.index_r];

PORT_REDIRECT(queue.port[queue.index_r]);

Expand All @@ -823,7 +822,7 @@ void GcodeSuite::process_next_command() {
SERIAL_ECHOLN(current_command);
#if ENABLED(M100_FREE_MEMORY_DUMPER)
SERIAL_ECHOPAIR("slot:", queue.index_r);
M100_dump_routine(PSTR(" Command Queue:"), queue.buffer, queue.buffer + sizeof(queue.buffer));
M100_dump_routine(PSTR(" Command Queue:"), queue.command_buffer, queue.command_buffer + sizeof(queue.command_buffer));
#endif
}

Expand Down
12 changes: 6 additions & 6 deletions Marlin/src/gcode/queue.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ uint8_t GCodeQueue::length = 0, // Count of commands in the queue
GCodeQueue::index_r = 0, // Ring buffer read position
GCodeQueue::index_w = 0; // Ring buffer write position

char GCodeQueue::buffer[BUFSIZE][MAX_CMD_SIZE];
char GCodeQueue::command_buffer[BUFSIZE][MAX_CMD_SIZE];

/*
* The port that the command was received on
Expand Down Expand Up @@ -135,7 +135,7 @@ bool GCodeQueue::_enqueue(const char* cmd, bool say_ok/*=false*/
#endif
) {
if (*cmd == ';' || length >= BUFSIZE) return false;
strcpy(buffer[index_w], cmd);
strcpy(command_buffer[index_w], cmd);
_commit_command(say_ok
#if NUM_SERIAL > 1
, pn
Expand Down Expand Up @@ -242,7 +242,7 @@ void GCodeQueue::ok_to_send() {
if (!send_ok[index_r]) return;
SERIAL_ECHOPGM(MSG_OK);
#if ENABLED(ADVANCED_OK)
char* p = buffer[index_r];
char* p = command_buffer[index_r];
if (*p == 'N') {
SERIAL_ECHO(' ');
SERIAL_ECHO(*p++);
Expand Down Expand Up @@ -553,7 +553,7 @@ void GCodeQueue::get_serial_commands() {
// Skip empty lines and comments
if (!sd_count) { thermalManager.manage_heater(); continue; }

buffer[index_w][sd_count] = '\0'; // terminate string
command_buffer[index_w][sd_count] = '\0'; // terminate string
sd_count = 0; // clear sd line buffer

_commit_command(false);
Expand All @@ -574,7 +574,7 @@ void GCodeQueue::get_serial_commands() {
#if ENABLED(PAREN_COMMENTS)
&& ! sd_comment_paren_mode
#endif
) buffer[index_w][sd_count++] = sd_char;
) command_buffer[index_w][sd_count++] = sd_char;
}
}
}
Expand Down Expand Up @@ -610,7 +610,7 @@ void GCodeQueue::advance() {
#if ENABLED(SDSUPPORT)

if (card.flag.saving) {
char* command = buffer[index_r];
char* command = command_buffer[index_r];
if (is_M29(command)) {
// M29 closes the file
card.closefile();
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/queue.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class GCodeQueue {
static uint8_t length, // Count of commands in the queue
index_r; // Ring buffer read position

static char buffer[BUFSIZE][MAX_CMD_SIZE];
static char command_buffer[BUFSIZE][MAX_CMD_SIZE];

/*
* The port that the command was received on
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/inc/SanityCheck.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
* Switching Toolhead requirements
*/
#if ENABLED(SWITCHING_TOOLHEAD)
#if !defined(SWITCHING_TOOLHEAD_SERVO_NR)
#ifndef SWITCHING_TOOLHEAD_SERVO_NR
#error "SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_SERVO_NR."
#elif EXTRUDERS < 2
#error "SWITCHING_TOOLHEAD requires at least 2 EXTRUDERS."
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/inc/Version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
#define STRING_DISTRIBUTION_DATE "2019-08-30"
#define STRING_DISTRIBUTION_DATE "2019-09-02"

/**
* Required minimum Configuration.h and Configuration_adv.h file versions.
Expand Down
Loading

0 comments on commit 935bda2

Please sign in to comment.