v8.8.5 bugfix release

M4k3Th1ngs · Oct 2, 2020 · c51cbc3 · c51cbc3
1 parent 6353d18
commit c51cbc3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,10 @@
-## 8.8.5 (Unreleased)
+## 8.8.5 (2020-10-01)
 
 ### Bugfixes
 
  - Fix Output Widgets not able to control outputs
+ - Fix ADS1256 ([#854](https://github.com/kizniche/mycodo/issues/854))
+ - Fix PID controllers not obeying minimum off duration ([#859](https://github.com/kizniche/mycodo/issues/859))
 
 
 ## 8.8.4 (2020-09-28)

diff --git a/README.rst b/README.rst
@@ -3,7 +3,7 @@ Mycodo
 
 Environmental Regulation System
 
-Latest version: 8.8.4
+Latest version: 8.8.5
 
 Mycodo is open source software for the Raspberry Pi that couples inputs and outputs in interesting ways to sense and manipulate the environment.
 

diff --git a/mycodo/config.py b/mycodo/config.py
@@ -13,7 +13,7 @@
 sys.path.append(os.path.abspath(os.path.dirname(__file__)))
 from config_translations import TRANSLATIONS
 
-MYCODO_VERSION = '8.8.4'
+MYCODO_VERSION = '8.8.5'
 ALEMBIC_VERSION = '0e150fb8020b'
 
 #  FORCE_UPGRADE_MASTER

diff --git a/mycodo/inputs/ads1256.py b/mycodo/inputs/ads1256.py
@@ -108,7 +108,7 @@ def __init__(self, input_dev, testing=False):
     def initialize_input(self):
         import glob
         from pipyadc_py3 import ADS1256
-        from ADS1256_definitions import POS_AIN0
+        from pipyadc_py3.ADS1256_definitions import POS_AIN0
         from pipyadc_py3.ADS1256_definitions import POS_AIN1
         from pipyadc_py3.ADS1256_definitions import POS_AIN2
         from pipyadc_py3.ADS1256_definitions import POS_AIN3

diff --git a/mycodo/outputs/base_output.py b/mycodo/outputs/base_output.py
@@ -229,14 +229,14 @@ def output_on_off(self,
         if state == 'on':
 
             # Checks if device is not on and is instructed to turn on
-            if (output_type == 'on_off' and
-                    'output_types' in self.OUTPUT_INFORMATION and
+            if (output_type in ['sec', None] and
+                    self.output_type in self.output_types['on_off'] and
                     not output_is_on):
 
                 # Check if time is greater than off_until to allow an output on.
                 # If the output is supposed to be off for a minimum duration and that amount
                 # of time has not passed, do not allow the output to be turned on.
-                off_until_datetime = self.output_off_until[self.unique_id][output_channel]
+                off_until_datetime = self.output_off_until[output_channel]
                 if off_until_datetime and off_until_datetime > current_time:
                     off_seconds = (off_until_datetime - current_time).total_seconds()
                     msg = "Output {id} CH{ch} ({name}) instructed to turn on, " \