aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/chelper
diff options
context:
space:
mode:
Diffstat (limited to 'klippy/chelper')
-rw-r--r--klippy/chelper/__init__.py3
-rw-r--r--klippy/chelper/itersolve.c7
-rw-r--r--klippy/chelper/itersolve.h5
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