Skip to content

Commit c61d428

Browse files
authored
Merge pull request #2739 from heeplr/linuxcncrsh
linuxcncrsh: fixes & cleanup
2 parents dc19861 + 8c7aa69 commit c61d428

File tree

8 files changed

+2738
-1451
lines changed

8 files changed

+2738
-1451
lines changed

docs/man/man1/linuxcncrsh.1

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,12 @@ With set, sends a command to the EMC to set the new debug level, and sets the EM
225225
This will make the two values the same, since they really ought to be the same.
226226
.RE
227227
.P
228-
\fBset_wait {received|done}\fR
228+
\fBwait_mode {received|done}\fR
229229
.RS
230-
The set_wait setting controls the wait after receiving a command.
230+
The wait_mode setting controls the wait after receiving a command.
231231
It can be "received" (after the command was sent and received) or "done" (after the command was done).
232-
With get, any parameter is ignored and the current set_wait setting is returned.
233-
With set, set the set_wait setting to the specified value.
232+
With get, any parameter is ignored and the current wait_mode setting is returned.
233+
With set, set the wait_mode setting to the specified value.
234234
.RE
235235
.P
236236
\fBwait {received|done}\fR
@@ -305,19 +305,21 @@ With get, ignores any parameters and returns the current flood coolant setting.
305305
With set, sets the flood setting as specified.
306306
.RE
307307
.P
308-
\fBspindle {forward|reverse|increase|decrease|constant|off}\fR
308+
\fBspindle {forward|reverse|increase|decrease|constant|off} {<spindle>}\fR
309309
.RS
310310
With get, any parameter is ignored and the current spindle state is
311311
returned as "forward", "reverse", "increase", "decrease", or "off".
312312
With set, sets the spindle as specified.
313313
Note that "increase" and "decrease" will cause a speed change in the corresponding direction
314314
until a "constant" command is sent.
315+
If "spindle" is omitted, spindle 0 is selected. If -1, all spindles are selected.
315316
.RE
316317
.P
317-
\fBbrake {on|off}\fR
318+
\fBbrake {on|off} {<spindle>}\fR
318319
.RS
319320
With get, any parameter is ignored and the current brake setting is returned.
320321
With set, the brake is set as specified.
322+
If "spindle" is omitted, spindle 0 is selected. If -1, all spindles are selected.
321323
.RE
322324
.P
323325
\fBtool\fR
@@ -343,22 +345,22 @@ With set, homes the indicated joint or, if -1, homes all joints.
343345
\fBjog_stop joint_number|axis_letter\fR
344346
.RS
345347
With set, stop any in-progress jog on the specified joint or axis.
346-
If TELEOP_ENABLE is NO, use joint_number;
347-
If TELEOP_ENABLE is YES, use axis_letter.
348+
If TELEOP_ENABLE is OFF, use joint_number;
349+
If TELEOP_ENABLE is ON, use axis_letter.
348350
.RE
349351
.P
350352
\fBjog joint_number|axis_letter <speed>\fR
351353
.RS
352354
With set, jog the specified joint or axis at <speed>; sign of speed is direction.
353-
If TELEOP_ENABLE is NO, use joint_number;
354-
If TELEOP_ENABLE is YES, use axis_letter.
355+
If TELEOP_ENABLE is OFF, use joint_number;
356+
If TELEOP_ENABLE is ON, use axis_letter.
355357
.RE
356358
.P
357359
\fBjog_incr jog_number|axis_letter <speed> <incr>\fR
358360
.RS
359361
With set, jog the indicated joint or axis by increment <incr> at the <speed>; sign of speed is direction.
360-
If TELEOP_ENABLE is NO, use joint_number;
361-
If TELEOP_ENABLE is YES, use axis_letter.
362+
If TELEOP_ENABLE is OFF, use joint_number;
363+
If TELEOP_ENABLE is ON, use axis_letter.
362364
.RE
363365
.P
364366
\fBfeed_override <percent>\fR
@@ -367,10 +369,11 @@ With get, any parameter is ignored and the current feed override is returned (as
367369
With set, sets the feed override as specified.
368370
.RE
369371
.P
370-
\fBspindle_override <percent>\fR
372+
\fBspindle_override <percent> {<spindle>}\fR
371373
.RS
372374
With get, any parameter is ignored and the current spindle override is returned (as a percentage of commanded speed).
373375
With set, sets the spindle override as specified.
376+
If "spindle" is omitted, spindle 0 is selected. If -1, all spindles are selected.
374377
.RE
375378
.P
376379
\fBabs_cmd_pos [{0|1|...}]\fR
@@ -570,7 +573,7 @@ With get, return the probe state - has the probe tripped since the last clear?
570573
With get, return the current value of the probe signal.
571574
.RE
572575
.P
573-
\fBprobe\fR
576+
\fBprobe <x> <y> <z>\fR
574577
.RS
575578
With set, move toward a certain location.
576579
If the probe is tripped on the way stop motion, record the position and raise the probe tripped flag.

0 commit comments

Comments
 (0)