Merge pull request #282 from boblemaire/staged

Staged
boblemaire · Sep 22, 2020 · 86cd5c6 · 86cd5c6
2 parents 9ce61b1 + 0055946
commit 86cd5c6
Show file tree

Hide file tree

Showing 7 changed files with 385 additions and 288 deletions.
diff --git a/Docs/graphPlus.rst b/Docs/graphPlus.rst
@@ -26,7 +26,7 @@ We're plotting power for the current day
 14.2 kWh as of 5:42.
 
 .. image:: pics/graphPlus/graphPlus.png
-    :scale: 40 %
+    :scale: 40%
     :align: center
     :alt: Graph+ image
 
@@ -185,6 +185,30 @@ highlighted selection will become the new time period.
     :align: center
     :alt: Screen Selection
 
+Refresh/Freeze
+..............
+
+The |refreshImage| button will immediately refresh the current plot.
+If the time period of the current plot ends at the current time, 
+as in the "Today", "Last 10 minutes", etc., the display 
+will continue to refresh at the "interval" rate.  
+For example if the auto interval is 2 minutes, it will continually refresh every 2 minutes.
+You will know it is auto refresh mode because the Refresh button will change to
+|freezeImage|. If you click this button the auto refresh will stop and the button will
+revert to the manual |refreshImage| button.
+
+The Refresh/Freeze state is retained when saving and subsequently restoring graphs.
+This feature is useful when loading a saved graph as an embeded window where there are
+no controls, allowing an auto refresh graph can be displayed in a frame.
+
+.. |refreshImage| image:: pics/graphPlus/refreshButton.png
+    :scale: 80%
+    :alt: Refresh Button
+
+.. |freezeImage| image:: pics/graphPlus/freezeButton.png
+    :scale: 80%
+    :alt: Freeze Button
+
 Graph window
 -------------
 
@@ -404,6 +428,28 @@ Whenever a saved graph name is in the *Graph name:* box, the **Delete** key will
 available. To change a graph specification, simply load it, make the changes and save 
 it again.
 
+Running Directly with URL
+-------------------------
+
+Graph+ can be loaded directly from the IoTaWatt's web server using the URL
+
+http://iotawatt.local/graph2.htm [?graph=savedgraph [&embed] ]
+
+Substitute your local hostname/IP address if different.
+
+graph=
+......
+
+Optional query parameter to specify a saved graph that is to be loaded initially.
+
+embed
+......
+
+Causes Graph+ to display only the plot window of the selected graph. 
+If the saved graph has refresh enabled, the plot will refresh at the 
+active interval.
+
+
 Reset
 -----
 Sometimes you just want to start over with a clean slate like the app was just loaded.

diff --git a/Docs/pics/graphPlus/freezeButton.png b/Docs/pics/graphPlus/freezeButton.png
diff --git a/Docs/pics/graphPlus/refreshButton.png b/Docs/pics/graphPlus/refreshButton.png
diff --git a/Firmware/IotaWatt/IotaWatt.h b/Firmware/IotaWatt/IotaWatt.h
@@ -18,7 +18,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.   
 ***********************************************************************************/
-#define IOTAWATT_VERSION "02_05_10"
+#define IOTAWATT_VERSION "02_05_11"
 #define DEVICE_NAME "IotaWatt"
 
 #define PRINT(txt,val) Serial.print(txt); Serial.print(val);      // Quick debug aids

diff --git a/Firmware/IotaWatt/common.cpp b/Firmware/IotaWatt/common.cpp
@@ -104,6 +104,7 @@
  *   04/20/20 02_05_08 Nothing to see here, just a change to tables.txt to add AccuCTs forced version change
  *   05/03/20 02_05_09 Add VAR VARh to script and query, Disable datalog WDT during update download, rp in influx query
  *   09/14/20 02_05_10 Add WiFi to status query
+ *   09/21/20 02_05_11 Add Graph+ imbed
  * 
  *****************************************************************************************************/