diff options
Diffstat (limited to 'klippy/extras/temperature_mcu.py')
| -rw-r--r-- | klippy/extras/temperature_mcu.py | 199 |
1 files changed, 122 insertions, 77 deletions
diff --git a/klippy/extras/temperature_mcu.py b/klippy/extras/temperature_mcu.py index 6f3386a4..1b4d983a 100644 --- a/klippy/extras/temperature_mcu.py +++ b/klippy/extras/temperature_mcu.py @@ -12,81 +12,101 @@ SAMPLE_COUNT = 8 REPORT_TIME = 0.300 RANGE_CHECK_COUNT = 4 + class PrinterTemperatureMCU: def __init__(self, config): self.printer = config.get_printer() self.base_temperature = self.slope = None self.temp1 = self.adc1 = self.temp2 = self.adc2 = None - self.min_temp = self.max_temp = 0. + self.min_temp = self.max_temp = 0.0 self.debug_read_cmd = None # Read config - mcu_name = config.get('sensor_mcu', 'mcu') - self.temp1 = config.getfloat('sensor_temperature1', None) + mcu_name = config.get("sensor_mcu", "mcu") + self.temp1 = config.getfloat("sensor_temperature1", None) if self.temp1 is not None: - self.adc1 = config.getfloat('sensor_adc1', minval=0., maxval=1.) - self.temp2 = config.getfloat('sensor_temperature2', None) + self.adc1 = config.getfloat("sensor_adc1", minval=0.0, maxval=1.0) + self.temp2 = config.getfloat("sensor_temperature2", None) if self.temp2 is not None: - self.adc2 = config.getfloat('sensor_adc2', minval=0., maxval=1.) + self.adc2 = config.getfloat("sensor_adc2", minval=0.0, maxval=1.0) # Setup ADC port - ppins = config.get_printer().lookup_object('pins') - self.mcu_adc = ppins.setup_pin('adc', - '%s:ADC_TEMPERATURE' % (mcu_name,)) + ppins = config.get_printer().lookup_object("pins") + self.mcu_adc = ppins.setup_pin("adc", "%s:ADC_TEMPERATURE" % (mcu_name,)) self.mcu_adc.setup_adc_callback(REPORT_TIME, self.adc_callback) self.diag_helper = adc_temperature.HelperTemperatureDiagnostics( - config, self.mcu_adc, self.calc_temp) + config, self.mcu_adc, self.calc_temp + ) # Register callbacks - if self.printer.get_start_args().get('debugoutput') is not None: + if self.printer.get_start_args().get("debugoutput") is not None: self.mcu_adc.setup_adc_sample(SAMPLE_TIME, SAMPLE_COUNT) return - self.printer.register_event_handler("klippy:mcu_identify", - self.handle_mcu_identify) + self.printer.register_event_handler( + "klippy:mcu_identify", self.handle_mcu_identify + ) + # Temperature interface def setup_callback(self, temperature_callback): self.temperature_callback = temperature_callback + def get_report_time_delta(self): return REPORT_TIME + def setup_minmax(self, min_temp, max_temp): self.min_temp = min_temp self.max_temp = max_temp + # Internal code def adc_callback(self, read_time, read_value): temp = self.base_temperature + read_value * self.slope self.temperature_callback(read_time + SAMPLE_COUNT * SAMPLE_TIME, temp) + def calc_temp(self, adc): return self.base_temperature + adc * self.slope + def calc_adc(self, temp): return (temp - self.base_temperature) / self.slope + def calc_base(self, temp, adc): return temp - adc * self.slope + def handle_mcu_identify(self): # Obtain mcu information mcu = self.mcu_adc.get_mcu() self.debug_read_cmd = mcu.lookup_query_command( - "debug_read order=%c addr=%u", "debug_result val=%u") + "debug_read order=%c addr=%u", "debug_result val=%u" + ) self.mcu_type = mcu.get_constants().get("MCU", "") # Run MCU specific configuration cfg_funcs = [ - ('rp2', self.config_rp2040), - ('sam3', self.config_sam3), ('sam4', self.config_sam4), - ('same70', self.config_same70), ('samd21', self.config_samd21), - ('samd51', self.config_samd51), ('same5', self.config_samd51), - ('stm32f1', self.config_stm32f1), ('stm32f2', self.config_stm32f2), - ('stm32f4', self.config_stm32f4), - ('stm32f042', self.config_stm32f0x2), - ('stm32f070', self.config_stm32f070), - ('stm32f072', self.config_stm32f0x2), - ('stm32g0', self.config_stm32g0), - ('stm32g4', self.config_stm32g0), - ('stm32l4', self.config_stm32g0), - ('stm32h723', self.config_stm32h723), - ('stm32h7', self.config_stm32h7), - ('', self.config_unknown)] + ("rp2", self.config_rp2040), + ("sam3", self.config_sam3), + ("sam4", self.config_sam4), + ("same70", self.config_same70), + ("samd21", self.config_samd21), + ("samd51", self.config_samd51), + ("same5", self.config_samd51), + ("stm32f1", self.config_stm32f1), + ("stm32f2", self.config_stm32f2), + ("stm32f4", self.config_stm32f4), + ("stm32f042", self.config_stm32f0x2), + ("stm32f070", self.config_stm32f070), + ("stm32f072", self.config_stm32f0x2), + ("stm32g0", self.config_stm32g0), + ("stm32g4", self.config_stm32g0), + ("stm32l4", self.config_stm32g0), + ("stm32h723", self.config_stm32h723), + ("stm32h7", self.config_stm32h7), + ("", self.config_unknown), + ] for name, func in cfg_funcs: if self.mcu_type.startswith(name): func() break - logging.info("mcu_temperature '%s' nominal base=%.6f slope=%.6f", - mcu.get_name(), self.base_temperature, self.slope) + logging.info( + "mcu_temperature '%s' nominal base=%.6f slope=%.6f", + mcu.get_name(), + self.base_temperature, + self.slope, + ) # Setup manual base/slope override if self.temp1 is not None: if self.temp2 is not None: @@ -95,81 +115,106 @@ class PrinterTemperatureMCU: # Setup min/max checks arange = [self.calc_adc(t) for t in [self.min_temp, self.max_temp]] min_adc, max_adc = sorted(arange) - self.mcu_adc.setup_adc_sample(SAMPLE_TIME, SAMPLE_COUNT, - minval=min_adc, maxval=max_adc, - range_check_count=RANGE_CHECK_COUNT) - self.diag_helper.setup_diag_minmax(self.min_temp, self.max_temp, - min_adc, max_adc) + self.mcu_adc.setup_adc_sample( + SAMPLE_TIME, + SAMPLE_COUNT, + minval=min_adc, + maxval=max_adc, + range_check_count=RANGE_CHECK_COUNT, + ) + self.diag_helper.setup_diag_minmax( + self.min_temp, self.max_temp, min_adc, max_adc + ) + def config_unknown(self): - raise self.printer.config_error("MCU temperature not supported on %s" - % (self.mcu_type,)) + raise self.printer.config_error( + "MCU temperature not supported on %s" % (self.mcu_type,) + ) + def config_rp2040(self): self.slope = 3.3 / -0.001721 - self.base_temperature = self.calc_base(27., 0.706 / 3.3) + self.base_temperature = self.calc_base(27.0, 0.706 / 3.3) + def config_sam3(self): - self.slope = 3.3 / .002650 - self.base_temperature = self.calc_base(27., 0.8 / 3.3) + self.slope = 3.3 / 0.002650 + self.base_temperature = self.calc_base(27.0, 0.8 / 3.3) + def config_sam4(self): - self.slope = 3.3 / .004700 - self.base_temperature = self.calc_base(27., 1.44 / 3.3) + self.slope = 3.3 / 0.004700 + self.base_temperature = self.calc_base(27.0, 1.44 / 3.3) + def config_same70(self): - self.slope = 3.3 / .002330 - self.base_temperature = self.calc_base(25., 0.72 / 3.3) + self.slope = 3.3 / 0.002330 + self.base_temperature = self.calc_base(25.0, 0.72 / 3.3) + def config_samd21(self, addr=0x00806030): def get1v(val): if val & 0x80: val = 0x100 - val - return 1. - val / 1000. + return 1.0 - val / 1000.0 + cal1 = self.read32(addr) cal2 = self.read32(addr + 4) - room_temp = ((cal1 >> 0) & 0xff) + ((cal1 >> 8) & 0xf) / 10. - hot_temp = ((cal1 >> 12) & 0xff) + ((cal1 >> 20) & 0xf) / 10. - room_1v = get1v((cal1 >> 24) & 0xff) - hot_1v = get1v((cal2 >> 0) & 0xff) - room_adc = ((cal2 >> 8) & 0xfff) * room_1v / (3.3 * 4095.) - hot_adc = ((cal2 >> 20) & 0xfff) * hot_1v / (3.3 * 4095.) + room_temp = ((cal1 >> 0) & 0xFF) + ((cal1 >> 8) & 0xF) / 10.0 + hot_temp = ((cal1 >> 12) & 0xFF) + ((cal1 >> 20) & 0xF) / 10.0 + room_1v = get1v((cal1 >> 24) & 0xFF) + hot_1v = get1v((cal2 >> 0) & 0xFF) + room_adc = ((cal2 >> 8) & 0xFFF) * room_1v / (3.3 * 4095.0) + hot_adc = ((cal2 >> 20) & 0xFFF) * hot_1v / (3.3 * 4095.0) self.slope = (hot_temp - room_temp) / (hot_adc - room_adc) self.base_temperature = self.calc_base(room_temp, room_adc) + def config_samd51(self): self.config_samd21(addr=0x00800100) + def config_stm32f1(self): - self.slope = 3.3 / -.004300 - self.base_temperature = self.calc_base(25., 1.43 / 3.3) + self.slope = 3.3 / -0.004300 + self.base_temperature = self.calc_base(25.0, 1.43 / 3.3) + def config_stm32f2(self): - self.slope = 3.3 / .002500 - self.base_temperature = self.calc_base(25., .76 / 3.3) + self.slope = 3.3 / 0.002500 + self.base_temperature = self.calc_base(25.0, 0.76 / 3.3) + def config_stm32f4(self, addr1=0x1FFF7A2C, addr2=0x1FFF7A2E): - cal_adc_30 = self.read16(addr1) / 4095. - cal_adc_110 = self.read16(addr2) / 4095. - self.slope = (110. - 30.) / (cal_adc_110 - cal_adc_30) - self.base_temperature = self.calc_base(30., cal_adc_30) + cal_adc_30 = self.read16(addr1) / 4095.0 + cal_adc_110 = self.read16(addr2) / 4095.0 + self.slope = (110.0 - 30.0) / (cal_adc_110 - cal_adc_30) + self.base_temperature = self.calc_base(30.0, cal_adc_30) + def config_stm32f0x2(self): self.config_stm32f4(addr1=0x1FFFF7B8, addr2=0x1FFFF7C2) + def config_stm32f070(self): - self.slope = 3.3 / -.004300 - cal_adc_30 = self.read16(0x1FFFF7B8) / 4095. - self.base_temperature = self.calc_base(30., cal_adc_30) + self.slope = 3.3 / -0.004300 + cal_adc_30 = self.read16(0x1FFFF7B8) / 4095.0 + self.base_temperature = self.calc_base(30.0, cal_adc_30) + def config_stm32g0(self): - cal_adc_30 = self.read16(0x1FFF75A8) * 3.0 / (3.3 * 4095.) - cal_adc_130 = self.read16(0x1FFF75CA) * 3.0 / (3.3 * 4095.) - self.slope = (130. - 30.) / (cal_adc_130 - cal_adc_30) - self.base_temperature = self.calc_base(30., cal_adc_30) + cal_adc_30 = self.read16(0x1FFF75A8) * 3.0 / (3.3 * 4095.0) + cal_adc_130 = self.read16(0x1FFF75CA) * 3.0 / (3.3 * 4095.0) + self.slope = (130.0 - 30.0) / (cal_adc_130 - cal_adc_30) + self.base_temperature = self.calc_base(30.0, cal_adc_30) + def config_stm32h723(self): - cal_adc_30 = self.read16(0x1FF1E820) / 4095. - cal_adc_130 = self.read16(0x1FF1E840) / 4095. - self.slope = (130. - 30.) / (cal_adc_130 - cal_adc_30) - self.base_temperature = self.calc_base(30., cal_adc_30) + cal_adc_30 = self.read16(0x1FF1E820) / 4095.0 + cal_adc_130 = self.read16(0x1FF1E840) / 4095.0 + self.slope = (130.0 - 30.0) / (cal_adc_130 - cal_adc_30) + self.base_temperature = self.calc_base(30.0, cal_adc_30) + def config_stm32h7(self): - cal_adc_30 = self.read16(0x1FF1E820) / 65535. - cal_adc_110 = self.read16(0x1FF1E840) / 65535. - self.slope = (110. - 30.) / (cal_adc_110 - cal_adc_30) - self.base_temperature = self.calc_base(30., cal_adc_30) + cal_adc_30 = self.read16(0x1FF1E820) / 65535.0 + cal_adc_110 = self.read16(0x1FF1E840) / 65535.0 + self.slope = (110.0 - 30.0) / (cal_adc_110 - cal_adc_30) + self.base_temperature = self.calc_base(30.0, cal_adc_30) + def read16(self, addr): params = self.debug_read_cmd.send([1, addr]) - return params['val'] + return params["val"] + def read32(self, addr): params = self.debug_read_cmd.send([2, addr]) - return params['val'] + return params["val"] + def load_config(config): pheaters = config.get_printer().load_object(config, "heaters") |