Fix mismatched conditional and default override include order #20657
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sjasonsmith
reviewed
Jan 4, 2021
thinkyhead
force-pushed
the
bugfix-2.0.x
branch
from
8ca70a7
to
63448f3
Compare
thinkyhead
force-pushed
the
Fix-mismatched-conditional-and-default-override-include-order
branch
from
e625878
to
43ec9af
Compare
TheMichalcinOfficial
added a commit
to TheMichalcinOfficial/Marlin
that referenced
this pull request
Jan 4, 2021
* [cron] Bump distribution date (2020-12-31) * SPI and pins cleanup * [cron] Bump distribution date (2021-01-01) * Prefix SD SPI pins (SCK, MISO, MOSI, SS) (MarlinFirmware#20606) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * Fix PARKING_EXTRUDER homing with solenoid (MarlinFirmware#20473) * Fix CHAMBER_FAN_MODE 0 build (MarlinFirmware#20621) * [cron] Bump distribution date (2021-01-02) * Fix UBL mesh edit delta moves (MarlinFirmware#20620) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * Fix //action prefix (MarlinFirmware#20600) * Assisted Tramming improvements (MarlinFirmware#20298) * Check for misplaced configs on build (MarlinFirmware#20599) Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com> * Fix a comment (MarlinFirmware#20629) * Document, adjust some homing code * Improved bootscreen animation * [cron] Bump distribution date (2021-01-03) * Homing code followup (MarlinFirmware#20632) Patching a87e519 * Animated boot followup * Add ALL_AXES manual move for UBL mesh editing Co-Authored-By: Jason Smith <20053467+sjasonsmith@users.noreply.github.com> MarlinFirmware#20620 * Creality 4.2.10 board (MarlinFirmware#20647) * Update Italian language (MarlinFirmware#20663) * [cron] Bump distribution date (2021-01-04) * Fix thermal error protection, reporting (MarlinFirmware#20655) * Rename FTDI EVE screen data structs * Fix SD SPI Speed override, FTDI mesh edit (MarlinFirmware#20657) Co-authored-by: Scott Lahteine <github@thinkyhead.com> * Fix IDEX reboot on travel after G28 X (MarlinFirmware#20654) * Fix delayed_move_time elapsed test * Move duplication_e_mask Co-authored-by: thinkyhead <thinkyhead@users.noreply.github.com> Co-authored-by: Scott Lahteine <github@thinkyhead.com> Co-authored-by: Victor Oliveira <rhapsodyv@gmail.com> Co-authored-by: zeleps <39417467+zeleps@users.noreply.github.com> Co-authored-by: Jason Smith <jason.inet@gmail.com> Co-authored-by: ellensp <ellensp@hotmail.com> Co-authored-by: qwewer0 <57561110+qwewer0@users.noreply.github.com> Co-authored-by: Giuliano Zaro <3684609+GMagician@users.noreply.github.com> Co-authored-by: Marcio T <mlt4356-github@yahoo.com> Co-authored-by: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
tharts
pushed a commit
to tharts/Marlin
that referenced
this pull request
Jan 6, 2021
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
dpreed
pushed a commit
to dpreed/Marlin_2.0.x
that referenced
this pull request
Feb 5, 2021
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
kpishere
pushed a commit
to kpishere/Marlin
that referenced
this pull request
Feb 19, 2021
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
zillarob
pushed a commit
to zillarob/Marlin
that referenced
this pull request
Feb 25, 2021
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
InsanityAutomation
deleted the
Fix-mismatched-conditional-and-default-override-include-order
branch
W4tel-BiDi
pushed a commit
to W4tel-BiDi/Marlin
that referenced
this pull request
Apr 5, 2021
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
thinkyhead
added a commit
to thinkyhead/Marlin
that referenced
this pull request
Apr 29, 2021
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
thinkyhead
added a commit
that referenced
this pull request
Apr 30, 2021
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When SD_SPI_SPEED was set in config adv, conditionals lcd had already set it, so duplicate define messages bounded. When using Bilinear instead of UBL, touchscreen had calls to undefined functions.