Skip to content

Commit c97899d

Browse files
committed
rename mult to scale
Signed-off-by: Rene Hopf <renehopf@mac.com>
1 parent 2185cd2 commit c97899d

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/emc/nml_intf/canon.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ all axes have covered the same proportion of their required motion.
478478
The meanings of the parameters is the same as for STRAIGHT_TRAVERSE.*/
479479

480480
extern void RIGID_TAP(int lineno,
481-
double x, double y, double z, double mult);
481+
double x, double y, double z, double scale);
482482

483483
/* Move linear and synced with the previously set pitch.
484484
Only linear moves are allowed, axes A,B,C are not allowed to move.*/

src/emc/nml_intf/emc.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ extern int emcTrajClearProbeTrippedFlag();
428428
extern int emcTrajProbe(EmcPose pos, int type, double vel,
429429
double ini_maxvel, double acc, unsigned char probe_type);
430430
extern int emcAuxInputWait(int index, int input_type, int wait_type, int timeout);
431-
extern int emcTrajRigidTap(EmcPose pos, double vel, double ini_maxvel, double acc, double mult);
431+
extern int emcTrajRigidTap(EmcPose pos, double vel, double ini_maxvel, double acc, double scale);
432432

433433
extern int emcTrajUpdate(EMC_TRAJ_STAT * stat);
434434

src/emc/rs274ngc/gcodemodule.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ void STRAIGHT_PROBE(int line_number,
485485

486486
}
487487
void RIGID_TAP(int line_number,
488-
double x, double y, double z, double mult) {
488+
double x, double y, double z, double scale) {
489489
if(metric) { x /= 25.4; y /= 25.4; z /= 25.4; }
490490
maybe_new_line(line_number);
491491
if(interp_error) return;

src/emc/sai/saicanon.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ void STRAIGHT_PROBE(int line_number,
554554
}
555555

556556

557-
void RIGID_TAP(int line_number, double x, double y, double z, double mult)
557+
void RIGID_TAP(int line_number, double x, double y, double z, double scale)
558558
{
559559

560560

0 commit comments

Comments
 (0)