Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

2011-11-13 20:46:44 +01:00
parent 65934eee9c 9980ceb4a3
commit ac82411c73
16 changed files with 1443 additions and 1156 deletions
--- a/Marlin/planner.h
+++ b/Marlin/planner.h
@@ -92,5 +92,7 @@ extern float max_xy_jerk; //speed than can be stopped at once, if i understand c
 extern float max_z_jerk;
 extern float mintravelfeedrate;
 extern unsigned long axis_steps_per_sqr_second[NUM_AXIS];
-
-#endif
+#ifdef AUTOTEMP
+extern float high_e_speed;
+#endif
+#endif