-
- Downloads
Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration
Conflicts: Marlin/Marlin_main.cpp
Showing
- Marlin/Configuration.h 44 additions, 15 deletionsMarlin/Configuration.h
- Marlin/Configuration_adv.h 8 additions, 2 deletionsMarlin/Configuration_adv.h
- Marlin/LCD Menu Tree.pdf 0 additions, 0 deletionsMarlin/LCD Menu Tree.pdf
- Marlin/Marlin.h 5 additions, 5 deletionsMarlin/Marlin.h
- Marlin/Marlin_main.cpp 126 additions, 136 deletionsMarlin/Marlin_main.cpp
- Marlin/Menu Plans.xlsx 0 additions, 0 deletionsMarlin/Menu Plans.xlsx
- Marlin/Servo.h 6 additions, 6 deletionsMarlin/Servo.h
- Marlin/fastio.h 1 addition, 1 deletionMarlin/fastio.h
- Marlin/language.h 222 additions, 40 deletionsMarlin/language.h
- Marlin/pins.h 6 additions, 5 deletionsMarlin/pins.h
- Marlin/qr_solve.cpp 4 additions, 6 deletionsMarlin/qr_solve.cpp
- Marlin/qr_solve.h 1 addition, 1 deletionMarlin/qr_solve.h
- Marlin/stepper.h 2 additions, 2 deletionsMarlin/stepper.h
- Marlin/temperature.cpp 2 additions, 2 deletionsMarlin/temperature.cpp
- Marlin/temperature.h 1 addition, 1 deletionMarlin/temperature.h
- Marlin/ultralcd.cpp 13 additions, 13 deletionsMarlin/ultralcd.cpp
- Marlin/ultralcd.h 4 additions, 4 deletionsMarlin/ultralcd.h
- Marlin/ultralcd_implementation_hitachi_HD44780.h 6 additions, 6 deletionsMarlin/ultralcd_implementation_hitachi_HD44780.h
Loading
Please register or sign in to comment