From 44c13ebe2496ce5ffc390b591fd69d626df614d6 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 18 May 2021 07:53:06 +0200 Subject: [PATCH] ugly code to convert to Garmin API payload --- rowers/garmin_stuff.py | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/rowers/garmin_stuff.py b/rowers/garmin_stuff.py index 5237f927..43335cc8 100644 --- a/rowers/garmin_stuff.py +++ b/rowers/garmin_stuff.py @@ -265,6 +265,16 @@ def step_to_garmin(step,order=0): targetValue = None except KeyError: targetValue = None + + if targetType is not None and targetType.lower() == "power": + targetType = 'POWER' + if targetValue is not None and targetValue <= 1000: + targetValueType = 'PERCENT' + else: + targetValueType = None + targetValue -= 1000 + + try: targetValueLow = step['dict']['targetValueLow'] if targetValueLow == 0 and targetValue is not None and targetValue > 0: @@ -272,6 +282,10 @@ def step_to_garmin(step,order=0): targetValue = None elif targetValueLow == 0: # pragma: no cover targetValueLow = None + elif targetValueLow <= 1000 and targetType == 'POWER': + targetValueType = 'PERCENT' + elif targetValueLow > 1000 and targetType == 'POWER': + targetValueLow -= 1000 except KeyError: targetValueLow = None try: @@ -279,26 +293,15 @@ def step_to_garmin(step,order=0): if targetValue is not None and targetValue > 0 and targetValueHigh == 0: targetValueHigh = targetValue targetValue = 0 + elif targetValueHigh <= 1000 and targetType == 'POWER': + targetValueType = 'PERCENT' + elif targetValueHigh > 1000 and targetType == 'POWER': + targetValueHigh -= 1000 elif targetValueHigh == 0: # pragma: no cover targetValueHigh = None except KeyError: targetValueHigh = None - if targetType is not None and targetType.lower() == "power": - targetType = 'POWER' - #if targetValue is not None and targetValue > 1000: - # targetValue -= 1000 - #if targetValueHigh is not None and targetValueHigh > 1000: # pragma: no cover - # targetValueHigh -= 1000 - #if targetValueLow is not None and targetValueLow > 1000: # pragma: no cover - # targetValueLow -= 1000 - - # temp - throw away target other than power - #if targetType is not None and targetType.lower() != 'power': - # targetType = None - # targetValue = None - # targetValueLow = None - # targetValueHigh = None if targetValue is None and targetValueLow is None and targetValueHigh is None: targetType = None