Skip to content

Commit d728514

Browse files
author
Luca Toniolo
committed
renamed ini.jerk pins to ini.max_jerk pins following other conventions
1 parent cc76f6c commit d728514

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

docs/src/config/core-components.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,10 @@ S-curve trajectory planning pins (sampled continuously, can be changed at runtim
377377

378378
Per-axis jerk limit pins (where _L_ is x, y, z, a, b, c, u, v, or w):
379379

380-
* 'ini._L_.jerk' - (float, in) [AXIS__L_]MAX_JERK
380+
* 'ini._L_.max_jerk' - (float, in) [AXIS__L_]MAX_JERK
381381

382382
Per-joint jerk limit pins (where _N_ is the joint number 0-8):
383383

384-
* 'ini._N_.jerk' - (float, in) [JOINT__N_]MAX_JERK
384+
* 'ini._N_.max_jerk' - (float, in) [JOINT__N_]MAX_JERK
385385

386386
// vim: set syntax=asciidoc:

docs/src/man/man9/motion.9.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ Note: Pins marked *(DEBUG)* serve as debugging aids and are subject to change or
411411
**joint.**_N_**.jerk-cmd** OUT FLOAT *(DEBUG)*::
412412
The joint's commanded jerk (rate of change of acceleration).
413413
Only active when S-curve trajectory planning is enabled (INI file [TRAJ]PLANNER_TYPE=1 and [TRAJ]MAX_LINEAR_JERK>0).
414-
Jerk limits are set via INI file [JOINT_N]MAX_JERK or via the ini.N.jerk HAL pin.
414+
Jerk limits are set via INI file [JOINT_N]MAX_JERK or via the ini.N.max_jerk HAL pin.
415415
**joint.**_N_**.wheel-jog-active** OUT BIT *(DEBUG)*::
416416
+
417417

src/emc/ini/inihal.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ int ini_hal_init(int numjoints)
159159
MAKE_FLOAT_PIN_IDX(joint_max_limit,max_limit,HAL_IN,idx);
160160
MAKE_FLOAT_PIN_IDX(joint_max_velocity,max_velocity,HAL_IN,idx);
161161
MAKE_FLOAT_PIN_IDX(joint_max_acceleration,max_acceleration,HAL_IN,idx);
162-
MAKE_FLOAT_PIN_IDX(joint_jerk,jerk,HAL_IN,idx);
162+
MAKE_FLOAT_PIN_IDX(joint_jerk,max_jerk,HAL_IN,idx);
163163
MAKE_FLOAT_PIN_IDX(joint_home,home,HAL_IN,idx);
164164
MAKE_FLOAT_PIN_IDX(joint_home_offset,home_offset,HAL_IN,idx);
165165
MAKE_S32_PIN_IDX( joint_home_sequence,home_sequence,HAL_IN,idx);
@@ -170,7 +170,7 @@ int ini_hal_init(int numjoints)
170170
MAKE_FLOAT_PIN_LETTER(axis_max_limit,max_limit,HAL_IN,idx,letter);
171171
MAKE_FLOAT_PIN_LETTER(axis_max_velocity,max_velocity,HAL_IN,idx,letter);
172172
MAKE_FLOAT_PIN_LETTER(axis_max_acceleration,max_acceleration,HAL_IN,idx,letter);
173-
MAKE_FLOAT_PIN_LETTER(axis_jerk,jerk,HAL_IN,idx,letter);
173+
MAKE_FLOAT_PIN_LETTER(axis_jerk,max_jerk,HAL_IN,idx,letter);
174174
}
175175

176176
MAKE_FLOAT_PIN(traj_default_velocity,HAL_IN);

0 commit comments

Comments
 (0)