Skip to content

Commit feb8b23

Browse files
dngarrettdngarrett
committed
motion: rename EMCMOT_JOINT_ABORT
to EMCMOT_JOG_ABORT Clarify message name as it is used for joint numbers or axis numbers depending on mutually exclusive settings for emcCommand.joint, emcCommand.axis Note: residual fix for joints-axes incorporation
1 parent 256f48e commit feb8b23

8 files changed

Lines changed: 201 additions & 200 deletions

File tree

‎src/emc/motion-logger/motion-logger.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ int main(int argc, char* argv[]) {
306306
log_print("ABORT\n");
307307
break;
308308

309-
case EMCMOT_JOINT_ABORT:
310-
log_print("JOINT_ABORT joint=%d\n", c->joint);
309+
case EMCMOT_JOG_ABORT:
310+
log_print("JOG_ABORT joint=%d\n", c->joint);
311311
break;
312312

313313
case EMCMOT_ENABLE:

‎src/emc/motion/command.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ void emcmotCommandHandler(void *arg, long servo_period)
530530
emcmotStatus->paused = 0;
531531
break;
532532

533-
case EMCMOT_JOINT_ABORT:
533+
case EMCMOT_JOG_ABORT:
534534
/* abort one joint number or axis number */
535535
/* can happen at any time */
536536
if (GET_MOTION_TELEOP_FLAG()) {

‎src/emc/motion/motion.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ extern "C" {
156156
EMCMOT_JOG_INCR, /* incremental jog */
157157
EMCMOT_JOG_ABS, /* absolute jog */
158158

159-
EMCMOT_JOINT_ABORT, /* abort one joint */
159+
EMCMOT_JOG_ABORT, /* abort one joint num or axis num */
160160
EMCMOT_JOINT_ACTIVATE, /* make joint active */
161161
EMCMOT_JOINT_DEACTIVATE, /* make joint inactive */
162162
EMCMOT_JOINT_ENABLE_AMPLIFIER, /* enable amp outputs */

‎src/emc/task/taskintf.cc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -686,13 +686,14 @@ int emcJointHalt(int joint)
686686
return 0;
687687
}
688688

689-
int emcJointAbort(int joint)
689+
int emcJogAbort(int joint)
690690
{
691691
if (joint < 0 || joint >= EMCMOT_MAX_JOINTS) {
692692
return 0;
693693
}
694-
emcmotCommand.command = EMCMOT_JOINT_ABORT;
694+
emcmotCommand.command = EMCMOT_JOG_ABORT;
695695
emcmotCommand.joint = joint;
696+
emcmotCommand.axis = -1; //NA
696697

697698
return usrmotWriteEmcmotCommand(&emcmotCommand);
698699
}
@@ -881,7 +882,7 @@ int emcJogStop(int nr, int jjogmode)
881882
emcmotCommand.joint = -1; //NA
882883
emcmotCommand.axis = nr;
883884
}
884-
emcmotCommand.command = EMCMOT_JOINT_ABORT;
885+
emcmotCommand.command = EMCMOT_JOG_ABORT;
885886
return usrmotWriteEmcmotCommand(&emcmotCommand);
886887
}
887888

@@ -1806,7 +1807,7 @@ int emcMotionAbort()
18061807

