3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mcu: Reset pwm and digital output pins to start values on a host restart 

This makes sure output pins are reset to their defaults when the host
is restarted and the micro-controller is not.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-07-16 15:33:48 -04:00
parent d204cc1fb7
commit 122fd88c6a
1 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
klippy/mcu.py
View File

@ -140,8 +140,8 @@ class MCU_digital_out:
self._is_static = is_static self._is_static = is_static
def _build_config(self): def _build_config(self):
if self._is_static: if self._is_static:
self._mcu.add_config_cmd("set_digital_out pin=%s value=%d" % ( self._mcu.add_config_cmd("set_digital_out pin=%s value=%d"
self._pin, self._start_value)) % (self._pin, self._start_value))
return return
self._oid = self._mcu.create_oid() self._oid = self._mcu.create_oid()
self._mcu.add_config_cmd( self._mcu.add_config_cmd(
@ -149,6 +149,9 @@ class MCU_digital_out:
" max_duration=%d" % ( " max_duration=%d" % (
self._oid, self._pin, self._start_value, self._shutdown_value, self._oid, self._pin, self._start_value, self._shutdown_value,
self._mcu.seconds_to_clock(self._max_duration))) self._mcu.seconds_to_clock(self._max_duration)))
self._mcu.add_config_cmd("update_digital_out oid=%d value=%d"
% (self._oid, self._start_value),
on_restart=True)
cmd_queue = self._mcu.alloc_command_queue() cmd_queue = self._mcu.alloc_command_queue()
self._set_cmd = self._mcu.lookup_command( self._set_cmd = self._mcu.lookup_command(
"schedule_digital_out oid=%c clock=%u value=%c", cq=cmd_queue) "schedule_digital_out oid=%c clock=%u value=%c", cq=cmd_queue)
@ -198,45 +201,50 @@ class MCU_pwm:
self._pwm_max = self._mcu.get_constant_float("PWM_MAX") self._pwm_max = self._mcu.get_constant_float("PWM_MAX")
if self._is_static: if self._is_static:
self._mcu.add_config_cmd( self._mcu.add_config_cmd(
"set_pwm_out pin=%s cycle_ticks=%d value=%d" % ( "set_pwm_out pin=%s cycle_ticks=%d value=%d"
self._pin, cycle_ticks, % (self._pin, cycle_ticks,
self._start_value * self._pwm_max)) self._start_value * self._pwm_max))
return return
self._oid = self._mcu.create_oid() self._oid = self._mcu.create_oid()
self._mcu.add_config_cmd( self._mcu.add_config_cmd(
"config_pwm_out oid=%d pin=%s cycle_ticks=%d value=%d" "config_pwm_out oid=%d pin=%s cycle_ticks=%d value=%d"
" default_value=%d max_duration=%d" % ( " default_value=%d max_duration=%d"
self._oid, self._pin, cycle_ticks, % (self._oid, self._pin, cycle_ticks,
self._start_value * self._pwm_max, self._start_value * self._pwm_max,
self._shutdown_value * self._pwm_max, self._shutdown_value * self._pwm_max,
self._mcu.seconds_to_clock(self._max_duration))) self._mcu.seconds_to_clock(self._max_duration)))
self._mcu.add_config_cmd(
"set_pwm_out pin=%s cycle_ticks=%d value=%d"
% (self._pin, cycle_ticks, self._start_value * self._pwm_max),
on_restart=True)
self._set_cmd = self._mcu.lookup_command( self._set_cmd = self._mcu.lookup_command(
"schedule_pwm_out oid=%c clock=%u value=%hu", cq=cmd_queue) "schedule_pwm_out oid=%c clock=%u value=%hu", cq=cmd_queue)
else: return
if self._shutdown_value not in [0., 1.]: # Software PWM
raise pins.error( if self._shutdown_value not in [0., 1.]:
"shutdown value must be 0.0 or 1.0 on soft pwm") raise pins.error("shutdown value must be 0.0 or 1.0 on soft pwm")
self._pwm_max = float(cycle_ticks) self._pwm_max = float(cycle_ticks)
if self._is_static: if self._is_static:
self._mcu.add_config_cmd("set_digital_out pin=%s value=%d" % ( self._mcu.add_config_cmd("set_digital_out pin=%s value=%d"
self._pin, self._start_value >= 0.5)) % (self._pin, self._start_value >= 0.5))
return return
self._oid = self._mcu.create_oid() self._oid = self._mcu.create_oid()
self._mcu.add_config_cmd( self._mcu.add_config_cmd(
"config_soft_pwm_out oid=%d pin=%s cycle_ticks=%d value=%d" "config_soft_pwm_out oid=%d pin=%s cycle_ticks=%d value=%d"
" default_value=%d max_duration=%d" % ( " default_value=%d max_duration=%d"
self._oid, self._pin, cycle_ticks, % (self._oid, self._pin, cycle_ticks,
self._start_value >= 1.0, self._shutdown_value >= 0.5, self._start_value >= 1.0, self._shutdown_value >= 0.5,
self._mcu.seconds_to_clock(self._max_duration))) self._mcu.seconds_to_clock(self._max_duration)))
if self._start_value not in [0., 1.]: curtime = self._mcu.get_printer().get_reactor().monotonic()
clock = self._mcu.get_query_slot(self._oid) printtime = self._mcu.estimated_print_time(curtime)
svalue = int(self._start_value * self._pwm_max + 0.5) self._last_clock = self._mcu.print_time_to_clock(printtime + 0.100)
self._mcu.add_config_cmd( svalue = int(self._start_value * self._pwm_max + 0.5)
"schedule_soft_pwm_out oid=%d clock=%d on_ticks=%d" % ( self._mcu.add_config_cmd(
self._oid, clock, svalue)) "schedule_soft_pwm_out oid=%d clock=%d on_ticks=%d"
self._set_cmd = self._mcu.lookup_command( % (self._oid, self._last_clock, svalue), is_init=True)
"schedule_soft_pwm_out oid=%c clock=%u on_ticks=%u", self._set_cmd = self._mcu.lookup_command(
cq=cmd_queue) "schedule_soft_pwm_out oid=%c clock=%u on_ticks=%u",
cq=cmd_queue)
def set_pwm(self, print_time, value): def set_pwm(self, print_time, value):
clock = self._mcu.print_time_to_clock(print_time) clock = self._mcu.print_time_to_clock(print_time)
if self._invert: if self._invert: