Merge remote-tracking branch 'origin/master'

Author: kizniche

mycodo/functions/bang_bang.py

@@ -109,7 +109,7 @@
 
 class CustomModule(AbstractFunction):
     """
-    Class to operate custom controller
+    Class to operate the bang-bang controller
     """
     def __init__(self, function, testing=False):
         super().__init__(function, testing=testing, name=__name__)
@@ -142,8 +142,7 @@ def __init__(self, function, testing=False):
             self.try_initialize()
 
     def initialize(self):
-        self.output_channel = self.get_output_channel_from_channel_id(
-            self.output_channel_id)
+        self.output_channel = self.get_output_channel_from_channel_id(self.output_channel_id)
 
         self.logger.info(
             "Bang-Bang controller started with options: "
@@ -175,34 +174,35 @@ def loop(self):
             self.measurement_measurement_id,
             max_age=self.measurement_max_age)
 
-        if not last_measurement:
-            self.logger.error("Could not acquire a measurement")
-            return
-
         output_state = self.control.output_state(self.output_device_id, self.output_channel)
 
-        self.logger.debug(
-            f"Input: {last_measurement[1]}, output: {output_state}, target: {self.setpoint}, hyst: {self.hysteresis}")
+        self.logger.debug(f"measurement: {last_measurement[1]}, output state: {output_state}, "
+                          f"setpoint: {self.setpoint}, hysteresis: {self.hysteresis}")
+
+        if not last_measurement or last_measurement[1] is None:
+            self.logger.error("No measurement available. Cannot operate without measurement. Turning output Off.")
+            self.control.output_off(self.output_device_id, output_channel=self.output_channel)
+            return
 
         if self.direction == 'raise':
-            if last_measurement[1] > (self.setpoint + self.hysteresis):
+            if last_measurement[1] > self.setpoint + self.hysteresis:
                 if output_state == 'on':
                     self.control.output_off(
                         self.output_device_id,
                         output_channel=self.output_channel)
             else:
-                if last_measurement[1] < (self.setpoint - self.hysteresis):
+                if last_measurement[1] < self.setpoint - self.hysteresis:
                     self.control.output_on(
                         self.output_device_id,
                         output_channel=self.output_channel)
         elif self.direction == 'lower':
-            if last_measurement[1] < (self.setpoint - self.hysteresis):
+            if last_measurement[1] < self.setpoint - self.hysteresis:
                 if output_state == 'on':
                     self.control.output_off(
                         self.output_device_id,
                         output_channel=self.output_channel)
             else:
-                if last_measurement[1] > (self.setpoint + self.hysteresis):
+                if last_measurement[1] > self.setpoint + self.hysteresis:
                     self.control.output_on(
                         self.output_device_id,
                         output_channel=self.output_channel)

mycodo/functions/bang_bang_on_off.py

@@ -196,54 +196,54 @@ def loop(self):
             self.measurement_measurement_id,
             max_age=self.measurement_max_age)
 
-        if not last_measurement:
-            self.logger.error("Could not acquire a measurement")
+        if not last_measurement or last_measurement[1] is None:
+            self.logger.error("No measurement available. Cannot operate without measurement. Turning output Off.")
+            self.control.output_off(self.output_device_id, output_channel=self.output_channel)
             return
 
         if self.direction == 'raise':
-            if last_measurement[1] > (self.setpoint + self.hysteresis):
+            if last_measurement[1] > self.setpoint + self.hysteresis:
                 self.logger.debug("Raise: Off")
                 self.control.output_off(
                     self.output_raise_device_id, output_channel=self.output_raise_channel)
-            elif last_measurement[1] < (self.setpoint - self.hysteresis):
+            elif last_measurement[1] < self.setpoint - self.hysteresis:
                 self.logger.debug("Raise: On")
                 self.control.output_on(
                     self.output_raise_device_id, output_channel=self.output_raise_channel)
 
         elif self.direction == 'lower':
-            if last_measurement[1] < (self.setpoint - self.hysteresis):
+            if last_measurement[1] < self.setpoint - self.hysteresis:
                 self.logger.debug("Lower: Off")
                 self.control.output_off(
                     self.output_lower_device_id, output_channel=self.output_lower_channel)
