From 9a4f57b5bbef6be03f744253bdef9cb7a72f8d40 Mon Sep 17 00:00:00 2001
From: dorfl68 <dorfl68@gmail.com>
Date: Tue, 19 Jan 2016 22:29:04 -0500
Subject: [PATCH 1/2] Support for many thermostats

Uses the device ID to support several thermostats. Pretty simple - only
setup is now an array of devices, now a single device. However, many
changes follow...
---
 calc_delay.php                              |  94 +++++++++
 cron.php                                    |  62 +++---
 db-get.php                                  | 102 ++++++----
 dbsetup.php                                 |   2 +-
 delay.html                                  | 123 -----------
 delay.php                                   | 207 ++++++++++++-------
 getdata.php                                 |  57 ++++++
 graph.html => graph.php                     | 215 ++++++++++----------
 index.html                                  |  50 -----
 index.php                                   |   3 +
 navbar.php                                  |  48 +++++
 settings/globals.php.example                |  12 +-
 thermostats/honeywell/logininfo.php.example |  12 +-
 thermostats/honeywell/scrape.php            |  50 ++---
 14 files changed, 568 insertions(+), 469 deletions(-)
 create mode 100644 calc_delay.php
 delete mode 100644 delay.html
 create mode 100644 getdata.php
 rename graph.html => graph.php (73%)
 delete mode 100644 index.html
 create mode 100644 index.php
 create mode 100644 navbar.php

diff --git a/calc_delay.php b/calc_delay.php
new file mode 100644
index 0000000..abbfad8
--- /dev/null
+++ b/calc_delay.php
@@ -0,0 +1,94 @@
+<?php
+include('settings/globals.php');
+
+if(in_array(THERMOSTAT_TYPE,$valid_thermostats)){
+    require('thermostats/'.THERMOSTAT_TYPE.'/scrape.php');    
+    require('thermostats/'.THERMOSTAT_TYPE.'/logininfo.php');  
+} else{
+    die("Invalid THERMOSTAT_TYPE set in settings/globals.php");
+}
+
+$d = $device_array[$_GET['id']]; // device ID we are calculating this for
+
+include('settings/globals.php');
+header('Content-Type: application/json');
+$conn = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
+// Check connection
+if (!$conn) {
+	die("Connection failed: " . mysqli_connect_error());
+}
+
+$sql = 'SELECT UNIX_TIMESTAMP(date),dispTemperature,weatherTemperature,heatSetPoint,systemSwitchPosition from stat WHERE deviceID=' . $d; // note filter for ID
+
+$result = $conn->query($sql);
+if (!$result) {
+printf("Errormessage: %s\n", $conn->error);
+}
+$rows = array();
+while($r = mysqli_fetch_assoc($result)) {
+	$r['date'] = $r['UNIX_TIMESTAMP(date)'];
+	unset($r['UNIX_TIMESTAMP(date)']);
+	$rows[] = $r;
+}
+// print("<pre>");
+// print_r($rows);
+$startTime = -1;
+$startTemp = NULL;
+$startSetPoint = NULL;
+$targetSetPoint = NULL;
+
+$heat_up = NULL;
+$heat_down = NULL;
+$cool_up = NULL;
+$cool_down = NULL;
+$type = NULL;
+
+for($i = 1; $i < count($rows); $i++){
+	$now = $rows[$i];
+	$last= $rows[$i-1];
+// 	echo $startTime;
+// print_r($now);
+	if($startTime == -1){
+// 		echo "no start <br/>";
+		if($now['heatSetPoint'] <> $last['heatSetPoint']){
+			//Down!
+// 			echo "down<br/>";
+			$startTime = $now['date'];
+			$startTemp = $now['dispTemperature'];
+			$startSetPoint = $last['heatSetPoint'];	
+			$targetSetPoint = $now['heatSetPoint'];
+			if($now['heatSetPoint'] > $last['heatSetPoint']){
+				$type = "up";
+			} else {
+				$type = "down";
+			}
+		} 
+	} else{
+		//looking for end
+// 		echo "yes start <br/>";
+		if($now['dispTemperature'] == $targetSetPoint || $now['heatSetPoint'] <> $targetSetPoint){
+			$changeTime = ($now['date']-$startTime)/60;
+			$changeTemp = abs($startTemp - $now['dispTemperature']);
+			$outside = $now['weatherTemperature'];
+			$minperdeg = $changeTime/$changeTemp;
+			
+			if($type == "up"){
+				$heat_up[] = [$minperdeg,intval($outside)];
+			} else{
+				$heat_down[] = [$minperdeg,intval($outside)];
+			}
+						
+			$startTime = -1;
+		}
+	}
+	
+}
+
+$return = [$heat_up, $heat_down];
+
+print json_encode($return);
+
+
+$conn->close();
+
+?>
\ No newline at end of file
diff --git a/cron.php b/cron.php
index eaa7108..fe77d4e 100644
--- a/cron.php
+++ b/cron.php
@@ -2,41 +2,47 @@
 
 include('settings/globals.php');
 
