diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2017-08-25 23:21:55 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2017-08-26 18:27:21 -0400 |
| commit | 68ba3d51065f56947e4c2d7d76f46b7b8913f61a (patch) | |
| tree | 8487d0d2ff7901be6bd37b4f8526da6ddbe21cd4 /klippy/mcu.py | |
| parent | 80dc1dfcc16753802c80603f3f21b175dbe48608 (diff) | |
| download | kutter-68ba3d51065f56947e4c2d7d76f46b7b8913f61a.tar.gz kutter-68ba3d51065f56947e4c2d7d76f46b7b8913f61a.tar.xz kutter-68ba3d51065f56947e4c2d7d76f46b7b8913f61a.zip | |
mcu: Drop support for TICKS() expansion in mcu config commands
It's no longer necessary to use the TICKS() hack as the config
commands are now all generated after the mcu speed is known.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/mcu.py')
| -rw-r--r-- | klippy/mcu.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/klippy/mcu.py b/klippy/mcu.py index 1132ab42..b653379a 100644 --- a/klippy/mcu.py +++ b/klippy/mcu.py @@ -45,9 +45,9 @@ class MCU_stepper: min_stop_interval = max(0., self._min_stop_interval - max_error) self._mcu.add_config_cmd( "config_stepper oid=%d step_pin=%s dir_pin=%s" - " min_stop_interval=TICKS(%.9f) invert_step=%d" % ( + " min_stop_interval=%d invert_step=%d" % ( self._oid, self._step_pin, self._dir_pin, - min_stop_interval, self._invert_step)) + min_stop_interval * self._mcu_freq, self._invert_step)) step_cmd = self._mcu.lookup_command( "queue_step oid=%c interval=%u count=%hu add=%hi") dir_cmd = self._mcu.lookup_command( @@ -261,8 +261,9 @@ class MCU_digital_out: self._oid = self._mcu.create_oid() self._mcu.add_config_cmd( "config_digital_out oid=%d pin=%s default_value=%d" - " max_duration=TICKS(%f)" % ( - self._oid, self._pin, self._invert, self._max_duration)) + " max_duration=%d" % ( + self._oid, self._pin, self._invert, + self._max_duration * self._mcu_freq)) self._set_cmd = self._mcu.lookup_command( "schedule_digital_out oid=%c clock=%u value=%c") def set_digital(self, mcu_time, value): @@ -326,9 +327,9 @@ class MCU_pwm: self._oid = self._mcu.create_oid() self._mcu.add_config_cmd( "config_pwm_out oid=%d pin=%s cycle_ticks=%d default_value=%d" - " max_duration=TICKS(%f)" % ( + " max_duration=%d" % ( self._oid, self._pin, self._cycle_time, self._invert, - self._max_duration)) + self._max_duration * self._mcu_freq)) self._set_cmd = self._mcu.lookup_command( "schedule_pwm_out oid=%c clock=%u value=%hu") else: @@ -342,10 +343,10 @@ class MCU_pwm: return self._oid = self._mcu.create_oid() self._mcu.add_config_cmd( - "config_soft_pwm_out oid=%d pin=%s cycle_ticks=TICKS(%f)" - " default_value=%d max_duration=TICKS(%f)" % ( - self._oid, self._pin, self._cycle_time, self._invert, - self._max_duration)) + "config_soft_pwm_out oid=%d pin=%s cycle_ticks=%d" + " default_value=%d max_duration=%d" % ( + self._oid, self._pin, self._cycle_time * self._mcu_freq, + self._invert, self._max_duration * self._mcu_freq)) self._set_cmd = self._mcu.lookup_command( "schedule_soft_pwm_out oid=%c clock=%u value=%hu") def set_pwm(self, mcu_time, value): |