diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2018-04-20 21:41:13 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2018-04-20 22:24:36 -0400 |
| commit | d5dc6b785d27572cee09c087417fef0ff2836af9 (patch) | |
| tree | 80c90022f29ea237c57f005c63cdc36c5ec25cbd /klippy/extruder.py | |
| parent | 8f4f5da11c1a6a1a80e4b02c9775b9154cb688a2 (diff) | |
| download | kutter-d5dc6b785d27572cee09c087417fef0ff2836af9.tar.gz kutter-d5dc6b785d27572cee09c087417fef0ff2836af9.tar.xz kutter-d5dc6b785d27572cee09c087417fef0ff2836af9.zip | |
gcode: Add minval/maxval/above/below options to get_X parsers
Add value checking to gcode parameter parsing code.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extruder.py')
| -rw-r--r-- | klippy/extruder.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/klippy/extruder.py b/klippy/extruder.py index 59d8b36a..3e4934e8 100644 --- a/klippy/extruder.py +++ b/klippy/extruder.py @@ -228,16 +228,16 @@ class PrinterExtruder: def cmd_SET_PRESSURE_ADVANCE(self, params): self.printer.lookup_object('toolhead').get_last_move_time() gcode = self.printer.lookup_object('gcode') - if 'ADVANCE' in params: - v = gcode.get_float('ADVANCE', params) - self.pressure_advance = v if v > 0. else 0. - if 'ADVANCE_LOOKAHEAD_TIME' in params: - v = gcode.get_float('ADVANCE_LOOKAHEAD_TIME', params) - self.pressure_advance_lookahead_time = v if v > 0. else 0. + pressure_advance = gcode.get_float( + 'ADVANCE', params, self.pressure_advance, minval=0.) + pressure_advance_lookahead_time = gcode.get_float( + 'ADVANCE_LOOKAHEAD_TIME', params, + self.pressure_advance_lookahead_time, minval=0.) + self.pressure_advance = pressure_advance + self.pressure_advance_lookahead_time = pressure_advance_lookahead_time msg = ("pressure_advance: %.6f\n" - "pressure_advance_lookahead_time: %.6f\n" % ( - self.pressure_advance, - self.pressure_advance_lookahead_time)) + "pressure_advance_lookahead_time: %.6f" % ( + pressure_advance, pressure_advance_lookahead_time)) self.printer.set_rollover_info(self.name, "%s: %s" % (self.name, msg)) gcode.respond_info(msg) |