@@ -306,7 +306,7 @@ def speed_cadence_connect(self):
306
306
return self .cyc_connections
307
307
308
308
309
- def _compute_speed (self , values ):
309
+ def _compute_speed (self , values , speed ):
310
310
wheel_diff = values .last_wheel_event_time - self ._previous_wheel
311
311
rev_diff = values .cumulative_wheel_revolutions - self ._previous_revolutions
312
312
@@ -326,9 +326,10 @@ def _compute_speed(self, values):
326
326
if self ._speed_failed >= 3 :
327
327
speed = 0
328
328
self ._previous_wheel = values .last_wheel_event_time
329
+ return speed
329
330
330
331
331
- def _compute_cadence (self , values ):
332
+ def _compute_cadence (self , values , cadence ):
332
333
crank_diff = values .last_crank_event_time - self ._previous_crank
333
334
crank_rev_diff = values .cumulative_crank_revolutions - self ._previous_rev
334
335
@@ -346,6 +347,7 @@ def _compute_cadence(self, values):
346
347
if self ._cadence_failed >= 3 :
347
348
cadence = 0
348
349
self ._previous_crank = values .last_crank_event_time
350
+ return cadence
349
351
350
352
351
353
def read_s_and_c (self ):
@@ -372,13 +374,13 @@ def read_s_and_c(self):
372
374
if not values .last_wheel_event_time :
373
375
continue
374
376
375
- self ._compute_speed (values )
377
+ speed = self ._compute_speed (values , speed )
376
378
377
379
378
380
if not values .last_crank_event_time :
379
381
continue
380
382
381
- self ._compute_cadence (values )
383
+ cadence = self ._compute_cadence (values , cadence )
382
384
383
385
return speed , cadence
384
386
0 commit comments