Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104)

Browse source

* 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

...

This commit is contained in:

Roxy-3D 2017-10-26 11:44:55 -05:00 • committed by GitHub

parent 594c075377

commit 2e746f2b8b

35 changed files with 811 additions and 273 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1726

Marlin/example_configurations/FolgerTech/i3-2020/Configuration.h Normal file

View file

File diff suppressed because it is too large Load diff

1449

Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h Normal file

View file

File diff suppressed because it is too large Load diff