[1.1] Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE #8104
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
All previous items resolved: - Use of ELAPSED() on timer code - Switch to use of defer_return_to_status=true as much as possible - Update & Clean Up of Max7219 routines
|
@gordo3di It should be in the Bugfix-v1.1.x branch for you to give a try now. |
Roxy-3D
added a commit
that referenced
this pull request
Oct 26, 2017
* Re-Print of same SD Memory Card file with single click * Re-Print of same SD Memory Card file with single click * This is the bugfix-v2.0.0 version of #8104
thinkyhead
changed the title
MoellerDi
added a commit
to MoellerDi/Marlin
that referenced
this pull request
Nov 27, 2017
… into bugfix-1.1.x-HD-CR10 * 'bugfix-1.1.x' of https://github.com/MarlinFirmware/Marlin: (94 commits) [1.1.x] Fix M303 thermal protection MarlinFirmware#8103 (MarlinFirmware#8126) Implement support for Dual X and Y endstops Add Dual Steppers / Endstops to configs Cleanup for DIGIPOTS settings (1.1.x) serious bug G33 Add scripts for .travis.yml to append config options Revert default BABYSTEP_MULTIPLICATOR to 1 Added MKS GEN L board (MarlinFirmware#8088) Concise SD_REPRINT_LAST_SELECTED_FILE description Clean up trailing whitespace (1.1.x) auto tune calibration parameters (MarlinFirmware#8031) Tweak neopixel self-test Add some Polish translations Fix FWRETRACT logic, apply common sense give this language an unique name Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (MarlinFirmware#8104) 1.1.x - save 1400 bytes of FLASH by using reduced font for some languages (MarlinFirmware#8095) More specific M100 description Fix spacing, use single instances of similar pins Encourage users to re-examine their configs ... # Conflicts: # Marlin/Configuration.h # Marlin/Configuration_adv.h
mtm88001
pushed a commit
to mtm88001/Marlin
that referenced
this pull request
Dec 9, 2017
…irmware#8104) * Initial conflict resolution All previous items resolved: - Use of ELAPSED() on timer code - Switch to use of defer_return_to_status=true as much as possible - Update & Clean Up of Max7219 routines * Resolve non-SD case in ultralcd.cpp
damicreabox
pushed a commit
to damicreabox/Marlin
that referenced
this pull request
Sep 14, 2018
…irmware#8104) * Initial conflict resolution All previous items resolved: - Use of ELAPSED() on timer code - Switch to use of defer_return_to_status=true as much as possible - Update & Clean Up of Max7219 routines * Resolve non-SD case in ultralcd.cpp
kForth
pushed a commit
to kForth/Marlin
that referenced
this pull request
Jun 22, 2022
…irmware#8104) * Initial conflict resolution All previous items resolved: - Use of ELAPSED() on timer code - Switch to use of defer_return_to_status=true as much as possible - Update & Clean Up of Max7219 routines * Resolve non-SD case in ultralcd.cpp
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.
All previous items resolved: