logging

errkk · Apr 10, 2016 · 67e0f77 · 67e0f77
1 parent 6505799
commit 67e0f77
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/wsp_control/models.py b/wsp_control/models.py
@@ -57,7 +57,7 @@ def tick(self, data):
         td = td.total_seconds()
         flow = LITERS_PER_REV / td
 
-        logger.info('Flowmeter tick: {0:.2f}s'.format(flow))
+        logger.info('Flowmeter tick: {0:.2f}l/s'.format(flow))
 
 
 class Pump:
@@ -71,6 +71,9 @@ def __init__(self):
     def is_on(self):
         return bool(GPIO.input(self.PIN))
 
+    def __repr__(self):
+        return ('OFF', 'ON')[self.is_on()]
+
     def turn_on(self):
         if self.is_on():
             return False

diff --git a/wsp_control/runwsp.py b/wsp_control/runwsp.py
@@ -48,7 +48,7 @@ def minutely():
     datalogger.tick(temp_in, temp_out, None, temp_air)
 
     uplift = temp_out - temp_in
-    logger.info('Uplift: {0}'.format(uplift))
+    logger.info('Checking Uplift: {0} Pump is {1}'.format(uplift, p))
     if uplift >= UPLIFT_THRESHOLD:
         p.turn_on()
     else:
@@ -62,6 +62,7 @@ def ten_minutely():
     # Turn the pump on to flush water through the system.
     # 10 seconds later, the ten_secondly function will decide
     # whether the pump should stay on
+    logger.info('Flush')
     p.turn_on()