task -use separate settings for g83/g73, drop peck/full retract option

Author: c-morley

src/emc/rs274ngc/interp_cycles.cc

@@ -154,9 +154,7 @@ int Interp::convert_cycle_g83(block_pointer block,
      Thanks to Billy Singleton for pointing it out... */
   CHKS((delta <= 0.0), NCE_NEGATIVE_OR_ZERO_Q_VALUE_USED);
 
-  rapid_delta = _setup.parameter_drill_cycle_chip_break_distance;
-  if (_setup.length_units == CANON_UNITS_MM)
-    rapid_delta = (rapid_delta * 25.4);
+  rapid_delta = _setup.parameter_g83_peck_clearence;;
 
   for (current_depth = (r - delta);
        current_depth > bottom_z; current_depth = (current_depth - delta)) {
@@ -212,24 +210,16 @@ int Interp::convert_cycle_g73(block_pointer block,
 {
   double current_depth;
   double rapid_delta;
-  int count = 0;
   /* Moved the check for negative Q values here as a sign
      may be used with user defined M functions
      Thanks to Billy Singleton for pointing it out... */
   CHKS((delta <= 0.0), NCE_NEGATIVE_OR_ZERO_Q_VALUE_USED);
 
-  rapid_delta = _setup.parameter_drill_cycle_chip_break_distance;
-  if (_setup.length_units == CANON_UNITS_MM)
-    rapid_delta = (rapid_delta * 25.4);
+  rapid_delta = _setup.parameter_g73_peck_clearence;
 
   for (current_depth = (r - delta);
     current_depth > bottom_z; current_depth = (current_depth - delta)) {
-    count ++;
     cycle_feed(block, plane, x, y, current_depth);
-    if (count == _setup.parameter_g73_peck_till_clear_count) {
-        cycle_traverse(block, plane, x, y, r);
-        count = 0;
-    }
     cycle_traverse(block, plane, x, y, current_depth + rapid_delta);
   }
   cycle_feed(block, plane, x, y, bottom_z);

src/emc/rs274ngc/interp_internal.hh

@@ -50,9 +50,6 @@ inline int round_to_int(T x) {
     return (int)std::nearbyint(x);
 }
 
-/* how far above hole bottom for rapid return, in inches */
-#define G83_RAPID_DELTA 0.010
-
 /* nested remap: a remapped code is found in the body of a subroutine
  * which is executing on behalf of another remapped code
  * example: a user G-code command executes a tool change
@@ -792,8 +789,8 @@ struct setup
   int tool_change_at_g30;
   int tool_change_quill_up;
   int tool_change_with_spindle_on;
-  double parameter_drill_cycle_chip_break_distance;
-  int parameter_g73_peck_till_clear_count;
+  double parameter_g73_peck_clearence;
+  double parameter_g83_peck_clearence;
   int a_axis_wrapped;
   int b_axis_wrapped;
   int c_axis_wrapped;

src/emc/rs274ngc/rs274ngc_pre.cc

@@ -833,14 +833,20 @@ int Interp::init()
   INIT_CANON();
 
   iniFileName = getenv("INI_FILE_NAME");
-
+  _setup.length_units = GET_EXTERNAL_LENGTH_UNIT_TYPE();
+  
   // the default log file
   _setup.loggingLevel = 0;
   _setup.tool_change_at_g30 = 0;
   _setup.tool_change_quill_up = 0;
   _setup.tool_change_with_spindle_on = 0;
-  _setup.parameter_drill_cycle_chip_break_distance = .010;
-  _setup.parameter_g73_peck_till_clear_count = 0;
+  if (_setup.length_units == CANON_UNITS_INCHES) {
+      _setup.parameter_g73_peck_clearence = .050;
+      _setup.parameter_g83_peck_clearence = .050;
+   } else{
+      _setup.parameter_g73_peck_clearence = 1;
+      _setup.parameter_g83_peck_clearence = 1;
+    }
   _setup.a_axis_wrapped = 0;
   _setup.b_axis_wrapped = 0;
   _setup.c_axis_wrapped = 0;
@@ -909,11 +915,8 @@ int Interp::init()
               _setup.c_indexer_jnum = atol(inistring);
           }
           inifile.Find(&_setup.orient_offset, "ORIENT_OFFSET", "RS274NGC");
-          inifile.Find(&_setup.parameter_drill_cycle_chip_break_distance, "PARAMETER_DRILL_CYCLE_CHIP_BREAK_DISTANCE", "RS274NGC");
-          if(NULL != (inistring = inifile.Find("PARAMETER_G73_PECK_TILL_CLEAR_COUNT", "RS274NGC")))
-          {
-              _setup.parameter_g73_peck_till_clear_count = atoi(inistring);
-          }
+          inifile.Find(&_setup.parameter_g73_peck_clearence, "PARAMETER_G73_PECK_CLEARENCE", "RS274NGC");
+          inifile.Find(&_setup.parameter_g83_peck_clearence, "PARAMETER_G83_PECK_CLEARENCE", "RS274NGC");
 
           inifile.Find(&_setup.debugmask, "DEBUG", "EMC");
 
@@ -1082,7 +1085,6 @@ int Interp::init()
       }
   }
 
-  _setup.length_units = GET_EXTERNAL_LENGTH_UNIT_TYPE();
   USE_LENGTH_UNITS(_setup.length_units);
   GET_EXTERNAL_PARAMETER_FILE_NAME(filename, LINELEN);
   if (filename[0] == 0)