Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mcu: Fix set_pwm() for hard pwm 

Must use self._pwm_max to calculate range for hard pwm updates.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-09-27 18:09:53 -04:00
parent 55e20f2c19
commit 4d0d219716
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
klippy/mcu.py
View File

@ -250,21 +250,23 @@ class MCU_pwm:
"schedule_soft_pwm_out oid=%c clock=%u on_ticks=%u off_ticks=%u", "schedule_soft_pwm_out oid=%c clock=%u on_ticks=%u off_ticks=%u",
cq=cmd_queue) cq=cmd_queue)
def set_pwm(self, print_time, value, cycle_time=None): def set_pwm(self, print_time, value, cycle_time=None):
clock = self._mcu.print_time_to_clock(print_time)
minclock = self._last_clock
self._last_clock = clock
if self._invert:
value = 1. - value
if self._hardware_pwm:
v = int(max(0., min(1., value)) * self._pwm_max + 0.5)
self._set_cmd.send([self._oid, clock, v],
minclock=minclock, reqclock=clock)
return
# Soft pwm update
if cycle_time is None: if cycle_time is None:
cycle_time = self._cycle_time cycle_time = self._cycle_time
cycle_ticks = self._mcu.seconds_to_clock(cycle_time) cycle_ticks = self._mcu.seconds_to_clock(cycle_time)
clock = self._mcu.print_time_to_clock(print_time)
if self._invert:
value = 1. - value
on_ticks = int(max(0., min(1., value)) * float(cycle_ticks) + 0.5) on_ticks = int(max(0., min(1., value)) * float(cycle_ticks) + 0.5)
if self._hardware_pwm: self._set_cmd.send([self._oid, clock, on_ticks, cycle_ticks - on_ticks],
self._set_cmd.send([self._oid, clock, on_ticks], minclock=minclock, reqclock=clock)
minclock=self._last_clock, reqclock=clock)
else:
off_ticks = cycle_ticks - on_ticks
self._set_cmd.send([self._oid, clock, on_ticks, off_ticks],
minclock=self._last_clock, reqclock=clock)
self._last_clock = clock
class MCU_adc: class MCU_adc:
def __init__(self, mcu, pin_params): def __init__(self, mcu, pin_params):