diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-11-13 18:58:51 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-11-13 19:35:26 -0500 |
| commit | d39142139e3d7b914f230e78d18e051564e0fd3d (patch) | |
| tree | 69ede0920f801dc16f4b194dd3ec2528c7e00e50 /klippy/chelper | |
| parent | 18b0749163e87602fe47cc6b7627f72cdd1055ad (diff) | |
| download | kutter-d39142139e3d7b914f230e78d18e051564e0fd3d.tar.gz kutter-d39142139e3d7b914f230e78d18e051564e0fd3d.tar.xz kutter-d39142139e3d7b914f230e78d18e051564e0fd3d.zip | |
stepper: Remove set_commanded_position() call
Now that the only caller to set_commanded_position() is
set_position(), remove the set_commanded_position() method and pass
the set_position() call directly to the itersolve.c code.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/chelper')
| -rw-r--r-- | klippy/chelper/__init__.py | 3 | ||||
| -rw-r--r-- | klippy/chelper/itersolve.c | 7 | ||||
| -rw-r--r-- | klippy/chelper/itersolve.h | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/klippy/chelper/__init__.py b/klippy/chelper/__init__.py index ed759f69..1adce192 100644 --- a/klippy/chelper/__init__.py +++ b/klippy/chelper/__init__.py @@ -51,9 +51,8 @@ defs_itersolve = """ void itersolve_set_trapq(struct stepper_kinematics *sk, struct trapq *tq); void itersolve_set_stepcompress(struct stepper_kinematics *sk , struct stepcompress *sc, double step_dist); - double itersolve_calc_position_from_coord(struct stepper_kinematics *sk + void itersolve_set_position(struct stepper_kinematics *sk , double x, double y, double z); - void itersolve_set_commanded_pos(struct stepper_kinematics *sk, double pos); double itersolve_get_commanded_pos(struct stepper_kinematics *sk); """ diff --git a/klippy/chelper/itersolve.c b/klippy/chelper/itersolve.c index 8f7905c3..5eafd2a7 100644 --- a/klippy/chelper/itersolve.c +++ b/klippy/chelper/itersolve.c @@ -208,7 +208,7 @@ itersolve_set_stepcompress(struct stepper_kinematics *sk sk->step_dist = step_dist; } -double __visible +static double itersolve_calc_position_from_coord(struct stepper_kinematics *sk , double x, double y, double z) { @@ -221,9 +221,10 @@ itersolve_calc_position_from_coord(struct stepper_kinematics *sk } void __visible -itersolve_set_commanded_pos(struct stepper_kinematics *sk, double pos) +itersolve_set_position(struct stepper_kinematics *sk + , double x, double y, double z) { - sk->commanded_pos = pos; + sk->commanded_pos = itersolve_calc_position_from_coord(sk, x, y, z); } double __visible diff --git a/klippy/chelper/itersolve.h b/klippy/chelper/itersolve.h index 9f622424..1615fc32 100644 --- a/klippy/chelper/itersolve.h +++ b/klippy/chelper/itersolve.h @@ -30,9 +30,8 @@ double itersolve_check_active(struct stepper_kinematics *sk, double flush_time); void itersolve_set_trapq(struct stepper_kinematics *sk, struct trapq *tq); void itersolve_set_stepcompress(struct stepper_kinematics *sk , struct stepcompress *sc, double step_dist); -double itersolve_calc_position_from_coord(struct stepper_kinematics *sk - , double x, double y, double z); -void itersolve_set_commanded_pos(struct stepper_kinematics *sk, double pos); +void itersolve_set_position(struct stepper_kinematics *sk + , double x, double y, double z); double itersolve_get_commanded_pos(struct stepper_kinematics *sk); #endif // itersolve.h |