v5.6.2 Release

kizniche · Mar 4, 2018 · b74075c · b74075c
1 parent 83bc197
commit b74075c
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 5.6.2 (Unreleased)
+## 5.6.2 (2018-03-04)
 
 ### Features
 

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ## Environmental Regulation System
 
-### Latest version: 5.6.1 [![Build Status](https://travis-ci.org/kizniche/Mycodo.svg?branch=master)](https://travis-ci.org/kizniche/Mycodo) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/5b9c21d5680f4f7fb87df1cf32f71e80)](https://www.codacy.com/app/Mycodo/Mycodo?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=kizniche/Mycodo&amp;utm_campaign=Badge_Grade) [![DOI](https://zenodo.org/badge/30382555.svg)](https://zenodo.org/badge/latestdoi/30382555)
+### Latest version: 5.6.2 [![Build Status](https://travis-ci.org/kizniche/Mycodo.svg?branch=master)](https://travis-ci.org/kizniche/Mycodo) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/5b9c21d5680f4f7fb87df1cf32f71e80)](https://www.codacy.com/app/Mycodo/Mycodo?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=kizniche/Mycodo&amp;utm_campaign=Badge_Grade) [![DOI](https://zenodo.org/badge/30382555.svg)](https://zenodo.org/badge/latestdoi/30382555)
 
 #### [Mycodo Manual](https://github.com/kizniche/Mycodo/blob/master/mycodo-manual.md) ([PDF](https://github.com/kizniche/Mycodo/raw/master/mycodo-manual.pdf), [HTML](http://htmlpreview.github.io/?https://github.com/kizniche/Mycodo/blob/master/mycodo-manual.html), [TEXT](https://raw.githubusercontent.com/kizniche/Mycodo/master/mycodo-manual.txt))
 

diff --git a/mycodo-manual.html b/mycodo-manual.html
@@ -1269,14 +1269,6 @@ <h4 id="edge-conditional-statement-if-options">Edge Conditional Statement If Opt
 <td style="text-align: left;">Edge Detected</td>
 <td style="text-align: left;">The conditional will be triggered if a change in state is detected, either Rising when the state changes from LOW (0 volts) to HIGH (3.5 volts) or Falling when the state changes from HIGH (3.3 volts) to LOW (0 volts), or Both (Rising and Falling).</td>
 </tr>
-<tr class="even">
-<td style="text-align: left;">GPIO State</td>
-<td style="text-align: left;">The conditional will trigger if the GPIO state of HIGH (3.3 volts) or LOW (0 volts) is detected every Period.</td>
-</tr>
-<tr class="odd">
-<td style="text-align: left;">Period (seconds)</td>
-<td style="text-align: left;">If GPIO State is selected, how often to check the state of the GPIO.</td>
-</tr>
 </tbody>
 </table>
 <h4 id="conditional-statement-actions">Conditional Statement Actions</h4>
@@ -1309,26 +1301,38 @@ <h4 id="conditional-statement-actions">Conditional Statement Actions</h4>
 <td style="text-align: left;">Deactivate a particular PID controller.</td>
 </tr>
 <tr class="odd">
+<td style="text-align: left;">Pause PID</td>
+<td style="text-align: left;">Pause a particular PID controller.</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">Hold PID</td>
+<td style="text-align: left;">Hold a particular PID controller.</td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">Resume PID</td>
+<td style="text-align: left;">Resume a particular PID controller.</td>
+</tr>
+<tr class="even">
 <td style="text-align: left;">Email</td>
 <td style="text-align: left;">Send an email containing information about the current condition that triggered the conditional to send the email.</td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td style="text-align: left;">Flash LCD</td>
 <td style="text-align: left;">Have an LCD screen begin flashing in order to alert.</td>
 </tr>
-<tr class="odd">
+<tr class="even">
 <td style="text-align: left;">Photo</td>
 <td style="text-align: left;">Capture a photo with the selected camera.</td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td style="text-align: left;">Email Photo</td>
 <td style="text-align: left;">Capture a photo and email it as an attachment to the an email address.</td>
 </tr>
-<tr class="odd">
+<tr class="even">
 <td style="text-align: left;">Video</td>
 <td style="text-align: left;">Capture a video of a set duration with the selected camera.</td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td style="text-align: left;">Email Video</td>
 <td style="text-align: left;">Capture a video and email it as an attachment to the an email address.</td>
 </tr>

diff --git a/mycodo-manual.md b/mycodo-manual.md
@@ -519,8 +519,6 @@ Duration (seconds) | If "On" is selected, a optional duration (seconds) may be s
 Setting | Description
 -------------------- | ----------------------------------------------
 Edge Detected | The conditional will be triggered if a change in state is detected, either Rising when the state changes from LOW (0 volts) to HIGH (3.5 volts) or Falling when the state changes from HIGH (3.3 volts) to LOW (0 volts), or Both (Rising and Falling).
