Merge pull request adafruit#1280 from kattni/move-timing-inline

Remove function, move time math inline.

Author: kattni

QT_Py_Timer/QT_Py_Activity_Timer.py

@@ -42,16 +42,6 @@
 RED_ALERT = "Red Alert"
 
 
-def minutes_to_seconds(minutes):
-    """
-    Convert minutes to seconds for use with time.monotonic().
-
-    :param minutes: The number of minutes. Can be a float, e.g. 0.5 for half a minute.
-    """
-    seconds = minutes * 60
-    return seconds
-
-
 def gradient(color_one, color_two, blend_weight):
     """
     Blend between two colors with a given ratio.
@@ -131,9 +121,9 @@ def timing():
     state_from_orientation()
 
     if current_orientation == 'up':
-        activity_duration = minutes_to_seconds(activity_one)
+        activity_duration = activity_one * 60  # Converts seconds to minutes.
     elif current_orientation == 'down':
-        activity_duration = minutes_to_seconds(activity_two)
+        activity_duration = activity_two * 60  # Converts seconds to minutes.
     else:
         return
 
@@ -155,7 +145,7 @@ def timing_complete():
 
     elapsed = time.monotonic() - state_changed
 
-    if elapsed >= minutes_to_seconds(red_alert_delay):
+    if elapsed >= (red_alert_delay * 60):  # Converts seconds to minutes.
         set_state(RED_ALERT)
         return
 

QT_Py_Timer/QT_Py_Hydration_Reminder.py

@@ -41,16 +41,6 @@
 RED_ALERT = "Red Alert"
 
 
-def minutes_to_seconds(minutes):
-    """
-    Convert minutes to seconds for use with time.monotonic().
-
-    :param minutes: The number of minutes. Can be a float, e.g. 0.5 for half a minute.
-    """
-    seconds = minutes * 60
-    return seconds
-
-
 def gradient(color_one, color_two, blend_weight):
     """
     Blend between two colors with a given ratio.
@@ -129,7 +119,7 @@ def timing():
     """The timing active state."""
     state_from_orientation()
 
-    activity_duration = minutes_to_seconds(hydration_reminder)
+    activity_duration = hydration_reminder * 60  # Converts minutes to seconds.
 
     elapsed = time.monotonic() - state_changed
 
@@ -149,7 +139,7 @@ def timing_complete():
 
     elapsed = time.monotonic() - state_changed
 
-    if elapsed >= minutes_to_seconds(red_alert_delay):
+    if elapsed >= (red_alert_delay * 60):  # Converts minutes to seconds.
         set_state(RED_ALERT)
         return