@@ -306,7 +306,7 @@ def speed_cadence_connect(self):
306306 return self .cyc_connections
307307
308308
309- def _compute_speed (self , values ):
309+ def _compute_speed (self , values , speed ):
310310 wheel_diff = values .last_wheel_event_time - self ._previous_wheel
311311 rev_diff = values .cumulative_wheel_revolutions - self ._previous_revolutions
312312
@@ -326,9 +326,10 @@ def _compute_speed(self, values):
326326 if self ._speed_failed >= 3 :
327327 speed = 0
328328 self ._previous_wheel = values .last_wheel_event_time
329+ return speed
329330
330331
331- def _compute_cadence (self , values ):
332+ def _compute_cadence (self , values , cadence ):
332333 crank_diff = values .last_crank_event_time - self ._previous_crank
333334 crank_rev_diff = values .cumulative_crank_revolutions - self ._previous_rev
334335
@@ -346,6 +347,7 @@ def _compute_cadence(self, values):
346347 if self ._cadence_failed >= 3 :
347348 cadence = 0
348349 self ._previous_crank = values .last_crank_event_time
350+ return cadence
349351
350352
351353 def read_s_and_c (self ):
@@ -372,13 +374,13 @@ def read_s_and_c(self):
372374 if not values .last_wheel_event_time :
373375 continue
374376
375- self ._compute_speed (values )
377+ speed = self ._compute_speed (values , speed )
376378
377379
378380 if not values .last_crank_event_time :
379381 continue
380382
381- self ._compute_cadence (values )
383+ cadence = self ._compute_cadence (values , cadence )
382384
383385 return speed , cadence
384386
0 commit comments