Browse Source

Patch some planner compile errors

Scott Lahteine 8 years ago
parent
commit
01e5d46ea7
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      Marlin/planner.h
  2. 1
    1
      Marlin/ultralcd.cpp

+ 1
- 1
Marlin/planner.h View File

348
     static void set_position_mm(const AxisEnum axis, const float &v);
348
     static void set_position_mm(const AxisEnum axis, const float &v);
349
     static FORCE_INLINE void set_z_position_mm(const float &z) { set_position_mm(Z_AXIS, z); }
349
     static FORCE_INLINE void set_z_position_mm(const float &z) { set_position_mm(Z_AXIS, z); }
350
     static FORCE_INLINE void set_e_position_mm(const float &e) {
350
     static FORCE_INLINE void set_e_position_mm(const float &e) {
351
-      set_position_mm(E_AXIS
351
+      set_position_mm((AxisEnum)E_AXIS
352
         #if ENABLED(DISTINCT_E_FACTORS)
352
         #if ENABLED(DISTINCT_E_FACTORS)
353
           + active_extruder
353
           + active_extruder
354
         #endif
354
         #endif

+ 1
- 1
Marlin/ultralcd.cpp View File

1874
       if (e == active_extruder)
1874
       if (e == active_extruder)
1875
         _planner_refresh_positioning();
1875
         _planner_refresh_positioning();
1876
       else
1876
       else
1877
-        planner.steps_to_mm[i] = 1.0 / planner.axis_steps_per_mm[i];
1877
+        planner.steps_to_mm[e] = 1.0 / planner.axis_steps_per_mm[e];
1878
     }
1878
     }
1879
     void _planner_refresh_e0_positioning() { _reset_e_acceleration_rate(0); }
1879
     void _planner_refresh_e0_positioning() { _reset_e_acceleration_rate(0); }
1880
     void _planner_refresh_e1_positioning() { _reset_e_acceleration_rate(1); }
1880
     void _planner_refresh_e1_positioning() { _reset_e_acceleration_rate(1); }

Loading…
Cancel
Save