diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2017-01-09 23:50:13 -0500 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2017-01-10 00:13:28 -0500 |
commit | 93d3a6e1d1f298bdbe4d6dc5c88226c63f7c6c41 (patch) | |
tree | 2f945555e556895f72e0782f1557e0e00189975e /klippy/mcu.py | |
parent | eebaeeff96450c840db1a86f08877420d3dd5073 (diff) | |
download | kutter-93d3a6e1d1f298bdbe4d6dc5c88226c63f7c6c41.tar.gz kutter-93d3a6e1d1f298bdbe4d6dc5c88226c63f7c6c41.tar.xz kutter-93d3a6e1d1f298bdbe4d6dc5c88226c63f7c6c41.zip |
klippy: Warn the user on common errors due to old firmware
Check for msgproto.error and warn the user about version firmware
version mismatch. Raise msgproto.error when extracting firmware
constants.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/mcu.py')
-rw-r--r-- | klippy/mcu.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/klippy/mcu.py b/klippy/mcu.py index 5d8fb31f..eddc56a5 100644 --- a/klippy/mcu.py +++ b/klippy/mcu.py @@ -283,7 +283,7 @@ class MCU_adc: minval = 0 if maxval is None: maxval = 0xffff - mcu_adc_max = float(self._mcu.serial.msgparser.config["ADC_MAX"]) + mcu_adc_max = self._mcu.serial.msgparser.get_constant_float("ADC_MAX") max_adc = sample_count * mcu_adc_max self._min_sample = int(minval * max_adc) self._max_sample = min(0xffff, int(math.ceil(maxval * max_adc))) @@ -357,9 +357,9 @@ class MCU: self.serial.connect() self._printer.reactor.update_timer( self._timeout_timer, time.time() + self.COMM_TIMEOUT) - self._mcu_freq = float(self.serial.msgparser.config['CLOCK_FREQ']) - self._stats_sumsq_base = float( - self.serial.msgparser.config['STATS_SUMSQ_BASE']) + self._mcu_freq = self.serial.msgparser.get_constant_float('CLOCK_FREQ') + self._stats_sumsq_base = self.serial.msgparser.get_constant_float( + 'STATS_SUMSQ_BASE') self._emergency_stop_cmd = self.lookup_command("emergency_stop") self._clear_shutdown_cmd = self.lookup_command("clear_shutdown") self.register_msg(self.handle_shutdown, 'shutdown') @@ -424,7 +424,7 @@ class MCU: self._num_oids,)) # Resolve pin names - mcu = self.serial.msgparser.config['MCU'] + mcu = self.serial.msgparser.get_constant('MCU') pin_map = self._config.get('pin_map', None) if pin_map is None: pnames = pins.mcu_to_pins(mcu) |