Scott Lahteine
|
88e81a4804
|
Latest upstream commits, plus fixes
- Also add Manual Bed Leveling to the rest of the configs
|
2015-03-21 16:12:57 -07:00 |
|
AnHardt
|
47c1ea72af
|
Merge https://github.com/kieranc/Marlin into PIDdebug
Conflicts:
Marlin/temperature.cpp
Cleaned merge conflict.
Codeposition had changed.
Variable pid_input had vanished.
Signed-off-by: AnHardt <github@kitelab.de>
|
2015-03-20 00:07:36 +01:00 |
|
maverikou
|
8a739b6fba
|
Merge branch 'Development' into delta_auto_bed_level
Conflicts:
Marlin/Marlin_main.cpp
|
2015-03-16 08:24:26 +02:00 |
|
maverikou
|
39d255608d
|
Test an extra delta configuration with auto bed leveling code paths
|
2015-03-07 20:53:23 +02:00 |
|