Quellcode durchsuchen

Cast int to AxisEnum for some accessors

Scott Lahteine vor 8 Jahren
Ursprung
Commit
0c79553fc5
1 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
  1. 3
    3
      Marlin/Marlin_main.cpp

+ 3
- 3
Marlin/Marlin_main.cpp Datei anzeigen

@@ -1449,7 +1449,7 @@ static void set_axis_is_at_home(AxisEnum axis) {
1449 1449
     if (axis == X_AXIS || axis == Y_AXIS) {
1450 1450
 
1451 1451
       float homeposition[XYZ];
1452
-      LOOP_XYZ(i) homeposition[i] = LOGICAL_POSITION(base_home_pos(i), i);
1452
+      LOOP_XYZ(i) homeposition[i] = LOGICAL_POSITION(base_home_pos((AxisEnum)i), i);
1453 1453
 
1454 1454
       // SERIAL_ECHOPAIR("homeposition X:", homeposition[X_AXIS]);
1455 1455
       // SERIAL_ECHOLNPAIR(" Y:", homeposition[Y_AXIS]);
@@ -4283,7 +4283,7 @@ inline void gcode_G28() {
4283 4283
     float retract_mm[XYZ];
4284 4284
     LOOP_XYZ(i) {
4285 4285
       float dist = destination[i] - current_position[i];
4286
-      retract_mm[i] = fabs(dist) < G38_MINIMUM_MOVE ? 0 : home_bump_mm(i) * (dist > 0 ? -1 : 1);
4286
+      retract_mm[i] = fabs(dist) < G38_MINIMUM_MOVE ? 0 : home_bump_mm((AxisEnum)i) * (dist > 0 ? -1 : 1);
4287 4287
     }
4288 4288
 
4289 4289
     stepper.synchronize();  // wait until the machine is idle
@@ -6666,7 +6666,7 @@ inline void gcode_M428() {
6666 6666
   bool err = false;
6667 6667
   LOOP_XYZ(i) {
6668 6668
     if (axis_homed[i]) {
6669
-      float base = (current_position[i] > (soft_endstop_min[i] + soft_endstop_max[i]) * 0.5) ? base_home_pos(i) : 0,
6669
+      float base = (current_position[i] > (soft_endstop_min[i] + soft_endstop_max[i]) * 0.5) ? base_home_pos((AxisEnum)i) : 0,
6670 6670
             diff = current_position[i] - LOGICAL_POSITION(base, i);
6671 6671
       if (diff > -20 && diff < 20) {
6672 6672
         set_home_offset((AxisEnum)i, home_offset[i] - diff);

Laden…
Abbrechen
Speichern