-
- Downloads
Merge branch 'smallopt' into Marlin_v1
Conflicts: Marlin/temperature.h
Showing
- Marlin/EEPROMwrite.h 2 additions, 2 deletionsMarlin/EEPROMwrite.h
- Marlin/Marlin.h 4 additions, 1 deletionMarlin/Marlin.h
- Marlin/Marlin.pde 18 additions, 3 deletionsMarlin/Marlin.pde
- Marlin/cardreader.h 24 additions, 24 deletionsMarlin/cardreader.h
- Marlin/planner.cpp 12 additions, 19 deletionsMarlin/planner.cpp
- Marlin/planner.h 27 additions, 5 deletionsMarlin/planner.h
- Marlin/stepper.cpp 2 additions, 2 deletionsMarlin/stepper.cpp
- Marlin/temperature.h 11 additions, 11 deletionsMarlin/temperature.h
- Marlin/ultralcd.h 3 additions, 3 deletionsMarlin/ultralcd.h
- Marlin/ultralcd.pde 141 additions, 2 deletionsMarlin/ultralcd.pde
- Marlin/watchdog.h 2 additions, 2 deletionsMarlin/watchdog.h
Loading
Please register or sign in to comment