Skip to content

Commit 992c3cc

Browse files
committed
fix pylint
1 parent 4587a56 commit 992c3cc

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

src/tmc_driver/_tmc_stepperdriver.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,7 @@ def run_to_position_steps(self, steps, movement_abs_rel:MovementAbsRel = None) -
257257
"""motioncontrol wrapper"""
258258
if self.tmc_mc is not None:
259259
return self.tmc_mc.run_to_position_steps(steps, movement_abs_rel)
260-
else:
261-
return None
260+
return None
262261

263262

264263
def run_to_position_fullsteps(self, steps, movement_abs_rel:MovementAbsRel = None) -> StopMode:

src/tmc_driver/tmc_2209.py

+6-14
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
"""
99

1010
import statistics
11-
import types
1211
from .tmc_220x import *
1312
from ._tmc_stallguard import StallGuard
14-
from ._tmc_gpio_board import GpioPUD
1513
from .reg._tmc2209_reg import *
1614

1715

@@ -89,7 +87,7 @@ def __del__(self):
8987

9088
# Tmc2209 methods
9189
# ----------------------------
92-
def do_homing(self, diag_pin, revolutions = 10, threshold = None, speed_rpm = None) -> bool:
90+
def do_homing(self, diag_pin, revolutions = 10, threshold = 100, speed_rpm = None) -> bool:
9391
"""homes the motor in the given direction using stallguard.
9492
this method is using vactual to move the motor and an interrupt on the DIAG pin
9593
@@ -107,10 +105,7 @@ def do_homing(self, diag_pin, revolutions = 10, threshold = None, speed_rpm = No
107105
self.tmc_logger.log("do_homing only works with VActual register control via COM", Loglevel.ERROR)
108106
return False
109107

110-
if threshold is not None:
111-
self._sg_threshold = threshold
112-
113-
self.tmc_logger.log(f"Stallguard threshold: {self._sg_threshold}", Loglevel.DEBUG)
108+
self.tmc_logger.log(f"Stallguard threshold: {threshold}", Loglevel.DEBUG)
114109

115110
if speed_rpm is None:
116111
speed_rpm = tmc_math.steps_to_rps(self.tmc_mc.max_speed_homing, self.tmc_mc.steps_per_rev)*60
@@ -125,7 +120,7 @@ def do_homing(self, diag_pin, revolutions = 10, threshold = None, speed_rpm = No
125120
mc_homing.tmc_com = self.tmc_com
126121
mc_homing.tmc_logger = self.tmc_logger
127122

128-
self.set_stallguard_callback(diag_pin, self._sg_threshold, mc_homing.stop,
123+
self.set_stallguard_callback(diag_pin, threshold, mc_homing.stop,
129124
0.5*tmc_math.rps_to_steps(speed_rpm/60, self.tmc_mc.steps_per_rev))
130125

131126
homing_failed = mc_homing.set_vactual_rpm(speed_rpm, revolutions=revolutions)
@@ -142,7 +137,7 @@ def do_homing(self, diag_pin, revolutions = 10, threshold = None, speed_rpm = No
142137

143138

144139

145-
def do_homing2(self, revolutions, threshold=None):
140+
def do_homing2(self, revolutions = 10, threshold = 100):
146141
"""homes the motor in the given direction using stallguard
147142
old function, uses STEP/DIR to move the motor and pulls the StallGuard result
148143
from the interface
@@ -156,13 +151,10 @@ def do_homing2(self, revolutions, threshold=None):
156151
return
157152
sgresults = []
158153

159-
if threshold is not None:
160-
self._sg_threshold = threshold
161-
162154
self.tmc_logger.log("---", Loglevel.INFO)
163155
self.tmc_logger.log("homing", Loglevel.INFO)
164156

165-
self.tmc_logger.log(f"Stallguard threshold: {self._sg_threshold}", Loglevel.DEBUG)
157+
self.tmc_logger.log(f"Stallguard threshold: {threshold}", Loglevel.DEBUG)
166158

167159
self.tmc_mc.set_direction_pin(revolutions > 0)
168160

@@ -192,7 +184,7 @@ def do_homing2(self, revolutions, threshold=None):
192184
sgresults.append(sgresult)
193185
if len(sgresults)>20:
194186
sgresult_average = statistics.mean(sgresults[-6:])
195-
if sgresult_average < self._sg_threshold:
187+
if sgresult_average < threshold:
196188
break
197189

198190
if step_counter<self.tmc_mc.steps_per_rev:

0 commit comments

Comments
 (0)