18071808
r1 = -1;
18081809
for (t = 0; t < EMCMOT_MAX_JOINTS; t++) {
1809-
if (0 == emcJointAbort(t)) {
1810+
if (0 == emcJogAbort(t)) {
18101811
r1 = 0; // at least one is okay
18111812
}
18121813
}

‎tests/interp/m98m99/12-M99-endless-main-program/expected.motion-logger‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -134,22 +134,22 @@ SET_AXIS_VEL_LIMIT axis=8 vel=4
134134
SET_AXIS_ACC_LIMIT axis=8, acc=1000
135135
SET_AXIS_LOCKING_JOINT axis=8, locking_joint=-1
136136
SET_SPINDLE_PARAMS, 1.00e+99, 0.00e+00, -1.00e+99, 0.00e+00
137-
JOINT_ABORT joint=0
138-
JOINT_ABORT joint=1
139-
JOINT_ABORT joint=2
140-
JOINT_ABORT joint=3
141-
JOINT_ABORT joint=4
142-
JOINT_ABORT joint=5
143-
JOINT_ABORT joint=6
144-
JOINT_ABORT joint=7
145-
JOINT_ABORT joint=8
146-
JOINT_ABORT joint=9
147-
JOINT_ABORT joint=10
148-
JOINT_ABORT joint=11
149-
JOINT_ABORT joint=12
150-
JOINT_ABORT joint=13
151-
JOINT_ABORT joint=14
152-
JOINT_ABORT joint=15
137+
JOG_ABORT joint=0
138+
JOG_ABORT joint=1
139+
JOG_ABORT joint=2
140+
JOG_ABORT joint=3
141+
JOG_ABORT joint=4
142+
JOG_ABORT joint=5
143+
JOG_ABORT joint=6
144+
JOG_ABORT joint=7
145+
JOG_ABORT joint=8
146+
JOG_ABORT joint=9
147+
JOG_ABORT joint=10
148+
JOG_ABORT joint=11
149+
JOG_ABORT joint=12
150+
JOG_ABORT joint=13
151+
JOG_ABORT joint=14
152+
JOG_ABORT joint=15
153153
ABORT
154154
SPINDLE_OFF
155155
DISABLE_AMPLIFIER
@@ -164,22 +164,22 @@ DISABLE_AMPLIFIER
164164
DISABLE
165165
JOINT_UNHOME joint=-2
166166
FREE
167-
JOINT_ABORT joint=0
168-
JOINT_ABORT joint=1
169-
JOINT_ABORT joint=2
170-
JOINT_ABORT joint=3
171-
JOINT_ABORT joint=4
172-
JOINT_ABORT joint=5
173-
JOINT_ABORT joint=6
174-
JOINT_ABORT joint=7
175-
JOINT_ABORT joint=8
176-
JOINT_ABORT joint=9
177-
JOINT_ABORT joint=10
178-
JOINT_ABORT joint=11
179-
JOINT_ABORT joint=12
180-
JOINT_ABORT joint=13
181-
JOINT_ABORT joint=14
182-
JOINT_ABORT joint=15
167+
JOG_ABORT joint=0
168+
JOG_ABORT joint=1
169+
JOG_ABORT joint=2
170+
JOG_ABORT joint=3
171+
JOG_ABORT joint=4
172+
JOG_ABORT joint=5
173+
JOG_ABORT joint=6
174+
JOG_ABORT joint=7
175+
JOG_ABORT joint=8
176+
JOG_ABORT joint=9
177+
JOG_ABORT joint=10
178+
JOG_ABORT joint=11
179+
JOG_ABORT joint=12
180+
JOG_ABORT joint=13
181+
JOG_ABORT joint=14
182+
JOG_ABORT joint=15
183183
ABORT
184184
SPINDLE_OFF
185185
ENABLE
@@ -193,22 +193,22 @@ ENABLE_AMPLIFIER
193193
ENABLE_AMPLIFIER
194194
ENABLE_AMPLIFIER
195195
COORD
196-
JOINT_ABORT joint=0
197-
JOINT_ABORT joint=1
198-
JOINT_ABORT joint=2
199-
JOINT_ABORT joint=3
200-
JOINT_ABORT joint=4
201-
JOINT_ABORT joint=5
202-
JOINT_ABORT joint=6
203-
JOINT_ABORT joint=7
204-
JOINT_ABORT joint=8
205-
JOINT_ABORT joint=9
206-
JOINT_ABORT joint=10
207-
JOINT_ABORT joint=11
208-
JOINT_ABORT joint=12
209-
JOINT_ABORT joint=13
210-
JOINT_ABORT joint=14
211-
JOINT_ABORT joint=15
196+
JOG_ABORT joint=0
197+
JOG_ABORT joint=1
198+
JOG_ABORT joint=2
199+
JOG_ABORT joint=3
200+
JOG_ABORT joint=4
201+
JOG_ABORT joint=5
202+
JOG_ABORT joint=6
203+
JOG_ABORT joint=7
204+
JOG_ABORT joint=8
205+
JOG_ABORT joint=9
206+
JOG_ABORT joint=10
207+
JOG_ABORT joint=11
208+
JOG_ABORT joint=12
209+
JOG_ABORT joint=13
210+
JOG_ABORT joint=14
211+
JOG_ABORT joint=15
212212
ABORT
213213
SET_LINE x=1, y=0, z=0, a=0, b=0, c=0, u=0, v=0, w=0, id=19, motion_type=2, vel=0.666667, ini_maxvel=4, acc=1000, turn=-1
214214
SET_LINE x=1, y=-4, z=0, a=0, b=0, c=0, u=0, v=0, w=0, id=26, motion_type=2, vel=0.666667, ini_maxvel=4, acc=1000, turn=-1

‎tests/motion-logger/basic/expected.builtin-startup.in‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -134,22 +134,22 @@ SET_AXIS_VEL_LIMIT axis=8 vel=4
134134
SET_AXIS_ACC_LIMIT axis=8, acc=1000
135135
SET_AXIS_LOCKING_JOINT axis=8, locking_joint=-1
136136
SET_SPINDLE_PARAMS, 1.00e+99, 0.00e+00, -1.00e+99, 0.00e+00
137-
JOINT_ABORT joint=0
138-
JOINT_ABORT joint=1
139-
JOINT_ABORT joint=2
140-
JOINT_ABORT joint=3
141-
JOINT_ABORT joint=4
142-
JOINT_ABORT joint=5
143-
JOINT_ABORT joint=6
144-
JOINT_ABORT joint=7
145-
JOINT_ABORT joint=8
146-
JOINT_ABORT joint=9
147-
JOINT_ABORT joint=10
148-
JOINT_ABORT joint=11
149-
JOINT_ABORT joint=12
150-
JOINT_ABORT joint=13
151-
JOINT_ABORT joint=14
152-
JOINT_ABORT joint=15
137+
JOG_ABORT joint=0
138+
JOG_ABORT joint=1
139+
JOG_ABORT joint=2
140+
JOG_ABORT joint=3
141+
JOG_ABORT joint=4
142+
JOG_ABORT joint=5
143+
JOG_ABORT joint=6
144+
JOG_ABORT joint=7
145+
JOG_ABORT joint=8
146+
JOG_ABORT joint=9
147+
JOG_ABORT joint=10
148+
JOG_ABORT joint=11
149+
JOG_ABORT joint=12
150+
JOG_ABORT joint=13
151+
JOG_ABORT joint=14
152+
JOG_ABORT joint=15
153153
ABORT
154154
SPINDLE_OFF
155155
DISABLE_AMPLIFIER
@@ -164,22 +164,22 @@ DISABLE_AMPLIFIER
164164
DISABLE
165165
JOINT_UNHOME joint=-2
166166
FREE
167-
JOINT_ABORT joint=0
168-
JOINT_ABORT joint=1
169-
JOINT_ABORT joint=2
170-
JOINT_ABORT joint=3
171-
JOINT_ABORT joint=4
172-
JOINT_ABORT joint=5
173-
JOINT_ABORT joint=6
174-
JOINT_ABORT joint=7
175-
JOINT_ABORT joint=8
176-
JOINT_ABORT joint=9
177-
JOINT_ABORT joint=10
178-
JOINT_ABORT joint=11
179-
JOINT_ABORT joint=12
180-
JOINT_ABORT joint=13
181-
JOINT_ABORT joint=14
182-
JOINT_ABORT joint=15
167+
JOG_ABORT joint=0
168+
JOG_ABORT joint=1
169+
JOG_ABORT joint=2
170+
JOG_ABORT joint=3
171+
JOG_ABORT joint=4
172+
JOG_ABORT joint=5
173+
JOG_ABORT joint=6
174+
JOG_ABORT joint=7
175+
JOG_ABORT joint=8
176+
JOG_ABORT joint=9
177+
JOG_ABORT joint=10
178+
JOG_ABORT joint=11
179+
JOG_ABORT joint=12
180+
JOG_ABORT joint=13
181+
JOG_ABORT joint=14
182+
JOG_ABORT joint=15
183183
ABORT
184184
SPINDLE_OFF
185185

@@ -205,20 +205,20 @@ ENABLE_AMPLIFIER
205205
#
206206

207207
COORD
208-
JOINT_ABORT joint=0
209-
JOINT_ABORT joint=1
210-
JOINT_ABORT joint=2
211-
JOINT_ABORT joint=3
212-
JOINT_ABORT joint=4
213-
JOINT_ABORT joint=5
214-
JOINT_ABORT joint=6
215-
JOINT_ABORT joint=7
216-
JOINT_ABORT joint=8
217-
JOINT_ABORT joint=9
218-
JOINT_ABORT joint=10
219-
JOINT_ABORT joint=11
220-
JOINT_ABORT joint=12
221-
JOINT_ABORT joint=13
222-
JOINT_ABORT joint=14
223-
JOINT_ABORT joint=15
208+
JOG_ABORT joint=0
209+
JOG_ABORT joint=1
210+
JOG_ABORT joint=2
211+
JOG_ABORT joint=3
212+
JOG_ABORT joint=4
213+
JOG_ABORT joint=5
214+
JOG_ABORT joint=6
215+
JOG_ABORT joint=7
216+
JOG_ABORT joint=8
217+
JOG_ABORT joint=9
218+
JOG_ABORT joint=10
219+
JOG_ABORT joint=11
220+
JOG_ABORT joint=12
221+
JOG_ABORT joint=13
222+
JOG_ABORT joint=14
223+
JOG_ABORT joint=15
224224
ABORT

0 commit comments

Comments
 (0)