andrew/statstat
Archived
1
0
Fork 0
Code Issues Releases Activity

Support for indoor humidity

Browse Source 
copied form other branch
This commit is contained in:
dorfl68
2016-01-20 07:13:54 -05:00
parent 9a4f57b5bb
commit 1d6210807a
5 changed files with 58 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cron.php
+4 -1
View File
@@ -22,7 +22,10 @@ for ($i = 0; $i <enumerate_thermostats(); $i++) { // all thermostats
die("Connection failed: " . mysqli_connect_error()); 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(); $clean_data = array();
db-get.php
+5 -2
View File
@@ -19,7 +19,7 @@ if(isset($_GET)){
if(isset($_GET['id'])){ if(isset($_GET['id'])){
$d = $device_array[$_GET['id']]; $d = $device_array[$_GET['id']];
//$d="1488017";
header('Content-Type: application/json'); header('Content-Type: application/json');
@@ -42,7 +42,10 @@ if(isset($_GET)){
case 'set_cool': case 'set_cool':
$sql = "SELECT UNIX_TIMESTAMP(date),coolSetpoint from stat"; $sql = "SELECT UNIX_TIMESTAMP(date),coolSetpoint from stat";
break; 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"; $sql = "SELECT UNIX_TIMESTAMP(date),weatherHumidity from stat";
break; break;
default: default:
dbsetup.php
+1
View File
@@ -23,6 +23,7 @@ $sql = "CREATE TABLE IF NOT EXISTS `stat` (
`heatSetpoint` float NOT NULL, `heatSetpoint` float NOT NULL,
`heatUpperSetptLimit` float NOT NULL, `heatUpperSetptLimit` float NOT NULL,
`isInVacationHoldMode` tinyint(1) NOT NULL, `isInVacationHoldMode` tinyint(1) NOT NULL,
`indoorHumidity` int(11) NOT NULL,
`schedCoolSp` float NOT NULL, `schedCoolSp` float NOT NULL,
`schedHeatSp` float NOT NULL, `schedHeatSp` float NOT NULL,
`scheduleCapable` tinyint(1) NOT NULL, `scheduleCapable` tinyint(1) NOT NULL,
graph.php
+1 -1
View File
@@ -30,7 +30,7 @@
timezoneOffset: timezoneOffset timezoneOffset: timezoneOffset
} }
}); });
var names = ['inside','outside','set_heat','set_cool','humidity']; var names = ['inside','outside','set_heat','set_cool','in_humidity','out_humidity'];
seriesOptions = [], seriesOptions = [],
seriesCounter = 0, seriesCounter = 0,
createChart = function () { createChart = function () {
navbar.php
+47 -47
View File
@@ -1,48 +1,48 @@
␍
<!-- Fixed navbar -->␍ <!-- Fixed navbar -->
<nav class="navbar navbar-inverse">␍ <nav class="navbar navbar-inverse">
<div class="container">␍ <div class="container">
<div class="navbar-header">␍ <div class="navbar-header">
<a class="navbar-brand" href="#">Household Temperature Tracker</a>␍ <a class="navbar-brand" href="#">Household Temperature Tracker</a>
</div>␍ </div>
<div id="navbar" class="navbar-collapse collapse">␍ <div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">␍ <ul class="nav navbar-nav">
<li class="active"><a href="index.php">Home</a></li>␍ <li class="active"><a href="index.php">Home</a></li>
<li class="dropdown">␍ <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Graph␍ <a class="dropdown-toggle" data-toggle="dropdown" href="#">Graph
<span class="caret"></span></a>␍ <span class="caret"></span></a>
<ul class="dropdown-menu">␍ <ul class="dropdown-menu">
<?php␍ <?php
// create drop-down entries␍ // create drop-down entries
for ($i = 0; $i <enumerate_thermostats(); $i++) {␍ for ($i = 0; $i <enumerate_thermostats(); $i++) {
echo '<li><a href="graph.php?id=';␍ echo '<li><a href="graph.php?id=';
echo $i;␍ echo $i;
echo '">';␍ echo '">';
echo $device_name_array[$i];␍ echo $device_name_array[$i];
echo '</a></li>';␍ echo '</a></li>';
␍
} ␍ }
?> ␍ ?>
</ul>␍ </ul>
</li> <!--/graph -->␍ </li> <!--/graph -->
<li class="dropdown">␍ <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Delay␍ <a class="dropdown-toggle" data-toggle="dropdown" href="#">Delay
<span class="caret"></span></a>␍ <span class="caret"></span></a>
<ul class="dropdown-menu">␍ <ul class="dropdown-menu">
<?php␍ <?php
// create drop-down entries␍ // create drop-down entries
for ($i = 0; $i <enumerate_thermostats(); $i++) {␍ for ($i = 0; $i <enumerate_thermostats(); $i++) {
echo '<li><a href="delay.php?id=';␍ echo '<li><a href="delay.php?id=';
echo $i;␍ echo $i;
echo '">';␍ echo '">';
echo $device_name_array[$i];␍ echo $device_name_array[$i];
echo '</a></li>';␍ echo '</a></li>';
␍
} ␍ }
?> ␍ ?>
</ul> ␍ </ul>
</li> <!--delay -->␍ </li> <!--delay -->
</ul> <!-- navbar -->␍ </ul> <!-- navbar -->
</div><!--/.nav-collapse -->␍ </div><!--/.nav-collapse -->
</div>␍ </div>
</nav> </nav>