-
- Downloads
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
This should fix issues with pull request 467, I hope. Conflicts: Marlin/Configuration.h Marlin/Marlin.pde Marlin/ultralcd_implementation_hitachi_HD44780.h
Showing
- Marlin/Configuration.h 129 additions, 43 deletionsMarlin/Configuration.h
- Marlin/Configuration_adv.h 22 additions, 9 deletionsMarlin/Configuration_adv.h
- Marlin/DOGMbitmaps.h 3 additions, 3 deletionsMarlin/DOGMbitmaps.h
- Marlin/Makefile 10 additions, 10 deletionsMarlin/Makefile
- Marlin/Marlin.h 7 additions, 3 deletionsMarlin/Marlin.h
- Marlin/Marlin.pde 2 additions, 2 deletionsMarlin/Marlin.pde
- Marlin/Marlin_main.cpp 423 additions, 309 deletionsMarlin/Marlin_main.cpp
- Marlin/Servo.cpp 341 additions, 0 deletionsMarlin/Servo.cpp
- Marlin/Servo.h 132 additions, 0 deletionsMarlin/Servo.h
- Marlin/dogm_lcd_implementation.h 20 additions, 8 deletionsMarlin/dogm_lcd_implementation.h
- Marlin/fastio.h 695 additions, 1 deletionMarlin/fastio.h
- Marlin/pins.h 531 additions, 329 deletionsMarlin/pins.h
- Marlin/planner.cpp 29 additions, 7 deletionsMarlin/planner.cpp
- Marlin/planner.h 7 additions, 1 deletionMarlin/planner.h
- Marlin/stepper.cpp 42 additions, 46 deletionsMarlin/stepper.cpp
- Marlin/temperature.cpp 196 additions, 76 deletionsMarlin/temperature.cpp
- Marlin/temperature.h 3 additions, 0 deletionsMarlin/temperature.h
- Marlin/ultralcd.cpp 156 additions, 33 deletionsMarlin/ultralcd.cpp
- Marlin/ultralcd.h 3 additions, 20 deletionsMarlin/ultralcd.h
- Marlin/ultralcd_implementation_hitachi_HD44780.h 260 additions, 24 deletionsMarlin/ultralcd_implementation_hitachi_HD44780.h
Loading
Please register or sign in to comment