Cutlery/beestat
1
0
Fork 0
mirror of https://github.com/beestat/app.git synced 2025-06-04 06:07:19 -04:00
Code Actions Packages Releases Activity

Fixing sensors failing to sync if identifiers are in a different format

Browse Source
This commit is contained in:
Jon Ziebell 2020-01-15 08:17:04 -05:00
parent 2e982faba1
commit 1250f63875
1 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
api/runtime.php
View File

@ -590,37 +590,53 @@ class runtime extends cora\api {
$sensor_identifier = substr($key, 0, strrpos($key, ':')); $sensor_identifier = substr($key, 0, strrpos($key, ':'));
$capability_identifier = substr($key, strrpos($key, ':') + 1); $capability_identifier = substr($key, strrpos($key, ':') + 1);
$sensor = $sensors_by_identifier[$sensor_identifier]; /**
$sensor_id = $sensors_by_identifier[$sensor_identifier]['sensor_id']; * Most of the time the pattern is that a sensor will have an
* identifier in the format XX:YY. Then the runtime report will
* return data keyed by XX:YY:ZZ, where ZZ is the capability_id as
* defined in sensor.capabilities.
*
* Some sensors have an identifier in the format XX:YY:ZZ, with a
* single entry in the capabilities array with no id. This makes
* little sense, but whatever. In these cases ecobee keys data by
* XX:YY:ZZ in the runtime report. This is a different pattern which
* has to be accounted for.
*
* For now I am simply ignoring this situation.
*/
if (isset($sensors_by_identifier[$sensor_identifier]) === true) {
$sensor = $sensors_by_identifier[$sensor_identifier];
$sensor_id = $sensors_by_identifier[$sensor_identifier]['sensor_id'];
if (isset($datas[$sensor['sensor_id']]) === false) { if (isset($datas[$sensor['sensor_id']]) === false) {
$datas[$sensor['sensor_id']] = [ $datas[$sensor['sensor_id']] = [
'sensor_id' => $sensor['sensor_id'], 'sensor_id' => $sensor['sensor_id'],
'timestamp' => $this->get_utc_datetime( 'timestamp' => $this->get_utc_datetime(
$columns['date'] . ' ' . $columns['time'], $columns['date'] . ' ' . $columns['time'],
$thermostat['time_zone'] $thermostat['time_zone']
) )
]; ];
} }
foreach($sensor['capability'] as $capability) { foreach($sensor['capability'] as $capability) {
if( if(
$capability['id'] == $capability_identifier && $capability['id'] == $capability_identifier &&
in_array($capability['type'], ['temperature', 'occupancy']) === true in_array($capability['type'], ['temperature', 'occupancy']) === true
) { ) {
$datas[$sensor['sensor_id']][$capability['type']] = ($capability['type'] === 'temperature') ? ($value * 10) : $value; $datas[$sensor['sensor_id']][$capability['type']] = ($capability['type'] === 'temperature') ? ($value * 10) : $value;
}
} }
} }
}
// Create or update the database // Create or update the database
foreach ($datas as $data) { foreach ($datas as $data) {
if(isset($existing_timestamps[$data['sensor_id']][$data['timestamp']]) === true) { if(isset($existing_timestamps[$data['sensor_id']][$data['timestamp']]) === true) {
$data['runtime_sensor_id'] = $existing_timestamps[$data['sensor_id']][$data['timestamp']]; $data['runtime_sensor_id'] = $existing_timestamps[$data['sensor_id']][$data['timestamp']];
$this->database->update('runtime_sensor', $data, 'id'); $this->database->update('runtime_sensor', $data, 'id');
} }
else { else {
$existing_timestamps[$data['sensor_id']][$data['timestamp']] = $this->database->create('runtime_sensor', $data, 'id'); $existing_timestamps[$data['sensor_id']][$data['timestamp']] = $this->database->create('runtime_sensor', $data, 'id');
}
} }
} }
} }