-
- Downloads
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
Fixed conflicts: Marlin/planner.h
Showing
- .travis.yml 6 additions, 2 deletions.travis.yml
- Marlin/Configuration.h 6 additions, 0 deletionsMarlin/Configuration.h
- Marlin/Marlin.h 6 additions, 0 deletionsMarlin/Marlin.h
- Marlin/Marlin_main.cpp 324 additions, 35 deletionsMarlin/Marlin_main.cpp
- Marlin/configurator/config/Configuration.h 5 additions, 0 deletionsMarlin/configurator/config/Configuration.h
- Marlin/example_configurations/Felix/Configuration.h 5 additions, 0 deletionsMarlin/example_configurations/Felix/Configuration.h
- Marlin/example_configurations/Felix/Configuration_DUAL.h 5 additions, 0 deletionsMarlin/example_configurations/Felix/Configuration_DUAL.h
- Marlin/example_configurations/Hephestos/Configuration.h 6 additions, 0 deletionsMarlin/example_configurations/Hephestos/Configuration.h
- Marlin/example_configurations/K8200/Configuration.h 6 additions, 0 deletionsMarlin/example_configurations/K8200/Configuration.h
- Marlin/example_configurations/SCARA/Configuration.h 6 additions, 0 deletionsMarlin/example_configurations/SCARA/Configuration.h
- Marlin/example_configurations/WITBOX/Configuration.h 6 additions, 0 deletionsMarlin/example_configurations/WITBOX/Configuration.h
- Marlin/example_configurations/delta/generic/Configuration.h 77 additions, 3 deletionsMarlin/example_configurations/delta/generic/Configuration.h
- Marlin/example_configurations/delta/generic/Configuration_adv.h 19 additions, 1 deletion.../example_configurations/delta/generic/Configuration_adv.h
- Marlin/example_configurations/delta/kossel_mini/Configuration.h 877 additions, 0 deletions.../example_configurations/delta/kossel_mini/Configuration.h
- Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h 547 additions, 0 deletions...mple_configurations/delta/kossel_mini/Configuration_adv.h
- Marlin/example_configurations/makibox/Configuration.h 6 additions, 0 deletionsMarlin/example_configurations/makibox/Configuration.h
- Marlin/example_configurations/tvrrug/Round2/Configuration.h 6 additions, 0 deletionsMarlin/example_configurations/tvrrug/Round2/Configuration.h
- Marlin/planner.cpp 1 addition, 1 deletionMarlin/planner.cpp
- Marlin/planner.h 4 additions, 2 deletionsMarlin/planner.h
- Marlin/stepper.cpp 40 additions, 39 deletionsMarlin/stepper.cpp
Loading
Please register or sign in to comment