Skip to content

Commit e049c5e

Browse files
committed
Swap the controlling G-code letter from P to D, shorten INI entries.
The G-code letter has been changed from P to D to allow potential future use of P for "Pause". The word "PARAMETER" has been removed from the INI entries. (what else would they be but parameters?)
1 parent ae93104 commit e049c5e

5 files changed

Lines changed: 20 additions & 18 deletions

File tree

docs/src/config/ini-config.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,9 +541,9 @@ The maximum number of `USER_M_PATH` directories is defined at compile time (typ:
541541
Allow to clear the G92 offset automatically when config start-up.
542542
* `DISABLE_FANUC_STYLE_SUB = 0` (Default: 0)
543543
If there is reason to disable Fanuc subroutines set it to 1.
544-
* 'PARAMETER_G73_PECK_CLEARANCE = .020' (default: Metric machine: 1mm, imperial machine: .050 inches)
544+
* 'G73_PECK_CLEARANCE = .020' (default: Metric machine: 1mm, imperial machine: .050 inches)
545545
Chip breaking back-off distance in machine units
546-
* 'PARAMETER_G83_PECK_CLEARANCE = .020' (default: Metric machine: 1mm, imperial machine: .050 inches)
546+
* 'G83_PECK_CLEARANCE = .020' (default: Metric machine: 1mm, imperial machine: .050 inches)
547547
Clearance distance from last feed depth when machine rapids back to bottom of hole, in machine units.
548548

549549
[NOTE]

docs/src/gcode/g-code.adoc

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1757,7 +1757,7 @@ It is an error if:
17571757

17581758
[source,{ngc}]
17591759
----
1760-
G73 X- Y- Z- R- Q- P- <L->
1760+
G73 X- Y- Z- R- Q- D- <L->
17611761
----
17621762

17631763
* 'R' - retract position along the Z axis.
@@ -1766,15 +1766,16 @@ G73 X- Y- Z- R- Q- P- <L->
17661766

17671767
The 'G73' cycle is drilling or milling with chip breaking.
17681768
This cycle takes a Q number which represents a 'delta' increment along
1769-
the Z axis. Peck clearance can be specified by optional P number.
1769+
the Z axis. Peck clearance can be specified by optional D number.
17701770

17711771
* Preliminary motion.
17721772
** If the current Z position is below the R position, The Z axis does
17731773
a <<gcode:g0,rapid move>> to the R position.
17741774
** Move to the X Y coordinates
17751775
* Move the Z-axis only at the current <<sec:set-feed-rate,feed rate>>
17761776
downward by delta or to the Z position, whichever is less deep.
1777-
* Rapid up .010 of an inch or 0.254 mm.
1777+
* Rapid up either the D value, the G73_PECK_CLEARANCE specified in the
1778+
INI file or the default of .010" / 0.254 mm.
17781779
* Repeat steps 2 and 3 until the Z position is reached at step 2.
17791780
* The Z axis does a rapid move to the R position.
17801781

@@ -2371,25 +2372,26 @@ seconds at the bottom of the hole.
23712372

23722373
[source,{ngc}]
23732374
----
2374-
G83 (X- Y- Z-) or (U- V- W-) R- L- Q- P-
2375+
G83 (X- Y- Z-) or (U- V- W-) R- L- Q- D-
23752376
----
23762377

23772378
The 'G83' cycle (often called peck drilling) is intended for deep
2378-
drilling ormilling with chip breaking. The retracts in this cycle clear
2379+
drilling or milling with chip breaking. The retracts in this cycle clear
23792380
the hole of chips and cut off any long stringers (which are common when
23802381
drilling in aluminum). This cycle takes a Q number which represents a
23812382
'delta' increment along the Z-axis. The retract before final depth will
23822383
always be to the 'retract' plane even if G98 is in effect. The final
23832384
retract will honor the G98/99 in effect. G83 functions the same as G81
2384-
with the addition of retracts during the drilling operation. Peck clearance
2385-
can be specified by optional P number.
2385+
with the addition of retracts during the drilling operation. Peck
2386+
clearance can be specified by optional D number.
23862387

23872388
* Preliminary motion, as described in the
23882389
<<gcode:preliminary-motion,Preliminary and In-Between Motion>> section.
23892390
* Move the Z-axis at the current <<sec:set-feed-rate,feed rate>>
23902391
downward by delta or to the Z position, whichever is less deep.
23912392
* Rapid move back out to the retract plane specified by the R word.
2392-
* Rapid move back down to the current hole bottom, less .010 of an inch or 0.254 mm.
2393+
* Rapid up either the D value, the G83_PECK_CLEARANCE specified in the
2394+
INI file or the default of .010" / 0.254 mm.
23932395
* Repeat steps 2, 3, and 4 until the Z position is reached at step 2.
23942396
* The Z-axis does a <<gcode:g0,rapid move>> to clear Z.
23952397

src/emc/rs274ngc/interp_check.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,11 @@ int Interp::check_other_codes(block_pointer block) //!< pointer to a block
254254
if (block->d_flag) {
255255
CHKS(((block->g_modes[7] != G_41) && (block->g_modes[7] != G_42) &&
256256
(block->g_modes[7] != G_41_1) && (block->g_modes[7] != G_42_1) &&
257-
(motion != G_70) &&
258-
(motion != G_71) && (motion != G_71_1) && (motion != G_71_2) &&
259-
(motion != G_72) && (motion != G_72_1) && (motion != G_72_2) &&
257+
(motion != G_70) && (motion != G_71) && (motion != G_71_1) &&
258+
(motion != G_71_2) && (motion != G_72) && (motion != G_72_1) &&
259+
(motion != G_72_2) && (motion != G_73) && (motion != G_83) &&
260260
(block->g_modes[14] != G_96)),
261-
_("D word with no G41, G41.1, G42, G42.1, G71, G71.1, G71.2 or G96 to use it"));
261+
_("D word with no G41, G41.1, G42, G42.1, G71, G71.1, G71.2 G73, G83 or G96 to use it"));
262262
}
263263

