fix building error when LCD_SHOW_E_TOTAL is defined #20874
Merged
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
prsimp
added a commit
to prsimp/Marlin
that referenced
this pull request
Jan 25, 2021
TyMi
pushed a commit
to TyMi/Marlin
that referenced
this pull request
Jan 25, 2021
…_bugfix * commit '876c2586b9146dd123af4c7b21138b8239ef5d39': (116 commits) Clean up MMU2 code (MarlinFirmware#20794) Init KILL, SUICIDE, PSU earlier (MarlinFirmware#20810) "Move … code" followup (MarlinFirmware#20869) Apply SEC_TO_MS and other fixes Reformat abortSDPrinting Fix sign warning (MarlinFirmware#20872) Cosmetic changes (2) (MarlinFirmware#20876) "Move … code" followup (MarlinFirmware#20868) "Move … code" followup (MarlinFirmware#20874) Graphical TFT fixes, cleanup (MarlinFirmware#20861) 🧻 Cosmetic changes (MarlinFirmware#20859) 🛠Fix deps script version regex Fix Ender 3 V2 DWIN manual move (MarlinFirmware#20837) [cron] Bump distribution date (2021-01-25) Fix LiquidCrystal CI failures (MarlinFirmware#20873) Revert "Adding custom move feedrate for G26 (MarlinFirmware#20729)" (MarlinFirmware#20870) MeatPack serial encoding (MarlinFirmware#20802) [cron] Bump distribution date (2021-01-24) lcd_put_wchar_max for COLOR_UI (MarlinFirmware#20838) Adding custom move feedrate for G26 (MarlinFirmware#20729) ... # Conflicts: # Marlin/Configuration.h # Marlin/Configuration_adv.h
Jyers
pushed a commit
to Jyers/Marlin
that referenced
this pull request
Feb 3, 2021
Fix regression from MarlinFirmware#20832
prsimp
added a commit
to prsimp/Marlin
that referenced
this pull request
Feb 10, 2021
Dot updates for use with the BTT E3 Turbo and BLTouch Tuned Hotend PID settings Tuned Bed PID settings Enables Z-probe offset wizard Gives Z-Probe a 3mm buffer Back to more full-featured menus New offsets after adding HeroMe Gen 5 Rebase fixes? lcd_put_wchar_max for COLOR_UI (MarlinFirmware#20838) Co-Authored-By: Victor Oliveira <github@victormo.com.br> Rebase fixes part deux A bug! Accurate SHORT_BUILD_VERSION Fixes LCD_SHOW_E_TOTAL bug See MarlinFirmware#20874 Better preheat temps just in case Adds better default Esteps Adds better Linear Advance deault New hotend PID tuning with HMG5 cooling New bed PID tuning with glass bed Bed PID tuning with new Gulfcoast Heater Enabling ARC support for ARCWelder plugin Dot updates for use with the BTT E3 Turbo and BLTouch Tuned Hotend PID settings Tuned Bed PID settings Enables Z-probe offset wizard Gives Z-Probe a 3mm buffer Back to more full-featured menus New offsets after adding HeroMe Gen 5 Rebase fixes? lcd_put_wchar_max for COLOR_UI (MarlinFirmware#20838) Co-Authored-By: Victor Oliveira <github@victormo.com.br> Rebase fixes part deux A bug! Accurate SHORT_BUILD_VERSION Fixes LCD_SHOW_E_TOTAL bug See MarlinFirmware#20874 Better preheat temps just in case Adds better default Esteps Adds better Linear Advance deault New hotend PID tuning with HMG5 cooling New bed PID tuning with glass bed Bed PID tuning with new Gulfcoast Heater Enabling ARC support for ARCWelder plugin
kpishere
pushed a commit
to kpishere/Marlin
that referenced
this pull request
Feb 19, 2021
Fix regression from MarlinFirmware#20832
zillarob
pushed a commit
to zillarob/Marlin
that referenced
this pull request
Feb 25, 2021
Fix regression from MarlinFirmware#20832
W4tel-BiDi
pushed a commit
to W4tel-BiDi/Marlin
that referenced
this pull request
Apr 5, 2021
Fix regression from MarlinFirmware#20832
thinkyhead
pushed a commit
that referenced
this pull request
Apr 30, 2021
Fix regression from #20832
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.
Description
Build fails with 3 errors if LCD_SHOW_E_TOTAL is defined:
importing MarlinCore.h in the same file solves these errors
Configurations
config.zip