SH/PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

some fix and new firmware for shelly1

Browse Source
This commit is contained in:
unknown
2020-02-18 21:30:44 +01:00
parent e76b3127f3
commit 5a06a6c85a
20 changed files with 626 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/class/FallbackManager.php
View File

@@ -2,6 +2,9 @@
/**
*
*/
class FallbackManager
{
public $deviceDefinitions = "";
@@ -13,7 +16,7 @@ class FallbackManager
function check(){
//TODO: FIX IT
/*$allDevicesData = DeviceManager::getAllDevices();
$allDevicesData = DeviceManager::getAllDevices();
foreach ($allDevicesData as $deviceKey => $deviceValue) {
$allSubDevicesData = SubDeviceManager::getAllSubDevices($deviceValue['device_id']);
foreach ($allSubDevicesData as $subDeviceKey => $subDeviceValue) {
@@ -21,13 +24,21 @@ class FallbackManager
continue;
}
if (!isset($this->deviceDefinitions[$subDeviceValue['type']]["fallBackTime"])) {
continue;
}
$lastRecord = RecordManager::getLastRecord($subDeviceValue['subdevice_id']);
$minutes = (time() - $lastRecord['time']) / 60;
echo $minutes;
if ( $minutes > 2){
if ($lastRecord["value"] == $this->deviceDefinitions[$subDeviceValue['type']]["fallBack"]) {
continue;
}
$minutes = (time() - strtotime($lastRecord['time'])) / 60;
if ( $minutes > $this->deviceDefinitions[$subDeviceValue['type']]["fallBackTime"]){
RecordManager::create($deviceValue['device_id'], $subDeviceValue['type'], $this->deviceDefinitions[$subDeviceValue['type']]["fallBack"]);
}
}
}*/
}
}
}

19
app/class/LogManager.php
View File

@@ -9,6 +9,25 @@ class LogRecordType{
const INFO = 'info';
}
class LogKeeper
{
function purge($days){
$todayFileName = date("Y-m-d").'.log';
$seconds = $days * 86400;
$logFiles = scandir('./app/logs/');
foreach ($logFiles as $key => $file) {
if (in_array($file,array(".","..", ".gitkeep", $todayFileName)))
{
continue;
}
if (filemtime($file) > $seconds) {
unlink('./app/logs/'.$file);
}
}
}
}
class LogManager
{

2
app/class/RecordManager.php
View File

@@ -67,7 +67,7 @@ class RecordManager{
public static function clean ($day) {
if (isset($day)) {
Db::command ('DELETE FROM records WHERE time < ADDDATE(NOW(), INTERVAL -? DAY);', array($day));
Db::command ('DELETE FROM records WHERE `time` < ADDDATE(NOW(), INTERVAL -? DAY);', array($day));
}
}

2
app/class/Template.php
View File

@@ -27,7 +27,7 @@ class Template extends Partial{
function render() {
extract($this->assignedValues);
if (!empty('app/controls/' . $this->path . '.php') && file_exists('app/controls/' . $this->path . '.php')) {
require_once('app/controls/' . $this->path . '.php');
include('app/controls/' . $this->path . '.php');
}
require_once('app/templates/' . $this->path . '.phtml');
}