-            elif last_measurement[1] > (self.setpoint + self.hysteresis):
+            elif last_measurement[1] > self.setpoint + self.hysteresis:
                 self.logger.debug("Lower: On")
                 self.control.output_on(
                     self.output_lower_device_id, output_channel=self.output_lower_channel)
 
         elif self.direction == 'both':
-            if (self.setpoint - self.hysteresis) < last_measurement[1] < (self.setpoint + self.hysteresis):
+            if self.setpoint - self.hysteresis < last_measurement[1] < self.setpoint + self.hysteresis:
                 self.logger.debug("Lower: Off, Raise: Off")
                 self.control.output_off(
                     self.output_raise_device_id, output_channel=self.output_raise_channel)
                 self.control.output_off(
                     self.output_lower_device_id, output_channel=self.output_lower_channel)
 
-            elif last_measurement[1] > (self.setpoint + self.hysteresis):
+            elif last_measurement[1] > self.setpoint + self.hysteresis:
                 self.logger.debug("Lower: On, Raise: Off")
                 self.control.output_off(
                     self.output_raise_device_id, output_channel=self.output_raise_channel)
                 self.control.output_on(
                     self.output_lower_device_id, output_channel=self.output_lower_channel)
 
-            elif last_measurement[1] < (self.setpoint - self.hysteresis):
+            elif last_measurement[1] < self.setpoint - self.hysteresis:
                 self.logger.debug("Lower: Off, Raise: On")
                 self.control.output_off(
                     self.output_lower_device_id, output_channel=self.output_lower_channel)
                 self.control.output_on(
                     self.output_raise_device_id, output_channel=self.output_raise_channel)
         else:
-            self.logger.error(
-                "Unknown controller direction: '{}'".format(self.direction))
+            self.logger.error("Unknown controller direction: '{}'".format(self.direction))
 
         output_raise_state = self.control.output_state(
             self.output_raise_device_id, self.output_raise_channel)

mycodo/functions/bang_bang_pwm.py

@@ -213,17 +213,18 @@ def loop(self):
             self.measurement_measurement_id,
             max_age=self.measurement_max_age)
 
-        if not last_measurement[1]:
-            self.logger.error("Could not acquire a measurement")
-            return
-
         output_state = self.control.output_state(self.output_device_id, self.output_channel)
 
-        self.logger.debug(
-            f"Input: {last_measurement[1]}, output: {output_state}, target: {self.setpoint}, hyst: {self.hysteresis}")
+        self.logger.debug(f"measurement: {last_measurement[1]}, output state: {output_state}, "
+                          f"setpoint: {self.setpoint}, hysteresis: {self.hysteresis}")
+
+        if not last_measurement or last_measurement[1] is None:
+            self.logger.error("No measurement available. Cannot operate without measurement. Turning output Off.")
+            self.control.output_off(self.output_device_id, output_channel=self.output_channel)
+            return
 
         if self.direction == 'raise':
-            if last_measurement[1] < (self.setpoint - self.hysteresis):
+            if last_measurement[1] < self.setpoint - self.hysteresis:
                 self.control.output_on(
                     self.output_device_id,
                     output_type='pwm',
@@ -236,7 +237,7 @@ def loop(self):
                     amount=self.duty_cycle_maintain,
                     output_channel=self.output_channel)
         elif self.direction == 'lower':
-            if last_measurement[1] > (self.setpoint + self.hysteresis):
+            if last_measurement[1] > self.setpoint + self.hysteresis:
                 self.control.output_on(
                     self.output_device_id,
                     output_type='pwm',
@@ -249,13 +250,13 @@ def loop(self):
                     amount=self.duty_cycle_maintain,
                     output_channel=self.output_channel)
         elif self.direction == 'both':
-            if last_measurement[1] < (self.setpoint - self.hysteresis):
+            if last_measurement[1] < self.setpoint - self.hysteresis:
                 self.control.output_on(
                     self.output_device_id,
                     output_type='pwm',
                     amount=self.duty_cycle_increase,
                     output_channel=self.output_channel)
-            elif last_measurement[1] > (self.setpoint + self.hysteresis):
+            elif last_measurement[1] > self.setpoint + self.hysteresis:
                 self.control.output_on(
                     self.output_device_id,
                     output_type='pwm',