-$valid_thermostats = ["honeywell"];
-
 if(in_array(THERMOSTAT_TYPE,$valid_thermostats)){
-	require('thermostats/'.THERMOSTAT_TYPE.'/scrape.php');
+	require('thermostats/'.THERMOSTAT_TYPE.'/scrape.php');   
+    require('thermostats/'.THERMOSTAT_TYPE.'/logininfo.php');      
 } else{
 	die("Invalid THERMOSTAT_TYPE set in settings/globals.php");
 }
-$data = getCurrentInfo();
-
-$conn = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
-// Check connection
-if (!$conn) {
-		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");
 
 
-$clean_data = array();
-foreach($good_columns as $col){
-	if(isset($data[$col])){
-		$clean_data[$col] = $data[$col];
-	}
-}
-$columns = implode(", ",array_keys($clean_data));
-$values  = implode(", ", array_values($clean_data));
 
-$sql = "INSERT INTO `stat`(" . $columns . ") VALUES (" . $values.")";
-$result = $conn->query($sql);
-echo $sql;
-echo "\n";
-echo $result;
-if (!$result) {
-	printf("Errormessage: %s\n", $conn->error);
-}
+// dorfl added simple loop
+for ($i = 0; $i <enumerate_thermostats(); $i++) { // all thermostats
+
+            $data = getCurrentInfo($i); // changed info!
+
+            $conn = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
+            // Check connection
+            if (!$conn) {
+                    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");
+
+
+            $clean_data = array();
+            foreach($good_columns as $col){
+                if(isset($data[$col])){
+                    $clean_data[$col] = $data[$col];
+                }
+            }
+            $columns = implode(", ",array_keys($clean_data));
+            $values  = implode(", ", array_values($clean_data));
+
+            $sql = "INSERT INTO `stat`(" . $columns . ") VALUES (" . $values.")";
+            $result = $conn->query($sql);
+            echo $sql;
+            echo "\n";
+            echo $result;
+            if (!$result) {
+                printf("Errormessage: %s\n", $conn->error);
+            }
+} // end for thermostats
 
 $conn->close();
 
diff --git a/db-get.php b/db-get.php
index 63b727c..a7b6faa 100644
--- a/db-get.php
+++ b/db-get.php
@@ -1,54 +1,70 @@
 <?php
 
 $q = '';
+$device_index = '';
+include('settings/globals.php');
+
+
+
+if(in_array(THERMOSTAT_TYPE,$valid_thermostats)){
+	require('thermostats/'.THERMOSTAT_TYPE.'/scrape.php');    
+    require('thermostats/'.THERMOSTAT_TYPE.'/logininfo.php');  
+} else{
+	die("Invalid THERMOSTAT_TYPE set in settings/globals.php");
+}
+
 if(isset($_GET)){
 	if(isset($_GET['q'])){
 		$q = $_GET['q'];
-
-	header('Content-Type: application/json');
-	include('settings/globals.php');
-	$conn = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
-	// Check connection
-	if (!$conn) {
-			die("Connection failed: " . mysqli_connect_error());
-	}
-	$sql = '';
-	switch($q){
-		case "inside":
-			$sql = "SELECT UNIX_TIMESTAMP(date),dispTemperature from stat";
-			break;
-		case 'outside':
-			$sql = "SELECT UNIX_TIMESTAMP(date),weatherTemperature from stat";
-			break;
-		case 'set_heat':
-			$sql = "SELECT UNIX_TIMESTAMP(date),heatSetpoint from stat";
-			break;
-		case 'set_cool':
-			$sql = "SELECT UNIX_TIMESTAMP(date),coolSetpoint from stat";
-			break;
-		case 'humidity':
-			$sql = "SELECT UNIX_TIMESTAMP(date),weatherHumidity from stat";
-			break;
-		default:
-			die("No query");
-		
-	}
-	
-	$result = $conn->query($sql);
-	if (!$result) {
-		printf("Errormessage: %s\n", $conn->error);
-	}
-	$rows = array();
-	while($r = mysqli_fetch_assoc($result)) {
-			$row = array_map('floatval',array_values($r));
-			$row[0] = $row[0]*1000;
-			$rows[] = $row;
-	}
-	print json_encode($rows);
+        if(isset($_GET['id'])){
+           $d = $device_array[$_GET['id']];
+            
+            //$d="1488017";
+  
+            header('Content-Type: application/json');
+            
+            $conn = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
+            // Check connection
+            if (!$conn) {
+                    die("Connection failed: " . mysqli_connect_error());
+            }
+            $sql = '';
+            switch($q){
+                case "inside":
+                    $sql = "SELECT UNIX_TIMESTAMP(date),dispTemperature from stat";
+                    break;
+                case 'outside':
+                    $sql = "SELECT UNIX_TIMESTAMP(date),weatherTemperature from stat";
+                    break;
+                case 'set_heat':
+                    $sql = "SELECT UNIX_TIMESTAMP(date),heatSetpoint from stat";
+                    break;
+                case 'set_cool':
+                    $sql = "SELECT UNIX_TIMESTAMP(date),coolSetpoint from stat";
+                    break;
+                case 'humidity':
+                    $sql = "SELECT UNIX_TIMESTAMP(date),weatherHumidity from stat";
+                    break;
+                default:
+                    die("No query");
+                
+            }
+            $sql = $sql . " WHERE deviceID=" . $d;
+            $result = $conn->query($sql);
+            if (!$result) {
+                printf("Errormessage: %s\n", $conn->error);
+            }
+            $rows = array();
+            while($r = mysqli_fetch_assoc($result)) {
+                    $row = array_map('floatval',array_values($r));
+                    $row[0] = $row[0]*1000;
+                    $rows[] = $row;
+            }
+            print json_encode($rows);
 
 
-	$conn->close();
-
+            $conn->close();
+        }
 	}
 }
 
diff --git a/dbsetup.php b/dbsetup.php
index 073d14c..343ba95 100644
--- a/dbsetup.php
+++ b/dbsetup.php
@@ -1,6 +1,6 @@
 <?php
 
-include('settings/globals.php');
+include('settings/globals.php'); 
 
 $conn = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
 // Check connection
diff --git a/delay.html b/delay.html
deleted file mode 100644
index e52c098..0000000
--- a/delay.html
+++ /dev/null
@@ -1,123 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>Stat delay</title>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.5.0/bootstrap-table.min.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-  <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-  <script src="http://code.highcharts.com/highcharts.js"></script>
-<script src="http://code.highcharts.com/modules/exporting.js"></script>
-<script type="text/javascript">
-$(function () {
-	console.log('load');
-	var seriesOptions = [];
-	var createChart = function(){
-		console.log('create');
-    	$('#container').highcharts({
-        chart: {
-            type: 'scatter',
-            zoomType: 'xy'
-        },
-        title: {
-            text: 'Time to heat or cool vs outside temperature'
-        },
-        subtitle: {
-            text: 'Because science'
-        },
-        xAxis: {
-            title: {
-                enabled: true,
-                text: 'Minutes per degree change'
-            },
-            startOnTick: true,
-            endOnTick: true,
-            showLastLabel: true
-        },
-        yAxis: {
-            title: {
-                text: 'Outside temp'
-            }
-        },
-        legend: {
-            layout: 'vertical',
-            align: 'left',
-            verticalAlign: 'top',
-            x: 100,
-            y: 70,
-            floating: true,
-            backgroundColor: (Highcharts.theme && Highcharts.theme.legendBackgroundColor) || '#FFFFFF',
-            borderWidth: 1
-        },
-        plotOptions: {
-            scatter: {
-                marker: {
-                    radius: 5,
-                    states: {
-                        hover: {
-                            enabled: true,
-                            lineColor: 'rgb(100,100,100)'
-                        }
-                    }
-                },
-                states: {
-                    hover: {
-                        marker: {
-                            enabled: false
-                        }
-                    }
-                },
-                tooltip: {
-                    headerFormat: '<b>{series.name}</b><br>',
-                    pointFormat: '{point.x} min per degree, {point.y} degrees'
-                }
-            }
-        },
-        series: seriesOptions,
-        
-    });
-    }
-    $.getJSON('delay.php', function (data) {
-    	console.log("data");
-								seriesOptions[0] = {
-										name: "Heat, Heating",
-										data: data[0]
-								};
-								seriesOptions[1] = {
-										name: "Heat, down",
-										data: data[1]
-								};
-								
-								createChart();
-							
-						
-						});
-});
-
-</script>
-
-
-<body>
-  <!-- Fixed navbar -->
-    <nav class="navbar navbar-inverse">
-      <div class="container">
-        <div class="navbar-header">
-          <a class="navbar-brand" href="#">Stat stats</a>
-        </div>
-        <div id="navbar" class="navbar-collapse collapse">
-          <ul class="nav navbar-nav">
-            <li><a href="index.html">Home</a></li>
-            <li><a href="graph.html">Graph</a></li>
-            <li class="active"><a href="delay.html">Delay</a></li>
-          </ul>
-        </div><!--/.nav-collapse -->
-      </div>
-    </nav>
-<div id="container" style="min-width: 310px; height: 400px; max-width: 800px; margin: 0 auto"></div>
-
-
-
-</body></html>
\ No newline at end of file
diff --git a/delay.php b/delay.php
index c32dd3b..f628232 100644
--- a/delay.php
+++ b/delay.php
@@ -1,82 +1,141 @@
+
+<!DOCTYPE html>
+<html lang="en">
+
+
+
+
 <?php
-include('settings/globals.php');
-header('Content-Type: application/json');
-$conn = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
-// Check connection
-if (!$conn) {
-	die("Connection failed: " . mysqli_connect_error());
-}
-$sql = 'SELECT UNIX_TIMESTAMP(date),dispTemperature,weatherTemperature,heatSetPoint,systemSwitchPosition from stat';
+        include('settings/globals.php');
 
-$result = $conn->query($sql);
-if (!$result) {
-printf("Errormessage: %s\n", $conn->error);
-}
-$rows = array();
-while($r = mysqli_fetch_assoc($result)) {
-	$r['date'] = $r['UNIX_TIMESTAMP(date)'];
-	unset($r['UNIX_TIMESTAMP(date)']);
-	$rows[] = $r;
-}
-// print("<pre>");
-// print_r($rows);
-$startTime = -1;
-$startTemp = NULL;
-$startSetPoint = NULL;
-$targetSetPoint = NULL;
+        $valid_thermostats = ["honeywell"];
 
-$heat_up = NULL;
-$heat_down = NULL;
-$cool_up = NULL;
-$cool_down = NULL;
-$type = NULL;
-
-for($i = 1; $i < count($rows); $i++){
-	$now = $rows[$i];
-	$last= $rows[$i-1];
-// 	echo $startTime;
-// print_r($now);
-	if($startTime == -1){
-// 		echo "no start <br/>";
-		if($now['heatSetPoint'] <> $last['heatSetPoint']){
-			//Down!
-// 			echo "down<br/>";
-			$startTime = $now['date'];
-			$startTemp = $now['dispTemperature'];
-			$startSetPoint = $last['heatSetPoint'];	
-			$targetSetPoint = $now['heatSetPoint'];
-			if($now['heatSetPoint'] > $last['heatSetPoint']){
-				$type = "up";
-			} else {
-				$type = "down";
-			}
-		} 
-	} else{
-		//looking for end
-// 		echo "yes start <br/>";
-		if($now['dispTemperature'] == $targetSetPoint || $now['heatSetPoint'] <> $targetSetPoint){
-			$changeTime = ($now['date']-$startTime)/60;
-			$changeTemp = abs($startTemp - $now['dispTemperature']);
-			$outside = $now['weatherTemperature'];
-			$minperdeg = $changeTime/$changeTemp;
-			
-			if($type == "up"){
-				$heat_up[] = [$minperdeg,intval($outside)];
-			} else{
-				$heat_down[] = [$minperdeg,intval($outside)];
-			}
+        if(in_array(THERMOSTAT_TYPE,$valid_thermostats)){
+            require('thermostats/'.THERMOSTAT_TYPE.'/scrape.php');    
+            require('thermostats/'.THERMOSTAT_TYPE.'/logininfo.php');  
+        } else{
+            die("Invalid THERMOSTAT_TYPE set in settings/globals.php");
+        }
+        
+        $id = $_GET['id']; // device ID
+        
+?>
+<head>
+  <title>Stat delay</title>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.5.0/bootstrap-table.min.css">
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+  <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+  <script src="http://code.highcharts.com/highcharts.js"></script>
+<script src="http://code.highcharts.com/modules/exporting.js"></script>
+<script type="text/javascript">
+$(function () {
+	console.log('load');
+	var seriesOptions = [];
+	var createChart = function(){
+		console.log('create');
+    	$('#container').highcharts({
+        chart: {
+            type: 'scatter',
+            zoomType: 'xy'
+        },
+        title: {
+            text: 'Time to heat or cool vs outside temperature'
+        },
+        subtitle: {
+            text: 'Because science'
+        },
+        xAxis: {
+            title: {
+                enabled: true,
+                text: 'Minutes per degree change'
+            },
+            startOnTick: true,
+            endOnTick: true,
+            showLastLabel: true
+        },
+        yAxis: {
+            title: {
+                text: 'Outside temp'
+            }
+        },
+        legend: {
+            layout: 'vertical',
+            align: 'left',
+            verticalAlign: 'top',
+            x: 100,
+            y: 70,
+            floating: true,
+            backgroundColor: (Highcharts.theme && Highcharts.theme.legendBackgroundColor) || '#FFFFFF',
+            borderWidth: 1
+        },
+        plotOptions: {
+            scatter: {
+                marker: {
+                    radius: 5,
+                    states: {
+                        hover: {
+                            enabled: true,
+                            lineColor: 'rgb(100,100,100)'
+                        }
+                    }
+                },
+                states: {
+                    hover: {
+                        marker: {
+                            enabled: false
+                        }
+                    }
+                },
+                tooltip: {
+                    headerFormat: '<b>{series.name}</b><br>',
+                    pointFormat: '{point.x} min per degree, {point.y} degrees'
+                }
+            }
+        },
+        series: seriesOptions,
+        
+    });
+    }
+    $.getJSON('calc_delay.php?id=<?php echo $id ?>', function (data) {
+    	console.log("data");
+								seriesOptions[0] = {
+										name: "Heat, Heating",
+										data: data[0]
+								};
+								seriesOptions[1] = {
+										name: "Heat, down",
+										data: data[1]
+								};
+								
+								createChart();
+							
 						
-			$startTime = -1;
-		}
-	}
-	
-}
+						});
+});
 
-$return = [$heat_up, $heat_down];
-
-print json_encode($return);
+</script>
 
 
-$conn->close();
+<body>
+  
+<?php
+   //  navbar
+     include('navbar.php'); 
+ ?>
+    
+ <h1>
 
-?>
\ No newline at end of file
+<?php
+  // title!
+  echo $device_name_array[$id];
+?>
+
+</h1>   
+<div id="container" style="min-width: 310px; height: 400px; max-width: 800px; margin: 0 auto"></div>
+
+
+
+</body></html>
\ No newline at end of file
diff --git a/getdata.php b/getdata.php
new file mode 100644
index 0000000..fe25149
--- /dev/null
+++ b/getdata.php
@@ -0,0 +1,57 @@
+<?php
+
+$q = '';
+if(isset($_GET)){
+	if(isset($_GET['q'])){
+		$q = $_GET['q'];
+
+    $d = 1488017; // device ID number
+    
+	header('Content-Type: application/json');
+	include('settings/globals.php');
+	$conn = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
+	// Check connection
+	if (!$conn) {
+			die("Connection failed: " . mysqli_connect_error());
+	}
+	$sql = '';
+	switch($q){
+		case "inside":
+			$sql = "SELECT UNIX_TIMESTAMP(date),dispTemperature from stat";
+			break;
+		case 'outside':
+			$sql = "SELECT UNIX_TIMESTAMP(date),weatherTemperature from stat";
+			break;
+		case 'set_heat':
+			$sql = "SELECT UNIX_TIMESTAMP(date),heatSetpoint from stat";
+			break;
+		case 'set_cool':
+			$sql = "SELECT UNIX_TIMESTAMP(date),coolSetpoint from stat";
+			break;
+		case 'humidity':
+			$sql = "SELECT UNIX_TIMESTAMP(date),weatherHumidity from stat";
+			break;
+		default:
+			die("No query");
+		
+	}
+	$sql = $sql . " WHERE deviceID=" . $d;
+	$result = $conn->query($sql);
+    
+    echo $sql;
+    $rows = array();
+	while($r = mysqli_fetch_assoc($result)) {
+			$row = array_map('floatval',array_values($r));
+			$row[0] = $row[0]*1000;
+			$rows[] = $row;
+            echo $row[1];
+            
+	
+    }
+    
+	$conn->close();
+
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/graph.html b/graph.php
similarity index 73%
rename from graph.html
rename to graph.php
index bb7c1bf..e317f13 100644
--- a/graph.html
+++ b/graph.php
@@ -1,106 +1,111 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>Stat tracker</title>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.5.0/bootstrap-table.min.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-  <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-	<script src="http://code.highcharts.com/stock/highstock.js"></script>
-	<script src="http://code.highcharts.com/stock/modules/exporting.js"></script>
-	<script type="text/javascript">
-		$(function () {
-				var d = new Date();
-				var timezoneOffset = d.getTimezoneOffset();
-				Highcharts.setOptions({
-						global: {
-								timezoneOffset: timezoneOffset
-						}
-				});
-				var names = ['inside','outside','set_heat','set_cool','humidity'];
-						seriesOptions = [],
-						seriesCounter = 0,
-						createChart = function () {
-
-								$('#container').highcharts('StockChart', {
-
-										rangeSelector: {
-												selected: 4
-										},
-									
-
-										yAxis: {
-												 title: {
-														text: 'Temperature �' 
-												},
-												labels: {
-														formatter: function () {
-																return this.value;
-														}
-												},
-												plotLines: [{
-														value: 0,
-														width: 2,
-														color: 'silver'
-												}]
-										},
-
-										
-
-										tooltip: {
-												pointFormat: '<span style="color:{series.color}">{series.name}</span>: <b>{point.y}</b><br/>',
-												valueDecimals: 0
-										},
-
-										series: seriesOptions,
-										legend: {
-											enabled: true,
-											borderWidth: 1,
-											backgroundColor: '#FFFFFF',
-											shadow: true
-										}
-								});
-						};
-						
-				$.each(names, function (i, name) {
-					$.getJSON('db-get.php?q='+name, function (data) {
-
-								seriesOptions[i] = {
-										name: name,
-										data: data
-								};
-							 seriesCounter += 1;
-
-							if (seriesCounter === names.length) {
-									createChart();
-							}
-						
-						});
-					});
-		});
-	</script>
-	</head>
-<body>
-  <!-- Fixed navbar -->
-    <nav class="navbar navbar-inverse">
-      <div class="container">
-        <div class="navbar-header">
-          <a class="navbar-brand" href="#">Stat stats</a>
-        </div>
-        <div id="navbar" class="navbar-collapse collapse">
-          <ul class="nav navbar-nav">
-            <li><a href="index.html">Home</a></li>
-            <li class="active"><a href="graph.html">Graph</a></li>
-            <li><a href="delay.html">Delay</a></li>
-          </ul>
-        </div><!--/.nav-collapse -->
-      </div>
-    </nav>
-
-<div id="container" style="height: 400px; min-width: 310px"></div>
-
-
-
+<!DOCTYPE html>
+<html lang="en">
+<?php
+        include('settings/globals.php');
+
+        if(in_array(THERMOSTAT_TYPE,$valid_thermostats)){
+            require('thermostats/'.THERMOSTAT_TYPE.'/scrape.php');    
+            require('thermostats/'.THERMOSTAT_TYPE.'/logininfo.php');  
+        } else{
+            die("Invalid THERMOSTAT_TYPE set in settings/globals.php");
+        }
+        $id = $_GET['id']; //id # of thermostat
+?>
+<head>
+  <title> Household Temperature Tracker</title>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.5.0/bootstrap-table.min.css">
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+  <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+	<script src="http://code.highcharts.com/stock/highstock.js"></script>
+	<script src="http://code.highcharts.com/stock/modules/exporting.js"></script>
+	<script type="text/javascript">
+		$(function () {
+				var d = new Date();
+				var timezoneOffset = d.getTimezoneOffset();
+				Highcharts.setOptions({
+						global: {
+								timezoneOffset: timezoneOffset
+						}
+				});
+				var names = ['inside','outside','set_heat','set_cool','humidity'];
+						seriesOptions = [],
+						seriesCounter = 0,
+						createChart = function () {
+
+								$('#container').highcharts('StockChart', {
+
+										rangeSelector: {
+												selected: 4
+										},
+									
+
+										yAxis: {
+												 title: {
+														text: 'Temperature �' 
+												},
+												labels: {
+														formatter: function () {
+																return this.value;
+														}
+												},
+												plotLines: [{
+														value: 0,
+														width: 2,
+														color: 'silver'
+												}]
+										},
+
+										
+
+										tooltip: {
+												pointFormat: '<span style="color:{series.color}">{series.name}</span>: <b>{point.y}</b><br/>',
+												valueDecimals: 0
+										},
+
+										series: seriesOptions,
+										legend: {
+											enabled: true,
+											borderWidth: 1,
+											backgroundColor: '#FFFFFF',
+											shadow: true
+										}
+								});
+						};
+						
+				$.each(names, function (i, name) {
+					$.getJSON('db-get.php?id=<?php echo $id ?>&q='+name, function (data) {
+
+								seriesOptions[i] = {
+										name: name,
+										data: data
+								};
+							 seriesCounter += 1;
+
+							if (seriesCounter === names.length) {
+									createChart();
+							}
+						
+						});
+					});
+		});
+	</script>
+	</head>
+<body>
+  <?php
+   //  navbar
+     include('navbar.php');
+  ?>
+<h1>
+
+<?php
+  // title!
+  echo $device_name_array[$id];
+?>
+
+</h1>
+<div id="container" style="height: 600px; min-width: 310px"></div>
+
 </body>
\ No newline at end of file
diff --git a/index.html b/index.html
deleted file mode 100644
index 52a4ae8..0000000
--- a/index.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-    <title>Stat stat</title>
-
-    <!-- Bootstrap -->
-    <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-  </head>
-  <body>
-  <!-- Fixed navbar -->
-    <nav class="navbar navbar-inverse">
-      <div class="container">
-        <div class="navbar-header">
-          <a class="navbar-brand" href="#">Stat stat</a>
-        </div>
-        <div id="navbar" class="navbar-collapse collapse">
-          <ul class="nav navbar-nav">
-            <li class="active"><a href="index.htmll=">Home</a></li>
-            <li><a href="graph.html">Graph</a></li>
-            <li><a href="delay.html">Delay</a></li>
-          </ul>
-        </div><!--/.nav-collapse -->
-      </div>
-    </nav>
-    
-    <div class="container" role="main">
-    <h1>Honeywell Thermostat tracker</h1>
-    
-    <a href="graph.html"><button type="button" class="btn btn-lg btn-default">Graph</button></a>
-     <a href="delay.html"><button type="button" class="btn btn-lg btn-default">Delay</button></a>
-    
-    </div>
-
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-   <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/index.php b/index.php
new file mode 100644
index 0000000..756eab7
--- /dev/null
+++ b/index.php
@@ -0,0 +1,3 @@
+<?php    
+header('Location: graph.php?id=0');    
+?>
\ No newline at end of file
diff --git a/navbar.php b/navbar.php
new file mode 100644
index 0000000..99d5953
--- /dev/null
+++ b/navbar.php
@@ -0,0 +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>

+    </nav>
\ No newline at end of file
diff --git a/settings/globals.php.example b/settings/globals.php.example
index d902a5a..595d582 100644
--- a/settings/globals.php.example
+++ b/settings/globals.php.example
@@ -1,9 +1,11 @@
 <?php
-define('DB_HOST','');
-define('DB_NAME', '');
-define('DB_USER', '');
-define('DB_PASSWORD', '');
+define('DB_HOST','localhost');  // define sql host
+define('DB_NAME', 'database'); // sql database
+define('DB_USER', 'user'); // sql database user
+define('DB_PASSWORD', 'pw');  // guess what
 
 // THERMOSTAT_TYPE needs to match the directory name of the thermostat plugin you are using.
-define('THERMOSTAT_TYPE','');
+define('THERMOSTAT_TYPE','honeywell'); // only honeywell supported at this poing
+
+$valid_thermostats = ["honeywell"]; // this should really be somewhere else but here it works right now
 ?>
\ No newline at end of file
diff --git a/thermostats/honeywell/logininfo.php.example b/thermostats/honeywell/logininfo.php.example
index ad772d3..50a02a2 100644
--- a/thermostats/honeywell/logininfo.php.example
+++ b/thermostats/honeywell/logininfo.php.example
@@ -1,6 +1,12 @@
 <?php
 //Total Connect info
-$username=""; 
-$password=""; 
-$device_number = "";
+// 
+$username="user@whatever.com";  // username as used with Honeywell
+$password="mypassword";           // password as used with Honeywell
+
+// device array - cannot be zero entries
+
+$device_array = array("1234567","1234568","1234569  ");  // from https://mytotalconnectcomfort.com/portal/Device/Control/[devicenumber to use here]?[ignore all that follows]
+$device_name_array = array("Kitchen","Dining","Upstairs"); // we could probably pull the names from the page but easier this way
+
 ?>
\ No newline at end of file
diff --git a/thermostats/honeywell/scrape.php b/thermostats/honeywell/scrape.php
index 026cbd2..6678216 100644
--- a/thermostats/honeywell/scrape.php
+++ b/thermostats/honeywell/scrape.php
@@ -1,6 +1,6 @@
 <?php
 
-$ch = curl_init();
+$ch = curl_init(); 
 
 function login($usr, $pwd){
 	$url = "https://mytotalconnectcomfort.com/portal/";
@@ -123,7 +123,7 @@ function getStatus($device){
 		}
 	}
 	
-	curl_close($ch);
+	
 	
 	return $data;
 	
@@ -139,46 +139,22 @@ function cleanCookies(){
 	curl_close($ch);
 }
 
-function add_data($data){
-	include('globals.php');
-	$conn = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
-	// Check connection
-	if (!$conn) {
-			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");
-	
-	$clean_data = array();
-	foreach($good_columns as $col){
-			$clean_data[$col] = $data[$col];
-	}
-	//$clean_data['weatherPhrase'] = $conn->real_escape_string($clean_data['weatherPhrase']);
-	$columns = implode(", ",array_keys($clean_data));
-	$values  = implode(", ", array_values($clean_data));
-	
-	$sql = "INSERT INTO `stat`(".$columns.") VALUES (".$values.")";
-  $result = $conn->query($sql);
-	echo $sql;
-	echo "\n";
-	echo $result;
-	if (!$result) {
-    printf("Errormessage: %s\n", $conn->error);
-}
-	
-	$conn->close();
-	
-}
 
-function getCurrentInfo(){
 
-	require_once('logininfo.php');
+Function enumerate_thermostats(){  // counts number of thermostats in array. Could probably move somewhere else
+    require('logininfo.php'); 
+    $count = count($device_array);
+    return $count;
+}   
+
+function getCurrentInfo($d){   // gets the current info for the thermostat with the id $d
+
+	require('logininfo.php'); 
 	login($username, $password);
-	$data = getStatus($device_number);
-	
+    $data = getStatus($device_array[$d]);
+    
 	return $data;
 }
 
 
-
 ?>
\ No newline at end of file

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 2/2] 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