diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2020-12-10 11:27:37 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-12-10 12:06:26 -0500 |
| commit | f3c5be0f003696966a299c936a8a7c05bf4465ff (patch) | |
| tree | 743f86876f21cabb5cf4c46c217d6b64238bbb37 /klippy/mcu.py | |
| parent | 41a41881f7dd85446a625b6470ce09fdfae5cae8 (diff) | |
| download | kutter-f3c5be0f003696966a299c936a8a7c05bf4465ff.tar.gz kutter-f3c5be0f003696966a299c936a8a7c05bf4465ff.tar.xz kutter-f3c5be0f003696966a299c936a8a7c05bf4465ff.zip | |
gpiocmds: Merge digital output and soft pwm code
The digital output commands implement a subset of the software pwm
commands. Change the host code to just use the software pwm commands
and simplify the micro-controller code.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/mcu.py')
| -rw-r--r-- | klippy/mcu.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/klippy/mcu.py b/klippy/mcu.py index d9470c25..6e8149a6 100644 --- a/klippy/mcu.py +++ b/klippy/mcu.py @@ -155,7 +155,7 @@ class MCU_digital_out: on_restart=True) cmd_queue = self._mcu.alloc_command_queue() self._set_cmd = self._mcu.lookup_command( - "queue_digital_out oid=%c clock=%u value=%c", cq=cmd_queue) + "queue_digital_out oid=%c clock=%u on_ticks=%u", cq=cmd_queue) def set_digital(self, print_time, value): clock = self._mcu.print_time_to_clock(print_time) self._set_cmd.send([self._oid, clock, (not not value) ^ self._invert], @@ -235,23 +235,23 @@ class MCU_pwm: self._mcu.request_move_queue_slot() self._oid = self._mcu.create_oid() self._mcu.add_config_cmd( - "config_soft_pwm_out oid=%d pin=%s value=%d" + "config_digital_out oid=%d pin=%s value=%d" " default_value=%d max_duration=%d" % (self._oid, self._pin, self._start_value >= 1.0, self._shutdown_value >= 0.5, self._mcu.seconds_to_clock(self._max_duration))) self._mcu.add_config_cmd( - "set_soft_pwm_cycle_ticks oid=%d cycle_ticks=%d" + "set_digital_out_pwm_cycle oid=%d cycle_ticks=%d" % (self._oid, cycle_ticks)) self._last_cycle_ticks = cycle_ticks svalue = int(self._start_value * cycle_ticks + 0.5) self._mcu.add_config_cmd( - "queue_soft_pwm_out oid=%d clock=%d on_ticks=%d" + "queue_digital_out oid=%d clock=%d on_ticks=%d" % (self._oid, self._last_clock, svalue), is_init=True) self._set_cmd = self._mcu.lookup_command( - "queue_soft_pwm_out oid=%c clock=%u on_ticks=%u", cq=cmd_queue) + "queue_digital_out oid=%c clock=%u on_ticks=%u", cq=cmd_queue) self._set_cycle_ticks = self._mcu.lookup_command( - "set_soft_pwm_cycle_ticks oid=%c cycle_ticks=%u", cq=cmd_queue) + "set_digital_out_pwm_cycle oid=%c cycle_ticks=%u", cq=cmd_queue) def set_pwm(self, print_time, value, cycle_time=None): clock = self._mcu.print_time_to_clock(print_time) minclock = self._last_clock |