-GPIO State | The conditional will trigger if the GPIO state of HIGH (3.3 volts) or LOW (0 volts) is detected every Period.
-Period (seconds) | If GPIO State is selected, how often to check the state of the GPIO.
 
 #### Conditional Statement Actions
 
@@ -530,6 +528,9 @@ Output | Turn a output on, off, or on for a duration of time.
 Command | Execute a command in the linux shell (as user mycodo).
 Activate PID | Activate a particular PID controller.
 Deactivate PID | Deactivate a particular PID controller.
+Pause PID | Pause a particular PID controller.
+Hold PID | Hold a particular PID controller.
+Resume PID | Resume a particular PID controller.
 Email | Send an email containing information about the current condition that triggered the conditional to send the email.
 Flash LCD | Have an LCD screen begin flashing in order to alert.
 Photo | Capture a photo with the selected camera.

diff --git a/mycodo-manual.pdf b/mycodo-manual.pdf
diff --git a/mycodo-manual.txt b/mycodo-manual.txt
@@ -1089,13 +1089,6 @@ Edge Conditional Statement If Options
                         volts) or Falling when the state changes from
                         HIGH (3.3 volts) to LOW (0 volts), or Both
                         (Rising and Falling).
-
-  GPIO State            The conditional will trigger if the GPIO state
-                        of HIGH (3.3 volts) or LOW (0 volts) is
-                        detected every Period.
-
-  Period (seconds)      If GPIO State is selected, how often to check
-                        the state of the GPIO.
   ---------------------------------------------------------------------
 
 Conditional Statement Actions
@@ -1113,6 +1106,12 @@ Conditional Statement Actions
 
   Deactivate PID        Deactivate a particular PID controller.
 
+  Pause PID             Pause a particular PID controller.
+
+  Hold PID              Hold a particular PID controller.
+
+  Resume PID            Resume a particular PID controller.
+
   Email                 Send an email containing information about the
                         current condition that triggered the
                         conditional to send the email.

diff --git a/mycodo/config.py b/mycodo/config.py
@@ -9,7 +9,7 @@
 import os
 from flask_babel import lazy_gettext
 
-MYCODO_VERSION = '5.6.1'
+MYCODO_VERSION = '5.6.2'
 ALEMBIC_VERSION = 'ba31c9ef6eab'
 
 #  FORCE_UPGRADE_MASTER

diff --git a/mycodo/mycodo_flask/templates/manual.html b/mycodo/mycodo_flask/templates/manual.html
@@ -1269,14 +1269,6 @@ <h4 id="edge-conditional-statement-if-options">Edge Conditional Statement If Opt
 <td style="text-align: left;">Edge Detected</td>
 <td style="text-align: left;">The conditional will be triggered if a change in state is detected, either Rising when the state changes from LOW (0 volts) to HIGH (3.5 volts) or Falling when the state changes from HIGH (3.3 volts) to LOW (0 volts), or Both (Rising and Falling).</td>
 </tr>
-<tr class="even">
-<td style="text-align: left;">GPIO State</td>
-<td style="text-align: left;">The conditional will trigger if the GPIO state of HIGH (3.3 volts) or LOW (0 volts) is detected every Period.</td>
-</tr>
-<tr class="odd">
-<td style="text-align: left;">Period (seconds)</td>
-<td style="text-align: left;">If GPIO State is selected, how often to check the state of the GPIO.</td>
-</tr>
 </tbody>
 </table>
 <h4 id="conditional-statement-actions">Conditional Statement Actions</h4>
@@ -1309,26 +1301,38 @@ <h4 id="conditional-statement-actions">Conditional Statement Actions</h4>
 <td style="text-align: left;">Deactivate a particular PID controller.</td>
 </tr>
 <tr class="odd">
+<td style="text-align: left;">Pause PID</td>
+<td style="text-align: left;">Pause a particular PID controller.</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">Hold PID</td>
+<td style="text-align: left;">Hold a particular PID controller.</td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">Resume PID</td>
+<td style="text-align: left;">Resume a particular PID controller.</td>
+</tr>
+<tr class="even">
 <td style="text-align: left;">Email</td>
 <td style="text-align: left;">Send an email containing information about the current condition that triggered the conditional to send the email.</td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td style="text-align: left;">Flash LCD</td>
 <td style="text-align: left;">Have an LCD screen begin flashing in order to alert.</td>
 </tr>
-<tr class="odd">
+<tr class="even">
 <td style="text-align: left;">Photo</td>
 <td style="text-align: left;">Capture a photo with the selected camera.</td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td style="text-align: left;">Email Photo</td>
 <td style="text-align: left;">Capture a photo and email it as an attachment to the an email address.</td>
 </tr>
-<tr class="odd">
+<tr class="even">
 <td style="text-align: left;">Video</td>
 <td style="text-align: left;">Capture a video of a set duration with the selected camera.</td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td style="text-align: left;">Email Video</td>
 <td style="text-align: left;">Capture a video and email it as an attachment to the an email address.</td>
 </tr>