3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-02-26 02:49:51 +00:00
Code Issues Releases Wiki Activity
8530 commits 22 branches 85 tags 2.2 GiB
Commit graph

2 commits

Author SHA1 Message Date
Scott Lahteine
445a7f65cd Clean up trailing whitespace 2017-10-27 00:02:35 -05:00
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
 2017-10-26 11:44:55 -05:00