Selaa lähdekoodia

Adjust some names and types in Marlin_main.cpp

Scott Lahteine 10 vuotta sitten
vanhempi
commit
7dfb8becdb
1 muutettua tiedostoa jossa 7 lisäystä ja 7 poistoa
  1. 7
    7
      Marlin/Marlin_main.cpp

+ 7
- 7
Marlin/Marlin_main.cpp Näytä tiedosto

997
 
997
 
998
 #endif //DUAL_X_CARRIAGE
998
 #endif //DUAL_X_CARRIAGE
999
 
999
 
1000
-static void axis_is_at_home(int axis) {
1000
+static void axis_is_at_home(AxisEnum axis) {
1001
 
1001
 
1002
   #ifdef DUAL_X_CARRIAGE
1002
   #ifdef DUAL_X_CARRIAGE
1003
     if (axis == X_AXIS) {
1003
     if (axis == X_AXIS) {
1422
   };
1422
   };
1423
 
1423
 
1424
   // Probe bed height at position (x,y), returns the measured z value
1424
   // Probe bed height at position (x,y), returns the measured z value
1425
-  static float probe_pt(float x, float y, float z_before, ProbeAction retract_action=ProbeDeployAndStow, int verbose_level=1) {
1425
+  static float probe_pt(float x, float y, float z_before, ProbeAction probe_action=ProbeDeployAndStow, int verbose_level=1) {
1426
     // move to right place
1426
     // move to right place
1427
     do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], z_before); // this also updates current_position
1427
     do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], z_before); // this also updates current_position
1428
     do_blocking_move_to(x - X_PROBE_OFFSET_FROM_EXTRUDER, y - Y_PROBE_OFFSET_FROM_EXTRUDER, current_position[Z_AXIS]); // this also updates current_position
1428
     do_blocking_move_to(x - X_PROBE_OFFSET_FROM_EXTRUDER, y - Y_PROBE_OFFSET_FROM_EXTRUDER, current_position[Z_AXIS]); // this also updates current_position
1429
 
1429
 
1430
     #if !defined(Z_PROBE_SLED) && !defined(Z_PROBE_ALLEN_KEY)
1430
     #if !defined(Z_PROBE_SLED) && !defined(Z_PROBE_ALLEN_KEY)
1431
-      if (retract_action & ProbeDeploy) deploy_z_probe();
1431
+      if (probe_action & ProbeDeploy) deploy_z_probe();
1432
     #endif
1432
     #endif
1433
 
1433
 
1434
     run_z_probe();
1434
     run_z_probe();
1435
     float measured_z = current_position[Z_AXIS];
1435
     float measured_z = current_position[Z_AXIS];
1436
 
1436
 
1437
     #if Z_RAISE_BETWEEN_PROBINGS > 0
1437
     #if Z_RAISE_BETWEEN_PROBINGS > 0
1438
-      if (retract_action == ProbeStay) {
1438
+      if (probe_action == ProbeStay) {
1439
         do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] + Z_RAISE_BETWEEN_PROBINGS); // this also updates current_position
1439
         do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] + Z_RAISE_BETWEEN_PROBINGS); // this also updates current_position
1440
         st_synchronize();
1440
         st_synchronize();
1441
       }
1441
       }
1442
     #endif
1442
     #endif
1443
 
1443
 
1444
     #if !defined(Z_PROBE_SLED) && !defined(Z_PROBE_ALLEN_KEY)
1444
     #if !defined(Z_PROBE_SLED) && !defined(Z_PROBE_ALLEN_KEY)
1445
-      if (retract_action & ProbeStow) stow_z_probe();
1445
+      if (probe_action & ProbeStow) stow_z_probe();
1446
     #endif
1446
     #endif
1447
 
1447
 
1448
     if (verbose_level > 2) {
1448
     if (verbose_level > 2) {
5082
  *   F[mm/min] Set the movement feedrate
5082
  *   F[mm/min] Set the movement feedrate
5083
  */
5083
  */
5084
 inline void gcode_T() {
5084
 inline void gcode_T() {
5085
-  int tmp_extruder = code_value();
5085
+  uint16_t tmp_extruder = code_value_short();
5086
   if (tmp_extruder >= EXTRUDERS) {
5086
   if (tmp_extruder >= EXTRUDERS) {
5087
     SERIAL_ECHO_START;
5087
     SERIAL_ECHO_START;
5088
     SERIAL_CHAR('T');
5088
     SERIAL_CHAR('T');
5595
         gcode_M400();
5595
         gcode_M400();
5596
         break;
5596
         break;
5597
 
5597
 
5598
-      #if defined(ENABLE_AUTO_BED_LEVELING) && (defined(SERVO_ENDSTOPS) || defined(Z_PROBE_ALLEN_KEY)) && not defined(Z_PROBE_SLED)
5598
+      #if defined(ENABLE_AUTO_BED_LEVELING) && (defined(SERVO_ENDSTOPS) || defined(Z_PROBE_ALLEN_KEY)) && !defined(Z_PROBE_SLED)
5599
         case 401:
5599
         case 401:
5600
           gcode_M401();
5600
           gcode_M401();
5601
           break;
5601
           break;

Loading…
Peruuta
Tallenna