Archived
1
0

Fix merge conflicts and add cooling

This commit is contained in:
James Stuckey Weber
2016-02-06 09:20:21 -05:00
14 changed files with 581 additions and 502 deletions

237
delay.php
View File

@@ -1,107 +1,148 @@
<!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),id,dispTemperature,weatherTemperature,heatSetPoint,coolSetPoint,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;
//Start at index 1 so index 0 is the prior one
for($i = 1; $i < count($rows); $i++){
$now = $rows[$i];
$last= $rows[$i-1];
// echo $startTime;
// print_r($now);
switch ($now['systemSwitchPosition']){
case 1:
// heating
$setPoint = 'heatSetPoint';
break;
case 3:
// cooling
$setPoint = 'coolSetPoint';
break;
default:
//AUTOCOOL: 5, AUTOHEAT: 4, EMHEAT: 0, OFF: 2, SOUTHERN_AWAY: 6, UNKNOWN: 7
$setPoint = NULL;
break;
}
if($setPoint){
if($startTime == -1){
if($now[$setPoint] <> $last[$setPoint]){
if($setPoint == 'heatSetPoint' && $now[$setPoint] > $now['dispTemperature'] ||
$setPoint == 'coolSetPoint' && $now[$setPoint] < $now['dispTemperature']){
// print "Temperature started to change and is different!";
$startTime = $now['date'];
$startTemp = $now['dispTemperature'];
$startSetPoint = $last[$setPoint];
$targetSetPoint = $now[$setPoint];
if($now[$setPoint] > $last[$setPoint]){
$type = "up";
} else {
$type = "down";
}
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");
}
}
} else{
//looking for end
if($now['dispTemperature'] == $targetSetPoint || $now[$setPoint] <> $targetSetPoint){
$changeTime = ($now['date']-$startTime)/60;
$changeTemp = abs($startTemp - $now['dispTemperature']);
$outside = $now['weatherTemperature'];
$minperdeg = $changeTime/$changeTemp;
if(!$minperdeg){
$minperdeg = 0;
}
if($setPoint == 'heatSetPoint'){
if($type == "up"){
$heat_up[] = [$minperdeg,intval($outside)];
} else{
$heat_down[] = [$minperdeg,intval($outside)];
}
} else if($setPoint == 'coolSetPoint'){
if($type == "up"){
$cool_up[] = [$minperdeg,intval($outside)];
} else{
$cool_down[] = [$minperdeg,intval($outside)];
}
}
$startTime = -1;
}
$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]
};
seriesOptions[2] = {
name: "Cool, Cooling",
data: data[2]
};
seriesOptions[3] = {
name: "Cool, up",
data: data[3]
};
createChart();
});
});
$return = [$heat_up, $heat_down, $cool_up, $cool_down];
print json_encode($return);
</script>
$conn->close();
<body>
<?php
// navbar
include('navbar.php');
?>
<h1>
?>
<?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>