Browse Source

Merge pull request #5431 from esenapaj/Suppress-warnings,-etc

Suppress warnings, etc
Scott Lahteine 8 years ago
parent
commit
f089279263
2 changed files with 2 additions and 3 deletions
  1. 0
    1
      Marlin/Marlin_main.cpp
  2. 2
    2
      Marlin/planner.h

+ 0
- 1
Marlin/Marlin_main.cpp View File

1349
   float offs = LOGICAL_POSITION(0, axis);
1349
   float offs = LOGICAL_POSITION(0, axis);
1350
 
1350
 
1351
   #if ENABLED(DUAL_X_CARRIAGE)
1351
   #if ENABLED(DUAL_X_CARRIAGE)
1352
-    bool did_update = false;
1353
     if (axis == X_AXIS) {
1352
     if (axis == X_AXIS) {
1354
 
1353
 
1355
       // In Dual X mode hotend_offset[X] is T1's home position
1354
       // In Dual X mode hotend_offset[X] is T1's home position

+ 2
- 2
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((AxisEnum)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
355
-      , e);
355
+      ), e);
356
     }
356
     }
357
 
357
 
358
     /**
358
     /**

Loading…
Cancel
Save