-
- Downloads
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Conflicts: Marlin/Configuration.h
Showing
- Marlin/Configuration.h 64 additions, 257 deletionsMarlin/Configuration.h
- Marlin/Configuration_adv.h 221 additions, 0 deletionsMarlin/Configuration_adv.h
- Marlin/Makefile 160 additions, 264 deletionsMarlin/Makefile
- Marlin/Marlin.h 14 additions, 10 deletionsMarlin/Marlin.h
- Marlin/Marlin.pde 49 additions, 51 deletionsMarlin/Marlin.pde
- Marlin/MarlinSerial.cpp 3 additions, 8 deletionsMarlin/MarlinSerial.cpp
- Marlin/MarlinSerial.h 3 additions, 4 deletionsMarlin/MarlinSerial.h
- Marlin/SdBaseFile.cpp 23 additions, 25 deletionsMarlin/SdBaseFile.cpp
- Marlin/SdFatUtil.cpp 2 additions, 2 deletionsMarlin/SdFatUtil.cpp
- Marlin/cardreader.cpp 5 additions, 0 deletionsMarlin/cardreader.cpp
- Marlin/fastio.h 1 addition, 1 deletionMarlin/fastio.h
- Marlin/motion_control.cpp 1 addition, 1 deletionMarlin/motion_control.cpp
- Marlin/pins.h 174 additions, 9 deletionsMarlin/pins.h
- Marlin/planner.cpp 10 additions, 9 deletionsMarlin/planner.cpp
- Marlin/speed_lookuptable.h 76 additions, 76 deletionsMarlin/speed_lookuptable.h
- Marlin/stepper.cpp 14 additions, 2 deletionsMarlin/stepper.cpp
- Marlin/temperature.cpp 95 additions, 7 deletionsMarlin/temperature.cpp
- Marlin/ultralcd.pde 1 addition, 1 deletionMarlin/ultralcd.pde
- README.md 5 additions, 1 deletionREADME.md
Loading
Please register or sign in to comment