-
- Downloads
Merge branch 'Marlin_v1' into thinkyhead
Conflicts: Marlin/Configuration.h Marlin/Configuration_adv.h Marlin/Marlin.h Marlin/Marlin_main.cpp Marlin/Servo.cpp Marlin/language.h Marlin/pins.h Marlin/planner.cpp Marlin/ultralcd_implementation_hitachi_HD44780.h README.md
Showing
- Marlin/Configuration.h 80 additions, 5 deletionsMarlin/Configuration.h
- Marlin/Marlin.h 7 additions, 0 deletionsMarlin/Marlin.h
- Marlin/Marlin_main.cpp 96 additions, 7 deletionsMarlin/Marlin_main.cpp
- Marlin/Servo.cpp 2 additions, 0 deletionsMarlin/Servo.cpp
- Marlin/language.h 25 additions, 25 deletionsMarlin/language.h
- Marlin/pins.h 127 additions, 1 deletionMarlin/pins.h
- Marlin/planner.cpp 47 additions, 21 deletionsMarlin/planner.cpp
- Marlin/stepper.cpp 28 additions, 89 deletionsMarlin/stepper.cpp
- Marlin/temperature.cpp 12 additions, 5 deletionsMarlin/temperature.cpp
- Marlin/ultralcd_implementation_hitachi_HD44780.h 12 additions, 3 deletionsMarlin/ultralcd_implementation_hitachi_HD44780.h
Loading
Please register or sign in to comment