Browse Source

Fix a minor compile warning

pull/1/head
Scott Lahteine 6 years ago
parent
commit
d29cb09b3e
  1. 2
      Marlin/src/gcode/config/M200-M205.cpp
  2. 4
      Marlin/src/inc/Conditionals_LCD.h

2
Marlin/src/gcode/config/M200-M205.cpp

@ -61,7 +61,7 @@ void GcodeSuite::M201() {
LOOP_XYZE(i) { LOOP_XYZE(i) {
if (parser.seen(axis_codes[i])) { if (parser.seen(axis_codes[i])) {
const uint8_t a = (i == uint8_t(E_AXIS) ? E_AXIS_N(target_extruder) : i); const uint8_t a = (i == E_AXIS ? E_AXIS_N(target_extruder) : i);
planner.settings.max_acceleration_mm_per_s2[a] = parser.value_axis_units((AxisEnum)a); planner.settings.max_acceleration_mm_per_s2[a] = parser.value_axis_units((AxisEnum)a);
} }
} }

4
Marlin/src/inc/Conditionals_LCD.h

@ -414,11 +414,11 @@
*/ */
#if ENABLED(DISTINCT_E_FACTORS) && E_STEPPERS > 1 #if ENABLED(DISTINCT_E_FACTORS) && E_STEPPERS > 1
#define XYZE_N (XYZ + E_STEPPERS) #define XYZE_N (XYZ + E_STEPPERS)
#define E_AXIS_N(E) (E_AXIS + E) #define E_AXIS_N(E) (uint8_t(E_AXIS) + E)
#else #else
#undef DISTINCT_E_FACTORS #undef DISTINCT_E_FACTORS
#define XYZE_N XYZE #define XYZE_N XYZE
#define E_AXIS_N(E) E_AXIS #define E_AXIS_N(E) uint8_t(E_AXIS)
#endif #endif
/** /**

Loading…
Cancel
Save