Merge branch 'master' into adding-ams

This commit is contained in:
dherrada 2020-02-10 20:41:02 -05:00 committed by GitHub
commit 5666c4607c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -345,14 +345,14 @@ class Pyloton:
speed, cadence = self.read_s_and_c()
if self.heart_enabled:
hr_label = self._label_maker('{} bpm'.format(heart), 50, self.heart_y) # 75
hr_label = self._label_maker('{} bpm'.format(heart), 50, 75) # 75
if self.setup:
self.splash[3] = hr_label
else:
self.splash.append(hr_label)
if self.speed_enabled:
sp_label = self._label_maker('{} mph'.format(speed), 50, self.speed_y) # 120
sp_label = self._label_maker('{} mph'.format(speed), 50, 120) # 120
if self.setup:
self.splash[4] = sp_label
else:
@ -360,14 +360,15 @@ class Pyloton:
if self.cadence_enabled:
cad_label = self._label_maker('{} rpm'.format(cadence), 50, self.cad_y) # 165
cad_label = self._label_maker('{} rpm'.format(cadence), 50, 165) # 165
if self.setup:
self.splash[5] = cad_label
else:
self.splash.append(cad_label)
if self.ams_enabled:
ams_label = self._label_maker('{}'.format(self.ams.title), 50, self.ams_y, font=self.arial16) # 210
ams_label = self._label_maker('{}'.format(self.ams.title), 50, 210, font=self.arial16) # 210
if self.setup:
self.splash[6] = ams_label
else: