From 1d6210807a49f12ed6fe44625692260da42ea7ed Mon Sep 17 00:00:00 2001
From: dorfl68 <dorfl68@gmail.com>
Date: Wed, 20 Jan 2016 07:13:54 -0500
Subject: [PATCH] Support for indoor humidity

copied form other branch
---
 cron.php    |  5 ++-
 db-get.php  |  7 ++--
 dbsetup.php |  1 +
 graph.php   |  2 +-
 navbar.php  | 94 ++++++++++++++++++++++++++---------------------------
 5 files changed, 58 insertions(+), 51 deletions(-)

diff --git a/cron.php b/cron.php
index fe77d4e..290e6c7 100644
--- a/cron.php
+++ b/cron.php
@@ -22,7 +22,10 @@ for ($i = 0; $i <enumerate_thermostats(); $i++) { // all thermostats
                     die("Connection failed: " . mysqli_connect_error());
             }
 
-            $good_columns = array("coolLowerSetpLimit","coolNextPeriod","coolSetpoint","coolUpperSetptLimit","deviceID","dispTemperature","displayedUnits","heatLowerSetptLimit","heatNextPeriod","heatSetpoint","heatUpperSetptLimit","isInVacationHoldMode","schedCoolSp","schedHeatSp","scheduleCapable","statusCool","statusHeat","systemSwitchPosition","weatherHumidity","weatherPhrase","weatherTemperature");
+            $good_columns = array("coolLowerSetpLimit","coolNextPeriod","coolSetpoint","coolUpperSetptLimit","deviceID","dispTemperature","displayedUnits","heatLowerSetptLimit","heatNextPeriod","heatSetpoint","heatUpperSetptLimit","indoorHumidity","isInVacationHoldMode","schedCoolSp","schedHeatSp","scheduleCapable","statusCool","statusHeat","systemSwitchPosition","weatherHumidity","weatherPhrase","weatherTemperature");
+  
+  
+            $clean_data = array();
 
 
             $clean_data = array();
diff --git a/db-get.php b/db-get.php
index a7b6faa..3a78839 100644
--- a/db-get.php
+++ b/db-get.php
@@ -19,7 +19,7 @@ if(isset($_GET)){
         if(isset($_GET['id'])){
            $d = $device_array[$_GET['id']];
             
-            //$d="1488017";
+            
   
             header('Content-Type: application/json');
             
@@ -42,7 +42,10 @@ if(isset($_GET)){
                 case 'set_cool':
                     $sql = "SELECT UNIX_TIMESTAMP(date),coolSetpoint from stat";
                     break;
-                case 'humidity':
+              	case 'in_humidity':
+                    $sql = "SELECT UNIX_TIMESTAMP(date),indoorHumidity from stat";
+                    break;
+                case 'out_humidity':
                     $sql = "SELECT UNIX_TIMESTAMP(date),weatherHumidity from stat";
                     break;
                 default:
diff --git a/dbsetup.php b/dbsetup.php
index 343ba95..e59af42 100644
--- a/dbsetup.php
+++ b/dbsetup.php
@@ -23,6 +23,7 @@ $sql  = "CREATE TABLE IF NOT EXISTS `stat` (
 	`heatSetpoint` float NOT NULL,
 	`heatUpperSetptLimit` float NOT NULL,
 	`isInVacationHoldMode` tinyint(1) NOT NULL,
+    `indoorHumidity` int(11) NOT NULL,
 	`schedCoolSp` float NOT NULL,
 	`schedHeatSp` float NOT NULL,
 	`scheduleCapable` tinyint(1) NOT NULL,
diff --git a/graph.php b/graph.php
index e317f13..64b6bac 100644
--- a/graph.php
+++ b/graph.php
@@ -30,7 +30,7 @@
 								timezoneOffset: timezoneOffset
 						}
 				});
-				var names = ['inside','outside','set_heat','set_cool','humidity'];
+				var names = ['inside','outside','set_heat','set_cool','in_humidity','out_humidity'];
 						seriesOptions = [],
 						seriesCounter = 0,
 						createChart = function () {
diff --git a/navbar.php b/navbar.php
index 99d5953..09244cd 100644
--- a/navbar.php
+++ b/navbar.php
@@ -1,48 +1,48 @@
-

-  <!-- Fixed navbar -->

-    <nav class="navbar navbar-inverse">

-      <div class="container">

-        <div class="navbar-header">

-          <a class="navbar-brand" href="#">Household Temperature Tracker</a>

-        </div>

-        <div id="navbar" class="navbar-collapse collapse">

-          <ul class="nav navbar-nav">

-            <li class="active"><a href="index.php">Home</a></li>

-            <li class="dropdown">

-                <a class="dropdown-toggle" data-toggle="dropdown" href="#">Graph

-                <span class="caret"></span></a>

-                <ul class="dropdown-menu">

-                <?php

-                // create drop-down entries

-                for ($i = 0; $i <enumerate_thermostats(); $i++) {

-                    echo '<li><a href="graph.php?id=';

-                    echo $i;

-                    echo '">';

-                    echo $device_name_array[$i];

-                    echo '</a></li>';

-                    

-                }                    

-                ?> 

-                </ul>

-            </li>    <!--/graph -->

-            <li class="dropdown">

-                <a class="dropdown-toggle" data-toggle="dropdown" href="#">Delay

-                <span class="caret"></span></a>

-                <ul class="dropdown-menu">

-                <?php

-                // create drop-down entries

-                for ($i = 0; $i <enumerate_thermostats(); $i++) {

-                    echo '<li><a href="delay.php?id=';

-                    echo $i;

-                    echo '">';

-                    echo $device_name_array[$i];

-                    echo '</a></li>';

-                    

-                }                    

-                ?> 

-                </ul> 

-            </li>    <!--delay -->

-           </ul> <!-- navbar -->

-        </div><!--/.nav-collapse -->

-      </div>

+
+  <!-- Fixed navbar -->
+    <nav class="navbar navbar-inverse">
+      <div class="container">
+        <div class="navbar-header">
+          <a class="navbar-brand" href="#">Household Temperature Tracker</a>
+        </div>
+        <div id="navbar" class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <li class="active"><a href="index.php">Home</a></li>
+            <li class="dropdown">
+                <a class="dropdown-toggle" data-toggle="dropdown" href="#">Graph
+                <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                <?php
+                // create drop-down entries
+                for ($i = 0; $i <enumerate_thermostats(); $i++) {
+                    echo '<li><a href="graph.php?id=';
+                    echo $i;
+                    echo '">';
+                    echo $device_name_array[$i];
+                    echo '</a></li>';
+                    
+                }                    
+                ?> 
+                </ul>
+            </li>    <!--/graph -->
+            <li class="dropdown">
+                <a class="dropdown-toggle" data-toggle="dropdown" href="#">Delay
+                <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                <?php
+                // create drop-down entries
+                for ($i = 0; $i <enumerate_thermostats(); $i++) {
+                    echo '<li><a href="delay.php?id=';
+                    echo $i;
+                    echo '">';
+                    echo $device_name_array[$i];
+                    echo '</a></li>';
+                    
+                }                    
+                ?> 
+                </ul> 
+            </li>    <!--delay -->
+           </ul> <!-- navbar -->
+        </div><!--/.nav-collapse -->
+      </div>
     </nav>
\ No newline at end of file