marlin

8527 Commits

4 Branches

Tree: 2296d98845

Commit Graph

Author	SHA1	Message	Date
Roxy-3D	2e746f2b8b	Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#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	7 years ago

Author

SHA1

Message

Date

Roxy-3D

2e746f2b8b

Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#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

7 years ago

1 Commits (2296d988450eedfeb446c35282a16d7d01652541)