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

mcu: Setup static values via setup_start_value() call 

Add an "is_static" setting to setup_start_value() and remove the
setup_static() method.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-01-08 19:51:35 -05:00
parent 45e65580f7
commit ed80b92b59
2 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
klippy/chipmisc.py
View File

@ -15,7 +15,7 @@ class PrinterStaticDigitalOut:
pin_list = [pin.strip() for pin in config.get('pins').split(',')] pin_list = [pin.strip() for pin in config.get('pins').split(',')]
for pin_desc in pin_list: for pin_desc in pin_list:
mcu_pin = pins.setup_pin(printer, 'digital_out', pin_desc) mcu_pin = pins.setup_pin(printer, 'digital_out', pin_desc)
mcu_pin.setup_static() mcu_pin.setup_start_value(1, 1, True)
PIN_MIN_TIME = 0.100 PIN_MIN_TIME = 0.100
@ -39,14 +39,15 @@ class PrinterPin:
self.mcu_pin.setup_max_duration(0.) self.mcu_pin.setup_max_duration(0.)
self.last_value_time = 0. self.last_value_time = 0.
self.last_value = config.getfloat( self.last_value = config.getfloat(
'value', 0., minval=0., maxval=self.scale) 'value', 0., minval=0., maxval=self.scale) / self.scale
self.is_static = config.section.startswith('static_') self.is_static = config.section.startswith('static_')
if self.is_static: if self.is_static:
self.mcu_pin.setup_static_pwm(self.last_value / self.scale)
else:
self.mcu_pin.setup_start_value( self.mcu_pin.setup_start_value(
self.last_value, config.getfloat('shutdown_value', 0., self.last_value, self.last_value, True)
minval=0., maxval=self.scale)) else:
shutdown_value = config.getfloat(
'shutdown_value', 0., minval=0., maxval=self.scale) / self.scale
self.mcu_pin.setup_start_value(self.last_value, shutdown_value)
self.gcode = printer.objects['gcode'] self.gcode = printer.objects['gcode']
self.gcode.register_command("SET_PIN", self.cmd_SET_PIN, self.gcode.register_command("SET_PIN", self.cmd_SET_PIN,
desc=self.cmd_SET_PIN_help) desc=self.cmd_SET_PIN_help)
@ -60,13 +61,13 @@ class PrinterPin:
return pin.cmd_SET_PIN(params) return pin.cmd_SET_PIN(params)
if self.is_static: if self.is_static:
raise self.gcode.error("Static pin can not be changed at run-time") raise self.gcode.error("Static pin can not be changed at run-time")
value = self.gcode.get_float('VALUE', params) value = self.gcode.get_float('VALUE', params) / self.scale
if value == self.last_value: if value == self.last_value:
return return
print_time = self.printer.objects['toolhead'].get_last_move_time() print_time = self.printer.objects['toolhead'].get_last_move_time()
print_time = max(print_time, self.last_value_time + PIN_MIN_TIME) print_time = max(print_time, self.last_value_time + PIN_MIN_TIME)
if self.is_pwm: if self.is_pwm:
if value < 0. or value > self.scale: if value < 0. or value > 1.:
raise self.gcode.error("Invalid pin value") raise self.gcode.error("Invalid pin value")
self.mcu_pin.set_pwm(print_time, value) self.mcu_pin.set_pwm(print_time, value)
else: else:
@ -230,11 +231,11 @@ class pca9685_pwm:
self._oid = None self._oid = None
self._invert = pin_params['invert'] self._invert = pin_params['invert']
self._start_value = self._shutdown_value = float(self._invert) self._start_value = self._shutdown_value = float(self._invert)
self._is_static = False
self._last_clock = 0 self._last_clock = 0
self._pwm_max = 0. self._pwm_max = 0.
self._cmd_queue = self._mcu.alloc_command_queue() self._cmd_queue = self._mcu.alloc_command_queue()
self._set_cmd = None self._set_cmd = None
self._static_value = None
def get_mcu(self): def get_mcu(self):
return self._mcu return self._mcu
def setup_max_duration(self, max_duration): def setup_max_duration(self, max_duration):
@ -244,28 +245,26 @@ class pca9685_pwm:
def setup_hard_pwm(self, hard_cycle_ticks): def setup_hard_pwm(self, hard_cycle_ticks):
if hard_cycle_ticks: if hard_cycle_ticks:
raise pins.error("pca9685 does not support hard_pwm parameter") raise pins.error("pca9685 does not support hard_pwm parameter")
def setup_static_pwm(self, value): def setup_start_value(self, start_value, shutdown_value, is_static=False):
if self._invert: if is_static and start_value != shutdown_value:
value = 1. - value raise pins.error("Static pin can not have shutdown value")
self._static_value = max(0., min(1., value))
def setup_start_value(self, start_value, shutdown_value):
if self._invert: if self._invert:
start_value = 1. - start_value start_value = 1. - start_value
shutdown_value = 1. - shutdown_value shutdown_value = 1. - shutdown_value
self._start_value = max(0., min(1., start_value)) self._start_value = max(0., min(1., start_value))
self._shutdown_value = max(0., min(1., shutdown_value)) self._shutdown_value = max(0., min(1., shutdown_value))
self._is_static = is_static
if self._shutdown_value: if self._shutdown_value:
self._replicape.note_enable_on_shutdown() self._replicape.note_enable_on_shutdown()
def build_config(self): def build_config(self):
self._pwm_max = self._mcu.get_constant_float("PCA9685_MAX") self._pwm_max = self._mcu.get_constant_float("PCA9685_MAX")
cycle_ticks = self._mcu.seconds_to_clock(self._cycle_time) cycle_ticks = self._mcu.seconds_to_clock(self._cycle_time)
if self._static_value is not None: if self._is_static:
value = int(self._static_value * self._pwm_max + 0.5)
self._mcu.add_config_cmd( self._mcu.add_config_cmd(
"set_pca9685_out bus=%d addr=%d channel=%d" "set_pca9685_out bus=%d addr=%d channel=%d"
" cycle_ticks=%d value=%d" % ( " cycle_ticks=%d value=%d" % (
self._bus, self._address, self._channel, self._bus, self._address, self._channel,
cycle_ticks, value)) cycle_ticks, 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(

45
klippy/mcu.py
View File

@ -230,7 +230,7 @@ class MCU_digital_out:
self._pin = pin_params['pin'] self._pin = pin_params['pin']
self._invert = pin_params['invert'] self._invert = pin_params['invert']
self._start_value = self._shutdown_value = self._invert self._start_value = self._shutdown_value = self._invert
self._static_value = None self._is_static = False
self._max_duration = 2. self._max_duration = 2.
self._last_clock = 0 self._last_clock = 0
self._cmd_queue = mcu.alloc_command_queue() self._cmd_queue = mcu.alloc_command_queue()
@ -239,21 +239,22 @@ class MCU_digital_out:
return self._mcu return self._mcu
def setup_max_duration(self, max_duration): def setup_max_duration(self, max_duration):
self._max_duration = max_duration self._max_duration = max_duration
def setup_static(self): def setup_start_value(self, start_value, shutdown_value, is_static=False):
self._static_value = not self._invert if is_static and start_value != shutdown_value:
def setup_start_value(self, start_value, shutdown_value): raise pins.error("Static pin can not have shutdown value")
self._start_value = (not not start_value) ^ self._invert self._start_value = (not not start_value) ^ self._invert
self._shutdown_value = (not not shutdown_value) ^ self._invert self._shutdown_value = (not not shutdown_value) ^ self._invert
self._is_static = is_static
def build_config(self): def build_config(self):
if self._static_value is not None: 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._static_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(
"config_digital_out oid=%d pin=%s value=%d default_value=%d" "config_digital_out oid=%d pin=%s value=%d default_value=%d"
" max_duration=%d" % ( " max_duration=%d" % (
self._oid, self._pin, self._invert, 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._set_cmd = self._mcu.lookup_command( self._set_cmd = self._mcu.lookup_command(
"schedule_digital_out oid=%c clock=%u value=%c") "schedule_digital_out oid=%c clock=%u value=%c")
@ -277,7 +278,7 @@ class MCU_pwm:
self._pin = pin_params['pin'] self._pin = pin_params['pin']
self._invert = pin_params['invert'] self._invert = pin_params['invert']
self._start_value = self._shutdown_value = float(self._invert) self._start_value = self._shutdown_value = float(self._invert)
self._static_value = None self._is_static = False
self._last_clock = 0 self._last_clock = 0
self._pwm_max = 0. self._pwm_max = 0.
self._cmd_queue = mcu.alloc_command_queue() self._cmd_queue = mcu.alloc_command_queue()
@ -294,24 +295,23 @@ class MCU_pwm:
return return
self._cycle_time = hard_cycle_ticks self._cycle_time = hard_cycle_ticks
self._hard_pwm = True self._hard_pwm = True
def setup_static_pwm(self, value): def setup_start_value(self, start_value, shutdown_value, is_static=False):
if self._invert: if is_static and start_value != shutdown_value:
value = 1. - value raise pins.error("Static pin can not have shutdown value")
self._static_value = max(0., min(1., value))
def setup_start_value(self, start_value, shutdown_value):
if self._invert: if self._invert:
start_value = 1. - start_value start_value = 1. - start_value
shutdown_value = 1. - shutdown_value shutdown_value = 1. - shutdown_value
self._start_value = max(0., min(1., start_value)) self._start_value = max(0., min(1., start_value))
self._shutdown_value = max(0., min(1., shutdown_value)) self._shutdown_value = max(0., min(1., shutdown_value))
self._is_static = is_static
def build_config(self): def build_config(self):
if self._hard_pwm: if self._hard_pwm:
self._pwm_max = self._mcu.get_constant_float("PWM_MAX") self._pwm_max = self._mcu.get_constant_float("PWM_MAX")
if self._static_value is not None: if self._is_static:
value = int(self._static_value * self._pwm_max + 0.5)
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, self._cycle_time, value)) self._pin, self._cycle_time,
self._static_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(
@ -324,18 +324,15 @@ class MCU_pwm:
self._set_cmd = self._mcu.lookup_command( self._set_cmd = self._mcu.lookup_command(
"schedule_pwm_out oid=%c clock=%u value=%hu") "schedule_pwm_out oid=%c clock=%u value=%hu")
else: else:
self._pwm_max = self._mcu.get_constant_float("SOFT_PWM_MAX")
if self._static_value is not None:
if self._static_value not in [0., 1.]:
raise pins.error(
"static value must be 0.0 or 1.0 on soft pwm")
self._mcu.add_config_cmd("set_digital_out pin=%s value=%d" % (
self._pin, self._static_value >= 0.5))
return
if (self._start_value not in [0., 1.] if (self._start_value not in [0., 1.]
or self._shutdown_value not in [0., 1.]): or self._shutdown_value not in [0., 1.]):
raise pins.error( raise pins.error(
"start and shutdown values must be 0.0 or 1.0 on soft pwm") "start and shutdown values must be 0.0 or 1.0 on soft pwm")
self._pwm_max = self._mcu.get_constant_float("SOFT_PWM_MAX")
if self._is_static:
self._mcu.add_config_cmd("set_digital_out pin=%s value=%d" % (
self._pin, self._start_value >= 0.5))
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"