MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9aac3d8773
Firmware/Marlin/example_configurations
History
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
..
adafruit/ST7565 More specific M100 description 2017-10-25 16:11:09 -05:00
AlephObjects/TAZ4 Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
AliExpress/CL-260 More specific M100 description 2017-10-25 16:11:09 -05:00
Anet Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
BQ Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
Cartesio Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
Creality/CR-10 Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
delta Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
Felix Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
FolgerTech/i3-2020 Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
gCreate/gMax1.5+ Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
Geeetech More specific M100 description 2017-10-25 16:11:09 -05:00
Infitary/i3-M508 Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
makibox Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
Malyan/M150 Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
Micromake/C1 Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
RepRapWorld/Megatronics More specific M100 description 2017-10-25 16:11:09 -05:00
RigidBot Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
Sanguinololu Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
SCARA Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
TinyBoy2 Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
tvrrug/Round2 Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
Velleman Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00
wt150 Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 2017-10-26 11:44:55 -05:00