Archived
1
0

Support for indoor humidity

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

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();

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:

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,

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 () {