diff options
| author | Florian Heilmann <Florian.Heilmann@gmx.net> | 2019-11-21 17:09:39 +0100 |
|---|---|---|
| committer | KevinOConnor <kevin@koconnor.net> | 2019-11-21 11:09:39 -0500 |
| commit | b0a158c27118468beaecc185fb55fd457c764f5d (patch) | |
| tree | df9cb8ec395e00e0d15979001cf3939fb1383a58 /klippy/extras | |
| parent | 9055e9f9b575efd3948651f2f11d1f671cef00ea (diff) | |
| download | kutter-b0a158c27118468beaecc185fb55fd457c764f5d.tar.gz kutter-b0a158c27118468beaecc185fb55fd457c764f5d.tar.xz kutter-b0a158c27118468beaecc185fb55fd457c764f5d.zip | |
tmc2130: Do not error if run current below hold current (#2190)
Signed-off-by: Florian Heilmann <Florian.Heilmann@gmx.net>
Diffstat (limited to 'klippy/extras')
| -rw-r--r-- | klippy/extras/tmc2130.py | 8 | ||||
| -rw-r--r-- | klippy/extras/tmc5160.py | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/klippy/extras/tmc2130.py b/klippy/extras/tmc2130.py index e6a27a43..9e676a5c 100644 --- a/klippy/extras/tmc2130.py +++ b/klippy/extras/tmc2130.py @@ -123,11 +123,13 @@ class TMCCurrentHelper: def _calc_current(self, run_current, hold_current): vsense = False irun = self._calc_current_bits(run_current, vsense) - ihold = self._calc_current_bits(hold_current, vsense) + ihold = self._calc_current_bits(min(hold_current, run_current), + vsense) if irun < 16 and ihold < 16: vsense = True irun = self._calc_current_bits(run_current, vsense) - ihold = self._calc_current_bits(hold_current, vsense) + ihold = self._calc_current_bits(min(hold_current, run_current), + vsense) return vsense, irun, ihold def _calc_current_from_field(self, field_name): bits = self.fields.get_field(field_name) @@ -147,7 +149,7 @@ class TMCCurrentHelper: hold_current = self._calc_current_from_field("IHOLD") if 'CURRENT' in params: run_current = gcode.get_float( - 'CURRENT', params, minval=hold_current, maxval=MAX_CURRENT) + 'CURRENT', params, minval=0., maxval=MAX_CURRENT) else: run_current = self._calc_current_from_field("IRUN") if 'HOLDCURRENT' not in params and 'CURRENT' not in params: diff --git a/klippy/extras/tmc5160.py b/klippy/extras/tmc5160.py index 9102f4b8..fa76c1b2 100644 --- a/klippy/extras/tmc5160.py +++ b/klippy/extras/tmc5160.py @@ -250,7 +250,7 @@ class TMC5160CurrentHelper: return max(0, min(31, cs)) def _calc_current(self, run_current, hold_current): irun = self._calc_current_bits(run_current) - ihold = self._calc_current_bits(hold_current) + ihold = self._calc_current_bits(min(hold_current, run_current)) return irun, ihold def _calc_current_from_field(self, field_name): bits = self.fields.get_field(field_name) @@ -267,7 +267,7 @@ class TMC5160CurrentHelper: hold_current = self._calc_current_from_field("IHOLD") if 'CURRENT' in params: run_current = gcode.get_float( - 'CURRENT', params, minval=hold_current, maxval=MAX_CURRENT) + 'CURRENT', params, minval=0., maxval=MAX_CURRENT) else: run_current = self._calc_current_from_field("IRUN") if 'HOLDCURRENT' not in params and 'CURRENT' not in params: |