264264
if (block->dollar_flag) {

src/emc/rs274ngc/interp_cycles.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ int Interp::convert_cycle_g83(block_pointer block,
154154
Thanks to Billy Singleton for pointing it out... */
155155
CHKS((delta <= 0.0), NCE_NEGATIVE_OR_ZERO_Q_VALUE_USED);
156156

157-
rapid_delta = block->p_flag?block->p_number:_setup.parameter_g83_peck_clearance;
157+
rapid_delta = block->d_flag?block->d_number_float:_setup.parameter_g83_peck_clearance;
158158

159159
for (current_depth = (r - delta);
160160
current_depth > bottom_z; current_depth = (current_depth - delta)) {
@@ -215,7 +215,7 @@ int Interp::convert_cycle_g73(block_pointer block,
215215
Thanks to Billy Singleton for pointing it out... */
216216
CHKS((delta <= 0.0), NCE_NEGATIVE_OR_ZERO_Q_VALUE_USED);
217217

218-
rapid_delta = block->p_flag?block->p_number:_setup.parameter_g73_peck_clearance;
218+
rapid_delta = block->d_flag?block->d_number_float:_setup.parameter_g73_peck_clearance;
219219

220220
for (current_depth = (r - delta);
221221
current_depth > bottom_z; current_depth = (current_depth - delta)) {

src/emc/rs274ngc/rs274ngc_pre.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -915,8 +915,8 @@ int Interp::init()
915915
_setup.c_indexer_jnum = atol(inistring);
916916
}
917917
inifile.Find(&_setup.orient_offset, "ORIENT_OFFSET", "RS274NGC");
918-
inifile.Find(&_setup.parameter_g73_peck_clearance, "PARAMETER_G73_PECK_CLEARANCE", "RS274NGC");
919-
inifile.Find(&_setup.parameter_g83_peck_clearance, "PARAMETER_G83_PECK_CLEARANCE", "RS274NGC");
918+
inifile.Find(&_setup.parameter_g73_peck_clearance, "G73_PECK_CLEARANCE", "RS274NGC");
919+
inifile.Find(&_setup.parameter_g83_peck_clearance, "G83_PECK_CLEARANCE", "RS274NGC");
920920

921921
inifile.Find(&_setup.debugmask, "DEBUG", "EMC");
922922

0 commit comments

Comments
 (0)