Browse Source

Rename feature to G38_PROBE_TARGET

Scott Lahteine 8 years ago
parent
commit
919fe3e4b8
5 changed files with 15 additions and 14 deletions
  1. 3
    3
      Marlin/Configuration_adv.h
  2. 1
    1
      Marlin/Marlin.h
  3. 7
    6
      Marlin/Marlin_main.cpp
  4. 3
    3
      Marlin/SanityCheck.h
  5. 1
    1
      Marlin/endstops.cpp

+ 3
- 3
Marlin/Configuration_adv.h View File

532
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
532
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
533
 //#define BEZIER_CURVE_SUPPORT
533
 //#define BEZIER_CURVE_SUPPORT
534
 
534
 
535
-// G38 Probe Target
536
-//#define G38_2_3
537
-#if ENABLED(G38_2_3)
535
+// G38.2 and G38.3 Probe Target
536
+//#define G38_PROBE_TARGET
537
+#if ENABLED(G38_PROBE_TARGET)
538
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)
538
   #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)
539
 #endif
539
 #endif
540
 
540
 

+ 1
- 1
Marlin/Marlin.h View File

209
 
209
 
210
 #endif // !MIXING_EXTRUDER
210
 #endif // !MIXING_EXTRUDER
211
 
211
 
212
-#if ENABLED(G38_2_3)
212
+#if ENABLED(G38_PROBE_TARGET)
213
   extern bool G38_move,        // flag to tell the interrupt handler that a G38 command is being run
213
   extern bool G38_move,        // flag to tell the interrupt handler that a G38 command is being run
214
               G38_endstop_hit; // flag from the interrupt handler to indicate if the endstop went active
214
               G38_endstop_hit; // flag from the interrupt handler to indicate if the endstop went active
215
 #endif
215
 #endif

+ 7
- 6
Marlin/Marlin_main.cpp View File

277
   TWIBus i2c;
277
   TWIBus i2c;
278
 #endif
278
 #endif
279
 
279
 
280
-#if ENABLED(G38_2_3)
280
+#if ENABLED(G38_PROBE_TARGET)
281
   bool G38_move = false,
281
   bool G38_move = false,
282
        G38_endstop_hit = false;
282
        G38_endstop_hit = false;
283
 #endif
283
 #endif
2331
 
2331
 
2332
 #endif // AUTO_BED_LEVELING_BILINEAR
2332
 #endif // AUTO_BED_LEVELING_BILINEAR
2333
 
2333
 
2334
+
2334
 /**
2335
 /**
2335
  * Home an individual linear axis
2336
  * Home an individual linear axis
2336
  */
2337
  */
4166
 
4167
 
4167
 #endif // HAS_BED_PROBE
4168
 #endif // HAS_BED_PROBE
4168
 
4169
 
4169
-#if ENABLED(G38_2_3)
4170
+#if ENABLED(G38_PROBE_TARGET)
4170
 
4171
 
4171
   static bool G38_run_probe() {
4172
   static bool G38_run_probe() {
4172
 
4173
 
4252
     clean_up_after_endstop_or_probe_move();
4253
     clean_up_after_endstop_or_probe_move();
4253
   }
4254
   }
4254
 
4255
 
4255
-#endif // G38_2_3
4256
+#endif // G38_PROBE_TARGET
4256
 
4257
 
4257
 /**
4258
 /**
4258
  * G92: Set current position to given X Y Z E
4259
  * G92: Set current position to given X Y Z E
7376
   while (*cmd_ptr == ' ') cmd_ptr++;
7377
   while (*cmd_ptr == ' ') cmd_ptr++;
7377
 
7378
 
7378
   // Allow for decimal point in command
7379
   // Allow for decimal point in command
7379
-  #if ENABLED(G38_2_3)
7380
+  #if ENABLED(G38_PROBE_TARGET)
7380
     uint8_t subcode = 0;
7381
     uint8_t subcode = 0;
7381
   #endif
7382
   #endif
7382
 
7383
 
7393
   } while (NUMERIC(*cmd_ptr));
7394
   } while (NUMERIC(*cmd_ptr));
7394
 
7395
 
7395
   // Allow for decimal point in command
7396
   // Allow for decimal point in command
7396
-  #if ENABLED(G38_2_3)
7397
+  #if ENABLED(G38_PROBE_TARGET)
7397
     if (*cmd_ptr == '.') {
7398
     if (*cmd_ptr == '.') {
7398
       cmd_ptr++;
7399
       cmd_ptr++;
7399
       while (NUMERIC(*cmd_ptr))
7400
       while (NUMERIC(*cmd_ptr))
7501
         #endif // Z_PROBE_SLED
7502
         #endif // Z_PROBE_SLED
7502
       #endif // HAS_BED_PROBE
7503
       #endif // HAS_BED_PROBE
7503
 
7504
 
7504
-      #if ENABLED(G38_2_3)
7505
+      #if ENABLED(G38_PROBE_TARGET)
7505
         case 38: // G38.2 & G38.3
7506
         case 38: // G38.2 & G38.3
7506
           if (subcode == 2 || subcode == 3)
7507
           if (subcode == 2 || subcode == 3)
7507
             gcode_G38(subcode == 2);
7508
             gcode_G38(subcode == 2);

+ 3
- 3
Marlin/SanityCheck.h View File

854
 /**
854
 /**
855
  * G38 Probe Target
855
  * G38 Probe Target
856
  */
856
  */
857
-#if ENABLED(G38_2_3)
857
+#if ENABLED(G38_PROBE_TARGET)
858
   #if !HAS_BED_PROBE
858
   #if !HAS_BED_PROBE
859
-    #error "G38_2_3 requires a bed probe."
859
+    #error "G38_PROBE_TARGET requires a bed probe."
860
   #elif !IS_CARTESIAN
860
   #elif !IS_CARTESIAN
861
-    #error "G38_2_3 requires a Cartesian machine."
861
+    #error "G38_PROBE_TARGET requires a Cartesian machine."
862
   #endif
862
   #endif
863
 #endif
863
 #endif
864
 
864
 

+ 1
- 1
Marlin/endstops.cpp View File

252
       } \
252
       } \
253
     } while(0)
253
     } while(0)
254
 
254
 
255
-  #if ENABLED(G38_2_3) && PIN_EXISTS(Z_MIN)  // If G38 command then check Z_MIN for every axis and every direction  
255
+  #if ENABLED(G38_PROBE_TARGET) && PIN_EXISTS(Z_MIN)  // If G38 command then check Z_MIN for every axis and every direction  
256
 
256
 
257
     #define UPDATE_ENDSTOP(AXIS,MINMAX) do { \
257
     #define UPDATE_ENDSTOP(AXIS,MINMAX) do { \
258
         _UPDATE_ENDSTOP(AXIS,MINMAX,NOOP); \
258
         _UPDATE_ENDSTOP(AXIS,MINMAX,NOOP); \

Loading…
Cancel
Save