*/ + IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); + abstract class IPSComponentDimmer extends IPSComponent { /** diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_DMX.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_DMX.class.php new file mode 100644 index 0000000..5037087 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_DMX.class.php @@ -0,0 +1,110 @@ + + */ + + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_DMX extends IPSComponentDimmer { + + private $instanceId; + private $channel; + + /** + * @public + * + * Initialisierung eines IPSComponentDimmer_DMX Objektes + * + * @param integer $instanceId InstanceId des DMX Devices + */ + public function __construct($instanceId, $channel=1) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->channel = (int)$channel; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId.','.$this->channel; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleDimmer $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param integer $power Geräte Power + * @param integer $level Wert für Dimmer Einstellung (Wertebereich 0-100) + */ + public function SetState($power, $level) { + if (!$power) { + DMX_SetValue ($this->instanceId, $this->channel, 0); + } else { + $levelDMX = $level / 100 * 255; + DMX_SetValue ($this->instanceId, $this->channel, $levelDMX); + } + + } + + /** + * @public + * + * Liefert aktuellen Level des Dimmers + * + * @return integer aktueller Dimmer Level + */ + public function GetLevel() { + return GetValue(IPS_GetVariableIDByIdent('ChannelValue'.$this->channel, $this->instanceId))*100/255; + } + + /** + * @public + * + * Liefert aktuellen Power Zustand des Dimmers + * + * @return boolean Gerätezustand On/Off des Dimmers + */ + public function GetPower() { + return GetValue(IPS_GetVariableIDByIdent('ChannelValue'.$this->channel, $this->instanceId)) > 0; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Dummy.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Dummy.class.php new file mode 100644 index 0000000..2a9b014 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Dummy.class.php @@ -0,0 +1,101 @@ + + */ + + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_Dummy extends IPSComponentDimmer { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentDimmer_Dummy Objektes + * + * @param integer $instanceId InstanceId des Dummy Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleDimmer $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param integer $power Geräte Power + * @param integer $level Wert für Dimmer Einstellung (Wertebereich 0-100) + */ + public function SetState($power, $level) { + } + + /** + * @public + * + * Liefert aktuellen Level des Dimmers + * + * @return integer aktueller Dimmer Level + */ + public function GetLevel() { + return null; + } + + /** + * @public + * + * Liefert aktuellen Power Zustand des Dimmers + * + * @return boolean Gerätezustand On/Off des Dimmers + */ + public function GetPower() { + return null; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_EIB.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_EIB.class.php new file mode 100644 index 0000000..b3754fa --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_EIB.class.php @@ -0,0 +1,185 @@ + + */ + + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_EIB extends IPSComponentDimmer { + + private $instanceId; + private $groupFunction; + private $groupInterpretation; + + /** + * @public + * + * Initialisierung eines IPSComponentDimmer_EIB Objektes + * + * @param integer $instanceId InstanceId des EIB Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->groupFunction = EIB_GetGroupFunction($this->instanceId); + $this->groupInterpretation = EIB_GetGroupInterpretation($this->instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleDimmer $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param integer $power Geräte Power + * @param integer $level Wert für Dimmer Einstellung (Wertebereich 0-100) + */ + public function SetState($power, $level) { + if (!$power) { + switch ($this->groupFunction) { + case 'Scale': + EIB_Scale($this->instanceId, 0); + break; + case 'DimControl': + EIB_DimControl($this->instanceId, 0); + break; + case 'DimValue': + EIB_DimValue($this->instanceId, 0); + break; + default: + trigger_error('Unsupported EIB GroupFunction "'.$this->groupFunction.'"'); + } + } else { + switch ($this->groupFunction) { + case 'Scale': + if ($this->groupInterpretation=='Standard') { /* 0 .. 255 */ + EIB_Scale($this->instanceId, round($level/100*255)); + } elseif ($this->groupInterpretation=='Percent') { /* 0 .. 100 */ + EIB_Scale($this->instanceId, round($level)); + } else { + trigger_error('Unsupported EIB GroupInterpretation "'.$this->groupInterpretation.'"'); + } + break; + case 'DimControl': + if ($this->groupInterpretation=='Standard') { /* 0 .. 15 */ + EIB_DimControl($this->instanceId, round($level/100*15)); + } elseif ($this->groupInterpretation=='Enhanced') { /* 0 .. 7 */ + EIB_DimControl($this->instanceId, round($level/100*7)); + } else { + trigger_error('Unsupported EIB GroupInterpretation "'.$this->groupInterpretation.'"'); + } + break; + case 'DimValue': + if ($this->groupInterpretation=='Standard') { /* 0 .. 255 */ + EIB_Value($this->instanceId, round($level/100*255)); + } elseif ($this->groupInterpretation=='Percent') { /* 0 .. 100 */ + EIB_DimValue($this->instanceId, round($level)); + } else { + trigger_error('Unsupported EIB GroupInterpretation "'.$this->groupInterpretation.'"'); + } + break; + default: + trigger_error('Unsupported EIB GroupFunction "'||$this->groupFunction.'"'); + } + } + + } + + /** + * @public + * + * Liefert aktuellen Level des Dimmers + * + * @return integer aktueller Dimmer Level + */ + public function GetLevel() { + $value = GetValue(IPS_GetObjectIdByIdent('Value', $this->instanceId)); + switch ($this->groupFunction) { + case 'Scale': + if ($this->groupInterpretation=='Standard') { /* 0 .. 255 */ + $value = round($value / 255 * 100); + } elseif ($this->groupInterpretation=='Percent') { /* 0 .. 100 */ + null; + } else { + trigger_error('Unsupported EIB GroupInterpretation "'.$this->groupInterpretation.'"'); + } + break; + case 'DimControl': + if ($this->groupInterpretation=='Standard') { /* 0 .. 15 */ + $value = round($value / 15 * 100); + } elseif ($this->groupInterpretation=='Enhanced') { /* 0 .. 7 */ + $value = round($value / 7 * 100); + } else { + trigger_error('Unsupported EIB GroupInterpretation "'.$this->groupInterpretation.'"'); + } + break; + case 'DimValue': + if ($this->groupInterpretation=='Standard') { /* 0 .. 255 */ + $value = round($value / 255 * 100); + } elseif ($this->groupInterpretation=='Percent') { /* 0 .. 100 */ + null; + } else { + trigger_error('Unsupported EIB GroupInterpretation "'.$this->groupInterpretation.'"'); + } + break; + default: + trigger_error('Unsupported EIB GroupFunction "'||$this->groupFunction.'"'); + } + return $value; + } + + /** + * @public + * + * Liefert aktuellen Power Zustand des Dimmers + * + * @return boolean Gerätezustand On/Off des Dimmers + */ + public function GetPower() { + return GetValue(IPS_GetObjectIdByIdent('Value', $this->instanceId)) > 0; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_EatonMoeller.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_EatonMoeller.class.php new file mode 100644 index 0000000..8fb0c5a --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_EatonMoeller.class.php @@ -0,0 +1,105 @@ + + */ + + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_EatonMoeller extends IPSComponentDimmer { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentDimmer_EatonMoeller Objektes + * + * @param integer $instanceId InstanceId des EatonMoeller Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleDimmer $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param integer $power Geräte Power + * @param integer $level Wert für Dimmer Einstellung (Wertebereich 0-100) + */ + public function SetState($power, $level) { + MXC_SwitchMode($this->instanceId, $power); + if ($power) { + MXC_DimSet($this->instanceId, $level); + } + } + + /** + * @public + * + * Liefert aktuellen Level des Dimmers + * + * @return integer aktueller Dimmer Level + */ + public function GetLevel() { + return GetValue(IPS_GetVariableIDByName('Intensity', $this->instanceId)); + } + + /** + * @public + * + * Liefert aktuellen Power Zustand des Dimmers + * + * @return boolean Gerätezustand On/Off des Dimmers + */ + public function GetPower() { + return GetValue(IPS_GetVariableIDByName('Status', $this->instanceId)) > 0; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Enocean.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Enocean.class.php new file mode 100644 index 0000000..663b31d --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Enocean.class.php @@ -0,0 +1,106 @@ + + */ + + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_Enocean extends IPSComponentDimmer { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentDimmer_Enocean Objektes + * + * @param integer $instanceId InstanceId des Dummy Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleDimmer $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param integer $power Geräte Power + * @param integer $level Wert für Dimmer Einstellung (Wertebereich 0-100) + */ + public function SetState($power, $level) { + if (!$power) { + ENO_DimSet($this->instanceId, 0); + } else { + ENO_DimSet($this->instanceId, $level); + } + } + + /** + * @public + * + * Liefert aktuellen Level des Dimmers + * + * @return integer aktueller Dimmer Level + */ + public function GetLevel() { + return GetValue(IPS_GetVariableIDByName('Intensity', $this->instanceId)); + } + + /** + * @public + * + * Liefert aktuellen Power Zustand des Dimmers + * + * @return boolean Gerätezustand On/Off des Dimmers + */ + public function GetPower() { + return GetValue(IPS_GetVariableIDByName('Intensity', $this->instanceId)) > 0; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_FS20.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_FS20.class.php new file mode 100644 index 0000000..65ceb72 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_FS20.class.php @@ -0,0 +1,115 @@ + + */ + + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_FS20 extends IPSComponentDimmer { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentDimmer_FS20 Objektes + * + * @param integer $instanceId InstanceId des FS20 Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleDimmer $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param integer $power Geräte Power + * @param integer $level Wert für Dimmer Einstellung (Wertebereich 0-100) + */ + public function SetState($power, $level) { + // Zeit in Sekunden wie schnell der Aktor dimmmen soll + $DimspeedSec = 2; + if (!$power) { + FS20_SetIntensity ($this->instanceId, 0, $DimspeedSec); + // Wartezeit um den Aktor auf OFF zu Schalten + // IPS_Sleep wird in Millisekunden angegeben, darum * 1000 + IPS_Sleep ($DimspeedSec*1000); + FS20_SwitchMode ($this->instanceId, false); + } else { + // 100% Helligkeit Entsprechen bei FS20 dem Wert 16 + $levelFS20 = round($level / 100 * 16); + FS20_SetIntensity ($this->instanceId, $levelFS20, $DimspeedSec); + } + + } + + /** + * @public + * + * Liefert aktuellen Level des Dimmers + * + * @return integer aktueller Dimmer Level + */ + public function GetLevel() { + return GetValue(IPS_GetVariableIDByName('Intensität', $this->instanceId)); + } + + /** + * @public + * + * Liefert aktuellen Power Zustand des Dimmers + * + * @return boolean Gerätezustand On/Off des Dimmers + */ + public function GetPower() { + return GetValue(IPS_GetVariableIDByName('Intensität', $this->instanceId)) > 0; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Homematic.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Homematic.class.php index a5912ae..c66ae41 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Homematic.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Homematic.class.php @@ -19,7 +19,9 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentDimmer_Homematic extends IPSComponentDimmer { + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_Homematic extends IPSComponentDimmer { private $instanceId; @@ -34,6 +36,19 @@ public function __construct($instanceId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_ZW.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_ZW.class.php new file mode 100644 index 0000000..c82d3b8 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_ZW.class.php @@ -0,0 +1,108 @@ + + */ + + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_ZW extends IPSComponentDimmer { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentDimmer_ZW Objektes + * + * @param integer $instanceId InstanceId des Z-Wave Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleDimmer $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param integer $power Geräte Power + * @param integer $level Wert für Dimmer Einstellung (Wertebereich 0-100) + */ + public function SetState($power, $level) { + if (!$power) { + ZW_DimSet($this->instanceId, 0); + } else { + $levelZW = $level; + ZW_DimSet($this->instanceId, $levelZW); + } + + } + + /** + * @public + * + * Liefert aktuellen Level des Dimmers + * + * @return integer aktueller Dimmer Level + */ + public function GetLevel() { + return GetValue(IPS_GetVariableIDByName('Intensity', $this->instanceId)); + } + + /** + * @public + * + * Liefert aktuellen Power Zustand des Dimmers + * + * @return boolean Gerätezustand On/Off des Dimmers + */ + public function GetPower() { + return GetValue(IPS_GetVariableIDByName('Intensity', $this->instanceId)) > 0; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer.class.php index ceb1867..687a84d 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer.class.php @@ -18,6 +18,8 @@ * Version 2.50.1, 31.01.2012
*/ + IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); + abstract class IPSComponentPlayer extends IPSComponent { /** diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer_Mediaplayer.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer_Mediaplayer.class.php index 76fa9a6..1cad5ea 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer_Mediaplayer.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer_Mediaplayer.class.php @@ -137,7 +137,7 @@ public function ClearPlaylist(){ */ public function SetPlaylistPosition($position){ if (WAC_GetPlaylistLength($this->instanceId) > 0 and - $position < WAC_GetPlaylistLength($this->instanceId) and + $position <= WAC_GetPlaylistLength($this->instanceId) and $position > 0){ WAC_SetPlaylistPosition($this->instanceId, (int)$position); WAC_Play($this->instanceId); diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB.class.php index 7e19aeb..5dc043f 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB.class.php @@ -12,7 +12,7 @@ /** * @class IPSComponentRGB * - * Definiert ein IPSComponentRGB Object, das als Wrapper für Dimmer Geräte verschiedener Hersteller + * Definiert ein IPSComponentRGB Object, das als Wrapper für RGB Geräte verschiedener Hersteller * verwendet werden kann. * * @author Andreas Brauneis @@ -20,6 +20,8 @@ * Version 2.50.1, 31.01.2012
*/ + IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); + abstract class IPSComponentRGB extends IPSComponent { /** @@ -30,9 +32,9 @@ abstract class IPSComponentRGB extends IPSComponent { * * @param integer $variable ID der auslösenden Variable * @param string $value Wert der Variable - * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + * @param IPSModuleRGB $module Module Object an das das aufgetretene Event weitergeleitet werden soll */ - abstract public function HandleEvent($variable, $value, IPSModuleDimmer $module); + abstract public function HandleEvent($variable, $value, IPSModuleRGB $module); /** * @public diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_DMX.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_DMX.class.php new file mode 100644 index 0000000..2a2576b --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_DMX.class.php @@ -0,0 +1,100 @@ + + */ + + IPSUtils_Include ('IPSComponentRGB.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentRGB'); + + class IPSComponentRGB_DMX extends IPSComponentRGB { + + private $instanceId; + private $channel1; + private $channel2; + private $channel3; + + /** + * @public + * + * Initialisierung eines IPSComponentRGB_DMX Objektes + * + * @param integer $instanceId InstanceId des IPS-RGBW868 Devices + */ + public function __construct($instanceId, $channel1=1, $channel2=2, $channel3=3) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->channel1 = $channel1; + $this->channel2 = $channel2; + $this->channel3 = $channel3; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleRGB $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleRGB $module){ + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId.','.$this->channel1.','.$this->channel2.','.$this->channel3; + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $power RGB Gerät On/Off + * @param integer $color RGB Farben (Hex Codierung) + * @param integer $level Dimmer Einstellung der RGB Beleuchtung (Wertebereich 0-100) + */ + public function SetState($power, $color, $level) { + if (!$power) { + DMX_SetValue ($this->instanceId, 0, 0); + } else { + $red = floor($color/256/256); + $green = floor(($color-$red*256*256)/256); + $blue = floor(($color-$red*256*256-$green*256)); + $red = floor($red*$level/100); + $green = floor($green*$level/100); + $blue = floor($blue*$level/100); + + DMX_SetValue ($this->instanceId, $this->channel1, $red); + DMX_SetValue ($this->instanceId, $this->channel2, $green); + DMX_SetValue ($this->instanceId, $this->channel3, $blue); + } + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_Dummy.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_Dummy.class.php new file mode 100644 index 0000000..9960fd3 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_Dummy.class.php @@ -0,0 +1,80 @@ + + */ + + IPSUtils_Include ('IPSComponentRGB.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentRGB'); + + class IPSComponentRGB_Dummy extends IPSComponentRGB { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentRGB_Dummy Objektes + * + * @param integer $instanceId InstanceId des Dummy Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleRGB $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleRGB $module){ + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $power RGB Gerät On/Off + * @param integer $color RGB Farben (Hex Codierung) + * @param integer $level Dimmer Einstellung der RGB Beleuchtung (Wertebereich 0-100) + */ + public function SetState($power, $color, $level) { + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_IPS868.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_IPS868.class.php index 4e2219c..4a7141f 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_IPS868.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_IPS868.class.php @@ -19,7 +19,9 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentRGB_IPS868 extends IPSComponentRGB { + IPSUtils_Include ('IPSComponentRGB.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentRGB'); + + class IPSComponentRGB_IPS868 extends IPSComponentRGB { private $instanceId; @@ -47,6 +49,19 @@ public function __construct($instanceId) { public function HandleEvent($variable, $value, IPSModuleRGB $module){ } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * @@ -57,7 +72,7 @@ public function HandleEvent($variable, $value, IPSModuleRGB $module){ * @param integer $level Dimmer Einstellung der RGB Beleuchtung (Wertebereich 0-100) */ public function SetState($power, $color, $level) { - if (!power) { + if (!$power) { @PJ_DimRGBW ($this->instanceId, 0, 2, 0, 2, 0, 2, 0, 2); } else { $red = floor($color/256/256); diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_PhilipsHUE.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_PhilipsHUE.class.php new file mode 100644 index 0000000..0d3d4da --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_PhilipsHUE.class.php @@ -0,0 +1,458 @@ + + */ + + IPSUtils_Include ('IPSComponentRGB.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentRGB'); + IPSUtils_Include ("IPSLogger.inc.php", "IPSLibrary::app::core::IPSLogger"); + + class IPSComponentRGB_PhilipsHUE extends IPSComponentRGB { + + private $bridgeIP; + private $lampNr; + private $hueKey; + private $modelID; + + public $Status; + public $Hue; + public $ModelID; + public $XY; + public $Level; + public $Saturation; + + + /** + * @public + * + * Initialisierung eines IPSComponentRGB_PhilipsHUE Objektes + * + * @param string $bridgeIP IP Addresse der HUE Lampe + * @param string $hueKey Key zum Zugriff auf die Lampe + * @param string $lampNr Nummer der Lampe + * @param string $modelID Philips Modelnummer der Lampe + * + */ + public function __construct($bridgeIP, $hueKey, $lampNr, $modelID) { + + $this->bridgeIP = $bridgeIP; + $this->hueKey = $hueKey; + $this->lampNr = $lampNr; + $this->modelID = $modelID; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleRGB $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleRGB $module){ + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->bridgeIP.','.$this->hueKey.','.$this->lampNr.','.$this->modelID; + } + + /** + * @brief Sends command to HUE bridge using JSON + * + * @param [in] $type Type of parameter ([Lights, Bridge] + * @param [in] $request [GET,PUT] + * @param [in] $cmd Command string + * @return Returns the result of the JSON command + * + */ + private function hue_SendLampCommand($type, $request, $cmd = null) { + + switch ($type) { + + case 'Lights': + $json_url = 'http://'.$this->bridgeIP.'/api/'.$this->hueKey.'/lights/'.$this->lampNr.'/state'; + break; + + case 'Bridge': + $json_url = 'http://'.$this->bridgeIP.'/api/'.$this->hueKey; + break; + + case 'api': + //For further development + break; + + default: + break; + } + + + $json_string = '{'.$cmd.'}'; + + // Configuring curl + $ch = curl_init($json_url); + $options = array( + CURLOPT_RETURNTRANSFER => true, + CURLOPT_CUSTOMREQUEST => $request, + CURLOPT_HTTPHEADER => array('Content-type: application/json') , + CURLOPT_POSTFIELDS => $json_string + ); + curl_setopt_array($ch, $options); + IPSLogger_Inf(__file__, 'Send PhilipsHUE: JsonURL='.$json_url.', Command='.$json_string); + + // Execute + if ($this->bridgeIP <> '') { + $json_result = curl_exec($ch); + return json_decode($json_result); + } + } + + + /** + * @public + * + * @brief Zustand Setzen + * + * @param boolean $power RGB Gerät On/Off + * @param integer $color RGB Farben (Hex Codierung) + * @param integer $level Dimmer Einstellung der RGB Beleuchtung (Wertebereich 0-100) + */ + public function SetState($power, $color, $level) { + if (!$power) { + $cmd = '"on":false'; + } else { + + $rotDec = (($color >> 16) & 0xFF); + $gruenDec = (($color >> 8) & 0xFF); + $blauDec = (($color >> 0) & 0xFF); + $color_array = array($rotDec,$gruenDec,$blauDec); + + $modelID = $this->modelID; + + //Convert RGB to XY values + $values = $this->calculateXY($color_array, $modelID); + + //IPSLight is using percentage in variable Level, Hue is using [0..255] + $level = round($level * 2,55); + $cmd = '"bri":'.$level.', "xy":['.$values->x.','.$values->y.'], "on":true'; + + } + + $type = 'Lights'; //Type of Command + $request = 'PUT'; //Type of Request + + //Send command to Hue lamp + $this->hue_SendLampCommand($type, $request, $cmd); + } + + /** + * @brief Queries bridge for details of the lamp + * + * @return None, details are populated in the public variables of the class + * + */ + public function QueryHUE() { + + + $type = 'Bridge'; //Type of Command + $request = 'GET'; //Type of Request + + //Send command to Hue lamp + $result = $this->hue_SendLampCommand($type, $request); + + $id = 1; + + foreach ($result->lights as $light) { + + if ($id == $this->lampNr) { + + $this->Status = $light->state->on; + $this->Hue = $light->state->hue; + $this->ModelID = $light->modelid; + $this->XY = $light->state->xy; + $this->Level = $light->state->bri; + $this->Saturation = $light->state->sat; + + } + + $id=$id+1; + + } + } + + /** + * @brief Sets the alert state. 'select' blinks once, 'lselect' blinks repeatedly, 'none' turns off blinking + * + */ + public function SetAlert( $alert_type = 'select' ) { + + $type = 'Lights'; //Type of Command + $request = 'PUT'; //Type of Request + $cmd = '"alert":"'.$alert_type.'"'; + + //Send command to Hue lamp + $this->hue_SendLampCommand($type, $request, $cmd); + } + + /** + * @brief Converts colour value from RGB to XY + * + * @param [in] $color Color in RGB + * @param [in] $model Philips lamp model + * @return XY value + */ + private function calculateXY($color, $model) { + + // Get the RGB values from color object and convert them to be between 0 and 1. + $red = round($color[0] / 255,2); + $green = round($color[1] / 255,2); + $blue = round($color[2] / 255,2); + + // Apply a gamma correction to the RGB values + $r = ($red > 0.04045) ? pow(($red + 0.055) / (1.0 + 0.055), 2.4) : ($red / 12.92); + $g = ($green > 0.04045) ? pow(($green + 0.055) / (1.0 + 0.055), 2.4) : ($green / 12.92); + $b = ($blue > 0.04045) ? pow(($blue + 0.055) / (1.0 + 0.055), 2.4) : ($blue / 12.92); + + // Convert the RGB values to XYZ using the Wide RGB D65 conversion formula + $X = $r * 0.649926 + $g * 0.103455 + $b * 0.197109; + $Y = $r * 0.234327 + $g * 0.743075 + $b * 0.022598; + $Z = $r * 0.0000000 + $g * 0.053077 + $b * 1.035763; + + // Calculate the xy values from the XYZ values + if($X==0 && $Y ==0 && $Z ==0) $Z = 0.1; + + $cx = $X / ($X + $Y + $Z); + $cy = $Y / ($X + $Y + $Z); + if(is_nan($cx)) $cx = 0.0; + if(is_nan($cy)) $cy = 0.0; + + // Check if the found xy value is within the color gamut of the light + $xyPoint = new cgpoint($cx, $cy); + $colorPoints = $this->getColorPointsForModel($model); + $inReachOfLamps = $this->checkPointInLampsReach($xyPoint, $colorPoints); + + if(!$inReachOfLamps) + { + // Calculate the closest point on the color gamut triangle and use that as xy value + $pAB = $this->getClosestPointToPoints($colorPoints[0], $colorPoints[1], $xyPoint); + $pAC = $this->getClosestPointToPoints($colorPoints[2], $colorPoints[0], $xyPoint); + $pBC = $this->getClosestPointToPoints($colorPoints[1], $colorPoints[2], $xyPoint); + + $dAB = $this->getDistanceBetweenTwoPoints($xyPoint, $pAB); + $dAC = $this->getDistanceBetweenTwoPoints($xyPoint, $pAC); + $dBC = $this->getDistanceBetweenTwoPoints($xyPoint, $pBC); + + $lowest = $dAB; + $closestPoint = $pAB; + + if($dAC < $lowest) + { + $lowest = $dAC; + $closestPoint = $pAC; + } + if($dBC < $lowest) + { + $lowest = $dBC; + $closestPoint = $pBC; + } + + $cx = $closestPoint->x; + $cy = $closestPoint->y; + } + return new cgpoint($cx, $cy); + } + + /** + * @brief Returns the color gamut of a specific Philips light model + * + * @param [in] $model ID of the lamp model + * @return Array with color gamut + * + * @details + * + * Following models are supported: + * + * Hue + * "LCT001": Hue A19 + * "LCT002": Hue BR30 + * "LCT003": Hue GU10 + * LivingColors + * "LLC001": Monet, Renoir, Mondriaan (gen II) + * "LLC005": Bloom (gen II) + * "LLC006": Iris (gen III) + * "LLC007": Bloom, Aura (gen III) + * "LLC011": Hue Bloom + * "LLC012": Hue Bloom + * "LLC013": Storylight + * "LST001": Light Strips + * + */ + private function getColorPointsForModel($model) { + $colorPoints = array(); + $hueBulbs = array("LCT001","LCT002","LCT003"); + $livingColors = array("LLC001","LLC005","LLC006","LLC007","LLC011","LLC012","LLC013","LST001"); + + if(in_array($model, $hueBulbs)) + { + array_push($colorPoints, new cgpoint(0.674,0.322)); + array_push($colorPoints, new cgpoint(0.408,0.517)); + array_push($colorPoints, new cgpoint(0.168,0.041)); + } + else if(in_array($model, $livingColors)) + { + array_push($colorPoints, new cgpoint(0.703,0.296)); + array_push($colorPoints, new cgpoint(0.214,0.709)); + array_push($colorPoints, new cgpoint(0.139,0.081)); + } + else + { + array_push($colorPoints, new cgpoint(1.0,0.0)); + array_push($colorPoints, new cgpoint(0.0,1.0)); + array_push($colorPoints, new cgpoint(0.0,0.0)); + } + + return $colorPoints; + } + + /** + * @brief Find the distance between two points. + * + * @param one + * @param two + * @return the distance between point one and two + */ + private function getDistanceBetweenTwoPoints($one, $two) { + + $dx = $one->x - $two->x; + $dy = $one->y - $two->y; + $dist = sqrt($dx * $dx + $dy * $dy); + return $dist; + } + + /** + * @brief Find the closest point on a line. This point will be within reach of the lamp. + * + * @param A the point where the line starts + * @param B the point where the line ends + * @param P the point which is close to a line. + * @return the point which is on the line. + */ + private function getClosestPointToPoints($A, $B, $P) { + + $AP = new cgpoint($P->x - $A->x, $P->y - $A->y); + $AB = new cgpoint($B->x - $A->x, $B->y - $A->y); + $ab2 = $AB->x * $AB->x + $AB->y * $AB->y; + $ap_ab = $AP->x * $AB->x + $AP->y * $AB->y; + + $t = $ap_ab / $ab2; + if($t < 0.0) + { + $t = 0.0; + } + else if($t > 1.0) + { + $t = 1.0; + } + $newPoint = new cgpoint($A->x + $AB->x * $t, $A->y + $AB->y * $t); + return $newPoint; + } + + /** + * @brief Calculates crossProduct of two 2D vectors / points + * + * @param p1 first point used as vector + * @param p2 second point used as vector + * @return crossProduct of vectors + * + */ + private function getCrossProduct($p1, $p2) { + return ($p1->x * $p2->y - $p1->y * $p2->x); + } + + /** + * @brief Method to see if the given XY value is within the reach of the lamps. + * + * @param p the point containing the X,Y value + * @return true if within reach, false otherwise. + * + */ + private function checkPointInLampsReach($p, $colorPoints) { + + $red = $colorPoints[0]; + $green = $colorPoints[1]; + $blue = $colorPoints[2]; + $grx =$green->x - $red->x; + $gry =$green->y - $red->y; + $brx =$blue->x - $red->x; + $bry =$blue->y -$red->y; + $prx =$p->x - $red->x; + $pry =$p->y - $red->y; + $v1 = new cgpoint($grx, $gry); + $v2 = new cgpoint($brx, $bry); + $q = new cgpoint($prx, $pry); + + $s = ($this->getCrossProduct($q, $v2) / $this->getCrossProduct($v1, $v2)); + $t = ($this->getCrossProduct($v1, $q) / $this->getCrossProduct($v1, $v2)); + + if(($s > 0.0) && ($t >= 0.0) && ($s + $t <= 1.0)) + { + return true; + } + return false; + } + + + } + + // @cond Ignore this class in doxygen + /** + * + * Helper class to ease translation from Philips C-coding + * Implements CGPoint class from iOS SDK + * + */ + + class cgpoint { + + public $x; + public $y; + + function __construct($_x, $_y) { + $this->x = $_x; + $this->y = $_y; + } + + }; + // @endcond + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor.class.php new file mode 100644 index 0000000..7255436 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor.class.php @@ -0,0 +1,42 @@ + + */ + + IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); + + abstract class IPSComponentSensor extends IPSComponent { + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSensor $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + abstract public function HandleEvent($variable, $value, IPSModuleSensor $module); + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor_Button.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor_Button.class.php new file mode 100644 index 0000000..3188251 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor_Button.class.php @@ -0,0 +1,57 @@ + + */ + + IPSUtils_Include ('IPSComponentSensor.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSensor'); + + class IPSComponentSensor_Button extends IPSComponentSensor { + + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSensor $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSensor $module){ + $module->SyncButton($value, $this); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor_IRTrans.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor_IRTrans.class.php new file mode 100644 index 0000000..1393f6f --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor_IRTrans.class.php @@ -0,0 +1,70 @@ + + */ + + IPSUtils_Include ('IPSComponentSensor.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSensor'); + + class IPSComponentSensor_IRTrans extends IPSComponentSensor { + + + private $instanceId; + + /** + * @public + * + * Initialisierung des IPSComponentSensor_IRTrans + * + * @param integer $instanceId InstanceId von IRTrans + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSensor $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSensor $module){ + $module->SyncButton($value, $this); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor.class.php new file mode 100644 index 0000000..00e4d0d --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor.class.php @@ -0,0 +1,49 @@ + + */ + + IPSUtils_Include ('IPSModule.class.php', 'IPSLibrary::app::core::IPSComponent'); + + abstract class IPSModuleSensor extends IPSModule { + + /** + * @public + * + * Ermöglicht die Synchronisation von Sensorwerten mit Modulen + * + * @param string $value Sensorwert + * @param IPSComponentSensor $component Sensor Komponente + */ + abstract public function SyncButton($value, IPSComponentSensor $component); + + /** + * @public + * + * Ermöglicht das Verarbeiten eines Taster Signals + * + */ + abstract public function ExecuteButton(); + + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_Entertainment.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_Entertainment.class.php new file mode 100644 index 0000000..2012d4d --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_Entertainment.class.php @@ -0,0 +1,107 @@ + + */ + + IPSUtils_Include ("Entertainment_InterfaceIPSComponentSensor.inc.php", "IPSLibrary::app::modules::Entertainment"); + IPSUtils_Include ('IPSModuleSensor.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSensor'); + + class IPSModuleSensor_Entertainment extends IPSModuleSensor { + + private $functionToCall; + private $param1; + private $param2; + private $param3; + + /** + * @public + * + * Initialisierung eines IPSModuleSensor_Entertainment Objektes + * + * @param integer $functionToCall Funktion, die aufgerufen werden soll + * @param boolean $param1 Parameter 1 + * @param boolean $param2 Parameter 2 + * @param boolean $param3 Parameter 3 + */ + public function __construct($functionToCall, $param1='', $param2='', $param3='') { + $this->functionToCall = $functionToCall; + $this->param1 = $param1; + $this->param2 = $param2; + $this->param3 = $param3; + } + + private function GetParam($param) { + if (is_numeric($param)) { + return (int)$param; + } elseif ($param=='true') { + return true; + } elseif ($param=='false') { + return false; + } else { + return $param; + } + } + + private function GetParamArray() { + $parameters = array(); + if ($this->param3<>'') { + $parameters[] = $this->GetParam($this->param1); + $parameters[] = $this->GetParam($this->param2); + $parameters[] = $this->GetParam($this->param3); + } elseif ($this->param2<>'') { + $parameters[] = $this->GetParam($this->param1); + $parameters[] = $this->GetParam($this->param2); + } elseif ($this->param1<>'') { + $parameters[] = $this->GetParam($this->param1); + } else { + } + return $parameters; + } + + /** + * @public + * + * Ermöglicht die Synchronisation von Sensorwerten mit Modulen + * + * @param string $value Sensorwert + * @param IPSComponentSensor $component Sensor Komponente + */ + public function SyncButton($value, IPSComponentSensor $component) { + $this->ExecuteButton(); + } + + /** + * @public + * + * Ermöglicht das Verarbeiten eines Taster Signals + * + */ + public function ExecuteButton () { + if (function_exists($this->functionToCall)) { + call_user_func_array($this->functionToCall, $this->GetParamArray()); + } else { + Entertainment_IPSComponentSensor_ReceiveData($this->functionToCall, $this->param1, $this->param2, $this->param3); + } + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IPSLight.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IPSLight.class.php new file mode 100644 index 0000000..1b5558c --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IPSLight.class.php @@ -0,0 +1,107 @@ + + */ + + IPSUtils_Include ('IPSLight.inc.php', 'IPSLibrary::app::modules::IPSLight'); + IPSUtils_Include ('IPSModuleSensor.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSensor'); + + class IPSModuleSensor_IPSLight extends IPSModuleSensor { + + private $lightObject; + private $lightFunction; + private $lightValue; + + /** + * @public + * + * Initialisierung eines IPSModuleSensor_IPSLight Objektes + * + * @param string $lightObject Licht Object/Name (Leuchte, Gruppe, Programm, ...) + * @param string $lightFunction Function die ausgeführt werden soll + * @param string $lightValue Wert für Beleuchtungs Änderung + */ + public function __construct($lightFunction, $lightObject, $lightValue=null) { + $this->lightObject = $lightObject; + $this->lightFunction = $lightFunction; + $this->lightValue = $lightValue; + } + + + /** + * @public + * + * Ermöglicht die Synchronisation von Sensorwerten mit Modulen + * + * @param string $value Sensorwert + * @param IPSComponentSensor $component Sensor Komponente + */ + public function SyncButton($value, IPSComponentSensor $component) { + $this->ExecuteButton(); + } + + /** + * @public + * + * Ermöglicht das Verarbeiten eines Taster Signals + * + */ + public function ExecuteButton () { + switch ($this->lightFunction) { + case 'IPSLight_DimAbsoluteByName': + IPSLight_DimAbsoluteByName($this->lightObject, $this->lightValue); + break; + case 'IPSLight_DimRelativByName': + IPSLight_DimRelativByName($this->lightObject, $this->lightValue); + break; + + case 'IPSLight_SetSwitchByName': + if ($this->lightValue == 'true') + IPSLight_SetSwitchByName($this->lightObject, true); + else + IPSLight_SetSwitchByName($this->lightObject, false); + break; + case 'IPSLight_ToggleSwitchByName': + IPSLight_ToggleSwitchByName($this->lightObject); + break; + + + case 'IPSLight_SetGroupByName': + IPSLight_SetGroupByName($this->lightObject, $this->lightValue); + break; + case 'IPSLight_ToggleGroupByName': + IPSLight_ToggleGroupByName($this->lightObject); + break; + + case 'IPSLight_SetProgramNextByName': + IPSLight_SetProgramNextByName($this->lightObject); + break; + case 'IPSLight_SetProgramName': + IPSLight_SetProgramName($this->lightObject, $this->lightValue); + break; + default: + IPSLogger_Wrn(__file__, 'Unknown Button Function "'.$this->lightFunction.'"'); + } + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IPSShadowing.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IPSShadowing.class.php new file mode 100644 index 0000000..d890f2e --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IPSShadowing.class.php @@ -0,0 +1,76 @@ + + */ + + IPSUtils_Include ("IPSShadowing.inc.php", "IPSLibrary::app::modules::IPSShadowing"); + IPSUtils_Include ('IPSModuleSensor.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSensor'); + + class IPSModuleSensor_IPSShadowing extends IPSModuleSensor { + + private $instanceId; + private $movementId; + + /** + * @public + * + * Initialisierung eines IPSModuleSensor_IPSShadowing Objektes + * + * @param integer $instanceId InstanceId des Homematic Devices + * @param boolean $movementId Movement Command + */ + public function __construct($instanceId, $movementId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->movementId = $movementId; + } + + + /** + * @public + * + * Ermöglicht die Synchronisation von Sensorwerten mit Modulen + * + * @param string $value Sensorwert + * @param IPSComponentSensor $component Sensor Komponente + */ + public function SyncButton($value, IPSComponentSensor $component) { + $this->ExecuteButton(); + } + + /** + * @public + * + * Ermöglicht das Verarbeiten eines Taster Signals + * + */ + public function ExecuteButton () { + $device = new IPSShadowing_Device($this->instanceId); + $movementId = GetValue(IPS_GetObjectIDByIdent(c_Control_Movement, $this->instanceId)); + if ($movementId==c_MovementId_MovingIn or $movementId==c_MovementId_MovingOut or $movementId==c_MovementId_Up or $movementId==c_MovementId_Down) { + $device->MoveByControl(c_MovementId_Stop); + } else { + $device->MoveByControl($this->movementId); + } + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IRTrans.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IRTrans.class.php new file mode 100644 index 0000000..f02fbbc --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IRTrans.class.php @@ -0,0 +1,73 @@ + + */ + + IPSUtils_Include ("IRTrans_InterfaceIPSComponentSensor.inc.php", "IPSLibrary::app::modules::IRTrans"); + IPSUtils_Include ('IPSModuleSensor.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSensor'); + + class IPSModuleSensor_IRTrans extends IPSModuleSensor { + + private $instanceId; + private $device; + private $button; + + /** + * @public + * + * Initialisierung eines IPSModuleSensor_IRTrans Objektes + * + * @param integer $instanceId InstanceId + * @param string $device Device + * @param string $button Button + */ + public function __construct($instanceId, $device='', $button='') { + $this->instanceId = $instanceId; + $this->device = $device; + $this->button = $button; + } + + + /** + * @public + * + * Ermöglicht die Synchronisation von Sensorwerten mit Modulen + * + * @param string $value Sensorwert + * @param IPSComponentSensor $component Sensor Komponente + */ + public function SyncButton($value, IPSComponentSensor $component) { + $this->ExecuteButton(); + } + + /** + * @public + * + * Ermöglicht das Verarbeiten eines Taster Signals + * + */ + public function ExecuteButton () { + IRT_SendOnce($this->instanceId, $this->device, $this->button); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_NetPlayer.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_NetPlayer.class.php new file mode 100644 index 0000000..b0367a5 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_NetPlayer.class.php @@ -0,0 +1,89 @@ + + */ + + IPSUtils_Include ("NetPlayer.inc.php", "IPSLibrary::app::modules::NetPlayer"); + IPSUtils_Include ('IPSModuleSensor.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSensor'); + + class IPSModuleSensor_NetPlayer extends IPSModuleSensor { + + private $functionToCall; + private $param1; + private $param2; + private $param3; + + /** + * @public + * + * Initialisierung eines IPSModuleSensor_NetPlayer Objektes + * + * @param integer $functionToCall Funktion + * @param boolean $param1 Parameter 1 + * @param boolean $param2 Parameter 2 + * @param boolean $param3 Parameter 3 + */ + public function __construct($functionToCall, $param1='', $param2='', $param3='') { + $this->functionToCall = $functionToCall; + $this->param1 = $param1; + $this->param2 = $param2; + $this->param3 = $param3; + } + + + /** + * @public + * + * Ermöglicht die Synchronisation von Sensorwerten mit Modulen + * + * @param string $value Sensorwert + * @param IPSComponentSensor $component Sensor Komponente + */ + public function SyncButton($value, IPSComponentSensor $component) { + $this->ExecuteButton(); + } + + /** + * @public + * + * Ermöglicht das Verarbeiten eines Taster Signals + * + */ + public function ExecuteButton () { + $parameters = array(); + if ($this->param3<>'') { + $parameters[] = $this->param1; + $parameters[] = $this->param2; + $parameters[] = $this->param3; + } elseif ($this->param2<>'') { + $parameters[] = $this->param1; + $parameters[] = $this->param2; + } elseif ($this->param1<>'') { + $parameters[] = $this->param1; + } else { + } + + call_user_func_array($this->functionToCall, $parameters); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter.class.php index d846bdf..8939826 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter.class.php @@ -20,6 +20,8 @@ * Version 2.50.1, 31.01.2012
*/ + IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); + abstract class IPSComponentShutter extends IPSComponent { /** diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_1Wire.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_1Wire.class.php index f5ac4a8..705f36f 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_1Wire.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_1Wire.class.php @@ -19,9 +19,12 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_1Wire extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_1Wire extends IPSComponentShutter { private $instanceId; + private $reverseControl; /** * @public @@ -29,9 +32,24 @@ abstract class IPSComponentShutter_1Wire extends IPSComponentShutter { * Initialisierung eines IPSComponentShutter_1Wire Objektes * * @param integer $instanceId InstanceId des 1Wire Devices + * @param boolean $reverseControl Reverse Ansteuerung des Devices + */ + public function __construct($instanceId, $reverseControl=false) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->reverseControl = $reverseControl; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object */ - public function __construct($instanceId) { - $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; } /** @@ -55,8 +73,13 @@ public function HandleEvent($variable, $value, IPSModuleShutter $module){ * Hinauffahren der Beschattung */ public function MoveUp(){ - @TMEX_F29_SetStrobe($this->instanceId, True); - @TMEX_F29_SetPort((integer)$this->instanceId, (integer)120+128); + if ($this->reverseControl) { + @TMEX_F29_SetStrobe($this->instanceId, True); + @TMEX_F29_SetPort((integer)$this->instanceId, (integer)120); + } else { + @TMEX_F29_SetStrobe($this->instanceId, True); + @TMEX_F29_SetPort((integer)$this->instanceId, (integer)120+128); + } } /** @@ -65,8 +88,13 @@ public function MoveUp(){ * Hinunterfahren der Beschattung */ public function MoveDown(){ - @TMEX_F29_SetStrobe($this->instanceId, True); - @TMEX_F29_SetPort((integer)$this->instanceId, (integer)120); + if ($this->reverseControl) { + @TMEX_F29_SetStrobe($this->instanceId, True); + @TMEX_F29_SetPort((integer)$this->instanceId, (integer)120+128); + } else { + @TMEX_F29_SetStrobe($this->instanceId, True); + @TMEX_F29_SetPort((integer)$this->instanceId, (integer)120); + } } /** diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Dummy.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Dummy.class.php index 07830e9..52e7f68 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Dummy.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Dummy.class.php @@ -19,7 +19,9 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_Dummy extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_Dummy extends IPSComponentShutter { private $instanceId; @@ -34,6 +36,19 @@ public function __construct($instanceId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_EIB.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_EIB.class.php new file mode 100644 index 0000000..0034c0d --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_EIB.class.php @@ -0,0 +1,125 @@ + + */ + + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_EIB extends IPSComponentShutter { + + private $instanceId1; + private $instanceId2; + private $reverseControl; + /** + * @public + * + * Initialisierung eines IPSComponentShutter_EIB Objektes + * + * @param integer $instanceId1 InstanceId des EIB Devices + * @param integer $instanceId2 InstanceId 2 des EIB Devices (Richtungs Relais für den Fall das normale EIB Switches verwendet werden) + * @param boolean $reverseControl Richtungs Schalter (default=false) + */ + public function __construct($instanceId1, $instanceId2='', $reverseControl=false) { + $this->instanceId1 = IPSUtil_ObjectIDByPath($instanceId1); + if ($this->instanceId2<>'') { + $this->instanceId2 = IPSUtil_ObjectIDByPath($instanceId2); + } + $this->reverseControl = $reverseControl; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleShutter $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleShutter $module){ + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId1.','.$this->instanceId2.','.$this->reverseControl; + } + + /** + * @public + * + * Hinauffahren der Beschattung + */ + public function MoveUp(){ + if ($this->instanceId2==null) { + if ($this->reverseControl) { + EIB_Move($this->instanceId1, 4); //0 = Open, 2 = Stop, 4 = Close + } else { + EIB_Move($this->instanceId1, 0); //0 = Open, 2 = Stop, 4 = Close + } + } else { + EIB_Switch($this->instanceId1, true); + EIB_Switch($this->instanceId2, $this->reverseControl); + } + } + + /** + * @public + * + * Hinunterfahren der Beschattung + */ + public function MoveDown(){ + if ($this->instanceId2==null) { + if ($this->reverseControl) { + EIB_Move($this->instanceId1, 0); //0 = Open, 2 = Stop, 4 = Close + } else { + EIB_Move($this->instanceId1, 4); //0 = Open, 2 = Stop, 4 = Close + } + } else { + EIB_Switch($this->instanceId1, true); + EIB_Switch($this->instanceId2, !$this->reverseControl); + } + } + + /** + * @public + * + * Stop + */ + public function Stop() { + if ($this->instanceId2==null) { + EIB_Move($this->instanceId1, 2); //0 = Open, 2 = Stop, 4 = Close + } else { + EIB_Switch($this->instanceId1, false); + EIB_Switch($this->instanceId2, false); + } + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Enocean.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Enocean.class.php index 7402154..182f2e7 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Enocean.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Enocean.class.php @@ -19,11 +19,13 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_Enocean extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_Enocean extends IPSComponentShutter { private $instanceId; private $isRunningId; - + /** * @public * @@ -33,20 +35,33 @@ abstract class IPSComponentShutter_Enocean extends IPSComponentShutter { */ public function __construct($instanceId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); - $this->isRunningId = @IPS_GetObjectIDByIdent('isrunning', $this->instanceId); + $this->isRunningId = @IPS_GetObjectIDByIdent('runningMode', $this->instanceId); if($this->isRunningId===false) { - $this->isRunningId = IPS_CreateVariable($this->instanceId); - IPS_SetParent($this->isRunningId, $id); - IPS_SetName($this->isRunningId, 'IsRunning'); - IPS_SetIdent($this->isRunningId, 'isrunning'); - IPS_SetInfo($this->isRunningId, "This Variable was created by Script IPSComponentShutter_FS20"); + $this->isRunningId = IPS_CreateVariable(1 /*Integer*/); + IPS_SetParent($this->isRunningId, $this->instanceId); + IPS_SetName($this->isRunningId, 'RunningMode'); + IPS_SetIdent($this->isRunningId, 'runningMode'); + IPS_SetInfo($this->isRunningId, "This Variable was created by Script IPSComponentShutter_Enocean"); } } /** * @public * - * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event * an das entsprechende Module zu leiten. * * @param integer $variable ID der auslösenden Variable @@ -65,11 +80,11 @@ public function HandleEvent($variable, $value, IPSModuleShutter $module){ */ public function MoveUp(){ if(!GetValue($this->isRunningId)) { - ENO_SwitchMode($this->InstanceId, true); - SetValue($this->isRunningId, true); + ENO_SwitchMode($this->instanceId, true); + SetValue($this->isRunningId, 1); } } - + /** * @public * @@ -77,24 +92,28 @@ public function MoveUp(){ */ public function MoveDown(){ if(!GetValue($this->isRunningId)) { - ENO_SwitchMode($this->InstanceId, false); - SetValue($this->isRunningId, true); + ENO_SwitchMode($this->instanceId, false); + SetValue($this->isRunningId, 2); } } - + /** * @public * * Stop */ public function Stop() { - if(GetValue($this->isRunningId)) { - $value = GetValue(IPS_GetObjectIDByIdent($this->InstanceId, "StatusVariable") - ENO_SwitchMode($this->InstanceId, $value); - SetValue($this->isRunningId, false); + $running = GetValue($this->isRunningId); + if($running != 0) { + if ($running == 1) { + ENO_SwitchMode($this->instanceId, true); + } else if ($running == 2) { + ENO_SwitchMode($this->instanceId, false); + } else { + } + SetValue($this->isRunningId, 0); } } - } /** @}*/ diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_FS20.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_FS20.class.php index 1c3690a..05e3814 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_FS20.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_FS20.class.php @@ -19,7 +19,9 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_FS20 extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_FS20 extends IPSComponentShutter { private $instanceId; private $isRunningId; @@ -35,14 +37,27 @@ public function __construct($instanceId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); $this->isRunningId = @IPS_GetObjectIDByIdent('isrunning', $this->instanceId); if($this->isRunningId===false) { - $this->isRunningId = IPS_CreateVariable($this->instanceId); - IPS_SetParent($this->isRunningId, $id); + $this->isRunningId = IPS_CreateVariable(0); + IPS_SetParent($this->isRunningId, $this->instanceId); IPS_SetName($this->isRunningId, 'IsRunning'); IPS_SetIdent($this->isRunningId, 'isrunning'); IPS_SetInfo($this->isRunningId, "This Variable was created by Script IPSComponentShutter_FS20"); } } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * @@ -65,7 +80,7 @@ public function HandleEvent($variable, $value, IPSModuleShutter $module){ */ public function MoveUp(){ if(!GetValue($this->isRunningId)) { - FS20_SwitchMode($this->InstanceId, true); + FS20_SwitchMode($this->instanceId, true); SetValue($this->isRunningId, true); } } @@ -77,7 +92,7 @@ public function MoveUp(){ */ public function MoveDown(){ if(!GetValue($this->isRunningId)) { - FS20_SwitchMode($this->InstanceId, false); + FS20_SwitchMode($this->instanceId, false); SetValue($this->isRunningId, true); } } @@ -89,8 +104,8 @@ public function MoveDown(){ */ public function Stop() { if(GetValue($this->isRunningId)) { - $value = GetValue(IPS_GetObjectIDByIdent($this->InstanceId, "StatusVariable") - FS20_SwitchMode($this->InstanceId, $value); + $value = GetValue(IPS_GetObjectIDByIdent("StatusVariable", $this->instanceId)); + FS20_SwitchMode($this->instanceId, $value); SetValue($this->isRunningId, false); } } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Homematic.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Homematic.class.php index dda998d..e561a7b 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Homematic.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Homematic.class.php @@ -19,19 +19,24 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_Homematic extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_Homematic extends IPSComponentShutter { private $instanceId; - + private $reverseControl; + /** * @public * * Initialisierung eines IPSComponentShutter_Homematic Objektes * * @param integer $instanceId InstanceId des Homematic Devices + * @param boolean $reverseControl Reverse Ansteuerung des Devices */ - public function __construct($instanceId) { - $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + public function __construct($instanceId, $reverseControl=false) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->reverseControl = $reverseControl; } /** @@ -45,6 +50,24 @@ public function __construct($instanceId) { * @param IPSModuleShutter $module Module Object an das das aufgetretene Event weitergeleitet werden soll */ public function HandleEvent($variable, $value, IPSModuleShutter $module){ + if ($this->reverseControl) { + $module->SyncPosition(($value*100), $this); + } else { + $module->SyncPosition(100-($value*100), $this); + } + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; } /** @@ -53,7 +76,11 @@ public function HandleEvent($variable, $value, IPSModuleShutter $module){ * Hinauffahren der Beschattung */ public function MoveUp(){ - HM_WriteValueFloat($this->InstanceId , 'LEVEL', 1); + if ($this->reverseControl) { + HM_WriteValueFloat($this->instanceId , 'LEVEL', 0); + } else { + HM_WriteValueFloat($this->instanceId , 'LEVEL', 1); + } } /** @@ -62,7 +89,11 @@ public function MoveUp(){ * Hinunterfahren der Beschattung */ public function MoveDown(){ - HM_WriteValueFloat($this->InstanceId , 'LEVEL', 0); + if ($this->reverseControl) { + HM_WriteValueFloat($this->instanceId , 'LEVEL', 1); + } else { + HM_WriteValueFloat($this->instanceId , 'LEVEL', 0); + } } /** @@ -71,7 +102,7 @@ public function MoveDown(){ * Stop */ public function Stop() { - HM_WriteValueFloat($this->InstanceId , 'STOP', true); + HM_WriteValueBoolean($this->instanceId , 'STOP', true); } } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_HomematicRelay.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_HomematicRelay.class.php new file mode 100644 index 0000000..7cbd7d6 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_HomematicRelay.class.php @@ -0,0 +1,105 @@ + + */ + + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_HomematicRelay extends IPSComponentShutter { + + private $instanceId1; + private $instanceId2; + private $directionSwitch; + + + /** + * @public + * + * Initialisierung eines IPSComponentShutter_HomematicRelay Objektes + * + * @param integer $instanceId1 InstanceId 1 des HM Devices (Movement) + * @param integer $instanceId2 InstanceId 2 des HM Devices (Direction) + * @param boolean $directionSwitch Richtungs Schalter (default=false) + */ + public function __construct($instanceId1, $instanceId2, $directionSwitch=false) { + $this->instanceId1 = IPSUtil_ObjectIDByPath($instanceId1); + $this->instanceId2 = IPSUtil_ObjectIDByPath($instanceId2); + $this->directionSwitch = $directionSwitch; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId1.','.$this->instanceId2; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleShutter $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleShutter $module){ + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Hinauffahren der Beschattung + */ + public function MoveUp() { + HM_WriteValueBoolean($this->instanceId1, 'STATE', true); + HM_WriteValueBoolean($this->instanceId2, 'STATE', $this->directionSwitch); + } + + /** + * @public + * + * Hinunterfahren der Beschattung + */ + public function MoveDown() { + HM_WriteValueBoolean($this->instanceId1, 'STATE', true); + HM_WriteValueBoolean($this->instanceId2, 'STATE', !$this->directionSwitch); + } + + /** + * @public + * + * Stop + */ + public function Stop() { + HM_WriteValueBoolean($this->instanceId1, 'STATE', false); + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_IPSShutterControl.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_IPSShutterControl.class.php index 265d96d..1e043f9 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_IPSShutterControl.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_IPSShutterControl.class.php @@ -19,7 +19,9 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_IPSShutterControl extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_IPSShutterControl extends IPSComponentShutter { private $instanceId; @@ -34,6 +36,19 @@ public function __construct($instanceId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_LCN.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_LCN.class.php index 23a7b32..e6c6e77 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_LCN.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_LCN.class.php @@ -19,7 +19,9 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_LCN extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_LCN extends IPSComponentShutter { private $instanceId1; private $instanceId2; @@ -42,6 +44,19 @@ public function __construct($instanceId1, $instanceId2, $directionSwitch=false) $this->unitType = LCN_GetUnit($this->instanceId1); } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId1.','.$this->instanceId2; + } + /** * @public * @@ -68,8 +83,8 @@ public function MoveUp(){ LCN_SetIntensity($this->instanceId1,100,4); break; case 2: - LCN_SwitchRelay($this->instanceId1, true); LCN_SwitchRelay($this->instanceId2, $this->directionSwitch); + LCN_SwitchRelay($this->instanceId1, true); break; default: throw new IPSComponentException('Unknown Unittype '.$this->unitType.' for LCN Device with ID='.$this->instanceId1); @@ -87,8 +102,8 @@ public function MoveDown(){ LCN_SetIntensity($this->instanceId1,100,4); break; case 2: + LCN_SwitchRelay($this->instanceId2, !$this->directionSwitch); LCN_SwitchRelay($this->instanceId1, true); - LCN_SwitchRelay($this->instanceId2, $this->directionSwitch); break; default: throw new IPSComponentException('Unknown Unittype '.$this->unitType.' for LCN Device with ID='.$this->instanceId1); diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_MoellerEaton.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_MoellerEaton.class.php index 8ef57b3..1a35b72 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_MoellerEaton.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_MoellerEaton.class.php @@ -19,7 +19,9 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_MoellerEaton extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_MoellerEaton extends IPSComponentShutter { private $instanceId; @@ -34,6 +36,20 @@ public function __construct($instanceId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_digitalStrom.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_digitalStrom.class.php new file mode 100644 index 0000000..8ab6c2f --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_digitalStrom.class.php @@ -0,0 +1,97 @@ + + */ + + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_digitalStrom extends IPSComponentShutter { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentShutter_digitalStrom Objektes + * + * @param integer $instanceId InstanceId des digitalStrom Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleShutter $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleShutter $module){ + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Hinauffahren der Beschattung + */ + public function MoveUp(){ + DS_ShutterMoveUp($this->instanceId); + } + + /** + * @public + * + * Hinunterfahren der Beschattung + */ + public function MoveDown(){ + DS_ShutterMoveDown($this->instanceId); + } + + /** + * @public + * + * Stop + */ + public function Stop() { + DS_ShutterStop($this->instanceId); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_zwave.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_zwave.class.php new file mode 100644 index 0000000..a7ee782 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_zwave.class.php @@ -0,0 +1,111 @@ +< + */ + + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_zwave extends IPSComponentShutter { + + private $instanceId; + private $reverseControl; + + /** + * @public + * + * Initialisierung eines IPSComponentShutter_zwave Objektes + * + * @param integer $instanceId InstanceId des Homematic Devices + * @param boolean $reverseControl Reverse Ansteuerung des Devices + */ + public function __construct($instanceId, $reverseControl=false) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->reverseControl = $reverseControl; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleShutter $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleShutter $module){ + if ($this->reverseControl) { + $module->SyncPosition(($value*100), $this); + } else { + $module->SyncPosition(100-($value*100), $this); + } + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Hinauffahren der Beschattung + */ + public function MoveUp(){ + if ($this->reverseControl) { + ZW_ShutterMoveDown($this->instanceId); + } else { + ZW_ShutterMoveUp($this->instanceId); + } + } + + /** + * @public + * + * Hinunterfahren der Beschattung + */ + public function MoveDown(){ + if ($this->reverseControl) { + ZW_ShutterMoveUp($this->instanceId); + } else { + ZW_ShutterMoveDown($this->instanceId); + } + } + + /** + * @public + * + * Stop + */ + public function Stop() { + ZW_ShutterStop ($this->instanceId); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSModuleShutter.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSModuleShutter.class.php index 54420a0..14c6d32 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSModuleShutter.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSModuleShutter.class.php @@ -29,7 +29,7 @@ abstract class IPSModuleShutter extends IPSModule { * * @param string $position Aktuelle Position der Beschattung (Wertebereich 0-100) */ - abstract public function SyncPosition($position); + abstract public function SyncPosition($position, IPSComponentShutter $component); } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSModuleShutter_IPSShadowing.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSModuleShutter_IPSShadowing.class.php new file mode 100644 index 0000000..0d1e99c --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSModuleShutter_IPSShadowing.class.php @@ -0,0 +1,55 @@ + + */ + + IPSUtils_Include ("IPSShadowing.inc.php", "IPSLibrary::app::modules::IPSShadowing"); + IPSUtils_Include ('IPSModuleShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSModuleShutter_IPSShadowing extends IPSModuleShutter { + + /** + * @public + * + * Ermöglicht die Synchronisation der aktuellen Position der Beschattung + * + * @param string $position Aktuelle Position der Beschattung (Wertebereich 0-100) + */ + public function SyncPosition($position, IPSComponentShutter $componentToSync) { + $componentParamsToSync = $componentToSync->GetComponentParams(); + $deviceConfig = get_ShadowingConfiguration(); + foreach ($deviceConfig as $deviceIdent=>$deviceData) { + $componentConfig = IPSComponent::CreateObjectByParams($deviceData[c_Property_Component]); + $componentParamsConfig = $componentConfig->GetComponentParams(); + if ($componentParamsConfig==$componentParamsToSync) { + $categoryIdDevices = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Devices'); + $deviceId = IPS_GetObjectIDByIdent($deviceIdent, $categoryIdDevices); + + $device = new IPSShadowing_Device($deviceId); + $device->MoveByEvent($position); + } + } + } + + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch.class.php index 8443b15..d8c693c 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch.class.php @@ -20,6 +20,8 @@ * Version 2.50.1, 31.01.2012
*/ + IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); + abstract class IPSComponentSwitch extends IPSComponent { /** @@ -40,8 +42,10 @@ abstract public function HandleEvent($variable, $value, IPSModuleSwitch $module) * Zustand Setzen * * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (ACHTUNG: wird nicht von + * allen Hardware Komponenten unterstützt). */ - abstract public function SetState($value); + abstract public function SetState($value, $onTime=false); /** * @public diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_1WireD2408.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_1WireD2408.class.php index abddba5..22c5e11 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_1WireD2408.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_1WireD2408.class.php @@ -32,10 +32,24 @@ class IPSComponentSwitch_1WireD2408 extends IPSComponentSwitch { * Initialisierung eines IPSComponentSwitch_1WireD2408 Objektes * * @param integer $instanceId InstanceId des 1WireD2408 Devices + * @param integer $channelId Kanal des 1WireD2408 Devices */ public function __construct($instanceId, $channelId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); - $this->channelId = $channelId; + $this->channelId = (int)$channelId; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId.','.$this->channelId; } /** @@ -49,6 +63,7 @@ public function __construct($instanceId, $channelId) { * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll */ public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); } /** @@ -57,8 +72,9 @@ public function HandleEvent($variable, $value, IPSModuleSwitch $module){ * Zustand Setzen * * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) */ - public function SetState($value) { + public function SetState($value, $onTime=false) { TMEX_F29_SetPin($this->instanceId, $this->channelId, $value); } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_1WireD2413.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_1WireD2413.class.php new file mode 100644 index 0000000..def604e --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_1WireD2413.class.php @@ -0,0 +1,95 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_1WireD2413 extends IPSComponentSwitch { + + private $instanceId; + private $channelId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_1WireD2413 Objektes + * + * @param integer $instanceId InstanceId des 1WireD2413 Devices + * @param integer $channelId Kanal des 1WireD2413 Devices + */ + public function __construct($instanceId, $channelId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->channelId = (int)$channelId; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId.','.$this->channelId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + TMEX_F3A_SetPin($this->instanceId, $this->channelId, $value); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + return null; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ALLNET.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ALLNET.class.php new file mode 100644 index 0000000..cc479b8 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ALLNET.class.php @@ -0,0 +1,92 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_ALLNET extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_ALLNET Objektes + * + * @param integer $instanceId InstanceId des ALLNET Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + */ + public function SetState($value) { + ALL_SwitchMode($this->instanceId, $value); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + $value = GetValueBoolean(IPS_GetObjectIDByIdent("StatusVariable",$this->instanceId)); + return $value; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_DMX.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_DMX.class.php new file mode 100644 index 0000000..d9b0614 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_DMX.class.php @@ -0,0 +1,99 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_DMX extends IPSComponentSwitch { + + private $instanceId; + private $channelId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_DMX Objektes + * + * @param integer $instanceId InstanceId des DMX Devices + * @param integer $channelId Kanal des DMX Devices + */ + public function __construct($instanceId, $channelId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->channelId = (int)$channelId; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId.','.$this->channelId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + if ($value) { + DMX_SetValue ($this->instanceId, $this->channel1, 255); + } else { + DMX_SetValue ($this->instanceId, $this->channel1, 0); + } + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + return null; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Dummy.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Dummy.class.php index 9caac34..dcc8a5a 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Dummy.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Dummy.class.php @@ -36,6 +36,19 @@ public function __construct($instanceId) { $this->instanceId = $instanceId; } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * @@ -55,9 +68,13 @@ public function HandleEvent($variable, $value, IPSModuleSwitch $module){ * Zustand Setzen * * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) */ - public function SetState($value) { - IPSLogger_Trc(__file__, 'Activate Dummy-Switch "'.$this->instanceId.'", Value='.($value?'On':'Off')); + public function SetState($value, $onTime=false) { + if ($onTime!==false and $value) + IPSLogger_Trc(__file__, 'Activate Dummy-Switch "'.$this->instanceId.'", Value='.($value?'On':'Off').', OnTime='.$onTime); + else + IPSLogger_Trc(__file__, 'Activate Dummy-Switch "'.$this->instanceId.'", Value='.($value?'On':'Off')); } /** diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_EIB.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_EIB.class.php new file mode 100644 index 0000000..65441fa --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_EIB.class.php @@ -0,0 +1,92 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_EIB extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_EIB Objektes + * + * @param integer $instanceId InstanceId des EIB Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + EIB_Switch($this->instanceId, $value); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + GetValue(IPS_GetVariableIDByName('Value', $this->instanceId)); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_EatonMoeller.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_EatonMoeller.class.php new file mode 100644 index 0000000..412ebb6 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_EatonMoeller.class.php @@ -0,0 +1,78 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_EatonMoeller extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_EatonMoeller Objektes + * + * @param integer $instanceId InstanceId des EatonMoeller Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + MXC_SwitchMode($this->instanceId, $value); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + GetValue(IPS_GetVariableIDByName('Status', $this->instanceId)); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Enocean.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Enocean.class.php new file mode 100644 index 0000000..19dac57 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Enocean.class.php @@ -0,0 +1,92 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_Enocean extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_Enocean Objektes + * + * @param integer $instanceId InstanceId des Homematic Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll + */ + public function SetState($value, $onTime=false) { + ENO_SwitchMode($this->instanceId, $value); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + GetValue(IPS_GetVariableIDByIdent('STATE', $this->instanceId)); + } + + } + + /** @}*/ +?> diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_FS20.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_FS20.class.php index 9c66567..b311f3b 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_FS20.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_FS20.class.php @@ -36,6 +36,19 @@ public function __construct($instanceId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * @@ -47,6 +60,7 @@ public function __construct($instanceId) { * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll */ public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); } /** @@ -55,9 +69,13 @@ public function HandleEvent($variable, $value, IPSModuleSwitch $module){ * Zustand Setzen * * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll */ - public function SetState($value) { - FS20_SwitchMode($this->instanceId, $value); + public function SetState($value, $onTime=false) { + if (!$onTime or !$value) + FS20_SwitchMode($this->instanceId, $value); + else + FS20_SwitchDuration($this->instanceId, $value, $onTime); } /** @@ -68,7 +86,9 @@ public function SetState($value) { * @return boolean aktueller Schaltzustand */ public function GetState() { - return null; + $value = GetValueBoolean(IPS_GetObjectIDByIdent("StatusVariable",$this->instanceId)); + return $value; + } } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Homematic.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Homematic.class.php index fff4910..7328b51 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Homematic.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Homematic.class.php @@ -24,6 +24,7 @@ class IPSComponentSwitch_Homematic extends IPSComponentSwitch { private $instanceId; + private $supportsOnTime; /** * @public @@ -31,9 +32,11 @@ class IPSComponentSwitch_Homematic extends IPSComponentSwitch { * Initialisierung eines IPSComponentSwitch_Homematic Objektes * * @param integer $instanceId InstanceId des Homematic Devices + * @param integer $supportsOnTime spezifiziert ob das Homematic Device eine ONTIME unterstützt */ - public function __construct($instanceId) { - $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + public function __construct($instanceId, $supportsOnTime=true) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->supportsOnTime = $supportsOnTime; } /** @@ -47,6 +50,20 @@ public function __construct($instanceId) { * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll */ public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; } /** @@ -55,8 +72,12 @@ public function HandleEvent($variable, $value, IPSModuleSwitch $module){ * Zustand Setzen * * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll */ - public function SetState($value) { + public function SetState($value, $onTime=false) { + if ($onTime!==false and $value and $this->supportsOnTime===true) + HM_WriteValueFloat($this->instanceId, "ON_TIME", $onTime); + HM_WriteValueBoolean($this->instanceId, "STATE", $value); } @@ -68,7 +89,7 @@ public function SetState($value) { * @return boolean aktueller Schaltzustand */ public function GetState() { - GetValue(IPS_GetVariableIDByName('STATE', $this->instanceId)); + GetValue(IPS_GetVariableIDByIdent('STATE', $this->instanceId)); } } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_LCN.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_LCN.class.php new file mode 100644 index 0000000..7095948 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_LCN.class.php @@ -0,0 +1,92 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_LCN extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_LCN Objektes + * + * @param integer $instanceId InstanceId des LCN Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + LCN_SwitchRelay($this->instanceId, $value); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + GetValue(IPS_GetVariableIDByName('Status', $this->instanceId)); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_LCNa.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_LCNa.class.php new file mode 100644 index 0000000..ad290ba --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_LCNa.class.php @@ -0,0 +1,98 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_LCNa extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_LCNa Objektes + * + * @param integer $instanceId InstanceId des LCN Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module) { + if ($value > 0) + $module->SyncState(true, $this); + else + $module->SyncState(false, $this); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + if ($value) + LCN_SetIntensity($this->instanceId, 100, 0.2); + else + LCN_SetIntensity($this->instanceId, 0, 0.2); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + GetValue(IPS_GetVariableIDByName('Intensity', $this->instanceId)); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ModBus.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ModBus.class.php new file mode 100644 index 0000000..3050846 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ModBus.class.php @@ -0,0 +1,79 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_ModBus extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_ModBus Objektes + * + * @param integer $instanceId InstanceId des ModBus Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + ModBus_WriteCoil($this->instanceId, $value); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + GetValue(IPS_GetObjectIDByIdent('Value', $this->instanceId)); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Plugwise.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Plugwise.class.php new file mode 100644 index 0000000..71afd5b --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Plugwise.class.php @@ -0,0 +1,138 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + IPSUtils_Include("Plugwise_Include.ips.php","IPSLibrary::app::hardware::Plugwise"); + IPSUtils_Include ('IPSMessageHandler.class.php', 'IPSLibrary::app::core::IPSMessageHandler'); + + class IPSComponentSwitch_Plugwise extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_Plugwise Objektes + * + * @param integer $instanceId InstanceId des Plugwise Devices + */ + public function __construct($instanceId) + { + // automatischen Einbinden/Konfiguration + // wenn schon vorhanden dann ohne Einfluss + $var = (int)$instanceId; + + $component = "IPSComponentSwitch_Plugwise,".$var; + $module = "IPSModuleSwitch_IPSLight"; + + $messageHandler = new IPSMessageHandler(); + + $messageHandler->RegisterOnChangeEvent($var, $component, $module); + + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + + + + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + + return get_class($this).','.$this->instanceId; + + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + IPS_LogMessage(__File__,"Variable ".$variable." sync"); + + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + */ + public function SetState($value,$onTime=false) { + + // Gibt es die Variable ? + $exist = IPS_VariableExists($this->instanceId); + if ( !$exist) + { + IPS_LogMessage(__File__,"Variable ".$this->instanceId." existiert nicht"); + return; + } + $parent = @IPS_GetParent($this->instanceId); + $obj = @IPS_GetObject ( $parent ); + if ( !$obj ) + { + IPS_LogMessage(__File__,"ParentVariable ".$parent." existiert nicht"); + return; + } + $ident = $obj['ObjectIdent']; + + $state = circle_on_off($ident,$value); + return $state; + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + //$value = GetValueBoolean(IPS_GetObjectIDByIdent("StatusVariable",$this->instanceId)); + $VarId = @IPS_GetVariableIDByName("Status",$this->instanceId); + if ( !$VarId ) + { + IPS_LogMessage(__File__,"Variable Status von ".$this->instanceId." existiert nicht"); + return; + } + + return $value; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ZW.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ZW.class.php new file mode 100644 index 0000000..d8b5f22 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ZW.class.php @@ -0,0 +1,130 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_ZW extends IPSComponentSwitch { + + private $instanceId; + private $channel; + + // Welche Klassen unterstütz der Schalter? + private $b_class_basic = false; + private $b_class_switch = false; + private $b_class_multi = false; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_ZW_Basic Objektes + * + * @param integer $instanceId InstanceId des Z-Wave Devices + */ + public function __construct($instanceId, $channel=0) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + // Bei Multiinstanz fähigen Schalter gleich den Kanal merken + $this->channel = (int)$channel; + //Ermittlung der unterstützten Klassen + $classes = ZW_GetNodeClasses((int)$instanceId); + foreach ($classes as $class) { + switch ((int)$class){ + case 32: + $this->b_class_basic = true; + break; + case 37: + $this->b_class_switch = true; + break; + case 96: + $this->b_class_multi = true; + break; + } + } + + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId.','.$this->channel; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + // Ein Binary Switch + if ($this->b_class_switch and ($this->channel == 0)) + ZW_SwitchMode((int)$this->instanceId, $value); + // Ein Basic Switch + elseif ($this->b_class_basic and ($this->channel == 0)) + ZW_Basic((int)$this->instanceId, $value); + // Ein Multiswitch + elseif (($this->channel > 0) and $this->b_class_multi) + ZW_SwitchModeEx((int)$this->instanceId, $value, $this->channel); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + if ($this->b_class_multi and ($this->channel > 0)) + $id = @IPS_GetObjectIDByIdent("MultiInstance".$this->channel."Variable",(int)$this->instanceId); + else + $id = @IPS_GetObjectIDByIdent("DataVariableBoolean",(int)$this->instanceId); + + if ($id > 0) + return GetValue($id); + else + return false; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSModuleSwitch.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSModuleSwitch.class.php index 4667738..81c1df0 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSModuleSwitch.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSModuleSwitch.class.php @@ -29,7 +29,7 @@ abstract class IPSModuleSwitch extends IPSModule { * * @param boolean $state aktueller Status des Gerätes */ - abstract public function SyncState($state); + abstract public function SyncState($state, IPSComponentSwitch $componentToSync); } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSModuleSwitch_IPSLight.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSModuleSwitch_IPSLight.class.php new file mode 100644 index 0000000..4ae100c --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSModuleSwitch_IPSLight.class.php @@ -0,0 +1,52 @@ + + */ + + IPSUtils_Include ("IPSLight.inc.php", "IPSLibrary::app::modules::IPSLight"); + IPSUtils_Include ('IPSModuleSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSModuleSwitch_IPSLight extends IPSModuleSwitch { + + /** + * @public + * + * Ermöglicht die Synchronisation einer Beleuchtung zu IPSLight + * + * @param string $state Aktueller Status des Switch + */ + public function SyncState($state, IPSComponentSwitch $componentToSync) { + $componentParamsToSync = $componentToSync->GetComponentParams(); + $deviceConfig = IPSLight_GetLightConfiguration(); + foreach ($deviceConfig as $deviceIdent=>$deviceData) { + $componentConfig = IPSComponent::CreateObjectByParams($deviceData[IPSLIGHT_COMPONENT]); + $componentParamsConfig = $componentConfig->GetComponentParams(); + if ($componentParamsConfig==$componentParamsToSync) { + $lightManager = new IPSLight_Manager(); + $lightManager->SynchronizeSwitch($deviceIdent, $state); + } + } + } + + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSConfigHandler/IPSConfigHandler.class.php b/IPSLibrary/app/core/IPSConfigHandler/IPSConfigHandler.class.php index e3a4608..d97abe0 100644 --- a/IPSLibrary/app/core/IPSConfigHandler/IPSConfigHandler.class.php +++ b/IPSLibrary/app/core/IPSConfigHandler/IPSConfigHandler.class.php @@ -30,12 +30,14 @@ class IPSConfigurationException extends Exception { */ abstract class IPSConfigHandler { - const VERSION = 'Version'; // Current Module Verison + const SCRIPTVERSION = 'Version'; // Current Module Verison (Script) + const INSTALLVERSION = 'InstallVersion'; // Current Module Verison (Installation) const MODULENAMESPACE = 'ModuleNamespace'; // Module Namespace const SOURCEREPOSITORY = 'SourceRepository'; // Pfad/Url zum Source Repository const LOGDIRECTORY = 'LogDirectory'; // Logging Directory + const CHANGELIST = 'ChangeList'; // ChangeList + const REQUIREDMODULES = 'RequiredModules'; // Required Modules - protected $configData = array(); /** @@ -48,10 +50,10 @@ abstract class IPSConfigHandler { * @return boolean liefert Existenz des übergebenen Parameters */ public function ExistsValue($key, $section=null) { - if ($section==null) { - return array_key_exists($key,$this->configData); + if ($section==null) { + return array_key_exists($key,$this->configData); } else { - return (array_key_exists($section,$this->configData) and array_key_exists($key,$this->configData[$section])); + return (array_key_exists($section,$this->configData) and array_key_exists($key,$this->configData[$section])); } } @@ -66,10 +68,10 @@ public function ExistsValue($key, $section=null) { * @throws IPSConfigurationException wenn der betroffene Parameter nicht gefunden wurde */ public function GetValue($key, $section=null) { - if (!$this->ExistsValue($key, $section)) { + if (!$this->ExistsValue($key, $section)) { throw new IPSConfigurationException('Configuration Value with Key='.$key.' could NOT be found (Section="'.$section.'")', - E_USER_ERROR); - } elseif ($section==null) { + E_USER_ERROR); + } elseif ($section==null) { return $this->configData[$key]; } else { return $this->configData[$section][$key]; @@ -87,7 +89,7 @@ public function GetValue($key, $section=null) { * @throws IPSConfigurationException wenn der betroffene Parameter nicht gefunden wurde */ public function GetValueInt ($key, $section=null) { - return (int)$this->GetValue($key, $section); + return (int)$this->GetValue($key, $section); } /** @@ -101,7 +103,14 @@ public function GetValueInt ($key, $section=null) { * @throws IPSConfigurationException wenn der betroffene Parameter nicht gefunden wurde */ public function GetValueBool ($key, $section=null) { - return (boolean)$this->GetValue($key, $section); + $value = $this->GetValue($key, $section); + if ($value=='false') { + return false; + } elseif ($value=='true') { + return true; + } else { + return (boolean)$value; + } } /** @@ -115,7 +124,7 @@ public function GetValueBool ($key, $section=null) { * @throws IPSConfigurationException wenn der betroffene Parameter nicht gefunden wurde */ public function GetValueFloat ($key, $section=null) { - return (float)$this->GetValue($key, $section); + return (float)$this->GetValue($key, $section); } /** @@ -130,14 +139,14 @@ public function GetValueFloat ($key, $section=null) { * @return string liefert den Wert des übergebenen Parameters */ public function GetValueDef($key, $section=null, $defaultValue="") { - if ($section==null) { - if ($this->ExistsValue($key, $section)) { + if ($section==null) { + if ($this->ExistsValue($key, $section)) { $result = $this->configData[$key]; } else { $result = $defaultValue; } } else { - if ($this->ExistsValue($key, $section)) { + if ($this->ExistsValue($key, $section)) { $result = $this->configData[$section][$key]; } else { $result = $defaultValue; @@ -158,7 +167,7 @@ public function GetValueDef($key, $section=null, $defaultValue="") { * @return integer retouniert den Wert des übergebenen Parameters */ public function GetValueIntDef($key, $section=null, $defaultValue="") { - return (int)$this->GetValueDef($key, $section, $defaultValue); + return (int)$this->GetValueDef($key, $section, $defaultValue); } /** @@ -173,7 +182,14 @@ public function GetValueIntDef($key, $section=null, $defaultValue="") { * @return boolean retouniert den Wert des übergebenen Parameters */ public function GetValueBoolDef ($key, $section=null, $defaultValue="") { - return (boolean)$this->GetValueDef($key, $section, $defaultValue); + $value = $this->GetValueDef($key, $section, $defaultValue); + if ($value=='false') { + return false; + } elseif ($value=='true') { + return true; + } else { + return (boolean)$value; + } } /** @@ -188,7 +204,7 @@ public function GetValueBoolDef ($key, $section=null, $defaultValue="") { * @return float retouniert den Wert des übergebenen Parameters */ public function GetValueFloatDef ($key, $section=null, $defaultValue="") { - return (float)$this->GetValueDef($key, $section, $defaultValue); + return (float)$this->GetValueDef($key, $section, $defaultValue); } } diff --git a/IPSLibrary/app/core/IPSConfigHandler/IPSIniConfigHandler.class.php b/IPSLibrary/app/core/IPSConfigHandler/IPSIniConfigHandler.class.php index abf3217..28c2b53 100644 --- a/IPSLibrary/app/core/IPSConfigHandler/IPSIniConfigHandler.class.php +++ b/IPSLibrary/app/core/IPSConfigHandler/IPSIniConfigHandler.class.php @@ -23,41 +23,40 @@ class IPSIniConfigHandler extends IPSConfigHandler { private $iniFileName=""; /** - * @public + * @public * * Initialisierung INI File ConigurationHandlers * - * @param string $iniFileName Name der INI Datei. - * @param string $namespace Namespace des INI Files + * @param string $iniFileName Name der INI Datei. + * @param string $namespace Namespace des INI Files */ public function __construct($iniFileName, $namespace="") { - $this->iniFileName = $this->GetFileName($iniFileName, $namespace); + $this->iniFileName = $this->GetFileName($iniFileName, $namespace); $this->LoadFile($this->iniFileName); - } + } + /** - * @public + * @public * * Initialisierung INI File ConfigHandlers * - * @param string $iniFileName Name der INI Datei. - * @param string $namespace Namespace des INI Files + * @param string $iniFileName Name der INI Datei. + * @param string $namespace Namespace des INI Files */ private function LoadFile () { - if (!file_exists($this->iniFileName)) { + if (!file_exists($this->iniFileName)) { throw new Exception('script '.$this->iniFileName.' could NOT be found!', E_USER_ERROR); } - - $this->configData = parse_ini_file($this->iniFileName, true); + $this->configData = parse_ini_file($this->iniFileName, true); } private function GetFileName ($iniFileName, $namespace="") { - if ($namespace=="") { + if ($namespace=="") { $result = $iniFileName; - } else { + } else { $result = IPS_GetKernelDir().'\\scripts\\'.str_replace('::','\\',$namespace).'\\'.$iniFileName;; - } - - return $result; + } + return $result; } } diff --git a/IPSLibrary/app/core/IPSLogger/IPSLogger.inc.php b/IPSLibrary/app/core/IPSLogger/IPSLogger.inc.php index 10863e6..5d796a9 100644 --- a/IPSLibrary/app/core/IPSLogger/IPSLogger.inc.php +++ b/IPSLibrary/app/core/IPSLogger/IPSLogger.inc.php @@ -129,9 +129,9 @@ function IPSLogger_Fat($LogContext, $LogMessage) { * @param $LogContext - Context of Logging (Identifier or Filename). * @param $LogMessage - Message to be logged */ - function IPSLogger_Err($LogContext, $LogMessage) { - IPSLogger_Out(c_LogLevel_Error, c_LogType_Error, $LogContext, $LogMessage); - } + function IPSLogger_Err($LogContext, $LogMessage) { + IPSLogger_Out(c_LogLevel_Error, c_LogType_Error, $LogContext, $LogMessage); + } // --------------------------------------------------------------------------------------------------------------------------- /** Procedure to log a Warning @@ -151,7 +151,7 @@ function IPSLogger_Wrn($LogContext, $LogMessage) { * @param $Priority - Priority of Notificaton Message (0 means high priority, higher values indicates a lower priority) */ function IPSLogger_Not($LogContext, $LogMessage, $Priority=0) { - IPSLogger_Out(c_LogLevel_Information, c_LogType_Information, $LogContext, $LogMessage, $Priority); + IPSLogger_Out(c_LogLevel_Notification, c_LogType_Notification, $LogContext, $LogMessage, $Priority); } // --------------------------------------------------------------------------------------------------------------------------- diff --git a/IPSLibrary/app/core/IPSLogger/IPSLogger_ChangeSettings.ips.php b/IPSLibrary/app/core/IPSLogger/IPSLogger_ChangeSettings.ips.php index de2e229..1759eb6 100644 --- a/IPSLibrary/app/core/IPSLogger/IPSLogger_ChangeSettings.ips.php +++ b/IPSLibrary/app/core/IPSLogger/IPSLogger_ChangeSettings.ips.php @@ -15,21 +15,21 @@ */ include "IPSLogger_Constants.inc.php"; - if ($IPS_VARIABLE==c_ID_EMailOutEnabled) { + if ($_IPS['VARIABLE']==c_ID_EMailOutEnabled) { if (c_ID_SmtpDevice <> 0) { - SetValue($IPS_VARIABLE, $IPS_VALUE); + SetValue($_IPS['VARIABLE'], $_IPS['VALUE']); if (!GetValue(c_ID_EMailOutEnabled)) { SetValue(c_ID_EMailOutMsgList, ''); IPS_SetScriptTimer(c_ID_ScriptSendMail, 0); } } - } else if ($IPS_VARIABLE==c_ID_ProwlOutEnabled) { + } else if ($_IPS['VARIABLE']==c_ID_ProwlOutEnabled) { if (c_Key_ProwlService <> '') { - SetValue($IPS_VARIABLE, $IPS_VALUE); + SetValue($_IPS['VARIABLE'], $_IPS['VALUE']); } } else { - SetValue($IPS_VARIABLE, $IPS_VALUE); + SetValue($_IPS['VARIABLE'], $_IPS['VALUE']); } ; /** @}*/ diff --git a/IPSLibrary/app/core/IPSLogger/IPSLogger_Output.inc.php b/IPSLibrary/app/core/IPSLogger/IPSLogger_Output.inc.php index 432774f..2b8af88 100644 --- a/IPSLibrary/app/core/IPSLogger/IPSLogger_Output.inc.php +++ b/IPSLibrary/app/core/IPSLogger/IPSLogger_Output.inc.php @@ -50,6 +50,8 @@ function IPSLogger_Out($LogLevel, $LogType, $Context, $Msg, $Priority=0) { IPSLogger_OutLog4IPS($LogLevel, $LogType, $Context, $Msg.$StackTxt); IPSLogger_OutEcho($LogLevel, $LogType, $Context, $Msg.$StackTxt); IPSLogger_OutProwl($LogLevel, $LogType, $Context, $Msg.$StackTxt, $Priority); + @IPSLogger_OutSysLog($LogLevel, $LogType, $Context, $Msg.$StackTxt); + @IPSLogger_OutMySQL($LogLevel, $LogType, $Context, $Msg.$StackTxt); } // --------------------------------------------------------------------------------------------------------------------------- @@ -106,6 +108,43 @@ function IPSLogger_OutLog4IPS($LogLevel, $LogType, $Context, $Msg) { } } + // --------------------------------------------------------------------------------------------------------------------------- + function IPSLogger_OutSysLog($LogLevel, $LogType, $Context, $Msg) { + if (defined('c_SysLog_Enabled') and c_SysLog_Enabled) { + $logTypeEnabled = true; + if (isset($SysLog_LogTypes) and array_key_exists($LogLevel, $SysLog_LogTypes) and $SysLog_LogTypes[$LogLevel]==false) { + $logTypeEnabled = false; + } + if ($logTypeEnabled) { + + // Sample Message + //<14>May 19 20:15:42 sbs2008.wps-computer.local IP-Symcon: ID 34690::SENDER Execute: My third PHP syslog message + + $severityList = array(2 /*Critical*/, 3 /*Error*/, 4 /*Warning*/, 5 /*Notice*/, 6 /*Info*/, 7 /*Debug*/, 7 /*Debug*/, 7 /*Debug*/, 7 /*Debug*/); + $severity = $severityList[$LogLevel]; + $facility = 1; + $priority = "<".($facility*8 + $severity).">"; + + $timestamp = date("M j H:i:s"); + $host = ''; + if (isset($_ENV["COMPUTERNAME"])) $host=$_ENV["COMPUTERNAME"]; + $message = substr($priority.$timestamp.' '.$host.' IP-Symcon-'.$Context.': '.$Msg, 0, 1024); + + if (c_SysLog_Instance != '') { + CSCK_SendText((int)c_SysLog_Instance, $message); + } else if (c_SysLog_Host != '') { + $handle = fsockopen("udp://".c_SysLog_Host, c_SysLog_Port, $errno, $errstr); + if ($handle) { + fwrite($handle, $message); + fclose($handle); + } + } else { + echo $message.PHP_EOL; + } + } + } + } + // --------------------------------------------------------------------------------------------------------------------------- function IPSLogger_OutEMail($LogLevel, $LogType, $Context, $Msg, $Priority) { if (GetValue(c_ID_EMailOutEnabled) and @@ -163,7 +202,10 @@ function IPSLogger_OutHtml($LogLevel, $LogType, $Context, $Msg) { $MsgList = GetValue(c_ID_HtmlOutMsgList); $MsgCount = GetValue(c_ID_HtmlOutMsgCount); - $TablePrefix = '
+ */ + class IPSHomematic_Manager { + + /** + * @public + * + * Initializes the IPSHomematic_Manager + */ + public function __construct() { + } + + /** + * @public + * + * Refreshed alle RSSI Variablen von der CCU + */ + public function RefreshRSSIValues() { + $instanceIdList = $this->GetMaintainanceInstanceList(); + foreach ($instanceIdList as $instanceId) { + $variableId = @IPS_GetVariableIDByName('RSSI_DEVICE', $instanceId); + if ($variableId!==false) { + usleep(100000); + set_time_limit(HM_TIMEOUT_REFRESH); + HM_RequestStatus($instanceId, 'RSSI_DEVICE'); + } + $variableId = @IPS_GetVariableIDByName('RSSI_PEER', $instanceId); + if ($variableId!==false) { + usleep(100000); + set_time_limit(HM_TIMEOUT_REFRESH); + HM_RequestStatus($instanceId, 'RSSI_PEER'); + } + } + } + + /** + * @public + * + * Refreshed alle RSSI HTML Listen + */ + public function RefreshRSSIHtml() { + $instanceIdList = $this->GetMaintainanceInstanceList(); + $rssiDeviceList = array(); + $rssiPeerList = array(); + foreach ($instanceIdList as $instanceId) { + $variableId = @IPS_GetVariableIDByName('RSSI_DEVICE', $instanceId); + if ($variableId!==false) { + $rssiValue = GetValue($variableId); + if ($rssiValue<>-65535) { + $rssiDeviceList[$instanceId] = $rssiValue; + } + } + } + arsort($rssiDeviceList, SORT_NATURAL); + + foreach ($instanceIdList as $instanceId) { + $variableId = @IPS_GetVariableIDByName('RSSI_PEER', $instanceId); + if ($variableId!==false) { + $rssiValue = GetValue($variableId); + if ($rssiValue<>-65535) { + $rssiPeerList[$instanceId] = $rssiValue; + } + } + } + arsort($rssiPeerList, SORT_NATURAL); + + $categoryIdHtml = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.IPSHomematic.StatusMessages'); + $categoryIdSettings = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.IPSHomematic.Settings'); + + $variableIdRssi = IPS_GetObjectIDByIdent(HM_CONTROL_RSSI, $categoryIdHtml); + $variableIdRssiDevice = IPS_GetObjectIDByIdent(HM_CONTROL_RSSIDEVICE, $categoryIdHtml); + $variableIdRssiPeer = IPS_GetObjectIDByIdent(HM_CONTROL_RSSIPEER, $categoryIdHtml); + + $str = "
| Gerätname | GeräteID | Empfangsstärke |
| ".IPS_GetName($instanceId)." | ".HM_GetAddress($instanceId)." | ".$value." |
| Gerätname | GeräteID | Empfangsstärke |
| ".IPS_GetName($instanceId)." | ".HM_GetAddress($instanceId)." | ".$value." |
| Gerätname | GeräteID | Empfangsstärke |
| ".IPS_GetName($instanceId)." | ".HM_GetAddress($instanceId)." | ".$value." |
| Gerätname | GeräteID | Meldung |
Keine Servicemeldungen! | ||
| ".$name." | ".$msg['Address']." | ".$text." |
\n"; + } else { + // Zusammenstellen des Header für HTTP-Post + fputs($fp, "POST /Test.exe HTTP/1.1\r\n"); + fputs($fp, "Content-type: application/x-www-form-urlencoded\r\n"); + fputs($fp, "Content-length: ". strlen($HM_Script) ."\r\n"); + fputs($fp, "Connection: close\r\n\r\n"); + fputs($fp, $HM_Script); + while(!feof($fp)) { + $res .= fgets($fp, 500); + } + fclose($fp); + } + return $res; + } + + /** + * @public + * + * Liefert alle Homematic Maintainmance Instance IDs, die in der Konfiguration eingetragen sind + * + * @return array[int] Homematic Instance IDs + */ + public function GetMaintainanceInstanceList() { + $homematicInstanceList = IPS_GetInstanceListByModuleID("{EE4A81C6-5C90-4DB7-AD2F-F6BBD521412E}"); + $homematicAddressList = array(); + $homematicMaintainanceList = array(); + + foreach ($homematicInstanceList as $homematicInstanceId ) { + $homematicAddress = HM_GetAddress($homematicInstanceId); + $homematicAddressList[$homematicAddress] = $homematicInstanceId; + + $pos = strpos($homematicAddress, ':0'); + if ($pos !== false) { + $homematicMaintainanceList[$homematicInstanceId] = $homematicInstanceId; + } + } + + return $homematicMaintainanceList; + } + } + + /** @}*/ +?> diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshRSSI.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshRSSI.ips.php new file mode 100644 index 0000000..ea1a490 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshRSSI.ips.php @@ -0,0 +1,35 @@ + + * + */ + + IPSUtils_Include ('IPSHomematic.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + $homematicManager = new IPSHomematic_Manager(); + $homematicManager->RefreshRSSI(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshServiceMessages.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshServiceMessages.ips.php new file mode 100644 index 0000000..942c7d6 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshServiceMessages.ips.php @@ -0,0 +1,36 @@ + + * + */ + + + IPSUtils_Include ('IPSHomematic.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + $homematicManager = new IPSHomematic_Manager(); + $homematicManager->RefreshServiceMessages(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshStatusVariables.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshStatusVariables.ips.php new file mode 100644 index 0000000..a397ac4 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshStatusVariables.ips.php @@ -0,0 +1,35 @@ + + * + */ + + IPSUtils_Include ('IPSHomematic.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + $homematicManager = new IPSHomematic_Manager(); + $homematicManager->RefreshStatusVariables(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_ResetServiceMessages.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_ResetServiceMessages.ips.php new file mode 100644 index 0000000..63d03a3 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_ResetServiceMessages.ips.php @@ -0,0 +1,36 @@ + + * + */ + + IPSUtils_Include ('IPSHomematic.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + $homematicManager = new IPSHomematic_Manager(); + $homematicManager->ResetServiceMessages(); + $homematicManager->RefreshServiceMessages(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_SmokeDetector.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_SmokeDetector.ips.php new file mode 100644 index 0000000..d733074 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_SmokeDetector.ips.php @@ -0,0 +1,39 @@ + + * + */ + + IPSUtils_Include ('IPSHomematic.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + $sender = $_IPS['SENDER']; + $variableId = $_IPS['VARIABLE']; + $value = $_IPS['VALUE']; + if ($value) { + IPSHomematic_OnActivateSmokeDetector($variableId); + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_TimerRefreshRSSI.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_TimerRefreshRSSI.ips.php new file mode 100644 index 0000000..ea1a490 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_TimerRefreshRSSI.ips.php @@ -0,0 +1,35 @@ + + * + */ + + IPSUtils_Include ('IPSHomematic.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + $homematicManager = new IPSHomematic_Manager(); + $homematicManager->RefreshRSSI(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_TimerRefreshServiceMessages.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_TimerRefreshServiceMessages.ips.php new file mode 100644 index 0000000..79f9ae5 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_TimerRefreshServiceMessages.ips.php @@ -0,0 +1,35 @@ + + * + */ + + IPSUtils_Include ('IPSHomematic.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + $homematicManager = new IPSHomematic_Manager(); + $homematicManager->RefreshServiceMessages(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_Utils.inc.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_Utils.inc.php new file mode 100644 index 0000000..4f04000 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_Utils.inc.php @@ -0,0 +1,51 @@ + + * + */ + + // ==================================================================================================== + /** + * @public + * + * Liefert die Instance ID zu einer Homematic Adresse + * + * @param string $sid Homematic Adresse + * @return int ID der Homematic Instance + */ + function HM_GetInstanceIDFromHMAddress($sid) { + $ids = IPS_GetInstanceListByModuleID("{EE4A81C6-5C90-4DB7-AD2F-F6BBD521412E}"); + foreach($ids as $id) { + $a = explode(":", HM_GetAddress($id)); + $b = explode(":", $sid); + if($a[0] == $b[0]) { + return $id; + } + } + return 0; + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/Charts/IPSHighcharts/IPSHighcharts.inc.php b/IPSLibrary/app/modules/Charts/IPSHighcharts/IPSHighcharts.inc.php new file mode 100644 index 0000000..6a31705 --- /dev/null +++ b/IPSLibrary/app/modules/Charts/IPSHighcharts/IPSHighcharts.inc.php @@ -0,0 +1,1792 @@ + + * Version 2.50.1, 05.10.2012 ab: Integration IPSLibrary
+ * + * IPSHighcharts, ermöglich Darstellung von Charts im Webfront mit Hilfe von "Highcharts" (www.highcharts.com) + * + */ + + $version = "2.03"; $versionDate = "05.10.2012"; + + //ToDo: + // FEATURE: Plotbands. Timestamp in From und To + // Fehlerquelle: AggType ist "Größer" als der angezeigte Zeitraum + // vielleicht alles als cfg direkt json_encoden und nicht jedes Teil einzeln + //-------------------------------------------------------------------------------------------------------------------------------- + // Für die Darstellung der Graphen wird das HTML5/JS Framework "Highcharts" der Fa. Highslide Software verwendet (www.highcharts.com) + // Alle Rechte dieses Frameworks liegen bei Highslide Software. + // 'Highcharts' kann unter folgenden Bedinungen kostenlos eingesetzt werden: + // * Namensnennung — Sie müssen den Namen des Autors/Rechteinhabers in der von ihm festgelegten Weise nennen. + // * Keine kommerzielle Nutzung — Dieses Werk bzw. dieser Inhalt darf nicht für kommerzielle Zwecke verwendet werden. + // Download: wwww.highcharts.com/download/ ... und die Dateien einfach in das Webfront (Es sollte ein V 2.2 oder höher verwendet werden. + // Demos: http://www.highcharts.com/demo/ + // API: http://www.highcharts.com/ref/ + //-------------------------------------------------------------------------------------------------------------------------------- + // Changelog: + // --- V2.00 --------------------------------------------------------------------------------------------------------------------- + // 10/2012 AB NEU Integration IPSLibrary + // 04/2012 KHC REFACT Umfangreiches Überarbeiten der Highchart-Script Funktionen. + // bis Integration der meisten Original-Highcharts-Options als PHP-Array (siehe http://www.highcharts.com/ref) + // 05/2012 Highcharts-Options "lang" aus IPS_Template.php in Highcharts-Script verschoben + // --- V2.01 --------------------------------------------------------------------------------------------------------------------- + // 07.05.2012 KHC NEU Test mit Integration Highstock. Neuer Parameter ['Ips']['ChartType'] = 'Highcharts' oder 'Highstock' + // 07.05.2012 KHC NEU IPS_Template.php auf jquery 1.7.2 geändert + // 07.05.2012 KHC FIX krsort durch array_reverse getauscht, da krsort Probleme beim json_encode macht + // 08.05.2012 KHC REFACT intern noch mehr auf Arrays umgestellt und etwas umstrukturiert + // 09.05.2012 KHC NEU über 'CreateConfigFileByPathAndFilename($stringForCfgFile, $path, $filename)' kann eine Tmp_datei mit bel. Namen geschrieben werden + // 10.05.2012 KHC FIX Fehler beim Auswerten der AggregatedValues behoben (ReadDataFromDBAndCreateDataArray) + // 12.05.2012 KHC FIX Tooltip für "ReplaceValues" korrigiert + // 12.05.2012 KHC CHANGE Start- und Endzeitpunkt der X-Achse wurde automatisch um 5 Minuten korrigiert -> dies wurde entfernt + // 12.05.2012 KHC NEU mit ['xAxis']['min']=false und ['xAxis']['min']=false kann festeglegt werden dass Min oder Max nicht autom. festgelegt werden + // --- V2.02 --------------------------------------------------------------------------------------------------------------------- + // 13.05.2012 KHC FIX RunType=file: Wenn Highstock vorgewählt wurde wurde das tmp File nicht in die Highstock-Verzeichnis geschrieben + // 16.05.2012 KHC NEU Integration Highstock: ['Navigator'], ['rangeSelector'] und ['scrollbar'] + // 18.05.2012 KHC FIX Integration Highstock: Zusätzliche series.type 'candlestick' und 'ohlc' erlauben + // 19.05.2012 KHC NEU Neue Parameter ['Ips']['Dashboard'] für die Darstellung im Dashboard + + //-------------------------------------------------------------------------------------------------------------------------------- + + // ------------------------------------------------------------------------ + // WriteContentWithFilename + // Mit dieser Funktion wird der Content-String geschrieben. + // IN: $cfg = .. + // IN: $tmpFilename = Der Dateiname welche die Config Daten enthält + // ------------------------------------------------------------------------ + function WriteContentWithFilename($cfg, $tmpFilename) + { + DebugModuleName($cfg,"WriteContentWithFilename"); + + if ($tmpFilename != "") + { + SetValue($cfg['ContentVarableId'], + GetContentVariableString ($cfg, "CfgFile", $tmpFilename)); + } + else + SetValue($cfg['ContentVarableId'], 'Falsche Parameter beim Funktionsaufruf "WriteContentTextbox"'); + } + + // ------------------------------------------------------------------------ + // WriteContentWithScriptId + // Mit dieser Funktion wird der Content-String geschrieben. + // IN: $cfg = .. + // IN: $scriptId = Die Script Id welche den ConfigString enthält. + // ------------------------------------------------------------------------ + function WriteContentWithScriptId($cfg, $scriptId) + { + DebugModuleName($cfg,"WriteContentWithScriptId"); + + if ($cfg['RunMode'] == "popup") + { + WFC_SendPopup($cfg['WebFrontConfigId'], + $cfg['WFCPopupTitle'] , + GetContentVariableString ($cfg, "ScriptId", $scriptId)); + } + else + { + SetValue($cfg['ContentVarableId'], + GetContentVariableString ($cfg, "ScriptId", $scriptId)); + } + } + + // ------------------------------------------------------------------------ + // 05.10.2012 ab: Adapted Path to Templates + function GetContentVariableString($cfg, $callBy, $callIdent) + { + $chartType = $cfg['Ips']['ChartType']; + $height = $cfg['HighChart']['Height'] + 16; + + if (isset($cfg['Ips']['Dashboard']['Ip']) && isset($cfg['Ips']['Dashboard']['Port'])) + { + $s = "http://" . $cfg['Ips']['Dashboard']['Ip'] . ":" . $cfg['Ips']['Dashboard']['Port'] . + "/User/IPSHighcharts/IPSTemplates/$chartType.php?$callBy=" . $callIdent . " " . + "width='100%' height='". $height ."' frameborder='1' scrolling='no'"; + } + else + { + $s = ""; + } + return $s; + } + + // ------------------------------------------------------------------------ + // CreateConfigFile + // Erzeugt das tmp-Highcharts Config-File mit der $id als Dateinamen + // IN: $stringForCfgFile = String welcher in das File geschrieben wird + // ------------------------------------------------------------------------ + function CreateConfigFile($stringForCfgFile, $id, $charttype = 'Highcharts') + { + $path = "webfront\user\IPSHighcharts\\" . $charttype; + $filename = $charttype . "Cfg$id.tmp"; + + return CreateConfigFileByPathAndFilename($stringForCfgFile, $path, $filename); + } + + // ------------------------------------------------------------------------ + // CreateConfigFileByPathAndFilename + // Erzeugt das tmp-Highcharts Config-File + // IN: $stringForCfgFile = String welcher in das File geschrieben wird + // $path, $filename = Pfad un Name des Tmp-Files welches erzeugt werden soll + // ------------------------------------------------------------------------ + function CreateConfigFileByPathAndFilename($stringForCfgFile, $path, $filename) + { + // Standard-Dateiname ..... + $tmpFilename = IPS_GetKernelDir() . $path . "\\" . $filename; + + // schreiben der Config Daten + $handle = fopen($tmpFilename,"w"); + fwrite($handle, $stringForCfgFile); + fclose($handle); + + return $tmpFilename; + } + + // ------------------------------------------------------------------------ + // CheckCfgDaten + // Aufruf bei jedem Cfg-Start + // IN: $cfg = .. + // OUT: korrigierte cfg + // ------------------------------------------------------------------------ + function CheckCfgDaten($cfg) + { + DebugModuleName($cfg,"CheckCfgDaten"); + + global $_IPS; + + // Debugging + IfNotIssetSetValue($cfg['Ips']['Debug']['Modules'], false); + IfNotIssetSetValue($cfg['Ips']['Debug']['ShowJSON'], false); + IfNotIssetSetValue($cfg['Ips']['Debug']['ShowJSON_Data'], false); + IfNotIssetSetValue($cfg['Ips']['Debug']['ShowCfg'], false); + + // ChartType + IfNotIssetSetValue($cfg['Ips']['ChartType'], 'Highcharts'); + + if ($cfg['Ips']['ChartType'] != 'Highcharts' && $cfg['Ips']['ChartType'] != 'Highstock') + die ("Abbruch! Es sind nur 'Highcharts' oder 'Highstock' als ChartType zulässig"); + + // über WebInterface kommt der Aufruf wenn die Content-Variable aktualisiert wird + if ($_IPS['SENDER'] != "WebInterface" && $cfg['RunMode'] != "popup") + $cfg = Check_ContentVariable($cfg, $_IPS['SELF']); + + return $cfg; + } + + // ------------------------------------------------------------------------ + // CreateConfigString + // Erzeugt den für Higcharts benötigten Config String und gibt diesen als String zurück + // IN: $cfg = .. + // OUT: der erzeugte Config String + // ------------------------------------------------------------------------ + function CreateConfigString($cfg) + { + DebugModuleName($cfg,"CreateConfigString"); + + $cfg = CompatibilityCheck($cfg); + $cfg = CheckCfg($cfg); + + $cfgString = GetHighChartsCfgFile($cfg); + + // Zusätzliche Config in Highchart Config hinzufügen + $cfgString = ReadAdditionalConfigData($cfg) . "\n|||\n" . $cfgString; + + // Language Options aus IPS_Template.php hierher verschoben + $cfgString .= "\n|||\n". GetHighChartsLangOptions($cfg);; + + return $cfgString; + } + + function CompatibilityCheck($cfg) + { + DebugModuleName($cfg,"CompatibilityCheck"); + + // Series + if (isset($cfg['Series']) && isset($cfg['series'])) + die ("Abbruch - Es düfen nicht gleichzeitig 'Series' und 'series' definiert werden."); + if (isset($cfg['Series']) && !isset($cfg['series'])) + $cfg['series'] = $cfg['Series']; + unset ($cfg['Series']); + + // Title + if (isset($cfg['Title']) && !isset($cfg['title']['text'])) + $cfg['title']['text'] = $cfg['Title']; + unset ($cfg['Title']); + + // SubTitle + if (isset($cfg['SubTitle']) && !isset($cfg['subtitle']['text'])) + $cfg['subtitle']['text'] = $cfg['SubTitle']; + unset ($cfg['SubTitle']); + + // SubTitleDateTimeFormat + if (isset($cfg['SubTitleDateTimeFormat']) && !isset($cfg['subtitle']['Ips']['DateTimeFormat'])) + $cfg['subtitle']['Ips']['DateTimeFormat'] = $cfg['SubTitleDateTimeFormat']; + unset ($cfg['SubTitleDateTimeFormat']); + + // yAxis + if (isset($cfg['yAxis'])) + { + $axisArr = array(); + foreach ($cfg['yAxis'] as $Axis) + { + $cfgAxis = $Axis; + + // Name + if (isset($Axis['Name']) && !isset($cfgAxis['title']['text'])) + $cfgAxis['title']['text'] = $Axis['Name']; + unset ($cfgAxis['Name']); + + // TickInterval + if (isset($Axis['TickInterval']) && !isset($cfgAxis['tickinterval'])) + $cfgAxis['tickinterval'] = $Axis['TickInterval']; + unset ($cfgAxis['TickInterval']); + + // Opposite + if (isset($Axis['Opposite']) && !isset($cfgAxis['opposite'])) + $cfgAxis['opposite'] = $Axis['Opposite']; + unset ($cfgAxis['Opposite']); + + $axisArr[] = $cfgAxis; + } + $cfg['yAxis'] = $axisArr; + } + return $cfg; + } + + // ------------------------------------------------------------------------ + // CheckCfg + // Prüft daKonfiguration und korrigiert und Vervollständigtdiese zum Teil + // IN: $cfg = .. + // OUT: der erzeugte Config String + // ------------------------------------------------------------------------ + function CheckCfg($cfg) + { + DebugModuleName($cfg,"CheckCfg"); + + $cfg = CheckCfg_Common($cfg); + $cfg = CheckCfg_AreaHighChart($cfg); + $cfg = CheckCfg_AggregatedValues($cfg); + $cfg = CheckCfg_StartEndTime($cfg); + $cfg = CheckCfg_Series($cfg); + + return $cfg; + } + + // ------------------------------------------------------------------------ + // CheckCfg_Common + // wenn RunMode=Popup, prüfen der dazugehörigen Daten wie WebfrontConfigId, usw. + // und wenn RunMode=Popup, prüfen der dazugehörigen Daten wie WebfrontConfigId, usw. + // IN: $cfg + // OUT: korrigiertes $cfg + // ------------------------------------------------------------------------ + function CheckCfg_Common($cfg) + { + DebugModuleName($cfg,"CheckCfg_Common"); + + if (!isset($cfg['series'])) + die ("Abbruch - Es wurden keine Serien definiert."); + + // Id des ArchiveHandler auslesen + if (!isset($cfg['ArchiveHandlerId']) || $cfg['ArchiveHandlerId'] == -1) + { + $instances = IPS_GetInstanceListByModuleID('{43192F0B-135B-4CE7-A0A7-1475603F3060}'); + $cfg['ArchiveHandlerId'] = $instances[0]; + } + // Prüfen des ArchiveHandlers + $instance = @IPS_GetInstance($cfg['ArchiveHandlerId']); + if ($instance['ModuleInfo']['ModuleID'] != "{43192F0B-135B-4CE7-A0A7-1475603F3060}") + die ("Abbruch - 'ArchiveHandlerId' (".$cfg['ArchiveHandlerId'].") ist keine Instance eines ArchiveHandler."); + + if ($cfg['RunMode'] == "popup") + { + // keine Webfront Id + if (!isset($cfg['WebFrontConfigId'])) + die ("Abbruch - Konfiguration von 'WebFrontConfigId' fehlt."); + + // prüfen ob die übergebene Id ein WebFront ist + $instance = @IPS_GetInstance($cfg['WebFrontConfigId']); + if ($instance['ModuleInfo']['ModuleID'] != "{3565B1F2-8F7B-4311-A4B6-1BF1D868F39E}") + die ("Abbruch - 'WebFrontConfigId' ist keine WebFrontId"); + + IfNotIssetSetValue($cfg['WFCPopupTitle'], ""); + } + + return $cfg; + } + + + // ------------------------------------------------------------------------ + // Check_ContentVariable + // prüfen ob Angaben der Content Variable stimmen oder ob es das übergeordnete Element ist + // IN: $cfg + // OUT: korrigiertes $cfg + // ------------------------------------------------------------------------ + function Check_ContentVariable($cfg, $scriptId) + { + DebugModuleName($cfg,"Check_ContentVariable"); + + // wenn keine Id übergeben wurde wird das übergeordnete Objekt als Content verwendet + if (!isset($cfg['ContentVarableId']) || $cfg['ContentVarableId'] <= 0) + $cfg['ContentVarableId'] = IPS_GetParent($scriptId); + + $variable = @IPS_GetVariable($cfg['ContentVarableId']); + if ($variable == false) + die ("Abbruch - Content-Variable nicht gefunden."); + + if ($variable['VariableValue']['ValueType'] != 3) + die ("Abbruch - Content-Variable ist keine STRING-Variable."); + + if ($variable['VariableCustomProfile'] != "~HTMLBox") + die ("Abbruch - Content-Variable muss als Profil '~HTMLBox' verwenden."); + + return $cfg; + } + + // ------------------------------------------------------------------------ + // CheckCfg_AreaHighChart + // + // IN: $cfg + // OUT: korrigiertes $cfg + // ------------------------------------------------------------------------ + function CheckCfg_AreaHighChart($cfg) + { + DebugModuleName($cfg,"CheckCfg_AreaHighChart"); + + IfNotIssetSetValue($cfg['HighChart']['Theme'], ""); + IfNotIssetSetValue($cfg['HighChart']['Width'], 0); + IfNotIssetSetValue($cfg['HighChart']['Height'], 400); + + return $cfg; + } + + // ------------------------------------------------------------------------ + // CheckCfg_StartEndTime + // Start- und Endzeit des gesamten Charts errechnen, und an jede Serie übergeben + // IN: $cfg + // OUT: korrigiertes $cfg + // ------------------------------------------------------------------------ + function CheckCfg_StartEndTime($cfg) + { + DebugModuleName($cfg,"CheckCfg_StartEndTime"); + + $cfg['Ips']['ChartStartTime'] = $cfg['StartTime']; + $cfg['Ips']['ChartEndTime'] = $cfg['EndTime']; + + $offsetExistsAtSerie = false; + $Count = count($cfg['series']); + + for ($i = 0; $i < $Count; $i++) + { + $Serie = $cfg['series'][$i]; + + // wenn für die Serie keine Start oder Endzeit übergeben würde wird der Standardwert genommen + IfNotIssetSetValue($Serie['StartTime'], $cfg['StartTime']); + IfNotIssetSetValue($Serie['EndTime'], $cfg['EndTime']); + + if ($Serie['StartTime'] < $cfg['Ips']['ChartStartTime']) + $cfg['Ips']['ChartStartTime'] = $Serie['StartTime']; + if ($Serie['EndTime'] > $cfg['Ips']['ChartEndTime']) + $cfg['Ips']['ChartEndTime'] = $Serie['EndTime']; + + $Serie['Ips']['EndTimeString'] = date("/r", $Serie['EndTime']); + $Serie['Ips']['StartTimeString']= date("/r", $Serie['StartTime']); + + $cfg['series'][$i] = $Serie; + + if (isset($Serie['Offset']) && $Serie['Offset'] != 0) + $offsetExistsAtSerie =true; + } + + // wenn ein Offset definiert wurde gilt nur der global eingestellte Start und Endzeitpunkt + if ($offsetExistsAtSerie = true) + { + $cfg['Ips']['ChartStartTime'] = $cfg['StartTime']; + $cfg['Ips']['ChartEndTime'] = $cfg['EndTime']; + } + + return $cfg; + + } + + // ------------------------------------------------------------------------ + // CheckCfg_Series + // prüfen der Serien + // IN: $cfg + // OUT: korrigiertes $cfg + // ------------------------------------------------------------------------ + function CheckCfg_Series($cfg) + { + DebugModuleName($cfg,"CheckCfg_Series"); + + $Id_AH = $cfg['ArchiveHandlerId']; + + $series = array(); + foreach ($cfg['series'] as $Serie) + { + $VariableId = @$Serie['Id']; + + // hier wird nur geprüft ob Wert von Eingabe passen könnte (wenn vorhanden) + if (isset($Serie['AggType']) && ($Serie['AggType']<0 || $Serie['AggType']>4) ) + die ("Abbruch - 'AggType' hat keinen korrekten Wert"); + + $Serie['Ips']['IsCounter'] = $VariableId && (@AC_GetAggregationType($Id_AH, $VariableId) == 1); + + // über AggValue kann Min/Max oder Avg vorgewählt werden (zum Lesen der AggregValues) + IfNotIssetSetValue($Serie['AggValue'], "Avg"); + + if ($Serie['AggValue'] != "Avg" + && $Serie['AggValue'] != "Min" + && $Serie['AggValue'] != "Max") + die ("Abbruch - 'AggValue' hat keinen gültigen Wert"); + + // Offset für Darstellung von z.B. Monate und Vormonat in einem Chart + IfNotIssetSetValue($Serie['Offset'], 0); + + IfNotIssetSetValue($Serie['ReplaceValues'], false); + + // Name (Kompatibilität aus V1.x) + if (isset($Serie['Name']) && !isset($Serie['name'])) + $Serie['name'] = $Serie['Name']; + unset($Serie['Name']); + + IfNotIssetSetValue($Serie['name'], ""); + + // type & Parameter + if (isset($Serie['type']) && isset($Serie['Param'])) + die ("Abbruch - Definition von 'Param' und 'type' in Serie gleichzeitig nicht möglich."); + if (!isset($Serie['type']) && !isset($Serie['Param'])) + die ("Abbruch - Serie muss Definition von 'Param' oder 'type' enthalten."); + + // Mögliche Charttypen + $allowedSeriesTypes = array(); + if ($cfg['Ips']['ChartType'] == 'Highcharts') + $allowedSeriesTypes = array('area','areaspline','bar','column','line','pie','scatter','spline'); + else if ($cfg['Ips']['ChartType'] == 'Highstock') + $allowedSeriesTypes = array('area','areaspline','bar','column','line','pie','scatter','spline','ohlc','candlestick'); + + if (!isset($Serie['type']) && isset($Serie['Param'])) + { + // type aus Param übernehmen + foreach($allowedSeriesTypes as $item) + { + if (strrpos($Serie['Param'],"'$item'") > 0) + $Serie['Ips']['Type'] = $item; + } + } + else + { + if (!in_array($Serie['type'], $allowedSeriesTypes)) + die ("Abbruch - Serien-Type (" . $Serie['type'] . ") nicht erkennbar."); + else + $Serie['Ips']['Type'] = $Serie['type']; + } + if (!isset($Serie['Ips']['Type'])) + die ("Abbruch - Serien-Type nicht erkennbar."); + + // data + if (isset($Serie['Data']) && isset($Serie['data'])) + die ("Abbruch - Definition von 'Data' und 'data' in ein und derselben Serie nicht mölglich."); + if (!isset($Serie['data']) && isset($Serie['Data'])) + { + $Serie['data'] = $Serie['Data']; + unset($Serie['Data']); + } + + // diverse Prüfungen bei PIE-Charts + if ($Serie['Ips']['Type'] == 'pie') + { + if (isset($Serie['Id'])) + { + if (!isset($Serie['AggType'])) + die ("Abbruch - Wird ein Pie über Id definiert muss auch AggType parametriert werden"); + + // wenn nichts angegeben wird 'AggNameFormat: automatisch abhängig vom 'AggType' berechnet + if (!isset($Serie['AggNameFormat'])) + { + if ($Serie['AggType'] == 0) //0=Hour + $Serie['AggNameFormat'] = "d.m.Y H:i"; + else if ($Serie['AggType'] == 1) //1=Day + $Serie['AggNameFormat'] = "d.m.Y"; + else if ($Serie['AggType'] == 2) //2=Week + $Serie['AggNameFormat'] = "\K\WW Y"; + else if ($Serie['AggType'] == 3) //3=Month + $Serie['AggNameFormat'] = "M Y"; + else if ($Serie['AggType'] == 4) //4=Year + $Serie['AggNameFormat'] = "Y"; + } + } + else if (isset($Serie['data'])) + { + foreach($Serie['data'] as $data) + { + if (isset($data['Id']) && isset($data['y'])) + die ("Abbruch - Pie['data']: Id und y sind als gleichzeitige Parameter nicht möglich."); + //if (!isset($data['Id']) && !isset($data['y'])) + // die ("Abbruch - Pie['data']: Id oder y muss definiert sein"); + // kann man so nicht prüfen + } + } + else + { + die ("Abbruch - Pie kann nie Daten besitzen. Es muss entweder über 'Id' oder über 'data' definiert werden."); + } + + } + + // geänderte Werte wieder zurückschreiben + $series[] = $Serie; + } + // geänderte Werte wieder zurückschreiben + + $cfg['series'] = $series; + return $cfg; + } + + // ------------------------------------------------------------------------ + // CheckCfg_AggregatedValues + // prüfen der AggregatedValues und Übernahme dieser in die Serien + // IN: $cfg + // OUT: korrigiertes $cfg + // ------------------------------------------------------------------------ + function CheckCfg_AggregatedValues($cfg) + { + DebugModuleName($cfg,"CheckCfg_AggregatedValues"); + + if (!isset($cfg['AggregatedValues'])) + $cfg['AggregatedValues'] = array(); + + // Default - wenn nichts vorbelegt + IfNotIssetSetValue($cfg['AggregatedValues']['MixedMode'], false); + IfNotIssetSetValue($cfg['AggregatedValues']['HourValues'], -1); + IfNotIssetSetValue($cfg['AggregatedValues']['DayValues'], -1); + IfNotIssetSetValue($cfg['AggregatedValues']['WeekValues'], -1); + IfNotIssetSetValue($cfg['AggregatedValues']['MonthValues'], -1); + IfNotIssetSetValue($cfg['AggregatedValues']['YearValues'], -1); + IfNotIssetSetValue($cfg['AggregatedValues']['NoLoggedValues'], 100); + + $series = array(); + foreach ($cfg['series'] as $Serie) + { + + // prüfen ob für die Serie Einstellungen für AggregatedValues vorhanden sind, + // wenn nicht Übernahme aus cfg + if (isset($Serie['AggregatedValues'])) + { + IfNotIssetSetValue($Serie['AggregatedValues']['MixedMode'], $cfg['AggregatedValues']['MixedMode']); + IfNotIssetSetValue($Serie['AggregatedValues']['HourValues'], $cfg['AggregatedValues']['HourValues']); + IfNotIssetSetValue($Serie['AggregatedValues']['DayValues'], $cfg['AggregatedValues']['DayValues']); + IfNotIssetSetValue($Serie['AggregatedValues']['WeekValues'], $cfg['AggregatedValues']['WeekValues']); + IfNotIssetSetValue($Serie['AggregatedValues']['MonthValues'], $cfg['AggregatedValues']['MonthValues']); + IfNotIssetSetValue($Serie['AggregatedValues']['YearValues'], $cfg['AggregatedValues']['YearValues']); + IfNotIssetSetValue($Serie['AggregatedValues']['NoLoggedValues'], $cfg['AggregatedValues']['NoLoggedValues']); + } + else // nein -> Daten aus übergeordneter cfg übernehmen + $Serie['AggregatedValues'] = $cfg['AggregatedValues']; + + // Umrechnen der Tage in Sekunden ... für direktes addieren zum Timestamp + $MinPerTag = 24*60*60; + + if ($Serie['AggregatedValues']['HourValues'] != -1) + $Serie['AggregatedValues']['HourValues'] *= $MinPerTag; + if ($Serie['AggregatedValues']['DayValues'] != -1) + $Serie['AggregatedValues']['DayValues'] *= $MinPerTag; + if ($Serie['AggregatedValues']['WeekValues'] != -1) + $Serie['AggregatedValues']['WeekValues'] *= $MinPerTag; + if ($Serie['AggregatedValues']['MonthValues'] != -1) + $Serie['AggregatedValues']['MonthValues'] *= $MinPerTag; + if ($Serie['AggregatedValues']['YearValues'] != -1) + $Serie['AggregatedValues']['YearValues'] *= $MinPerTag; + if ($Serie['AggregatedValues']['NoLoggedValues'] != -1) + $Serie['AggregatedValues']['NoLoggedValues'] *= $MinPerTag; + + // geänderte Werte wieder zurückschreiben + $series[] = $Serie; + } + // geänderte Werte wieder zurückschreiben + $cfg['series'] = $series; + + // die sind jetzt nicht mehr nötig..... + unset($cfg['AggregatedValues']); + + return $cfg; + } + + + + // ------------------------------------------------------------------------ + // ReadAdditionalConfigData + // zusätzliche Daten für File (hat jetzt aber nichts mit den eigentlichen Highchart Config String zu tun + // IN: $cfg + // OUT: der String welcher dann in das IPS_Template geschrieben wird. + // ------------------------------------------------------------------------ + function ReadAdditionalConfigData($cfg) + { + DebugModuleName($cfg,"ReadAdditionalConfigData"); + + // z.B.: Breite und Höhe für Container + // Breite und Höhe anpassen für HTML Ausgabe + $s['Theme'] = $cfg['HighChart']['Theme']; + if ($cfg['HighChart']['Width'] == 0) + $s['Width'] = "100%"; + else + $s['Width'] = $cfg['HighChart']['Width']. "px"; + + $s['Height'] = $cfg['HighChart']['Height']. "px"; + + return trim(print_r($s, true), "Array\n()") ; + } + +// *************************************************************************************************************************** + + // ------------------------------------------------------------------------ + // GetHighChartsCfgFile + // Falls nicht konfiguriert, wird dies als Default String genommen + // OUT: natürlich den String .... + // ------------------------------------------------------------------------ + function GetHighChartsCfgFile($cfg) + { + DebugModuleName($cfg,"GetHighChartsCfgFile"); + + $cfgArr['chart'] = CreateArrayForChart($cfg); + + if (isset($cfg['colors'])) + $cfgArr['colors'] = $cfg['colors']; + + $cfgArr['credits'] = CreateArrayForCredits($cfg); + + if (isset($cfg['global'])) + $cfgArr['global'] = $cfg['global']; + + if (isset($cfg['labels'])) + $cfgArr['labels'] = $cfg['labels']; + + // $cfg['lang'])) werden seperat behandelt + + if (isset($cfg['legend'])) + $cfgArr['legend'] = $cfg['legend']; + + if (isset($cfg['loading'])) + $cfgArr['loading'] = $cfg['loading']; + + if (isset($cfg['plotOptions'])) + $cfgArr['plotOptions'] = $cfg['plotOptions']; + + $cfgArr['exporting'] = CreateArrayForExporting($cfg); + + if (isset($cfg['symbols'])) + $cfgArr['symbols'] = $cfg['symbols']; + + $cfgArr['title'] = CreateArrayForTitle($cfg); + $cfgArr['subtitle'] = CreateArrayForSubTitle($cfg); + + $cfgArr['tooltip'] = CreateArrayForTooltip($cfg); + + $cfgArr['xAxis'] = CreateArrayForXAxis($cfg); + $cfgArr['yAxis'] = CreateArrayForYAxis($cfg); + + if ($cfg['Ips']['ChartType'] == 'Highstock') + { + if (isset($cfg['navigator'])) + $cfgArr['navigator'] = $cfg['navigator']; + if (isset($cfg['rangeSelector'])) + $cfgArr['rangeSelector'] = $cfg['rangeSelector']; + if (isset($cfg['scrollbar'])) + $cfgArr['scrollbar'] = $cfg['scrollbar']; + } + + + if ($cfg['Ips']['Debug']['ShowJSON']) + DebugString(my_json_encode($cfgArr)); + + $cfgArr['series'] = CreateArrayForSeries($cfg) ; + + if ($cfg['Ips']['Debug']['ShowJSON_Data']) + DebugString(my_json_encode($cfgArr)); + + // Array in JSON wandeln + $s = my_json_encode($cfgArr); + + // ersetzten des 'Param'-Parameters (Altlast aus V1.x) + $s = str_replace(",Param@@@:",",",$s); + $s = trim($s, "{"); + $s .= ");"; + + return $s; + } + + // ------------------------------------------------------------------------ + // GetHighChartsLangOptions + // + // IN: $cfg + // OUT: JSON Options String für den Bereich 'lang' + // ------------------------------------------------------------------------ + function GetHighChartsLangOptions($cfg) + { + DebugModuleName($cfg,"GetHighChartsLangOptions"); + + // Default + IfNotIssetSetValue($cfg['lang']['decimalPoint'], ","); + IfNotIssetSetValue($cfg['lang']['thousandsSep'], "."); + + IfNotIssetSetValue($cfg['lang']['months'], ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember']); + IfNotIssetSetValue($cfg['lang']['shortMonths'], ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez']); + IfNotIssetSetValue($cfg['lang']['weekdays'], ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag']); + + $s = "lang:" . my_json_encode($cfg['lang']); + + return $s; + } + + + // ------------------------------------------------------------------------ + // CreateArrayForSeries + // + // IN: $cfg + // OUT: der String welcher dann in das IPS_Template geschrieben wird. + // ------------------------------------------------------------------------ + function CreateArrayForSeries($cfg) + { + DebugModuleName($cfg,"CreateArrayForSeries"); + + // Daten für einzelne Serien erzeugen + $dataArr = array(); + foreach ($cfg['series'] as $Serie) + { + if ($Serie['Ips']['Type'] == 'pie') + { + $Serie['data'] = CreateDataArrayForPie($cfg, $Serie); + } + else + { + // Daten wurden von extern übergeben + if (isset($Serie['data'])) + { + if (is_array($Serie['data'])) + $Serie['data'] = CreateDataArrayFromExternalData($Serie['data'], $Serie); + else + $Serie['data'] = $Serie['data']; + + } + // Daten werden aus DB gelesen + else + $Serie['data'] = ReadDataFromDBAndCreateDataArray($cfg, $Serie); + } + + // ... aus Serie umkopieren + $serieArr = $Serie; + + // nicht für JSON benötigte Parameter löschen + unset($serieArr['Param']); + unset($serieArr['AggregatedValues']); + unset($serieArr['Unit']); + unset($serieArr['StartTime']); + unset($serieArr['EndTime']); + unset($serieArr['ReplaceValues']); + unset($serieArr['Ips']); + unset($serieArr['Offset']); + unset($serieArr['AggValue']); + unset($serieArr['AggType']); + unset($serieArr['AggNameFormat']); + unset($serieArr['ScaleFactor']); + unset($serieArr['RoundValue']); + + // ersetzten des 'Param'-Parameters (Altlast aus V1.x) + if (isset($Serie['Param'])) + $serieArr['Param@@@'] = "@" . $Serie['Param'] . "@"; + + $dataArr[] = $serieArr; + } + + return $dataArr; + } + + // ------------------------------------------------------------------------ + // PopulateDate + // + // IN: $dt + // $serie + // OUT: Date-Value für Data-String + // ------------------------------------------------------------------------ + function PopulateDate($dt, $serie) + { + if ($dt < $serie['StartTime']) + $dt = $serie['StartTime'] ; + + // z.B.: Date.UTC(2011,4,27,19,42,19),23.4 + return CreateDateUTC($dt + $serie['Offset']); + } + + // ------------------------------------------------------------------------ + // PopulateValue + // + // IN: $val + // $serie + // OUT: korrigiertes $cfg + // ------------------------------------------------------------------------ + function PopulateValue($val, $serie) + { + // Werte ersetzten (sinnvoll für Boolean, oder Integer - z.B.: Tür/Fenster-Kontakt oder Drehgriffkontakt) + if ($serie['ReplaceValues'] != false) + { + if (isset($serie['ReplaceValues'][$val])) + $val = $serie['ReplaceValues'][$val]; + } + + // Skalieren von Loggingdaten + if (isset($serie['ScaleFactor'])) + $val = $val * $serie['ScaleFactor']; + + // Rounden von Nachkommastellen + if (isset($serie['RoundValue'])) + $val = round($val, $serie['RoundValue']); + + + return $val; + } + + // ------------------------------------------------------------------------ + // CreateDataArrayForPie + // Liest die aktuellen Werte aus den übergebenen Variablen und erzeugt die Daten für das PIE + // IN: $cfg, $Serie + // OUT: der Data String + // ------------------------------------------------------------------------ + function CreateDataArrayForPie($cfg, $serie) + { + DebugModuleName($cfg,"CreateDataArrayForPie"); + + if (isset($serie['Id'])) + { + return ReadPieDataById($cfg, $serie); + } + else if (isset($serie['data'])) + { + $result = array(); + foreach($serie['data'] as $item) + { + if (isset($item['Id'])) + { + $currentValue = ReadCurrentValue($item['Id']); + $item['y'] = PopulateValue($currentValue['Value'], $serie) ; + } + $result[] = $item; + } + return $result; + } + else + { + Die ("Abbruch - Pie-Definition nicht korrekt"); + } + return $Data; + } + + // ------------------------------------------------------------------------ + // ReadPieDataById + // liest die Aggregated-Werte einer einer Vriablen aus und erzeugt das entsprechende Array + // IN: $cfg, $serie + // OUT: Config Array + // ------------------------------------------------------------------------ + function ReadPieDataById($cfg, $serie) + { + $id_AH = $cfg['ArchiveHandlerId']; + + $tempData = @AC_GetAggregatedValues($id_AH, $serie['Id'], $serie['AggType'], $serie['StartTime'], $serie['EndTime'], 0); + $tempData = array_reverse($tempData); + + $result = array(); + foreach ($tempData as $ValueItem) + { + $item['name'] = ReplaceToGermanDate(date($serie['AggNameFormat'], $ValueItem['TimeStamp'])); + $item['y'] = PopulateValue($ValueItem[$serie['AggValue']], $serie); + $result[] = $item; + } + unset ($tempData); + + return $result; + } + + // ------------------------------------------------------------------------ + // CalculateStartAndEndTimeForAggreagtedValues + // Liest den Start- und Endzeitpunkt des angefragten Bereiches + // IN: $Serie, $search : "" für alle Werte, "Hour", "Day", usw + // OUT: Array(StartTime,EndTime) + // ------------------------------------------------------------------------ + function CalculateStartAndEndTimeForAggreagtedValues($Serie, $search ="") + { + $start = -1; $ende = -1; + $trap = false; + $sum = 0; + + if ($search == "") + { + $search =="Values"; + $start = 0; + $trap = true; + } + foreach($Serie['AggregatedValues'] as $key => $value) + { + if (strrpos ($key, "Values") != false) + { + if ($value > 0) + $sum += $value; + + if (strrpos ($key, $search) !== false) + { + $trap = true; + if ($value == -1) + return false; + } + + if (!$trap) + continue; + + if ($value < 0) + continue; + + if ($start == -1) + { + $start = $sum; + continue; + } + + if ($start != -1 && $ende ==-1) + { + $ende = $sum; + break; + } + } + } + + $result = false; + if ($start != -1) + { + $result["EndTime"] = $Serie["EndTime"] - $start; + if ($ende == -1) + $result["StartTime"] = $Serie["StartTime"]; + else + $result["StartTime"] = $Serie["EndTime"] - $ende; + + if ($result["StartTime"] < $Serie["StartTime"]) + $result["StartTime"] = $Serie["StartTime"]; + + if ($result["StartTime"] == $Serie["EndTime"]) + $result = false; + } + + return $result; + } + + // ------------------------------------------------------------------------ + // ReadDataFromDBAndCreateDataArray + // Liest die Series-Daten aus der DB und schreibt sie in den DataString + // IN: $cfg, $Serie + // OUT: der Data String + // ------------------------------------------------------------------------ + function ReadDataFromDBAndCreateDataArray($cfg, $Serie) + { + DebugModuleName($cfg,"ReadDataFromDBAndCreateDataArray"); + + if (!isset($Serie['Id'])) + return ""; + + // errechne die Zeitspanne + if ($Serie['EndTime'] > time()) + $Diff = time() - $Serie['StartTime']; + else + $Diff = $Serie['EndTime'] - $Serie['StartTime']; + + + + $Id_AH = $cfg['ArchiveHandlerId']; + $dataArray = array(); + $VariableId = (int)$Serie['Id']; + $Agg = -1; + $ReadCurrentValue = true; + + // wenn ReplaceValues definiert wurden werden nur geloggte und keine Aggregated Werte gelesen + if ($Serie['ReplaceValues'] != false) + { + if ($Diff > $Serie['AggregatedValues']['NoLoggedValues']) + { + $Serie['StartTime'] = $Serie['EndTime'] - $Serie['AggregatedValues']['NoLoggedValues']; + } + + // Einzelwerte lesen + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, -1 , $Serie["StartTime"], $Serie["EndTime"], "Value", $Serie); + } + else if ($Serie['AggregatedValues']['MixedMode']) // im MixedMode werden anfangs alle Werte, dann die Stunden- und zuletzt Tageswerte ausgelesen + { + // zuerst Einzelwerte + $result = CalculateStartAndEndTimeForAggreagtedValues($Serie, ""); + if ($result != false) + { + if ($Serie['Ips']['IsCounter']) // wenn Zähler dann immer Agg.Values + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, 0, $result["StartTime"], $result["EndTime"], $Serie['AggValue'], $Serie); + else + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, -1 , $result["StartTime"], $result["EndTime"], "Value", $Serie); + } + + // -> Stundenwerte + $result = CalculateStartAndEndTimeForAggreagtedValues($Serie,"Hour"); + if ($result != false) + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, 0, $result["StartTime"], $result["EndTime"], $Serie['AggValue'], $Serie); + + // -> Tageswerte + $result = CalculateStartAndEndTimeForAggreagtedValues($Serie,"Day"); + if ($result != false) + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, 1, $result["StartTime"], $result["EndTime"], $Serie['AggValue'], $Serie); + + // -> Wochenwerten + $result = CalculateStartAndEndTimeForAggreagtedValues($Serie,"Week"); + if ($result != false) + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, 2, $result["StartTime"], $result["EndTime"], $Serie['AggValue'], $Serie); + + // -> Monatswerte + $result = CalculateStartAndEndTimeForAggreagtedValues($Serie,"Month"); + if ($result != false) + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, 3, $result["StartTime"], $result["EndTime"], $Serie['AggValue'], $Serie); + + // -> Jahreswerte + $result = CalculateStartAndEndTimeForAggreagtedValues($Serie,"Year"); + if ($result != false) + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, 4, $result["StartTime"], $result["EndTime"], $Serie['AggValue'], $Serie); + } + else + { + $Agg = -1; // -> AC_GetLoggedValues + + if (isset($Serie['AggType'])) // wenn 'AggType' definiert wurde, wird dies vorrangig bearbeitet + { + $Agg = $Serie['AggType']; + } + elseif ($Serie['AggregatedValues']['YearValues']!= -1 && $Diff > $Serie['AggregatedValues']['YearValues']) + $Agg = 4; // -> AC_GetAggregatedValues [0=Hour, 1=Day, 2=Week, 3=Month, 4=Year] + elseif ($Serie['AggregatedValues']['MonthValues']!= -1 && $Diff > $Serie['AggregatedValues']['MonthValues']) + $Agg = 3; // -> AC_GetAggregatedValues [0=Hour, 1=Day, 2=Week, 3=Month, 4=Year] + elseif ($Serie['AggregatedValues']['WeekValues']!= -1 && $Diff > $Serie['AggregatedValues']['WeekValues']) + $Agg = 2; // -> AC_GetAggregatedValues [0=Hour, 1=Day, 2=Week, 3=Month, 4=Year] + elseif ($Serie['AggregatedValues']['DayValues']!= -1 && $Diff > $Serie['AggregatedValues']['DayValues']) + $Agg = 1; // -> AC_GetAggregatedValues [0=Hour, 1=Day, 2=Week, 3=Month, 4=Year] + else if ($Serie['AggregatedValues']['HourValues']!= -1 && $Diff > $Serie['AggregatedValues']['HourValues']) + $Agg = 0; // -> AC_GetAggregatedValues [0=Hour, 1=Day, 2=Week, 3=Month, 4=Year] + + // es wurde noch nichts definiert und es handelt sich um einen Zähler --> Tageswerte + if ($Agg == -1 && $Serie['Ips']['IsCounter']) + $Agg = 0; + + if ($Agg == -1) + { + // Zeitraum ist zu groß -> nur bis max. Zeitraum einlesen + if ($Diff > $Serie['AggregatedValues']['NoLoggedValues']) + $Serie['StartTime'] = $Serie['EndTime'] - $Serie['AggregatedValues']['NoLoggedValues']; + + // Alle Werte + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, -1 , $Serie["StartTime"], $Serie["EndTime"], "Value", $Serie); + } + else + { + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, $Agg, $Serie["StartTime"], $Serie["EndTime"], $Serie['AggValue'], $Serie); + $ReadCurrentValue = false; + } + } + + // sortieren, so , dass der aktuellste Wert zuletzt kommt + $dataArray = array_reverse($dataArray); + + // aktuellen Wert der Variable noch in Array aufnehmen + if ($ReadCurrentValue + //&& $Serie['EndTime'] >= time() // nicht wenn Endzeitpunkt vor NOW ist + && !$Serie['Ips']['IsCounter']) // nicht bei Zählervariablen + { +// $curValue = ReadCurrentValue($VariableId); + $curValue = ReadLoggedValue($Id_AH, $VariableId, $Serie['EndTime']); + $dataArray[] = CreateDataItem($curValue['TimeStamp'], $curValue['Value'], $Serie); + } + + + return $dataArray ; + } + + // ------------------------------------------------------------------------ + // ReadLoggedValue + // IN: $instanceID, $VariableId, $time + // OUT: Aktueller Wert + // ------------------------------------------------------------------------ + function ReadLoggedValue($instanceID, $variableId, $time) + { + if ($time > time()) $time = time(); + $values = AC_GetLoggedValues($instanceID, $variableId, 0, $time+1, 1); + $currentVal['Value']= $values[0]['Value']; + $currentVal['TimeStamp'] = $time; + + return $currentVal; + } + + // ------------------------------------------------------------------------ + // ReadCurrentValue + // IN: $VariableId + // OUT: Aktueller Wert + // ------------------------------------------------------------------------ + function ReadCurrentValue($variableId) + { + $currentVal['Value']= GetValue($variableId); + $currentVal['TimeStamp'] = time(); + + return $currentVal; + } + + // ------------------------------------------------------------------------ + // ReadAndAddToLoggedData + // IN: siehe Parameter + // OUT: Vervollständigte Logged Data + // ------------------------------------------------------------------------ + function ReadAndAddToLoggedData($loggedData, $id_AH, $variableId, $aggType, $startTime, $endTime, $aggValueName, $serie) + { + $cfg['Ips']['Debug']['Modules'] = true; + + if ($aggType >= 0) + $tempData = @AC_GetAggregatedValues($id_AH, $variableId, $aggType, $startTime, $endTime, 0); + else + //$tempData = @AC_GetLoggedValues($id_AH, $variableId, $startTime, $endTime, 0 ); + $tempData = @AC_GetLoggedValuesCompatibility($id_AH, $variableId, $startTime, $endTime, 0 ); + + foreach ($tempData as $item) + { + $loggedData[] = CreateDataItem($item['TimeStamp'], $item[$aggValueName], $serie); + } + + unset ($tempData); + + return $loggedData; + } + + //Hilfsfunktion, die die Funktionsweise von IP-Symcon 2.x nachbildet + function AC_GetLoggedValuesCompatibility($instanceID, $variableID, $startTime, $endTime, $limit) { + $values = AC_GetLoggedValues($instanceID, $variableID, $startTime, $endTime, $limit ); + if((sizeof($values) == 0) || (end($values)['TimeStamp'] > $startTime)) { + $previousRow = AC_GetLoggedValues($instanceID, $variableID, 0, $startTime - 1, 1 ); + $values = array_merge($values, $previousRow); + } + return $values; + } + + function CreateDataItem($dt, $val, $serie) + { + // Wert anpassen (Round, Scale) + $val = PopulateValue($val, $serie); + + // z.B.: Date.UTC(2011,4,27,19,42,19),23.4 + $dtUTC = PopulateDate($dt, $serie); + + return array("@$dtUTC@", $val); + } + + // ------------------------------------------------------------------------ + // CreateDataArrayFromExternalData + // Umwandeln der externen Daten in ein Daten Array + // IN: $arr = Aus IPS-Datenbank ausgelesenen Daten (LoggedData) + // $Serie = Config Daten der aktuellen Serie + // OUT: Highcharts ConfigString für Series-Data + // ------------------------------------------------------------------------ + function CreateDataArrayFromExternalData($arr, $Serie) + { + $result = array(); + foreach($Serie['data'] as $item) + { + if (is_array($item)) + { + if (isset($item['TimeStamp']) && !isset($item['x'])) + { + $item['x'] = "@" . PopulateDate($item['TimeStamp'], $Serie) . "@"; + unset($item['TimeStamp']); + } + if (isset($item['Value']) && !isset($item['y'])) + { + $item['y'] = $item['Value']; + unset($item['Value']); + } + if (isset($item['y'])) + $item['y'] = PopulateValue($item['y'], $Serie); + + $result[] = $item; + } + else + $result[] = $item; + } + + return $result; + } + + // ------------------------------------------------------------------------ + // CreateTooltipFormatter + // Auslesen von immer wieder benötigten Werten aus der Variable + // IN: $cfg = Alle Config Daten + // OUT: Highcharts ConfigString für Tooltip-Formatter (Interaktive Anzeige des Wertes) + // ------------------------------------------------------------------------ + function CreateTooltipFormatter($cfg) + { + DebugModuleName($cfg,"CreateTooltipFormatter"); + + //ToDo: da sollten wir etwas lesbarer arbeiten + $s = ""; + $offset =""; + + foreach ($cfg['series'] as $Serie ) + { + if ($Serie['Ips']['Type'] == 'pie') + { + if (isset($Serie['data'])) + { + $s .= "["; + foreach($Serie['data'] as $data) + { + $unit = @$Serie['Unit']; + if (isset($data['Unit'])) + $unit = $data['Unit']; + + $s .= "this.y +' " . $unit . "',"; + } + $s = trim($s,","); + $s .= "][this.point.x],"; + } + else + { + $unit = @$Serie['Unit']; + $s .= "[this.y + ' " . $unit . "'],"; + } + $offset .= "0,"; // pies haben nie einen Offset + } + else + { + // hier wird das VariableCustomProfile aus IPS übernommen + if (!isset($Serie['Unit'])) + { + // hole das Variablen Profil + $IPSProfil = @GetIPSVariableProfile($Serie['Id']); + if ($IPSProfil != false) + { + if (array_key_exists("Associations",$IPSProfil) && count($IPSProfil['Associations'])>0) + { + $Arr = array(); + foreach($IPSProfil['Associations'] as $Item) + { + $Arr[$Item['Value']] = $Item['Name']; + } + + if (!is_array($Serie['ReplaceValues'])) // erzeuge Tooltips vollständig aus VariablenProfil + $s .= CreateTooltipSubValues($Arr, array_keys($Arr)); + else // oder nehme ReplaceValues zur Hilfe + $s .= CreateTooltipSubValues($Arr, $Serie['ReplaceValues']); + } + else + { + // Suffix als Einheit übernehmen + $Serie['Unit'] = trim($IPSProfil['Suffix'], " "); + $s .= "[this.y + ' ". $Serie['Unit']."'],"; + } + } + else // falls VariablenId nicht existiert + { + $s .= "[this.y ],"; + } + } + // es wurden Unit und ReplaceValues übergeben + else if (is_array($Serie['Unit']) && is_array($Serie['ReplaceValues'])) + { + $s .= CreateTooltipSubValues($Serie['Unit'],$Serie['ReplaceValues']); + } + else // Einheit aus übergebenem Parmeter Unit + { + $s .= "[this.y + ' ". $Serie['Unit']."'],"; + } + $offset .= $Serie['Offset'] . ","; + } + + } + + $s = trim($s , "," ); + $offset = trim($offset , "," ); + + //*1000 da JS in [ms] angebgeben wird un php in [s] +/* $TooltipString="function() { + var serieIndex = this.series.index; + + if (this.series.type == 'pie') + { + var pointIndex = this.point.x; + var unit = [".$s. "][serieIndex][pointIndex]; + + if (!unit) + unit = [".$s. "][serieIndex][0]; + + return '' + this.point.name +': '+ unit +'
= ' + this.percentage.toFixed(1) + ' %'; + } + else + { + var pointIndex = 0; + var unit = [".$s. "][serieIndex][pointIndex]; + var offset = [".$offset. "][serieIndex] * 1000; + + var offsetInfo =''; + if (offset != 0) + offsetInfo = '
(Achtung Zeitwert hat einen Offset)'; + else + offsetInfo =''; + + return '' + this.series.name + ': '+ unit + '
' + + Highcharts.dateFormat('%A %d.%m.%Y %H:%M', this.x - offset) + + offsetInfo; + + + } + } "; +*/ + $TooltipString="function() { + var serieIndex = this.series.index; + var unit = [".$s. "][serieIndex]; + var offset = [".$offset. "][serieIndex] * 1000; + var offsetInfo =''; + + if (offset != 0) + offsetInfo = '
(Achtung Zeitwert hat einen Offset)'; + else + offsetInfo =''; + + if (this.series.type == 'pie') + { + return '' + this.point.name +': '+ unit +'
= ' + this.percentage.toFixed(1) + ' %'; + } + else + { + return '' + this.series.name + ': '+ unit + '
' + + Highcharts.dateFormat('%A %d.%m.%Y %H:%M', this.x - offset) + + offsetInfo; + } + } "; + + + + return $TooltipString; + } + + // ------------------------------------------------------------------------ + // CreateTooltipSubValues + // Erzeugt den Tooltip für Unter-Elemente + // IN: shownTooltipArr = Array der Werte (Synonyme) welche im Tooltip angezeigt werden sollen + // chartValueArr = Array der Werte welche im Chart eingetragen werden + // OUT: Tooltip String + // ------------------------------------------------------------------------ + function CreateTooltipSubValues($shownTooltipArr, $chartValueArr) + { + $s="{"; + $Count = count($shownTooltipArr); + for ($i = 0; $i < $Count ; $i++) + { + if (isset($chartValueArr[$i]) && isset($shownTooltipArr[$i])) + $s .= $chartValueArr[$i] .": '" . $shownTooltipArr[$i] ."'," ; + } + $s = trim($s, ",") . "}"; + + return $s ."[this.y],"; + } + + // ------------------------------------------------------------------------ + // GetIPSVariableProfile + // Liest das Variablen Profil der übergeben Variable aus + // Versucht zuerst das eigene und wenn nicht verfügbar das Standar Profil auszulesen + // IN: variableId = Id der Variablen + // OUT: Variablen Profil + // ------------------------------------------------------------------------ + function GetIPSVariableProfile($variableId) + { + $var = @IPS_GetVariable($variableId); + if ($var == false) // Variabel existiert nicht + return false; + + $profilName = $var['VariableCustomProfile']; // "Eigenes Profil" + + if ($profilName == false) // "Standard" Profil + $profilName = $var['VariableProfile']; + + if ($profilName != false) + return IPS_GetVariableProfile($profilName); // und jetzt die dazugehörigen Daten laden + else + return false; + } + + + + // ------------------------------------------------------------------------ + // CreateArrayForChart + // + // IN: $cfg + // OUT: Config Array für den Bereich 'chart' + // ------------------------------------------------------------------------ + function CreateArrayForChart($cfg) + { + if (!isset($cfg['chart'])) + $cfg['chart'] = array(); + + //Default + IfNotIssetSetValue($cfg['chart']['renderTo'], "container"); + IfNotIssetSetValue($cfg['chart']['zoomType'], "xy"); + + return $cfg['chart']; + } + + // ------------------------------------------------------------------------ + // CreateArrayForCredits + // + // IN: $cfg + // OUT: Config Array für den Bereich 'credits' + // ------------------------------------------------------------------------ + function CreateArrayForCredits($cfg) + { + if (!isset($cfg['credits'])) + $cfg['credits'] = array(); + + //Default + IfNotIssetSetValue($cfg['credits']['enabled'], false); + + return $cfg['credits']; + } + + // ------------------------------------------------------------------------ + // CreateArrayForTitle + // + // IN: $cfg + // OUT: Config Array für den Bereich 'title' + // ------------------------------------------------------------------------ + function CreateArrayForTitle($cfg) + { + if (!isset($cfg['title'])) + $cfg['title'] = array(); + + return $cfg['title']; + } + + // ------------------------------------------------------------------------ + // CreateArrayForExporting + // + // IN: $cfg + // OUT: Config Array für den Bereich 'exporting' + // ------------------------------------------------------------------------ + function CreateArrayForExporting($cfg) + { + if (!isset($cfg['exporting'])) + $cfg['exporting'] = array(); + + //Default + IfNotIssetSetValue($cfg['exporting']['buttons']['printButton']['enabled'], false); + + return $cfg['exporting']; + } + + // ------------------------------------------------------------------------ + // CreateArrayForTooltip + // + // IN: $cfg + // OUT: Config Array für den Bereich 'tooltip' + // ------------------------------------------------------------------------ + function CreateArrayForTooltip($cfg) + { + if (!isset($cfg['tooltip'])) + $cfg['tooltip'] = array(); + + //Default + // wenn not isset -> autom. erzeugen durch IPS + if (!isset($cfg['tooltip']['formatter'])) + $cfg['tooltip']['formatter'] = "@" . CreateTooltipFormatter($cfg) . "@"; + // wenn "" -> default by highcharts + else if ($cfg['tooltip']['formatter'] == "") + { + // do nothing + } + + return $cfg['tooltip']; + } + + // ------------------------------------------------------------------------ + // CreateArrayForSubTitle + // + // IN: $cfg + // OUT: Config Array für den Bereich subtitle + // ------------------------------------------------------------------------ + function CreateArrayForSubTitle($cfg) + { + if (!isset($cfg['subtitle'])) + $cfg['subtitle'] = array(); + + //Default + IfNotIssetSetValue($cfg['subtitle']['text'], "Zeitraum: %STARTTIME% - %ENDTIME%"); + IfNotIssetSetValue($cfg['subtitle']['Ips']['DateTimeFormat'], "(D) d.m.Y H:i"); + + $s = $cfg['subtitle']['text']; + $s = str_ireplace("%STARTTIME%", date($cfg['subtitle']['Ips']['DateTimeFormat'], $cfg['Ips']['ChartStartTime']), $s); + $s = str_ireplace("%ENDTIME%", date($cfg['subtitle']['Ips']['DateTimeFormat'], $cfg['Ips']['ChartEndTime']), $s); + $cfg['subtitle']['text'] = ReplaceToGermanDate($s); + + unset($cfg['subtitle']['Ips']); + + return $cfg['subtitle']; + } + // ------------------------------------------------------------------------ + // CreateArrayForXAxis + // Erzeugen das ArrX-Achsen Strings für Highchart-Config + // IN: $cfg + // es besteht die Möglichkeit den Achsen String bereits im Highchart Format zu hinterlegen + // oder die folgenden Parameter als Array einzustellen: Name, Min, Max, TickInterval, Opposite, Unit + // OUT: Highcharts String für die Achsen + // ------------------------------------------------------------------------ + function CreateArrayForXAxis($cfg) + { + if (!isset($cfg['xAxis'])) + $cfg['xAxis'] = array(); + + //Default + IfNotIssetSetValue($cfg['xAxis']['type'], "datetime"); + IfNotIssetSetValue($cfg['xAxis']['dateTimeLabelFormats']['second'], "%H:%M:%S"); + IfNotIssetSetValue($cfg['xAxis']['dateTimeLabelFormats']['minute'], "%H:%M"); + IfNotIssetSetValue($cfg['xAxis']['dateTimeLabelFormats']['hour'], "%H:%M"); + IfNotIssetSetValue($cfg['xAxis']['dateTimeLabelFormats']['day'], "%e. %b"); + IfNotIssetSetValue($cfg['xAxis']['dateTimeLabelFormats']['week'], "%e. %b"); + IfNotIssetSetValue($cfg['xAxis']['dateTimeLabelFormats']['month'], "%b %y"); + IfNotIssetSetValue($cfg['xAxis']['dateTimeLabelFormats']['year'], "%Y"); + + IfNotIssetSetValue($cfg['xAxis']['allowDecimals'], false); + + if (isset($cfg['xAxis']['min']) && $cfg['xAxis']['min'] == false) + unset($cfg['xAxis']['min']); + else + IfNotIssetSetValue($cfg['xAxis']['min'], "@" . CreateDateUTC($cfg['Ips']['ChartStartTime']) ."@"); + + if (isset($cfg['xAxis']['max']) && $cfg['xAxis']['max'] == false) + unset($cfg['xAxis']['max']); + else + IfNotIssetSetValue($cfg['xAxis']['max'], "@" . CreateDateUTC($cfg['Ips']['ChartEndTime'])."@"); + + + + return $cfg['xAxis']; + } + + // ------------------------------------------------------------------------ + // CreateArrayForYAxis + // Erzeugen der Y-Achsen Strings für Highchart-Config + // IN: $cfg + // es besteht die Möglichkeit den Achsen String bereits im Highchart Format zu hinterlegen + // oder die folgenden Parameter als Array einzustellen: Name, Min, Max, TickInterval, Opposite, Unit + // OUT: Highcharts String für die Achsen + // ------------------------------------------------------------------------ + function CreateArrayForYAxis($cfg) + { + if (!isset($cfg['yAxis'])) + return null; + + $result = array(); + + foreach ($cfg['yAxis'] as $Axis ) + { + // erst mal alles kopieren + $cfgAxis = $Axis; + + if (!isset($cfgAxis['labels']['formatter']) && isset($Axis['Unit'])) + $cfgAxis['labels']['formatter'] ="@function() { return this.value +' ". $Axis['Unit']."'; }@"; + + $result[] = $cfgAxis; + } + + return $result; + } + + // ------------------------------------------------------------------------ + // CreateDateUTC + // Erzeugen des DateTime Strings für Highchart-Config + // IN: $timeStamp = Zeitstempel + // OUT: Highcharts DateTime-Format als UTC String ... Date.UTC(1970, 9, 27, ) + // Achtung! Javascript Monat beginnt bei 0 = Januar + // ------------------------------------------------------------------------ + function CreateDateUTC($timeStamp) + { + $monthForJS = ((int)date("m", $timeStamp))-1 ; // Monat -1 (PHP->JS) + return "Date.UTC(" . date("Y,", $timeStamp) .$monthForJS. date(",j,H,i,s", $timeStamp) .")"; + } + + // ------------------------------------------------------------------------ + // ReplaceToGermanDate + // Falls nicht konfiguriert, wird dies als Default String genommen + // IN: String mit englischen Wochentagen, bzw. Monaten + // OUT: der String übersetzt ins Deutsche + // ------------------------------------------------------------------------ + function ReplaceToGermanDate($value) + { + $trans = array( + 'Monday' => 'Montag', + 'Tuesday' => 'Dienstag', + 'Wednesday' => 'Mittwoch', + 'Thursday' => 'Donnerstag', + 'Friday' => 'Freitag', + 'Saturday' => 'Samstag', + 'Sunday' => 'Sonntag', + 'Mon' => 'Mo', + 'Tue' => 'Di', + 'Wed' => 'Mi', + 'Thu' => 'Do', + 'Fri' => 'Fr', + 'Sat' => 'Sa', + 'Sun' => 'So', + 'January' => 'Januar', + 'February' => 'Februar', + 'March' => 'März', + 'May' => 'Mai', + 'June' => 'Juni', + 'July' => 'Juli', + 'October' => 'Oktober', + 'December' => 'Dezember', + 'Mar' => 'Mär', + 'May' => 'Mai', + 'Oct' => 'Okt', + 'Dec' => 'Dez', + ); + return strtr($value, $trans); + } + + + // ------------------------------------------------------------------------ + // my_json_encode + // + // IN: PHP-Array + // OUT: JSON String + // ------------------------------------------------------------------------ + function my_json_encode($cfgArr) + { + array_walk_recursive($cfgArr, "CheckArrayItems"); + + $s = json_encode($cfgArr); + + // alle " entfernen + $s = str_replace('"', '',$s); + + // Zeilenumbruch, Tabs, etc entfernen ... bin mir nicht so sicher ob das so gut ist + $s = RemoveUnsupportedStrings($s); + + return $s; + } + + // ------------------------------------------------------------------------ + // CheckArrayItems + // + // IN: Array-Item + // OUT: + // ------------------------------------------------------------------------ + function CheckArrayItems(&$item) + { + if (is_string($item)) + { + if ($item == "@" || $item == "@@" ) + { + $item = "'" . $item . "'"; + } + else if ((substr($item,0,1) == "@" && substr($item,-1) == "@")) + { + $item = trim($item, "@"); + } +/* else if ((substr($item,0,1) == "$" && substr($item,-1) == "$")) + { + + $item = trim($item, "$"); + }*/ + else + { + $item = "'" . trim($item, "'") . "'"; + } + $item = utf8_encode($item); + + } + } + + // ------------------------------------------------------------------------ + // RemoveUnsupportedStrings + // Versuchen Sonderzeichen wie Zeilenumbrüche, Tabs, etc. aus dem übergebenen String zu entfernen + // IN: $str + // OUT: $str + // ------------------------------------------------------------------------ + function RemoveUnsupportedStrings($str) + { + + $str = str_replace("\\t","",$str); + $str = str_replace("\\n","",$str); + $str = str_replace("\\r","",$str); + $str = str_ireplace("\\\u00","\\u00",$str); // da muss man nochmals checken + $str = str_replace("\\\\","",$str); + + return $str; + } + + // ------------------------------------------------------------------------ + // IfNotIssetSetValue + // pfüft ob isset($item), wenn nicht wird $value in &$item geschrieben + // IN: &$item, $value + // OUT: &$item + // ------------------------------------------------------------------------ + function IfNotIssetSetValue(&$item, $value ) + { + if (!isset($item) + || (is_string($item) && $item == "")) // zusätzliche Abfrage in 2.01 + { + $item = $value; + return false; + } + + return true; + } + + // ------------------------------------------------------------------------ + // getmicrotime + // + // IN: + // OUT: + // ------------------------------------------------------------------------ + function getmicrotime($short = false) + { + list($usec,$sec)=explode(" ", microtime()); + + if ($short ) + return (float)$usec + (float)substr($sec,-1); + else + return (float)$usec + (float)$sec; + } + + // ------------------------------------------------------------------------ + // DebugString + // + // IN: + // OUT: + // ------------------------------------------------------------------------ + function DebugString($str) + { + $s = RemoveUnsupportedStrings($str); + echo $s; + } + + // ------------------------------------------------------------------------ + // DebugModuleName + // + // IN: + // OUT: + // ------------------------------------------------------------------------ + function DebugModuleName($cfg, $name) + { + if (isset($cfg['Ips']['Debug']['Modules']) && $cfg['Ips']['Debug']['Modules']) + { + global $_IPS, $version, $versionDate; + + IPS_LogMessage($_IPS['SENDER'] ." - " .getmicrotime(true) , "Highcharts $version ($versionDate) - $name"); + } + } +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment.inc.php index 486174d..650580e 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment.inc.php @@ -18,6 +18,7 @@ */ IPSUtils_Include ("IPSLogger.inc.php", "IPSLibrary::app::core::IPSLogger"); + IPSUtils_Include ('IPSMessageHandler.class.php', 'IPSLibrary::app::core::IPSMessageHandler'); include_once "Entertainment_Constants.inc.php"; IPSUtils_Include ("Entertainment_IDs.inc.php", "IPSLibrary::app::modules::Entertainment"); IPSUtils_Include ("Entertainment_Configuration.inc.php", "IPSLibrary::config::modules::Entertainment"); diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Communication.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Communication.inc.php index e0c64a8..79bf579 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Communication.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Communication.inc.php @@ -20,17 +20,17 @@ function ExtractCommProperties($PropertyData, $CommParams, $ControlData=null) { foreach ($PropertyData as $Idx=>$Property) { $CommParam = $CommParams[$Idx]; - if ($Property==$CommParams[$Idx]) { + if ($Property === $CommParams[$Idx]) { //Ok, Continue - } else if ($Property==c_Template_Value) { + } else if ($Property === c_Template_Value) { $CommProperties[c_Template_Value] = $CommParams[$Idx]; - } else if ($Property==c_Template_Code and + } else if ($Property === c_Template_Code and array_key_exists(c_Property_Codes,$ControlData) and array_key_exists($CommParam, array_flip($ControlData[c_Property_Codes])) ) { $CommProperties[c_Template_Code] = $CommParams[$Idx]; $Codes = array_flip($ControlData[c_Property_Codes]); $CommProperties[c_Template_Value] = $Codes[$CommParams[$Idx]]; - } else if ($Property==c_Template_Code2 and + } else if ($Property === c_Template_Code2 and array_key_exists(c_Property_Codes2,$ControlData) and array_key_exists($CommParam, array_flip($ControlData[c_Property_Codes2])) ) { $CommProperties[c_Template_Code2] = $CommParams[$Idx]; @@ -53,14 +53,14 @@ function get_CommPropertiesSource($CommParams) { foreach ($SourcePropertyData as $DevicePropertyName => $DevicePropertyData) { $CommProperties = ExtractCommProperties($DevicePropertyData, $CommParams); if ($CommProperties !== false) { - $CommProperties[c_Property_Comm] = $DevicePropertyName; + $CommProperties[c_Property_Comm] = $DevicePropertyName; $CommProperties[c_Property_Device] = $SourceConf[$RoomName][$SourceIdx][$SourcePropertyName][c_Property_Device]; $CommProperties[c_Property_Control] = c_Control_Source; $CommProperties[c_Property_Name] = $SourcePropertyName; $CommProperties[c_Property_SourceIdx]= $SourceIdx; $CommProperties[c_Property_Room] = $RoomName; - return $CommProperties; - } + return $CommProperties; + } } } } @@ -94,13 +94,13 @@ function get_CommPropertiesDevice($CommParams) { // --------------------------------------------------------------------------------------------------------------------------- function get_CommProperties($CommParams) { - $CommProperties = get_CommPropertiesDevice($CommParams); - if ($CommProperties !== false) { - return $CommProperties; + $CommProperties = get_CommPropertiesDevice($CommParams); + if ($CommProperties !== false) { + return $CommProperties; } - $CommProperties = get_CommPropertiesSource($CommParams); - if ($CommProperties !== false) { - return $CommProperties; + $CommProperties = get_CommPropertiesSource($CommParams); + if ($CommProperties !== false) { + return $CommProperties; } return false; } @@ -110,139 +110,152 @@ function get_CommProperties($CommParams) { // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_ReceiveData($CommParams, $MessageType=c_MessageType_Action) { if (!Entertainment_Before_ReceiveData($CommParams, $MessageType)) { - return true; + return true; } $CommProperties = get_CommProperties($CommParams); if ($CommProperties !== false) { - $CommType = $CommProperties[c_Property_Comm]; - $DeviceName = $CommProperties[c_Property_Device]; + $CommType = $CommProperties[c_Property_Comm]; + $DeviceName = $CommProperties[c_Property_Device]; IPSLogger_Trc(__File__, 'Received Data "'.implode($CommParams, '.').'" for Device '.$DeviceName); - switch ($CommType) { - case c_Property_CommPower: - case c_Property_CommPower2: - Entertainment_SetDevicePower(get_ControlIdByDeviceName($DeviceName, c_Control_DevicePower), c_Value_Toggle, $MessageType); - break; - case c_Property_CommPowerOn: - case c_Property_CommPowerOn2: - Entertainment_SetDevicePower(get_ControlIdByDeviceName($DeviceName, c_Control_DevicePower), true, $MessageType); - break; - case c_Property_CommPowerOff: - case c_Property_CommPowerOff2: - Entertainment_SetDevicePower(get_ControlIdByDeviceName($DeviceName, c_Control_DevicePower), false, $MessageType); - break; - case c_Property_CommMute: - case c_Property_CommMute2: - Entertainment_SetMuting(get_ControlIdByDeviceName($DeviceName, c_Control_Muting), c_Value_Toggle, $MessageType); - break; - case c_Property_CommMuteOn: - case c_Property_CommMuteOn2: - Entertainment_SetMuting(get_ControlIdByDeviceName($DeviceName, c_Control_Muting), true, $MessageType); - break; - case c_Property_CommMuteOff: - case c_Property_CommMuteOff2: - Entertainment_SetMuting(get_ControlIdByDeviceName($DeviceName, c_Control_Muting), false, $MessageType); - break; - case c_Property_CommVol: - case c_Property_CommVol2: + switch ($CommType) { + case c_Property_CommPower: + case c_Property_CommPower2: + Entertainment_SetDevicePower(get_ControlIdByDeviceName($DeviceName, c_Control_DevicePower), c_Value_Toggle, $MessageType); + break; + case c_Property_CommPowerOn: + case c_Property_CommPowerOn2: + Entertainment_SetDevicePower(get_ControlIdByDeviceName($DeviceName, c_Control_DevicePower), true, $MessageType); + break; + case c_Property_CommPowerOff: + case c_Property_CommPowerOff2: + Entertainment_SetDevicePower(get_ControlIdByDeviceName($DeviceName, c_Control_DevicePower), false, $MessageType); + break; + case c_Property_CommMute: + case c_Property_CommMute2: + Entertainment_SetMuting(get_ControlIdByDeviceName($DeviceName, c_Control_Muting), c_Value_Toggle, $MessageType); + break; + case c_Property_CommMuteOn: + case c_Property_CommMuteOn2: + Entertainment_SetMuting(get_ControlIdByDeviceName($DeviceName, c_Control_Muting), true, $MessageType); + break; + case c_Property_CommMuteOff: + case c_Property_CommMuteOff2: + Entertainment_SetMuting(get_ControlIdByDeviceName($DeviceName, c_Control_Muting), false, $MessageType); + break; + case c_Property_CommVol: + case c_Property_CommVol2: Entertainment_SetVolume(get_ControlIdByDeviceName($DeviceName, c_Control_Volume), (int)$CommProperties[c_Template_Value], $MessageType); - break; - case c_Property_CommBal: - case c_Property_CommBal2: + break; + case c_Property_CommVolPlus: + Entertainment_SetVolumeDiff(get_ControlIdByDeviceName($DeviceName, c_Control_Volume), + 5, $MessageType); + break; + case c_Property_CommVolMinus: + Entertainment_SetVolumeDiff(get_ControlIdByDeviceName($DeviceName, c_Control_Volume), + -5, $MessageType); + break; + case c_Property_CommBal: + case c_Property_CommBal2: Entertainment_SetBalance(get_ControlIdByDeviceName($DeviceName, c_Control_Balance), (int)$CommProperties[c_Template_Value], $MessageType); - break; - case c_Property_CommTre: - case c_Property_CommTre2: + break; + case c_Property_CommTre: + case c_Property_CommTre2: Entertainment_SetTreble(get_ControlIdByDeviceName($DeviceName, c_Control_Treble), (int)$CommProperties[c_Template_Value], $MessageType); - break; - case c_Property_CommMid: - case c_Property_CommMid2: + break; + case c_Property_CommMid: + case c_Property_CommMid2: Entertainment_SetMiddle(get_ControlIdByDeviceName($DeviceName, c_Control_Middle), (int)$CommProperties[c_Template_Value], $MessageType); - break; - case c_Property_CommBas: - case c_Property_CommBas2: + break; + case c_Property_CommBas: + case c_Property_CommBas2: Entertainment_SetBass(get_ControlIdByDeviceName($DeviceName, c_Control_Bass), (int)$CommProperties[c_Template_Value], $MessageType); - break; - case c_Property_CommMode: - case c_Property_CommMode2: - Entertainment_SetMode(get_ControlIdByDeviceName($DeviceName, c_Control_Mode), + break; + case c_Property_CommMode: + case c_Property_CommMode2: + Entertainment_SetMode(get_ControlIdByDeviceName($DeviceName, c_Control_Mode), $CommProperties[c_Template_Value], $MessageType); - break; - case c_Property_CommRemSrc: - $ControlId = get_ControlIdByDeviceName($DeviceName, c_Control_RemoteSourceType); - $Value = $CommProperties[c_Template_Value]; - Entertainment_SetRemoteControlType($ControlId, + break; + case c_Property_CommRemSrc: + $ControlId = get_ControlIdByDeviceName($DeviceName, c_Control_RemoteSourceType); + $Value = $CommProperties[c_Template_Value]; + Entertainment_SetRemoteControlType($ControlId, $Value, c_Control_RemoteSource); - break; - case c_Property_CommRemVol: - Entertainment_SetRemoteControlType(get_ControlIdByDeviceName($DeviceName, c_Control_RemoteVolumeType), + break; + case c_Property_CommRemVol: + Entertainment_SetRemoteControlType(get_ControlIdByDeviceName($DeviceName, c_Control_RemoteVolumeType), $CommProperties[c_Template_Value], c_Control_RemoteVolume); - break; - case c_Property_CommSrc: - case c_Property_CommSrc2: - $SourceIdx = $CommProperties[c_Property_SourceIdx]; - $RoomName = $CommProperties[c_Property_Room]; - IPSLogger_Inf(__file__, "Switch Source for $RoomName to $SourceIdx"); - Entertainment_SetSource(get_ControlIdByRoomId(get_RoomId($RoomName), c_Control_Source), $SourceIdx, $MessageType); - break; - case c_Property_CommPrg: - case c_Property_CommPrg2: - Entertainment_SetProgram(get_ControlIdByDeviceName($DeviceName, c_Control_Program), + break; + case c_Property_CommSrc: + case c_Property_CommSrc2: + $SourceIdx = $CommProperties[c_Property_SourceIdx]; + $RoomName = $CommProperties[c_Property_Room]; + IPSLogger_Inf(__file__, "Switch Source for $RoomName to $SourceIdx"); + Entertainment_SetSource(get_ControlIdByRoomId(get_RoomId($RoomName), c_Control_Source), $SourceIdx, $MessageType); + break; + case c_Property_CommSrcNext: + $RoomName = $CommProperties[c_Property_Room]; + IPSLogger_Inf(__file__, "Switch Next Source for $RoomName"); + Entertainment_SetSourceNext(get_ControlIdByRoomId(get_RoomId($RoomName), c_Control_Source), $MessageType); + break; + case c_Property_CommPrg: + case c_Property_CommPrg2: + Entertainment_SetProgram(get_ControlIdByDeviceName($DeviceName, c_Control_Program), $CommProperties[c_Template_Value], $MessageType); - break; - case c_Property_CommPrgPrev: - case c_Property_CommPrgPrev2: - Entertainment_SetProgramPrev(get_ControlIdByDeviceName($DeviceName, c_Control_Program), $MessageType); - break; - case c_Property_CommPrgNext: - case c_Property_CommPrgNext2: - Entertainment_SetProgramNext(get_ControlIdByDeviceName($DeviceName, c_Control_Program), $MessageType); - break; - default: + break; + case c_Property_CommPrgPrev: + case c_Property_CommPrgPrev2: + Entertainment_SetProgramPrev(get_ControlIdByDeviceName($DeviceName, c_Control_Program), $MessageType); + break; + case c_Property_CommPrgNext: + case c_Property_CommPrgNext2: + Entertainment_SetProgramNext(get_ControlIdByDeviceName($DeviceName, c_Control_Program), $MessageType); + break; + default: IPSLogger_Err(__File__, 'Found unknown CommunicationType "'.$CommType.'"'); - } - Entertainment_After_ReceiveData($CommParams, $MessageType); + } + Entertainment_After_ReceiveData($CommParams, $MessageType); return true; } - Entertainment_After_ReceiveData($CommParams, $MessageType); + Entertainment_After_ReceiveData($CommParams, $MessageType); return false; } // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SendData($DeviceName, $ControlType, $CommParams, $CommType) { - $CommConfig = get_CommunicationConfiguration(); - $CommInterface = $CommParams[0]; + $CommConfig = get_CommunicationConfiguration(); + $CommInterface = $CommParams[0]; $FunctionName = $CommConfig[$CommInterface][c_Property_FunctionSnd]; $FunctionScript = $CommConfig[$CommInterface][c_Property_ScriptSnd]; $FunctionParameters = array(); - foreach ($CommParams as $CommIdx=>$CommParam) { - if ($CommParam==c_Template_Value) { + foreach ($CommParams as $CommIdx => $CommParam) { + if ($CommParam === c_Template_Value) { $FunctionParameters[] = GetValue(get_ControlIdByDeviceName($DeviceName, $ControlType)); - } else if ($CommParam==c_Template_Code) { + } else if ($CommParam === c_Template_Code) { $DeviceConfig = get_DeviceConfiguration(); $Value = GetValue(get_ControlIdByDeviceName($DeviceName, $ControlType)); $FunctionParameters[] = $DeviceConfig[$DeviceName][$ControlType][c_Property_Codes][$Value]; } else { - $FunctionParameters[] = $CommParam; + $FunctionParameters[] = $CommParam; } } if (!Entertainment_Before_SendData($FunctionParameters)) { - return; + return; } - IPSLogger_Trc(__file__, 'SendData '.$CommInterface.'.'.$FunctionName.'('.implode(',',$FunctionParameters).')'); + IPSLogger_Trc(__file__, 'SendData '.$CommInterface.'.'.$FunctionName.'('.print_r($FunctionParameters, true).')'); try { include_once $FunctionScript; - $Function = new ReflectionFunction($FunctionName); + $Function = new ReflectionFunction($FunctionName); $Function->invoke($FunctionParameters); } catch (Exception $e) { - IPSLogger_Err(__file__, 'Error Executing Function '.$FunctionName.':'.$e->getMessage()); + IPSLogger_Err(__file__, 'Error Executing Function '.$FunctionName.':'.$e->getMessage()); } Entertainment_After_SendData($FunctionParameters); } @@ -268,13 +281,22 @@ function Entertainment_SendDataBySourceIdx($RoomId, $SourceIdx, $MessageType) { return; } $RoomName = IPS_GetName($RoomId); - $DeviceTypes = get_SourceDeviceTypes($RoomId, $SourceIdx); - $SourceConf = get_SourceConfiguration(); - foreach ($DeviceTypes as $DeviceType=>$DeviceName) { - $SourceData = $SourceConf[$RoomName][$SourceIdx][$DeviceType]; - if (array_key_exists(c_Property_CommSrc, $SourceData)) { - Entertainment_SendData($DeviceName, c_Control_Source, $SourceData[c_Property_CommSrc], c_Property_CommSrc); - } + $DeviceTypes = get_SourceDeviceTypes($RoomId, $SourceIdx); + $SourceConf = get_SourceConfiguration(); + foreach ($DeviceTypes as $DeviceType=>$DeviceName) { + $SourcesData = $SourceConf[$RoomName][$SourceIdx][$DeviceType]; + + // wrap older/non array configuration in an array for downward compatibility + if(isset($SourcesData[c_Property_Device])) { + $SourcesData = array($SourcesData); + } + + foreach($SourcesData as $SourceData) { + $DeviceName = $SourceData[c_Property_Device]; + if (array_key_exists(c_Property_CommSrc, $SourceData)) { + Entertainment_SendData($DeviceName, c_Control_Source, $SourceData[c_Property_CommSrc], c_Property_CommSrc); + } + } } } diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Constants.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Constants.inc.php index b4adc38..77439c6 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Constants.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Constants.inc.php @@ -13,17 +13,17 @@ // Control Definition define ("c_Control_RoomPower", "RoomPower"); - define ("c_Control_DevicePower", "DevicePower"); + define ("c_Control_DevicePower", "DevicePower"); define ("c_Control_Muting", "Muting"); define ("c_Control_Source", "Source"); define ("c_Control_Volume", "Volume"); - define ("c_Control_Balance", "Balance"); + define ("c_Control_Balance", "Balance"); define ("c_Control_Treble", "Treble"); define ("c_Control_Middle", "Middle"); - define ("c_Control_Bass", "Bass"); - define ("c_Control_Program", "Program"); - define ("c_Control_Mode", "Mode"); - define ("c_Control_Group", "Group"); + define ("c_Control_Bass", "Bass"); + define ("c_Control_Program", "Program"); + define ("c_Control_Mode", "Mode"); + define ("c_Control_Group", "Group"); define ("c_Control_RemoteVolume", "RemoteVolume"); define ("c_Control_RemoteVolumeType", "RemoteVolumeType"); define ("c_Control_iRemoteVolume", "iRemoteVolume"); @@ -32,20 +32,20 @@ define ("c_Control_iRemoteSource", "iRemoteSource"); // Device Properties - define ("c_Property_Name", "Name"); + define ("c_Property_Name", "Name"); define ("c_Property_Group", "Group"); - define ("c_Property_Icon", "Icon"); + define ("c_Property_Icon", "Icon"); define ("c_Property_Names", "Names"); define ("c_Property_Codes", "Codes"); define ("c_Property_Codes2", "Codes2"); define ("c_Property_MinValue", "MinValue"); define ("c_Property_MaxValue", "MaxValue"); - define ("c_Property_Limit", "Limit"); - define ("c_Property_PowerDelay", "PowerDelay"); - define ("c_Property_Control", "Control"); + define ("c_Property_Limit", "Limit"); + define ("c_Property_PowerDelay", "PowerDelay"); + define ("c_Property_Control", "Control"); define ("c_Property_SourceIdx", "SourceIdx"); define ("c_Property_Device", "Device"); - define ("c_Property_Room", "Room"); + define ("c_Property_Room", "Room"); define ("c_Property_Input", "Input"); define ("c_Property_Output", "Output"); define ("c_Property_Switch", "Switch"); @@ -63,35 +63,38 @@ define ("c_Property_Register", "Register"); define ("c_Property_Variables", "Variables"); define ("c_Property_IPAddress", "IPAddress"); - define ("c_Property_Timeout", "Timeout"); + define ("c_Property_Timeout", "Timeout"); // Communication Properties - define ("c_Property_Comm", "Comm"); - define ("c_Property_CommVol", "CommVol"); + define ("c_Property_Comm", "Comm"); + define ("c_Property_CommVol", "CommVol"); define ("c_Property_CommVol2", "CommVol2"); - define ("c_Property_CommBal", "CommBal"); + define ("c_Property_CommVolPlus", "CommVolPlus"); + define ("c_Property_CommVolMinus", "CommVolMinus"); + define ("c_Property_CommBal", "CommBal"); define ("c_Property_CommBal2", "CommBal2"); - define ("c_Property_CommTre", "CommTre"); + define ("c_Property_CommTre", "CommTre"); define ("c_Property_CommTre2", "CommTre2"); - define ("c_Property_CommMid", "CommMid"); + define ("c_Property_CommMid", "CommMid"); define ("c_Property_CommMid2", "CommMid2"); - define ("c_Property_CommBas", "CommBas"); + define ("c_Property_CommBas", "CommBas"); define ("c_Property_CommBas2", "CommBas2"); - define ("c_Property_CommSrc", "CommSource"); + define ("c_Property_CommSrc", "CommSource"); define ("c_Property_CommSrc2", "CommSource2"); + define ("c_Property_CommSrcNext", "CommSourceNext"); define ("c_Property_CommPower", "CommPower"); - define ("c_Property_CommPower2", "CommPower2"); + define ("c_Property_CommPower2", "CommPower2"); define ("c_Property_CommPowerOn", "CommPowerOn"); define ("c_Property_CommPowerOn2", "CommPowerOn2"); define ("c_Property_CommPowerOff", "CommPowerOff"); define ("c_Property_CommPowerOff2", "CommPowerOff2"); define ("c_Property_CommMute", "CommMute"); define ("c_Property_CommMute2", "CommMute2"); - define ("c_Property_CommMuteOn", "CommMuteOn"); + define ("c_Property_CommMuteOn", "CommMuteOn"); define ("c_Property_CommMuteOn2", "CommMuteOn2"); define ("c_Property_CommMuteOff", "CommMuteOff"); define ("c_Property_CommMuteOff2", "CommMuteOff2"); - define ("c_Property_CommPrg", "CommPrg"); + define ("c_Property_CommPrg", "CommPrg"); define ("c_Property_CommPrg2", "CommPrg2"); define ("c_Property_CommPrgPrev", "CommPrgPrev"); define ("c_Property_CommPrgPrev2", "CommPrgPrev2"); @@ -99,11 +102,11 @@ define ("c_Property_CommPrgNext2", "CommPrgNext2"); define ("c_Property_CommMode", "CommMode"); define ("c_Property_CommMode2", "CommMode2"); - define ("c_Property_CommRemSrc", "CommRemSrc"); - define ("c_Property_CommRemVol", "CommRemVol"); + define ("c_Property_CommRemSrc", "CommRemSrc"); + define ("c_Property_CommRemVol", "CommRemVol"); define ("c_Template_Value", "#Value#"); - define ("c_Template_Code", "#Code#"); + define ("c_Template_Code", "#Code#"); define ("c_Template_Code2", "#Code2#"); define ("c_MessageType_Info", "Info"); diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Control.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Control.inc.php index e552b31..9a3ede5 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Control.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Control.inc.php @@ -165,12 +165,12 @@ function get_ControlType($ControlId) { // --------------------------------------------------------------------------------------------------------------------------- function get_SourceIdxByRoomId($RoomId) { $RoomName = IPS_GetName($RoomId); - $RoomData = get_RoomConfiguration(); + $RoomData = get_RoomConfiguration(); $SourceName = $RoomData[$RoomName][c_Control_Source][c_Property_Name]; - $ChildrenIds = IPS_GetChildrenIDs($RoomId); + $ChildrenIds = IPS_GetChildrenIDs($RoomId); foreach($ChildrenIds as $ChildrenIdx => $ChildrenId) { - if (IPS_GetName($ChildrenId) == $SourceName) { + if (IPS_GetName($ChildrenId) == $SourceName) { return GetValue($ChildrenId); } } @@ -250,8 +250,8 @@ function get_ControlIdByRoomId($RoomId, $ControlType) { // --------------------------------------------------------------------------------------------------------------------------- function get_ActiveRoomIds () { - $RoomIds = IPS_GetChildrenIDs(c_ID_Roomes); - $ActiveRoomIds = array(); + $RoomIds = IPS_GetChildrenIDs(c_ID_Roomes); + $ActiveRoomIds = array(); foreach ($RoomIds as $RoomId) { $PowerId = get_ControlIdByRoomId($RoomId, c_Control_RoomPower); if (GetValue($PowerId)) { @@ -263,8 +263,8 @@ function get_ActiveRoomIds () { // --------------------------------------------------------------------------------------------------------------------------- function get_DeviceNamesByRoomId($RoomId, $SourceIdx=-1, $SourceDeviceTypes=array(c_Property_Input, c_Property_Switch, c_Property_Output)) { - $SourceConf = get_SourceConfiguration(); - if ($SourceIdx==-1) { + $SourceConf = get_SourceConfiguration(); + if ($SourceIdx==-1) { $SourceId = get_ControlIdByRoomId($RoomId, c_Control_Source); $SourceIdx = GetValue($SourceId); } @@ -272,13 +272,32 @@ function get_DeviceNamesByRoomId($RoomId, $SourceIdx=-1, $SourceDeviceTypes=arra $DeviceNames = array(); foreach ($SourceDeviceTypes as $SourceDeviceType) { if (array_key_exists($SourceDeviceType, $SourceConfRoom)) { - $DeviceName = $SourceConfRoom[$SourceDeviceType][c_Property_Device]; - $DeviceNames[$DeviceName] = $DeviceName; + $SourceDevices = $SourceConfRoom[$SourceDeviceType]; + // wrap older/non array configuration in an array for downward compatibility + if(isset($SourceDevices[c_Property_Device])) { + $SourceDevices = array($SourceDevices); + } + + foreach($SourceDevices as $SourceDevice) { + $DeviceName = $SourceDevice[c_Property_Device]; + $DeviceNames[$DeviceName] = $DeviceName; + } } } return $DeviceNames; } - + + // --------------------------------------------------------------------------------------------------------------------------- + function get_SourceDeviceTypeArray($DeviceList) { + $DeviceTypes = array(); + if(isset($DeviceList[c_Property_Device])) { + $DeviceList = array($DeviceList); + } + foreach($DeviceList as $Device) { + array_push($DeviceTypes, $Device[c_Property_Device]); + } + return $DeviceTypes; + } // --------------------------------------------------------------------------------------------------------------------------- function get_SourceDeviceTypes($RoomId, $SourceIdx) { @@ -286,13 +305,13 @@ function get_SourceDeviceTypes($RoomId, $SourceIdx) { $SourceConfRoom = $SourceConf[IPS_GetName($RoomId)][$SourceIdx]; $DeviceTypes = array(); if (array_key_exists(c_Property_Input, $SourceConfRoom)) { - $DeviceTypes[c_Property_Input] = $SourceConfRoom[c_Property_Input][c_Property_Device]; + $DeviceTypes[c_Property_Input] = get_SourceDeviceTypeArray($SourceConfRoom[c_Property_Input]); } if (array_key_exists(c_Property_Switch, $SourceConfRoom)) { - $DeviceTypes[c_Property_Switch] = $SourceConfRoom[c_Property_Switch][c_Property_Device]; + $DeviceTypes[c_Property_Switch] = get_SourceDeviceTypeArray($SourceConfRoom[c_Property_Switch]); } if (array_key_exists(c_Property_Output, $SourceConfRoom)) { - $DeviceTypes[c_Property_Output] = $SourceConfRoom[c_Property_Output][c_Property_Device]; + $DeviceTypes[c_Property_Output] = get_SourceDeviceTypeArray($SourceConfRoom[c_Property_Output]); } return $DeviceTypes; } @@ -325,42 +344,48 @@ function get_RoomId($RoomName) { // Function returns RoomId for Device where Room is active and current Output is equal to specified DeviceName // --------------------------------------------------------------------------------------------------------------------------- function get_RoomIdByOutputDevice($DeviceName) { - $SourceConf = get_SourceConfiguration(); - foreach ($SourceConf as $RoomName=>$RoomSources) { - $RoomId = get_RoomId($RoomName); - $SourceIdx = get_SourceIdxByRoomId($RoomId); - $RoomSource = $RoomSources[$SourceIdx]; + $SourceConf = get_SourceConfiguration(); + foreach ($SourceConf as $RoomName=>$RoomSources) { + $RoomId = get_RoomId($RoomName); + $SourceIdx = get_SourceIdxByRoomId($RoomId); + $RoomSource = $RoomSources[$SourceIdx]; if (array_key_exists(c_Property_Output, $RoomSource)) { - $OutputName= $RoomSource[c_Property_Output][c_Property_Device]; - if ($OutputName==$DeviceName) { - return $RoomId; + $OutputDevices = $RoomSource[c_Property_Output]; + // wrap older/non array configuration in an array for downward compatibility + if(isset($OutputDevices[c_Property_Device])) { + $OutputDevices = array($OutputDevices); + } + + $OutputName = $OutputDevices[0][c_Property_Device]; + if ($OutputName == $DeviceName) { + return $RoomId; } } - } - return false; + } + return false; } // --------------------------------------------------------------------------------------------------------------------------- function get_SourceListByDeviceName($DeviceName) { - $SourceConfig = get_SourceConfiguration(); - $SourceList = array(); - foreach ($SourceConfig as $RoomName=>$RoomSources) { - $RoomId = get_RoomId($RoomName); - $CurrentIdx = get_SourceIdxByRoomId($RoomId); - foreach ($RoomSources as $SourceIdx=>$SourceData) { - $DeviceNames = get_DeviceNamesByRoomId($RoomId, $SourceIdx, array(c_Property_Output)); + $SourceConfig = get_SourceConfiguration(); + $SourceList = array(); + foreach ($SourceConfig as $RoomName=>$RoomSources) { + $RoomId = get_RoomId($RoomName); + $CurrentIdx = get_SourceIdxByRoomId($RoomId); + foreach ($RoomSources as $SourceIdx=>$SourceData) { + $DeviceNames = get_DeviceNamesByRoomId($RoomId, $SourceIdx, array(c_Property_Output)); if (in_array($DeviceName, $DeviceNames)) { - if (!array_key_exists($RoomId, $SourceList)) { - $SourceList[$RoomId] = $SourceIdx; - } + if (!array_key_exists($RoomId, $SourceList)) { + $SourceList[$RoomId] = $SourceIdx; + } if ($CurrentIdx==$SourceIdx) { - $SourceList[$RoomId] = $SourceIdx; - break; + $SourceList[$RoomId] = $SourceIdx; + break; } } - } - } - return $SourceList; + } + } + return $SourceList; } /** @}*/ diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Device.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Device.inc.php index f619bc5..18ddec0 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Device.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Device.inc.php @@ -17,6 +17,9 @@ function get_MaxValueByControlId($ControlId) { $ProfileName = $VariableObject['VariableCustomProfile']; $ProfileObject = IPS_GetVariableProfile($ProfileName); $MaxValue = Count($ProfileObject['Associations']); + if ($MaxValue==0) { + $MaxValue = $ProfileObject['MaxValue']; + } return $MaxValue; } @@ -72,6 +75,20 @@ function Entertainment_SetMode($Id, $Value, $MessageType=c_MessageType_Action) { } } + // --------------------------------------------------------------------------------------------------------------------------- + function Entertainment_SetVolumeDiff($Id, $Diff, $MessageType=c_MessageType_Action) { + $MaxValue = get_MaxValueByControlId($Id); + IPSLogger_Inf(__file__, 'Max='.$MaxValue); + $Value = GetValue($Id) + $Diff; + if ($Value > $MaxValue) { + $Value = $MaxValue; + } + if ($Value < 0) { + $Value = 0; + } + Entertainment_SetVolume($Id, $Value, $MessageType); + } + // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetVolume($Id, $Value, $MessageType=c_MessageType_Action) { $DeviceName = IPS_GetName(IPS_GetParent($Id)); diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Interface.ips.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Interface.ips.php index e52dbbe..611be55 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Interface.ips.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Interface.ips.php @@ -22,20 +22,20 @@ // --------------------------------------------------------------------------------------------------------------------------- // WebFront // --------------------------------------------------------------------------------------------------------------------------- - if ($IPS_SENDER == "WebFront") { - $ControlType = get_ControlType($IPS_VARIABLE); + if ($_IPS['SENDER'] == "WebFront") { + $ControlType = get_ControlType($_IPS['VARIABLE']); switch ($ControlType) { case c_Control_RoomPower: - Entertainment_SetRoomPower($IPS_VARIABLE, $IPS_VALUE); + Entertainment_SetRoomPower($_IPS['VARIABLE'], $_IPS['VALUE']); break; case c_Control_DevicePower: - Entertainment_SetDevicePower($IPS_VARIABLE, $IPS_VALUE); + Entertainment_SetDevicePower($_IPS['VARIABLE'], $_IPS['VALUE']); break; case c_Control_Source: - Entertainment_SetSource($IPS_VARIABLE, $IPS_VALUE); + Entertainment_SetSource($_IPS['VARIABLE'], $_IPS['VALUE']); break; case c_Control_Group: - Entertainment_SetGroupControlVisibility($IPS_VARIABLE, $IPS_VALUE); + Entertainment_SetGroupControlVisibility($_IPS['VARIABLE'], $_IPS['VALUE']); break; case c_Control_Muting: case c_Control_Volume: @@ -45,10 +45,10 @@ case c_Control_Bass: case c_Control_Mode: case c_Control_Program: - Entertainment_SetControl($IPS_VARIABLE, $IPS_VALUE); + Entertainment_SetControl($_IPS['VARIABLE'], $_IPS['VALUE']); break; default: - IPSLogger_Err(__file__, 'Unknown Control with ID='.$IPS_VARIABLE.' !'); + IPSLogger_Err(__file__, 'Unknown Control with ID='.$_IPS['VARIABLE'].' !'); } } diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceIPSComponentAVControl.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceIPSComponentAVControl.inc.php index b9413cf..3059baa 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceIPSComponentAVControl.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceIPSComponentAVControl.inc.php @@ -3,7 +3,7 @@ * @ingroup entertainment * @{ * - * @file Entertainment_InterfaceIPSComponent.inc.php + * @file Entertainment_InterfaceIPSComponentAVControl.inc.php * @author Andreas Brauneis * @version * Version 2.50.1, 31.01.2012
@@ -16,18 +16,17 @@ IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); - // --------------------------------------------------------------------------------------------------------------------------- - function Entertainment_AutoConfigureMessageHandler() { - } - // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_IPSComponent_ReceiveData($componentParams, $function, $output, $value) { $interfaceList = get_CommunicationConfiguration(); $interface = ''; foreach ($interfaceList as $interfaceName=>$interfaceData) { - if ($interfaceData[c_Property_ComponentParams]==$componentParams) { - $interface = $interfaceName; + if (array_key_exists(c_Property_ComponentParams, $interfaceData)) { + if ($interfaceData[c_Property_ComponentParams]==$componentParams or + $interfaceData[c_Property_ComponentParams]=='IPSComponentAVControl_AudioMax,null') { + $interface = $interfaceName; + } } } Entertainment_ReceiveData(array($interface, $function, $output, $value), c_MessageType_Info); diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceNetPlayerRcv.ips.php b/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceNetPlayerRcv.ips.php index 0f1b0c1..3fc08c4 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceNetPlayerRcv.ips.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceNetPlayerRcv.ips.php @@ -22,11 +22,11 @@ IPS_SemaphoreEnter('NetPlayer', 1000); - if($IPS_SENDER == "Variable") { - $variableName = IPS_GetName($IPS_VARIABLE); + if($_IPS['SENDER'] == "Variable") { + $variableName = IPS_GetName($_IPS['VARIABLE']); switch ($variableName) { case 'Power': - if ($IPS_VALUE) { + if ($_IPS['VALUE']) { Entertainment_ReceiveData(array(c_Comm_NetPlayer, 'netplayer', 'poweron'), c_MessageType_Info); } else { Entertainment_ReceiveData(array(c_Comm_NetPlayer, 'netplayer', 'poweroff'), c_MessageType_Info); @@ -45,8 +45,8 @@ //Entertainment_RefreshRemoteControlByDeviceName(c_Device_NetPlayer, c_Control_iRemoteSource); break; case 'ControlType': - //IPSLogger_Com(__file__, "Receive RemoteControlType $IPS_VALUE for NetPlayer"); - //Entertainment_ReceiveData(array(c_Comm_NetPlayer, 'netplayertype', (string)$IPS_VALUE), c_MessageType_Info); + //IPSLogger_Com(__file__, "Receive RemoteControlType $_IPS['VALUE'] for NetPlayer"); + //Entertainment_ReceiveData(array(c_Comm_NetPlayer, 'netplayertype', (string)$_IPS['VALUE']), c_MessageType_Info); break; default: IPSLogger_Err(__file__, "Unknown Variable $variableName"); diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceOnkyoRcv.ips.php b/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceOnkyoRcv.ips.php index f0ca527..bdc9f02 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceOnkyoRcv.ips.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceOnkyoRcv.ips.php @@ -15,8 +15,8 @@ include_once "Entertainment.inc.php"; - if($IPS_SENDER == "RegisterVariable") { - Onkyo_ReceiveData_Register($IPS_INSTANCE, $IPS_VALUE); + if($_IPS['SENDER'] == "RegisterVariable") { + Onkyo_ReceiveData_Register($_IPS['INSTANCE'], $_IPS['VALUE']); } diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Power.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Power.inc.php index b22991e..a83e2eb 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Power.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Power.inc.php @@ -39,8 +39,8 @@ function Entertainment_PowerOffUnusedDevices() { // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetDevicePower($PowerId, $Value, $MessageType=c_MessageType_Action) { - $DeviceName = IPS_GetName(IPS_GetParent($PowerId)); - Entertainment_SetDevicePowerByDeviceName($DeviceName, $Value, $MessageType); + $DeviceName = IPS_GetName(IPS_GetParent($PowerId)); + Entertainment_SetDevicePowerByDeviceName($DeviceName, $Value, $MessageType); } // --------------------------------------------------------------------------------------------------------------------------- @@ -48,10 +48,10 @@ function Entertainment_SetDevicePowerByDeviceName($DeviceName, $Value, $MessageT IPSLogger_Trc(__file__, 'Handle Device Power for "'.$DeviceName.'" '.bool2OnOff($Value)); $PowerId = get_ControlIdByDeviceName($DeviceName, c_Control_DevicePower, false); if ($PowerId!==false) { - if (!is_bool($Value)) { /*Toggle Power Value*/ - $Value = !GetValue($PowerId); + if (!is_bool($Value)) { /*Toggle Power Value*/ + $Value = !GetValue($PowerId); IPSLogger_Dbg(__file__, "Toogle Device Power for '$DeviceName' to ".bool2OnOff($Value)); - } + } if (GetValue($PowerId) <> $Value) { IPSLogger_Inf(__file__, 'Set Device Power for "'.$DeviceName.'" '.bool2OnOff($Value)); if ($Value) { @@ -64,7 +64,7 @@ function Entertainment_SetDevicePowerByDeviceName($DeviceName, $Value, $MessageT SetValue($PowerId, $Value); Entertainment_Connect($DeviceName, $Value, true); Entertainment_SetDeviceControlByDeviceName($DeviceName, c_Control_Muting, false); - Entertainment_SetRoomPowerByDeviceName($DeviceName, $Value); + Entertainment_SetRoomPowerByDeviceName($DeviceName, $Value); } } } @@ -74,8 +74,26 @@ function Entertainment_SetDevicePowerByRoomId($RoomId, $Value=true) { if ($Value) { $RoomName = IPS_GetName($RoomId); $DeviceNames = get_DeviceNamesByRoomId($RoomId); + $DeviceData = get_DeviceConfiguration(); + $first = true; foreach ($DeviceNames as $DeviceName) { - Entertainment_SetDevicePowerByDeviceName($DeviceName, true); + if(isset($DeviceData[$DeviceName][c_Control_DevicePower])) { + $devicePower = $DeviceData[$DeviceName][c_Control_DevicePower]; + if(isset($devicePower[c_Property_PowerDelay])) { + $delaySeconds = $devicePower[c_Property_PowerDelay]; + if(!is_numeric($delaySeconds) || $delaySeconds < 0 || $delaySeconds > 5000) { + IPSLogger_Wrn(__file__, "'c_Property_PowerDelay' for control 'c_Control_DevicePower' for device $DeviceName is not a number ($delaySeconds). Please use a value between 0 and 5000. Using default: 1000 (= 1 second)"); + $delaySeconds = 1000; + } + // no delay for first device + if($first) { + $first = false; + } else { + usleep($delaySeconds * 1000); + } + } + } + Entertainment_SetDevicePowerByDeviceName($DeviceName, true); } } else { Entertainment_PowerOffUnusedDevices(); diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Room.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Room.inc.php index 8593d20..899b842 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Room.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Room.inc.php @@ -38,15 +38,16 @@ function Entertainment_SetRoomVisible($PowerId, $Value) { // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetRoomPower($PowerId, $Value, $PowerOnDevices=true) { - if (GetValue($PowerId) <> $Value) { - IPSLogger_Inf(__file__, 'Set Power for Room "'.IPS_GetName(IPS_GetParent($PowerId)).'" '.bool2OnOff($Value)); + if (GetValue($PowerId) <> $Value) { + IPSLogger_Inf(__file__, 'Set Power for Room "'.IPS_GetName(IPS_GetParent($PowerId)).'" '.bool2OnOff($Value)); SetValue($PowerId, $Value); - Entertainment_SetRoomVisible($PowerId, $Value); + IPSMessageHandler_HandleLibraryEvent($PowerId, $Value, 'Entertainment', 'Power'); + Entertainment_SetRoomVisible($PowerId, $Value); if ($PowerOnDevices) { - Entertainment_SetDevicePowerByRoomId(IPS_GetParent($PowerId), $Value); + Entertainment_SetDevicePowerByRoomId(IPS_GetParent($PowerId), $Value); } - Entertainment_SyncRoomControls(IPS_GetParent($PowerId)); - } + Entertainment_SyncRoomControls(IPS_GetParent($PowerId)); + } } // --------------------------------------------------------------------------------------------------------------------------- @@ -80,12 +81,12 @@ function Entertainment_PowerOffUnusedRoomes() { // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetRoomPowerByDeviceName($DeviceName, $Value) { if ($Value) { - $SourceList = get_SourceListByDeviceName($DeviceName, $Value); + $SourceList = get_SourceListByDeviceName($DeviceName); if (count($SourceList)==1) { $RoomKeys = array_keys($SourceList); $RoomId = $RoomKeys[0]; - $SourceIdx = $SourceList[$RoomId]; if (!IsRoomPoweredOn($RoomId)) { + $SourceIdx = $SourceList[$RoomId]; Entertainment_SetRoomPowerByRoomId($RoomId, true, false); Entertainment_SetSourceByRoomId($RoomId, $SourceIdx); } diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Source.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Source.inc.php index 02abe31..9dc866c 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Source.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Source.inc.php @@ -15,33 +15,32 @@ // Show/Hide Group // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetGroupControlVisibility($GroupSwitchId, $Value) { - $RoomConfig = get_RoomConfiguration(); - $RoomName = IPS_GetName(IPS_GetParent($GroupSwitchId)); - $ControlName = IPS_GetName($GroupSwitchId); - $WFRoomName = $RoomConfig[$RoomName][c_Property_Name]; - $WFRoomId = IPS_GetCategoryIDByName($WFRoomName, c_ID_WebFrontRoomes); - $WFGroupId = IPS_GetInstanceIDByName($ControlName, $WFRoomId); + $RoomConfig = get_RoomConfiguration(); + $RoomName = IPS_GetName(IPS_GetParent($GroupSwitchId)); + $ControlName = IPS_GetName($GroupSwitchId); + $WFRoomName = $RoomConfig[$RoomName][c_Property_Name]; + $WFRoomId = IPS_GetCategoryIDByName($WFRoomName, c_ID_WebFrontRoomes); + $WFGroupId = IPS_GetInstanceIDByName($ControlName, $WFRoomId); IPS_SetHidden($WFGroupId, !$Value); - SetValue($GroupSwitchId, $Value); + SetValue($GroupSwitchId, $Value); } - // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetRoomControlVisibility($RoomControlId, $Value) { - $RoomName = IPS_GetName(IPS_GetParent($RoomControlId)); - $RoomConfig = get_RoomConfiguration(); - $ControlName = IPS_GetName($RoomControlId); - $WFRoomName = $RoomConfig[$RoomName][c_Property_Name]; - if ($WFRoomName=="") return; - $WFRoomId = IPS_GetCategoryIDByName($WFRoomName, c_ID_WebFrontRoomes); + $RoomName = IPS_GetName(IPS_GetParent($RoomControlId)); + $RoomConfig = get_RoomConfiguration(); + $ControlName = IPS_GetName($RoomControlId); + $WFRoomName = $RoomConfig[$RoomName][c_Property_Name]; + if ($WFRoomName=="") return; + $WFRoomId = IPS_GetCategoryIDByName($WFRoomName, c_ID_WebFrontRoomes); - $WFControlId = false; + $WFControlId = false; $ChildrenIds = IPS_GetChildrenIDs($WFRoomId); foreach($ChildrenIds as $ChildrenIdx => $ChildrenId) { - if (IPS_LinkExists($ChildrenId)) { - if (IPS_GetName($ChildrenId)==$ControlName) { - $WFControlId = $ChildrenId; - } + if (IPS_LinkExists($ChildrenId)) { + if (IPS_GetName($ChildrenId)==$ControlName) { + $WFControlId = $ChildrenId; + } } else { $WFControlId = @IPS_GetLinkIDByName($ControlName, $WFRoomId); } @@ -53,7 +52,6 @@ function Entertainment_SetRoomControlVisibility($RoomControlId, $Value) { IPS_SetHidden($WFControlId, !$Value); } } - } @@ -69,9 +67,9 @@ function Entertainment_SyncAllRoomControls() { function Entertainment_SyncRoomControls($RoomId) { $RoomName = IPS_GetName($RoomId); $RoomPower = GetValue(get_ControlIdByRoomId($RoomId, c_Control_RoomPower)); - $RoomConfig = get_RoomConfiguration(); - $ControlTypes = $RoomConfig[$RoomName]; - foreach ($ControlTypes as $ControlType=>$ControlData) { + $RoomConfig = get_RoomConfiguration(); + $ControlTypes = $RoomConfig[$RoomName]; + foreach ($ControlTypes as $ControlType=>$ControlData) { if ($ControlType==c_Control_Muting or $ControlType==c_Control_Volume or $ControlType==c_Control_Balance or @@ -79,13 +77,13 @@ function Entertainment_SyncRoomControls($RoomId) { $ControlType==c_Control_Middle or $ControlType==c_Control_Bass or $ControlType==c_Control_Program or - $ControlType==c_Control_RemoteVolume or - $ControlType==c_Control_iRemoteVolume or - $ControlType==c_Control_RemoteSource or - $ControlType==c_Control_iRemoteSource or - $ControlType==c_Control_Mode) { - $RoomControlId = get_ControlIdByRoomId($RoomId, $ControlType); - $DeviceControlId = get_DeviceControlIdByRoomControlId($RoomControlId); + $ControlType==c_Control_RemoteVolume or + $ControlType==c_Control_iRemoteVolume or + $ControlType==c_Control_RemoteSource or + $ControlType==c_Control_iRemoteSource or + $ControlType==c_Control_Mode) { + $RoomControlId = get_ControlIdByRoomId($RoomId, $ControlType); + $DeviceControlId = get_DeviceControlIdByRoomControlId($RoomControlId); if ($DeviceControlId===false and $ControlType==c_Control_iRemoteVolume) { $DeviceControlId = get_DeviceControlIdByRoomControlId($RoomControlId, c_Control_RemoteVolume); @@ -103,30 +101,42 @@ function Entertainment_SyncRoomControls($RoomId) { Entertainment_SetRoomControlVisibility($RoomControlId, false); } } - } + } } + // --------------------------------------------------------------------------------------------------------------------------- + function Entertainment_SetSourceNext($SourceId, $MessageType=c_MessageType_Action) { + $MaxValue = get_MaxValueByControlId($SourceId); + $Value = GetValue($SourceId) + 1; + if ($Value >= $MaxValue) { + $Value = 0; + } + Entertainment_SetSource($SourceId, $Value, $MessageType); + } + // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetSource($SourceId, $Value, $MessageType=c_MessageType_Action) { - if (GetValue($SourceId) <> $Value) { - $RoomId = IPS_GetParent($SourceId); - $SourceName = get_SourceName($RoomId, $Value); - IPSLogger_Inf(__file__, 'Set Source "'.$SourceName.'" of Room '.IPS_GetName($RoomId)); + $RoomId = IPS_GetParent($SourceId); + $IsRoomPoweredOn = IsRoomPoweredOn($RoomId); + if (GetValue($SourceId) <> $Value || !$IsRoomPoweredOn) { + $RoomId = IPS_GetParent($SourceId); + $SourceName = get_SourceName($RoomId, $Value); + IPSLogger_Inf(__file__, 'Set Source "'.$SourceName.'" of Room '.IPS_GetName($RoomId)); SetValue($SourceId, $Value); - if (!IsRoomPoweredOn($RoomId)) { + if (!$IsRoomPoweredOn) { Entertainment_SetRoomPowerByRoomId($RoomId, true, false); } Entertainment_SetDeviceControlByRoomId($RoomId, c_Control_Muting, false); - Entertainment_SetDevicePowerByRoomId($RoomId, true); - Entertainment_SendDataBySourceIdx($RoomId, $Value, $MessageType); - Entertainment_SyncRoomControls($RoomId); + Entertainment_SetDevicePowerByRoomId($RoomId, true); + Entertainment_SendDataBySourceIdx($RoomId, $Value, $MessageType); + Entertainment_SyncRoomControls($RoomId); Entertainment_PowerOffUnusedDevices(); } } // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetSourceByRoomId($RoomId, $SourceIdx) { - $SourceId = get_ControlIdByRoomId($RoomId, c_Control_Source); + $SourceId = get_ControlIdByRoomId($RoomId, c_Control_Source); Entertainment_SetSource($SourceId, $SourceIdx); } diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam.inc.php b/IPSLibrary/app/modules/IPSCam/IPSCam.inc.php new file mode 100644 index 0000000..767a2ca --- /dev/null +++ b/IPSLibrary/app/modules/IPSCam/IPSCam.inc.php @@ -0,0 +1,92 @@ + + * + * IPSCam API + * + */ + + IPSUtils_Include ("IPSLogger.inc.php", "IPSLibrary::app::core::IPSLogger"); + IPSUtils_Include ("IPSComponent.class.php", "IPSLibrary::app::core::IPSComponent"); + IPSUtils_Include ("IPSModule.class.php", "IPSLibrary::app::core::IPSComponent"); + IPSUtils_Include ("IPSCam_Constants.inc.php", "IPSLibrary::app::modules::IPSCam"); + IPSUtils_Include ("IPSCam_Configuration.inc.php", "IPSLibrary::config::modules::IPSCam"); + IPSUtils_Include ("IPSCam_Custom.inc.php", "IPSLibrary::config::modules::IPSCam"); + IPSUtils_Include ("IPSCam_Manager.class.php", "IPSLibrary::app::modules::IPSCam"); + + /** + * Selektiert die spezifizierte Kamera und schaltet auf den gewünschten Mode um + * + * @param int $cameraIdx Index der Kamera + * @param int $mode Kamera Modus + */ + function IPSCam_ActivateCam($cameraIdx, $mode) { + $camManager = new IPSCam_Manager(); + $camManager->ActivateCamera($cameraIdx, $mode); + } + + /** + * Liefert den Camera Index (Position im Konfigurations Array) einer bestimmten Kamera + * Dieser Index wird zur Ansteuerung der meisten IPSCam Funktionen benötigt. + * + * @param string $name Name der Kamera + * @return int Index der Kamera + */ + function IPSCam_IPSCam_GetCamIdxByName($name) { + $config = IPSCam_GetConfiguration(); + foreach ($config as $idx=>$data) { + if ($data[IPSCAM_PROPERTY_NAME]==$name) { + return $idx; + } + } + trigger_error('Camera with Name "'.$name.'" could NOT be found in Configuration Array!!!'); + } + + /** + * Aktualisiert das entsprechende Kamera Bild, wenn der Kamera Index nicht gesetzt wird, + * wird das aktuell gewählte Kamera Bild aktualisiert + * + * @param int $cameraIdx Index der Kamera + */ + function IPSCam_RefreshPicture($cameraIdx=null) { + $camManager = new IPSCam_Manager(); + $camManager->PictureRefresh($cameraIdx); + } + + /** + * Speichert ein Bild der entsprechende Kamera , wenn der Kamera Index nicht gesetzt wird, + * wird das aktuell gewählte Kamera Bild gespeichert + * + * @param int $cameraIdx Index der Kamera + */ + function IPSCam_StorePicture($cameraIdx=null) { + $camManager = new IPSCam_Manager(); + $camManager->PictureStore($cameraIdx); + } + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_ActionScript.ips.php b/IPSLibrary/app/modules/IPSCam/IPSCam_ActionScript.ips.php new file mode 100644 index 0000000..386dc26 --- /dev/null +++ b/IPSLibrary/app/modules/IPSCam/IPSCam_ActionScript.ips.php @@ -0,0 +1,52 @@ + + * + * IPSCam ActionScript + * + */ + + include_once "IPSCam.inc.php"; + + // ---------------------------------------------------------------------------------------------------------------------------- + if ($_IPS['SENDER']=='WebFront') { + $variableId = $_IPS['VARIABLE']; + $value = $_IPS['VALUE']; + + $camManager = new IPSCam_Manager(); + $camManager->ChangeSetting($variableId, $value); + + } elseif ($_IPS['SENDER']=='TimerEvent') { + $eventId = $_IPS['EVENT']; + + $camManager = new IPSCam_Manager(); + $camManager->ActivateTimer($eventId); + + // ---------------------------------------------------------------------------------------------------------------------------- + } else { + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_Constants.inc.php b/IPSLibrary/app/modules/IPSCam/IPSCam_Constants.inc.php new file mode 100644 index 0000000..a64abb4 --- /dev/null +++ b/IPSLibrary/app/modules/IPSCam/IPSCam_Constants.inc.php @@ -0,0 +1,117 @@ + + * + * Definition der Konstanten für IPSCam + * + */ + + // Confguration Property Definition + define ('IPSCAM_PROPERTY_NAME', 'Name'); + define ('IPSCAM_PROPERTY_TYPE', 'Type'); + define ('IPSCAM_PROPERTY_COMPONENT', 'Component'); + define ('IPSCAM_PROPERTY_SWITCHPOWER', 'SwitchPower'); + define ('IPSCAM_PROPERTY_SWITCHWLAN', 'SwitchWLAN'); + define ('IPSCAM_PROPERTY_PREDEFPOS1', 'PredefinedPosition1'); + define ('IPSCAM_PROPERTY_PREDEFPOS2', 'PredefinedPosition2'); + define ('IPSCAM_PROPERTY_PREDEFPOS3', 'PredefinedPosition3'); + define ('IPSCAM_PROPERTY_PREDEFPOS4', 'PredefinedPosition4'); + define ('IPSCAM_PROPERTY_COMMAND1', 'Command1'); + define ('IPSCAM_PROPERTY_COMMAND2', 'Command2'); + define ('IPSCAM_PROPERTY_COMMAND3', 'Command3'); + define ('IPSCAM_PROPERTY_COMMAND4', 'Command4'); + define ('IPSCAM_PROPERTY_ACTION1', 'Action1'); + define ('IPSCAM_PROPERTY_ACTION2', 'Action2'); + define ('IPSCAM_PROPERTY_ACTION3', 'Action3'); + define ('IPSCAM_PROPERTY_ACTION4', 'Action4'); + + define ('IPSCAM_TYPE_FIXEDCAM', 'FixedCam'); + define ('IPSCAM_TYPE_MOVABLECAM', 'MovableCam'); + + define ('IPSCAM_MODE_LIVE', 0); + define ('IPSCAM_MODE_PICTURE', 1); + define ('IPSCAM_MODE_HISTORY', 2); + define ('IPSCAM_MODE_SETTINGS', 3); + + define ('IPSCAM_URL_LIVE', 0); + define ('IPSCAM_URL_PICTURE', 1); + define ('IPSCAM_URL_DISPLAY', 2); + define ('IPSCAM_URL_MOVEUP', 100); + define ('IPSCAM_URL_MOVEDOWN', 101); + define ('IPSCAM_URL_MOVELEFT', 102); + define ('IPSCAM_URL_MOVERIGHT', 103); + define ('IPSCAM_URL_MOVEHOME', 104); + define ('IPSCAM_URL_PREDEFPOS1', 110); + define ('IPSCAM_URL_PREDEFPOS2', 111); + define ('IPSCAM_URL_PREDEFPOS3', 112); + define ('IPSCAM_URL_PREDEFPOS4', 113); + define ('IPSCAM_URL_PREDEFPOS5', 114); + + define ('IPSCAM_VAL_DISABLED', 100000); + + define ('IPSCAM_SIZE_SMALL', 0); + define ('IPSCAM_SIZE_MIDDLE', 1); + define ('IPSCAM_SIZE_LARGE', 2); + + define ('IPSCAM_NAV_BACK', 0); + define ('IPSCAM_NAV_FORWARD', 1); + + define ('IPSCAM_NAV_DATEFORMATFILE', 'Ymd_His'); + define ('IPSCAM_NAV_DATEFORMATDISP', 'Y-m-d H:i'); + + define ('IPSCAM_DAY_BACK', 0); + define ('IPSCAM_DAY_FORWARD', 1); + + define ('IPSCAM_VAR_CAMSELECT', 'CamSelect'); + define ('IPSCAM_VAR_CAMPOWER', 'CamPower'); + define ('IPSCAM_VAR_CAMHTML', 'CamHtml'); + define ('IPSCAM_VAR_HTML', 'Html'); + define ('IPSCAM_VAR_IHTML', 'iHtml'); + define ('IPSCAM_VAR_CAMPICT', 'CamPict'); + define ('IPSCAM_VAR_CAMHIST', 'CamHist'); + define ('IPSCAM_VAR_MODE', 'Mode'); + define ('IPSCAM_VAR_MODELIVE', 'ModeLive'); + define ('IPSCAM_VAR_MODEPICT', 'ModePicture'); + define ('IPSCAM_VAR_MODEHIST', 'ModeHistory'); + define ('IPSCAM_VAR_MODESETT', 'ModeSettings'); + define ('IPSCAM_VAR_SIZE', 'Size'); + define ('IPSCAM_VAR_NAVPICT', 'NavigatePict'); + define ('IPSCAM_VAR_NAVDAYS', 'NavigateDays'); + define ('IPSCAM_VAR_NAVTIME', 'NavigateTime'); + define ('IPSCAM_VAR_NAVFILE', 'NavigateFile'); + define ('IPSCAM_VAR_MOTMODE', 'MotionMode'); + define ('IPSCAM_VAR_MOTTIME', 'MotionTime'); + define ('IPSCAM_VAR_MOTHIST', 'MotionHist'); + define ('IPSCAM_VAR_MOTSIZE', 'MotionSize'); + define ('IPSCAM_VAR_PICTREF', 'PictureRefresh'); + define ('IPSCAM_VAR_PICTSTORE', 'PictureStore'); + define ('IPSCAM_VAR_PICTRESET', 'PictureReset'); + define ('IPSCAM_VAR_PICTHIST', 'PictureHist'); + define ('IPSCAM_VAR_PICTSIZE', 'PictureSize'); + + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_GenerateMovies.ips.php b/IPSLibrary/app/modules/IPSCam/IPSCam_GenerateMovies.ips.php new file mode 100644 index 0000000..16647ab --- /dev/null +++ b/IPSLibrary/app/modules/IPSCam/IPSCam_GenerateMovies.ips.php @@ -0,0 +1,37 @@ + + * + * Generieren der "Motion Capture" Movies + * + */ + + include_once "IPSCam.inc.php"; + + $camManager = new IPSCam_Manager(); + $camManager->GenerateMovies(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_Manager.class.php b/IPSLibrary/app/modules/IPSCam/IPSCam_Manager.class.php new file mode 100644 index 0000000..71a6480 --- /dev/null +++ b/IPSLibrary/app/modules/IPSCam/IPSCam_Manager.class.php @@ -0,0 +1,1127 @@ + + * + * IPSCam Kamera Management + */ + + /** + * @class IPSCam_Manager + * + * Definiert ein IPSCam_Manager Objekt + * + * @author Andreas Brauneis + * @version + * Version 2.50.1, 26.07.2012
+ */ + class IPSCam_Manager { + + /** + * @private + * ID Kategorie für Kamera Daten + */ + private $categoryIdCams; + + /** + * @private + * ID Kategorie für allgemeine Steuerungs Daten + */ + private $categoryIdCommon; + + /** + * @private + * ID Kategorie WebFront Navigations Panel + */ + private $categoryIdNavPanel; + + /** + * @private + * ID Kategorie WebFront Camera Panel + */ + private $categoryIdCamPanel; + + /** + * @private + * Konfigurations Daten Array + */ + private $config; + + /** + * @public + * + * Initialisierung des IPSCam_Manager Objektes + * + */ + public function __construct() { + $baseId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSCam'); + $displayCategoryId = IPS_GetObjectIDByIdent('Display', $baseId); + $this->categoryIdNavPanel = IPS_GetObjectIDByIdent('NavigationPanel', $displayCategoryId); + $this->categoryIdCamPanel = IPS_GetObjectIDByIdent('CameraPanel', $displayCategoryId); + $this->categoryIdCams = IPS_GetObjectIDByIdent('Cams', $baseId); + $this->categoryIdCommon = IPS_GetObjectIDByIdent('Common', $baseId); + $this->config = IPSCam_GetConfiguration(); + } + + public function ActivateCamera($cameraIdx, $mode) { + $this->SetCamera($cameraIdx); + $this->SetMode($mode); + } + /** + * @public + * + * Modifiziert einen Variablen Wert der Kamera Steuerung + * + * @param integer $variableId ID der Variable die geändert werden soll + * @param variant $value Neuer Wert der Variable + */ + public function ChangeSetting($variableId, $value) { + $variableIdent = IPS_GetIdent($variableId); + switch ($variableIdent) { + case IPSCAM_VAR_CAMSELECT: + $this->SetCamera($value); + break; + case IPSCAM_VAR_CAMPOWER: + $cameraIdx = (int)IPS_GetName(IPS_GetParent($variableId)); + $this->SetCamera($cameraIdx); + break; + case IPSCAM_VAR_MODE: + $this->SetMode($value); + break; + case IPSCAM_VAR_SIZE: + SetValue($variableId, $value); + $mode = GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_MODE, $this->categoryIdCommon)); + $cameraIdx = GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMSELECT, $this->categoryIdCommon)); + if ($mode==IPSCAM_MODE_PICTURE) { + $this->PictureRefresh($cameraIdx); + } + $this->RefreshDisplay($cameraIdx); + break; + case IPSCAM_VAR_MODELIVE: + case IPSCAM_VAR_MODEPICT: + case IPSCAM_VAR_MODEHIST: + case IPSCAM_VAR_MODESETT: + if (!$value) { + $this->SetMode(IPSCAM_MODE_PICTURE); + } elseif ($variableIdent==IPSCAM_VAR_MODELIVE) { + $this->SetMode(IPSCAM_MODE_LIVE); + } elseif ($variableIdent==IPSCAM_VAR_MODEPICT) { + $this->SetMode(IPSCAM_MODE_PICTURE); + } elseif ($variableIdent==IPSCAM_VAR_MODEHIST) { + $this->SetMode(IPSCAM_MODE_HISTORY); + } elseif ($variableIdent==IPSCAM_VAR_MODESETT) { + $this->SetMode(IPSCAM_MODE_SETTINGS); + } else { + trigger_error('Unknown Variable'); + } + break; + case IPSCAM_VAR_NAVPICT: + SetValue($variableId, $value); + $this->NavigatePictures($value, 1); + IPS_Sleep(200); + SetValue($variableId, -1); + break; + case IPSCAM_VAR_NAVDAYS: + SetValue($variableId, $value); + $this->NavigateDays($value, 1); + IPS_Sleep(200); + SetValue($variableId, -1); + break; + case IPSCAM_VAR_MOTMODE: + case IPSCAM_VAR_MOTTIME: + SetValue($variableId, $value); + $categoryId = IPS_GetParent($variableId); + $cameraIdx = (int)IPS_GetName($categoryId); + $this->SetTimer ($cameraIdx, 'PictureMotion', + GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_MOTMODE, $categoryId)), + GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_MOTTIME, $categoryId))); + break; + case IPSCAM_VAR_MOTHIST: + case IPSCAM_VAR_MOTSIZE: + SetValue($variableId, $value); + break; + case IPSCAM_VAR_PICTREF: + SetValue($variableId, $value); + $cameraIdx = (int)IPS_GetName(IPS_GetParent($variableId)); + $this->SetTimer ($cameraIdx, 'PictureRefresh', $value); + break; + case IPSCAM_VAR_PICTSTORE: + SetValue($variableId, $value); + $cameraIdx = (int)IPS_GetName(IPS_GetParent($variableId)); + $this->SetTimer ($cameraIdx, 'PictureStore', $value); + break; + case IPSCAM_VAR_PICTRESET: + SetValue($variableId, $value); + $cameraIdx = (int)IPS_GetName(IPS_GetParent($variableId)); + $this->SetTimer ($cameraIdx, 'PictureReset', $value); + break; + case IPSCAM_VAR_PICTHIST: + case IPSCAM_VAR_PICTSIZE: + SetValue($variableId, $value); + break; + default: + trigger_error('Unknown VariableID'.$variableId); + } + } + + private function SetCamera ($cameraIdx) { + $variableIdCamSelect = IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMSELECT, $this->categoryIdCommon); + if (GetValue($variableIdCamSelect)<>$cameraIdx) { + SetValue($variableIdCamSelect, $cameraIdx); + foreach ($this->config as $idx=>$data) { + $categoryIdCam = IPS_GetObjectIDByIdent($idx, $this->categoryIdCams); + $variableIdCamPower = IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMPOWER, $categoryIdCam); + $valueCamPower = ($idx==$cameraIdx); + SetValue($variableIdCamPower, $valueCamPower); + } + $mode = GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_MODE, $this->categoryIdCommon)); + $this->RefreshDisplayByMode($mode); + if ($mode==IPSCAM_MODE_HISTORY) { + $this->NavigatePictures(IPSCAM_DAY_FORWARD, 1); + } elseif ($mode==IPSCAM_MODE_PICTURE) { + $this->PictureRefresh($cameraIdx); + } else { + } + $this->RefreshDisplay($cameraIdx); + } + } + + private function SetMode ($mode) { + $variableIdMode = IPS_GetObjectIDByIdent(IPSCAM_VAR_MODE, $this->categoryIdCommon); + if (GetValue($variableIdMode)<>$mode) { + SetValue($variableIdMode, $mode); + $variableIdMode = IPS_GetObjectIDByIdent(IPSCAM_VAR_MODELIVE, $this->categoryIdCommon); + SetValue($variableIdMode, ($mode==IPSCAM_MODE_LIVE)); + $variableIdMode = IPS_GetObjectIDByIdent(IPSCAM_VAR_MODEPICT, $this->categoryIdCommon); + SetValue($variableIdMode, ($mode==IPSCAM_MODE_PICTURE)); + $variableIdMode = IPS_GetObjectIDByIdent(IPSCAM_VAR_MODEHIST, $this->categoryIdCommon); + SetValue($variableIdMode, ($mode==IPSCAM_MODE_HISTORY)); + $variableIdMode = IPS_GetObjectIDByIdent(IPSCAM_VAR_MODESETT, $this->categoryIdCommon); + SetValue($variableIdMode, ($mode==IPSCAM_MODE_SETTINGS)); + + //Reset Timers + $variableIdCamSelect = IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMSELECT, $this->categoryIdCommon); + $cameraIdx = GetValue($variableIdCamSelect); + $categoryIdCam = IPS_GetObjectIDByIdent($cameraIdx, $this->categoryIdCams); + $this->SetTimer ($cameraIdx, 'PictureReset', IPSCAM_VAL_DISABLED); + $this->SetTimer ($cameraIdx, 'PictureReset', GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_PICTRESET, $categoryIdCam)), 'Once'); + + // Refresh + $this->RefreshDisplayByMode($mode); + $this->RefreshDisplay($cameraIdx); + } + } + + + private function RefreshDisplay($cameraIdx) { + $mode = GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_MODE, $this->categoryIdCommon)); + $variableIdHtml = IPS_GetObjectIDByIdent(IPSCAM_VAR_HTML, $this->categoryIdCommon); + $variableIdHtml2 = IPS_GetObjectIDByIdent(IPSCAM_VAR_IHTML, $this->categoryIdCommon); + + $urlStream = $this->GetURL($cameraIdx, IPSCAM_URL_LIVE); + $urlImage = $this->GetURL($cameraIdx, IPSCAM_URL_PICTURE); + + + $styleImage = 'text-align:center; border:3px solid rgba(255,255,255,0.5);'; + $styleContainer = 'text-align:center; width:100%; display:block; cursor:default;'; + $styleImage2 = 'text-align:center; width:95%; border:3px solid rgba(255,255,255,0.5);'; + $styleContainer2 = 'text-align:center; display:block; cursor:default;'; + + switch ($mode) { + case IPSCAM_MODE_LIVE: + $variableIdCam = IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMHTML, $this->categoryIdCommon); + SetValue($variableIdCam, ''); + SetValue($variableIdHtml, '
'.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '  '.PHP_EOL;
+ $return .= ' |
'.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' | '. + $this->GetCameraProperty($cameraIdx, $property). + ' |
| '.PHP_EOL; + $return .= ' | '.PHP_EOL; + $return .= '
'.PHP_EOL;
+ $return .= ' 
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ if ($showPreDefPosButtons and $camType==IPSCAM_TYPE_MOVABLECAM and $this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_PREDEFPOS1)<>'') {
+ $return .= ' | '.PHP_EOL; + $return .= ' | '.PHP_EOL; + $return .= '
| '.PHP_EOL; + $return .= ' | '.PHP_EOL; + $return .= '
'.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ }
+ $return .= ''.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ''.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ if ($streamHeight===null) {
+ $return .= ' '.PHP_EOL;
+ } else {
+ $return .= ' '.PHP_EOL;
+ $streamWidth = $origWidth * (($streamHeight)/$origHeight);
+ }
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ if ($showPreDefPosButtons and $camType==IPSCAM_TYPE_MOVABLECAM and $this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_PREDEFPOS1)<>'') {
+ $return .= ''.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ }
+ if ($showCommandButtons and $this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_COMMAND1)<>'') {
+ $return .= ''.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ''.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' Vordefinierte Positionen
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' '.$this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_PREDEFPOS1).'
'.PHP_EOL;
+ if ($this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_PREDEFPOS2)<>'') {
+ $return .= ' '.$this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_PREDEFPOS2).'
'.PHP_EOL;
+ }
+ if ($this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_PREDEFPOS3)<>'') {
+ $return .= ' '.$this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_PREDEFPOS3).'
'.PHP_EOL;
+ }
+ if ($this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_PREDEFPOS4)<>'') {
+ $return .= ' '.$this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_PREDEFPOS4).'
'.PHP_EOL;
+ }
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ }
+
+ return $return;
+ }
+
+
+ }
+
+
+ /** @}*/
+?>
\ No newline at end of file
diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_NavDayNext.ips.php b/IPSLibrary/app/modules/IPSCam/IPSCam_NavDayNext.ips.php
new file mode 100644
index 0000000..1a02146
--- /dev/null
+++ b/IPSLibrary/app/modules/IPSCam/IPSCam_NavDayNext.ips.php
@@ -0,0 +1,41 @@
+
+ *
+ * IPSCam Script zur History Navigation
+ *
+ */
+
+ include_once "IPSCam.inc.php";
+
+ $variableId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSCam.Common.'.IPSCAM_VAR_NAVDAYS);
+ $value = IPSCAM_DAY_FORWARD;
+
+ $camManager = new IPSCam_Manager();
+ $camManager->ChangeSetting($variableId, $value);
+
+
+ /** @}*/
+?>
\ No newline at end of file
diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_NavDayPrev.ips.php b/IPSLibrary/app/modules/IPSCam/IPSCam_NavDayPrev.ips.php
new file mode 100644
index 0000000..9ab5fd9
--- /dev/null
+++ b/IPSLibrary/app/modules/IPSCam/IPSCam_NavDayPrev.ips.php
@@ -0,0 +1,41 @@
+
+ *
+ * IPSCam Script zur History Navigation
+ *
+ */
+
+ include_once "IPSCam.inc.php";
+
+ $variableId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSCam.Common.'.IPSCAM_VAR_NAVDAYS);
+ $value = IPSCAM_DAY_BACK;
+
+ $camManager = new IPSCam_Manager();
+ $camManager->ChangeSetting($variableId, $value);
+
+
+ /** @}*/
+?>
\ No newline at end of file
diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_NavPicNext.ips.php b/IPSLibrary/app/modules/IPSCam/IPSCam_NavPicNext.ips.php
new file mode 100644
index 0000000..f2e9b83
--- /dev/null
+++ b/IPSLibrary/app/modules/IPSCam/IPSCam_NavPicNext.ips.php
@@ -0,0 +1,41 @@
+
+ *
+ * IPSCam Script zur History Navigation
+ *
+ */
+
+ include_once "IPSCam.inc.php";
+
+ $variableId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSCam.Common.'.IPSCAM_VAR_NAVPICT);
+ $value = IPSCAM_NAV_FORWARD;
+
+ $camManager = new IPSCam_Manager();
+ $camManager->ChangeSetting($variableId, $value);
+
+
+ /** @}*/
+?>
\ No newline at end of file
diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_NavPicPrev.ips.php b/IPSLibrary/app/modules/IPSCam/IPSCam_NavPicPrev.ips.php
new file mode 100644
index 0000000..bfa7a3b
--- /dev/null
+++ b/IPSLibrary/app/modules/IPSCam/IPSCam_NavPicPrev.ips.php
@@ -0,0 +1,41 @@
+
+ *
+ * IPSCam Script zur History Navigation
+ *
+ */
+
+ include_once "IPSCam.inc.php";
+
+ $variableId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSCam.Common.'.IPSCAM_VAR_NAVPICT);
+ $value = IPSCAM_NAV_BACK;
+
+ $camManager = new IPSCam_Manager();
+ $camManager->ChangeSetting($variableId, $value);
+
+
+ /** @}*/
+?>
\ No newline at end of file
diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_PurgeFiles.ips.php b/IPSLibrary/app/modules/IPSCam/IPSCam_PurgeFiles.ips.php
new file mode 100644
index 0000000..e731672
--- /dev/null
+++ b/IPSLibrary/app/modules/IPSCam/IPSCam_PurgeFiles.ips.php
@@ -0,0 +1,37 @@
+
+ *
+ * Alter Bilder von der Platte löschen
+ *
+ */
+
+ include_once "IPSCam.inc.php";
+
+ $camManager = new IPSCam_Manager();
+ $camManager->PurgeFiles();
+
+ /** @}*/
+?>
\ No newline at end of file
diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_RefreshPicture.ips.php b/IPSLibrary/app/modules/IPSCam/IPSCam_RefreshPicture.ips.php
new file mode 100644
index 0000000..52e4741
--- /dev/null
+++ b/IPSLibrary/app/modules/IPSCam/IPSCam_RefreshPicture.ips.php
@@ -0,0 +1,38 @@
+
+ *
+ * Aktualisiert das aktuell gewählte Kamera Bild
+ *
+ */
+
+ include_once "IPSCam.inc.php";
+
+ $camManager = new IPSCam_Manager();
+ $camManager->PictureRefresh();
+
+
+ /** @}*/
+?>
\ No newline at end of file
diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_StorePicture.ips.php b/IPSLibrary/app/modules/IPSCam/IPSCam_StorePicture.ips.php
new file mode 100644
index 0000000..7320520
--- /dev/null
+++ b/IPSLibrary/app/modules/IPSCam/IPSCam_StorePicture.ips.php
@@ -0,0 +1,37 @@
+
+ *
+ * Speichern des aktuell gewählten Kamera Bildes
+ *
+ */
+
+ include_once "IPSCam.inc.php";
+
+ $camManager = new IPSCam_Manager();
+ $camManager->PictureStore();
+
+ /** @}*/
+?>
\ No newline at end of file
diff --git a/IPSLibrary/app/modules/IPSLight/IPSLight.inc.php b/IPSLibrary/app/modules/IPSLight/IPSLight.inc.php
new file mode 100644
index 0000000..9d3b63b
--- /dev/null
+++ b/IPSLibrary/app/modules/IPSLight/IPSLight.inc.php
@@ -0,0 +1,230 @@
+
+ *
+ * IPSLight API
+ *
+ */
+
+ IPSUtils_Include ("IPSLogger.inc.php", "IPSLibrary::app::core::IPSLogger");
+ IPSUtils_Include ("IPSComponent.class.php", "IPSLibrary::app::core::IPSComponent");
+ IPSUtils_Include ("IPSLight_Constants.inc.php", "IPSLibrary::app::modules::IPSLight");
+ IPSUtils_Include ("IPSLight_Configuration.inc.php", "IPSLibrary::config::modules::IPSLight");
+ IPSUtils_Include ("IPSLight_Custom.inc.php", "IPSLibrary::config::modules::IPSLight");
+ IPSUtils_Include ("IPSLight_Manager.class.php", "IPSLibrary::app::modules::IPSLight");
+
+ /**
+ * Setzt den Wert einer Variable (Schalter, Dimmer, Gruppe, ...) anhand der zugehörigen ID
+ *
+ * @param int $variableId ID der Variable
+ * @param variant $value Neuer Wert der Variable
+ */
+ function IPSLight_SetValue($variableId, $value) {
+ $lightManager = new IPSLight_Manager();
+ $lightManager->SetValue($variableId, $value);
+ }
+
+ /**
+ * Setzt den Wert eines Schalters anhand der zugehörigen ID
+ *
+ * @param int $switchId ID der Variable
+ * @param bool $value Neuer Wert der Variable
+ */
+ function IPSLight_SetSwitch($switchId, $value) {
+ $lightManager = new IPSLight_Manager();
+ $lightManager->SetValue($switchId, $value);
+ }
+
+ /**
+ * "Toggle" eines Schalters anhand der zugehörigen ID
+ *
+ * @param int $switchId ID der Variable
+ */
+ function IPSLight_ToggleSwitch($switchId) {
+ $lightManager = new IPSLight_Manager();
+ $lightManager->SetValue($switchId, !$lightManager->GetValue($switchId));
+ }
+
+ /**
+ * Setzt den Wert eines Dimmers anhand der zugehörigen Level ID
+ *
+ * @param int $levelId ID der Variable
+ * @param int $value Neuer Wert der Variable
+ */
+ function IPSLight_SetDimmerAbs($levelId, $value) {
+ $lightManager = new IPSLight_Manager();
+ $lightManager->SetDimmer($levelId, $value);
+ }
+
+ /**
+ * Verändert den Wert eines Dimmers anhand der zugehörigen Level ID um einen bestimmten Delta Wert
+ *
+ * @param int $levelId ID der Variable
+ * @param int $value Delta Wert um den der Dimmer Wert erhöht bzw. erniedrigt werden soll
+ */
+ function IPSLight_SetDimmerRel($levelId, $value) {
+ $lightManager = new IPSLight_Manager();
+ $lightManager->SetDimmer($levelId, $lightManager->GetValue($levelId) + $value);
+ }
+
+ /**
+ * Setzt den Wert eines Gruppen Schalters anhand der zugehörigen ID
+ *
+ * @param int $groupId ID des Gruppen Schalters
+ * @param bool $value Neuer Wert der Gruppe
+ */
+ function IPSLight_SetGroup($groupId, $value) {
+ $lightManager = new IPSLight_Manager();
+ $lightManager->SetGroup($groupId, $value);
+ }
+
+ /**
+ * "Toogle" Gruppen Schalter anhand der zugehörigen ID
+ *
+ * @param int $groupId ID des Gruppen Schalters
+ */
+ function IPSLight_ToggleGroup($groupId) {
+ $lightManager = new IPSLight_Manager();
+ $lightManager->SetGroup($groupId, !$lightManager->GetValue(groupId));
+ }
+
+ /**
+ * Setzt den Wert eines Programm Schalters anhand der zugehörigen ID
+ *
+ * @param int $programId ID des Programm Schalters
+ * @param bool $value Neuer Wert des Programm Schalters
+ */
+ function IPSLight_SetProgram($programId, $value) {
+ $lightManager = new IPSLight_Manager();
+ $lightManager->SetProgram($programId, $value);
+ }
+
+ /**
+ * Setzt des nächtsten Programms anhand der zugehörigen ID
+ *
+ * @param int $programId ID des Programm Schalters
+ */
+ function IPSLight_SetProgramNext($programId) {
+ $lightManager = new IPSLight_Manager();
+ $lightManager->SetProgram($programId, $lightManager->GetValue($programId) + 1);
+ }
+
+
+ /**
+ * Setzt den Wert eines Schalters anhand des zugehörigen Namens
+ *
+ * @param string $lightName Name des Schalters
+ * @param bool $value Neuer Wert des Schalters
+ */
+ function IPSLight_SetSwitchByName($lightName, $value) {
+ $lightManager = new IPSLight_Manager();
+ $switchId = $lightManager->GetSwitchIdByName($lightName);
+ $lightManager->SetValue($switchId, $value);
+ }
+
+ /**
+ * "Toogle" Schalter anhand des zugehörigen Namens
+ *
+ * @param string $lightName Name des Schalters
+ */
+ function IPSLight_ToggleSwitchByName($lightName) {
+ $lightManager = new IPSLight_Manager();
+ $switchId = $lightManager->GetSwitchIdByName($lightName);
+ $lightManager->SetValue($switchId, !$lightManager->GetValue($switchId));
+ }
+
+ /**
+ * Setzt den Wert eines Dimmers anhand des zugehörigen Namens
+ *
+ * @param string $lightName Name des Dimmers
+ * @param int $value Neuer Wert des Dimmers
+ */
+ function IPSLight_DimAbsoluteByName($lightName, $value) {
+ $lightManager = new IPSLight_Manager();
+ $levelId = $lightManager->GetLevelIdByName($lightName);
+ $lightManager->SetDimmer($levelId, $value);
+ }
+
+ /**
+ * Verändert den Wert eines Dimmers anhand des zugehörigen Namens um einen übergebenen Delta Wert
+ *
+ * @param string $lightName Name des Dimmers
+ * @param int $value Delta Wert (positiv oder negativ)
+ */
+ function IPSLight_DimRelativByName($lightName, $value) {
+ $lightManager = new IPSLight_Manager();
+ $levelId = $lightManager->GetLevelIdByName($lightName);
+ $lightManager->SetDimmer($levelId, $lightManager->GetValue($levelId) + $value);
+ }
+
+ /**
+ * Setzt den Wert einer Gruppe anhand des zugehörigen Namens
+ *
+ * @param string $groupName Name der Gruppe
+ * @param bool $value Neuer Wert der Gruppe
+ */
+ function IPSLight_SetGroupByName($groupName, $value) {
+ $lightManager = new IPSLight_Manager();
+ $groupId = $lightManager->GetGroupIdByName($groupName);
+ $lightManager->SetGroup($groupId, $value);
+ }
+
+ /**
+ * "Toogle" Wert einer Gruppe anhand des zugehörigen Namens
+ *
+ * @param string $groupName Name der Gruppe
+ */
+ function IPSLight_ToggleGroupByName($groupName) {
+ $lightManager = new IPSLight_Manager();
+ $groupId = $lightManager->GetGroupIdByName($groupName);
+ $lightManager->SetGroup($groupId, !$lightManager->GetValue($groupId));
+ }
+
+ /**
+ * Setzt den Wert eines Programms anhand des zugehörigen Namens
+ *
+ * @param string $programName Name des Programms
+ * @param bool $value Neuer Wert des Programms
+ */
+ function IPSLight_SetProgramName($programName, $value) {
+ $lightManager = new IPSLight_Manager();
+ $programId = $lightManager->GetProgramIdByName($programName);
+ $lightManager->SetProgram($programId, $value);
+ }
+
+ /**
+ * Setzt das nächste Programm eines Programwahlschalters anhand des zugehörigen Namens
+ *
+ * @param string $programName Name des Programms
+ */
+ function IPSLight_SetProgramNextByName($programName) {
+ $lightManager = new IPSLight_Manager();
+ $programId = $lightManager->GetProgramIdByName($programName);
+ $lightManager->SetProgram($programId, $lightManager->GetValue($programId) + 1);
+ }
+
+ /** @}*/
+?>
\ No newline at end of file
diff --git a/IPSLibrary/app/modules/IPSLight/IPSLight_ActionScript.ips.php b/IPSLibrary/app/modules/IPSLight/IPSLight_ActionScript.ips.php
new file mode 100644
index 0000000..fe5654e
--- /dev/null
+++ b/IPSLibrary/app/modules/IPSLight/IPSLight_ActionScript.ips.php
@@ -0,0 +1,58 @@
+
+ *
+ * IPSLight ActionScript
+ *
+ */
+
+ include_once "IPSLight.inc.php";
+
+ $variableId = $_IPS['VARIABLE'];
+ $value = $_IPS['VALUE'];
+ $categoryName = IPS_GetName(IPS_GetParent($_IPS['VARIABLE']));
+
+ // ----------------------------------------------------------------------------------------------------------------------------
+ if ($_IPS['SENDER']=='WebFront') {
+ switch ($categoryName) {
+ case 'Switches':
+ IPSLight_SetValue($variableId, $value);
+ break;
+ case 'Groups':
+ IPSLight_SetGroup($variableId, $value);
+ break;
+ case 'Programs':
+ IPSLight_SetProgram($variableId, $value);
+ break;
+ default:
+ trigger_error('Unknown Category '.$categoryName);
+ }
+
+ // ----------------------------------------------------------------------------------------------------------------------------
+ } else {
+ }
+
+ /** @}*/
+?>
\ No newline at end of file
diff --git a/IPSLibrary/app/modules/IPSLight/IPSLight_Constants.inc.php b/IPSLibrary/app/modules/IPSLight/IPSLight_Constants.inc.php
new file mode 100644
index 0000000..c3e1f49
--- /dev/null
+++ b/IPSLibrary/app/modules/IPSLight/IPSLight_Constants.inc.php
@@ -0,0 +1,59 @@
+
+ *
+ * Definition der Konstanten für IPSLight
+ *
+ */
+
+ // Confguration Property Definition
+ define ('IPSLIGHT_NAME', 0);
+ define ('IPSLIGHT_GROUPS', 1);
+ define ('IPSLIGHT_TYPE', 2);
+ define ('IPSLIGHT_COMPONENT', 3);
+ define ('IPSLIGHT_POWERCIRCLE', 4);
+ define ('IPSLIGHT_POWERWATT', 5);
+ define ('IPSLIGHT_ACTIVATABLE', 6);
+ define ('IPSLIGHT_PROGRAMON', 7);
+ define ('IPSLIGHT_PROGRAMOFF', 8);
+ define ('IPSLIGHT_PROGRAMLEVEL', 9);
+ define ('IPSLIGHT_PROGRAMRGB', 10);
+ define ('IPSLIGHT_WFCSPLITPANEL', 'WFCSplitPanel');
+ define ('IPSLIGHT_WFCCATEGORY', 'WFCCategory');
+ define ('IPSLIGHT_WFCGROUP', 'WFCGroup');
+ define ('IPSLIGHT_WFCLINKS', 'WFCLinks');
+
+ // Supported Device Types
+ define ('IPSLIGHT_TYPE_SWITCH', 'Switch');
+ define ('IPSLIGHT_TYPE_RGB', 'RGB');
+ define ('IPSLIGHT_TYPE_DIMMER', 'Dimmer');
+
+ // Device specific Properties
+ define ('IPSLIGHT_DEVICE_COLOR', '#Color');
+ define ('IPSLIGHT_DEVICE_LEVEL', '#Level');
+
+
+ /** @}*/
+?>
\ No newline at end of file
diff --git a/IPSLibrary/app/modules/IPSLight/IPSLight_Manager.class.php b/IPSLibrary/app/modules/IPSLight/IPSLight_Manager.class.php
new file mode 100644
index 0000000..8845ac8
--- /dev/null
+++ b/IPSLibrary/app/modules/IPSLight/IPSLight_Manager.class.php
@@ -0,0 +1,590 @@
+
+ *
+ * IPSLight Licht Management
+ */
+
+ /**
+ * @class IPSLight_Manager
+ *
+ * Definiert ein IPSLight_Manager Objekt
+ *
+ * @author Andreas Brauneis
+ * @version
+ * Version 2.50.1, 26.07.2012'.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ''.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' Licht
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' '.PHP_EOL;
+ $return .= '
'.PHP_EOL;
+ $return .= ' '.$this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_COMMAND1).'
'.PHP_EOL;
+ if ($this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_COMMAND2)<>'') {
+ $return .= ' '.$this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_COMMAND2).'
'.PHP_EOL;
+ }
+ if ($this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_COMMAND3)<>'') {
+ $return .= ' '.$this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_COMMAND3).'
'.PHP_EOL;
+ }
+ if ($this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_COMMAND4)<>'') {
+ $return .= ' '.$this->GetCameraProperty($cameraIdx, IPSCAM_PROPERTY_COMMAND4).'
'.PHP_EOL;
+ }
+ $return .= ' + */ + class IPSLight_Manager { + + /** + * @private + * ID Kategorie mit Schalter und Dimmern + */ + private $switchCategoryId; + + /** + * @private + * ID Kategorie mit Schalter + */ + private $groupCategoryId; + + /** + * @private + * ID Kategorie mit Programmen + */ + private $programCategoryId; + + /** + * @public + * + * Initialisierung des IPSLight_Manager Objektes + * + */ + public function __construct() { + $baseId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSLight'); + $this->switchCategoryId = IPS_GetObjectIDByIdent('Switches', $baseId); + $this->groupCategoryId = IPS_GetObjectIDByIdent('Groups', $baseId); + $this->programCategoryId = IPS_GetObjectIDByIdent('Programs', $baseId); + } + + /** + * @public + * + * Liefert ID eines Schalters anhand des Namens + * + * @param string $name Name des Schalters + * @return int ID des Schalters + */ + public function GetSwitchIdByName($name) { + return IPS_GetVariableIDByName($name, $this->switchCategoryId); + } + + /** + * @public + * + * Liefert ID einer Level Variable eines Dimmers anhand des Namens + * + * @param string $name Name des Dimmers + * @return int ID der Level Variable + */ + public function GetLevelIdByName($name) { + return IPS_GetVariableIDByName($name.IPSLIGHT_DEVICE_LEVEL, $this->switchCategoryId); + } + + /** + * @public + * + * Liefert ID einer RGB Variable anhand des Namens + * + * @param string $name Name des RGB Lichtes + * @return int ID der RGB Variable + */ + public function GetColorIdByName($name) { + return IPS_GetVariableIDByName($name.IPSLIGHT_DEVICE_COLOR, $this->switchCategoryId); + } + + /** + * @public + * + * Liefert ID eines Gruppen Schalters anhand des Namens + * + * @param string $name Name der Gruppe + * @return int ID der Gruppe + */ + public function GetGroupIdByName($name) { + return IPS_GetVariableIDByName($name, $this->groupCategoryId); + } + + /** + * @public + * + * Liefert ID eines Programm Schalters anhand des Namens + * + * @param string $name Name des Programm Schalters + * @return int ID des Programm Schalters + */ + public function GetProgramIdByName($name) { + return IPS_GetVariableIDByName($name, $this->programCategoryId); + } + + /** + * @public + * + * Liefert Wert einer Control Variable (Schalter, Dimmer, Gruppe, ...) anhand der zugehörigen ID + * + * @param string $variableId ID der Variable + * @return int Wert der Variable + */ + public function GetValue($variableId) { + return GetValue($variableId); + } + + /** + * @public + * + * Setzt den Wert einer Control Variable (Schalter, Dimmer, Gruppe, ...) anhand der zugehörigen ID + * + * @param int $variableId ID der Variable + * @param int $value Neuer Wert der Variable + */ + public function SetValue($variableId, $value) { + $parentId = IPS_GetParent($variableId); + switch($parentId) { + case $this->switchCategoryId: + $configName = $this->GetConfigNameById($variableId); + $configLights = IPSLight_GetLightConfiguration(); + $lightType = $configLights[$configName][IPSLIGHT_TYPE]; + if ($lightType==IPSLIGHT_TYPE_SWITCH) { + $this->SetSwitch($variableId, $value); + } elseif ($lightType==IPSLIGHT_TYPE_DIMMER) { + $this->SetDimmer($variableId, $value); + } elseif ($lightType==IPSLIGHT_TYPE_RGB) { + $this->SetRGB($variableId, $value); + } else { + trigger_error('Unknown LightType '.$lightType.' for Light '.$configName); + } + break; + case $this->groupCategoryId: + $this->SetGroup($variableId, $value); + break; + case $this->programCategoryId: + $this->SetProgram($variableId, $value); + break; + default: + trigger_error('Unknown ControlId '.$variableId); + } + } + + /** + * @public + * + * Setzt den Wert einer Schalter Variable anhand der zugehörigen ID + * + * @param int $switchId ID der Variable + * @param bool $value Neuer Wert der Variable + */ + public function SetSwitch($switchId, $value, $syncGroups=true, $syncPrograms=true) { + if (GetValue($switchId)==$value) { + return; + } + $configName = $this->GetConfigNameById($switchId); + $configLights = IPSLight_GetLightConfiguration(); + $componentParams = $configLights[$configName][IPSLIGHT_COMPONENT]; + $component = IPSComponent::CreateObjectByParams($componentParams); + + SetValue($switchId, $value); + IPSLogger_Inf(__file__, 'Turn Light '.$configName.' '.($value?'On':'Off')); + + if (IPSLight_BeforeSwitch($switchId, $value)) { + $component->SetState($value); + } + IPSLight_AfterSwitch($switchId, $value); + + if ($syncGroups) { + $this->SynchronizeGroupsBySwitch($switchId); + } + if ($syncPrograms) { + $this->SynchronizeProgramsBySwitch ($switchId); + } + } + + /** + * @public + * + * Setzt den Wert einer Dimmer Variable anhand der zugehörigen ID + * + * @param int $variableId ID der Variable + * @param bool $value Neuer Wert der Variable + */ + public function SetDimmer($variableId, $value, $syncGroups=true, $syncPrograms=true) { + if (GetValue($variableId)==$value) { + return; + } + $configName = $this->GetConfigNameById($variableId); + $configLights = IPSLight_GetLightConfiguration(); + $switchId = IPS_GetVariableIDByName($configName, $this->switchCategoryId); + $switchValue = GetValue($switchId); + $levelId = IPS_GetVariableIDByName($configName.IPSLIGHT_DEVICE_LEVEL, $this->switchCategoryId); + $levelValue = GetValue($levelId); + + $componentParams = $configLights[$configName][IPSLIGHT_COMPONENT]; + $component = IPSComponent::CreateObjectByParams($componentParams); + + if ($variableId==$levelId) { + if (!$switchValue and $value>0) { + SetValue($switchId, true); + } else if ($switchValue and $value==0) { + SetValue($switchId, false); + } else { + } + if (GetValue($levelId) > 100) { $value = 100; } + if (GetValue($levelId) < 0) { $value = 0; } + } else { + if ($value and $levelValue==0) { + SetValue($levelId, 15); + } + } + SetValue($variableId, $value); + + $switchValue = GetValue($switchId); + IPSLogger_Inf(__file__, 'Turn Light '.$configName.' '.($switchValue?'On, Level='.GetValue($levelId):'Off')); + + if (IPSLight_BeforeSwitch($switchId, $switchValue)) { + $component->SetState(GetValue($switchId), GetValue($levelId)); + } + IPSLight_AfterSwitch($switchId, $switchValue); + + if ($syncGroups) { + $this->SynchronizeGroupsBySwitch($switchId); + } + if ($syncPrograms) { + $this->SynchronizeProgramsBySwitch ($switchId); + } + } + + /** + * @public + * + * Setzt den Wert einer RGB Farb Variable anhand der zugehörigen ID + * + * @param int $variableId ID der Variable + * @param bool $value Neuer Wert der Variable + */ + public function SetRGB($variableId, $value, $syncGroups=true, $syncPrograms=true) { + if (GetValue($variableId)==$value) { + return; + } + $configName = $this->GetConfigNameById($variableId); + $configLights = IPSLight_GetLightConfiguration(); + $switchId = IPS_GetVariableIDByName($configName, $this->switchCategoryId); + $colorId = IPS_GetVariableIDByName($configName.IPSLIGHT_DEVICE_COLOR, $this->switchCategoryId); + $levelId = IPS_GetVariableIDByName($configName.IPSLIGHT_DEVICE_LEVEL, $this->switchCategoryId); + $switchValue = GetValue($switchId); + + $componentParams = $configLights[$configName][IPSLIGHT_COMPONENT]; + $component = IPSComponent::CreateObjectByParams($componentParams); + + SetValue($variableId, $value); + if (!$switchValue and ($variableId==$levelId or $variableId==$colorId)) { + SetValue($switchId, true); + } + $switchValue = GetValue($switchId); + IPSLogger_Inf(__file__, 'Turn Light '.$configName.' '.($switchValue?'On, Level='.GetValue($levelId).', Color='.GetValue($colorId):'Off')); + + if (IPSLight_BeforeSwitch($switchId, $switchValue)) { + $component->SetState(GetValue($switchId), GetValue($colorId), GetValue($levelId)); + } + IPSLight_AfterSwitch($switchId, $switchValue); + + if ($syncGroups) { + $this->SynchronizeGroupsBySwitch($switchId); + } + if ($syncPrograms) { + $this->SynchronizeProgramsBySwitch ($switchId); + } + } + + /** + * @public + * + * Setzt den Wert einer Gruppen Variable anhand der zugehörigen ID + * + * @param int $variableId ID der Gruppe + * @param bool $value Neuer Wert der Gruppe + */ + public function SetGroup($groupId, $value) { + $groupConfig = IPSLight_GetGroupConfiguration(); + $groupName = IPS_GetName($groupId); + if ($value and !$groupConfig[$groupName][IPSLIGHT_ACTIVATABLE]) { + IPSLogger_Trc(__file__, "Ignore ".($value?'On':'Off')." forLightGroup '$groupName' (not allowed)"); + } else { + SetValue($groupId, $value); + IPSLogger_Inf(__file__, "Turn LightGroup '$groupName' ".($value?'On':'Off')); + $this->SetAllSwitchesByGroup($groupId); + } + } + + /** + * @public + * + * Setzt den Wert einer Programm Variable anhand der zugehörigen ID + * + * @param int $variableId ID der Programm Variable + * @param bool $value Neuer Wert der Programm Variable + */ + public function SetProgram($programId, $value) { + $programName = IPS_GetName($programId); + $programConfig = IPSLight_GetProgramConfiguration(); + $programKeys = array_keys($programConfig[$programName]); + if ($value>(count($programKeys)-1)) { + $value=0; + } + $programItemName = $programKeys[$value]; + + IPSLogger_Inf(__file__, "Set Program $programName=$value "); + + // Light On + if (array_key_exists(IPSLIGHT_PROGRAMON, $programConfig[$programName][$programItemName])) { + $switches = $programConfig[$programName][$programItemName][IPSLIGHT_PROGRAMON]; + $switches = explode(',', $switches); + foreach ($switches as $idx=>$switchName) { + if ($switchName <> '') { + $switchId = $this->GetSwitchIdByName($switchName); + $configLights = IPSLight_GetLightConfiguration(); + $lightType = $configLights[$switchName][IPSLIGHT_TYPE]; + if ($lightType==IPSLIGHT_TYPE_SWITCH) { + $this->SetSwitch($switchId, true); + } elseif ($lightType==IPSLIGHT_TYPE_DIMMER) { + $this->SetDimmer($switchId, true); + } elseif ($lightType==IPSLIGHT_TYPE_RGB) { + $this->SetRGB($switchId, true); + } else { + trigger_error('Unknown LightType '.$lightType.' for Light '.$configName); + } + } + } + } + // Light Off + if (array_key_exists(IPSLIGHT_PROGRAMOFF, $programConfig[$programName][$programItemName])) { + $switches = $programConfig[$programName][$programItemName][IPSLIGHT_PROGRAMOFF]; + $switches = explode(',', $switches); + foreach ($switches as $idx=>$switchName) { + if ($switchName <> '') { + $switchId = $this->GetSwitchIdByName($switchName); + $configLights = IPSLight_GetLightConfiguration(); + $lightType = $configLights[$switchName][IPSLIGHT_TYPE]; + if ($lightType==IPSLIGHT_TYPE_SWITCH) { + $this->SetSwitch($switchId, false); + } elseif ($lightType==IPSLIGHT_TYPE_DIMMER) { + $this->SetDimmer($switchId, false); + } elseif ($lightType==IPSLIGHT_TYPE_RGB) { + $this->SetRGB($switchId, false); + } else { + trigger_error('Unknown LightType '.$lightType.' for Light '.$configName); + } + } + } + } + // Light Level + if (array_key_exists(IPSLIGHT_PROGRAMLEVEL, $programConfig[$programName][$programItemName])) { + $switches = $programConfig[$programName][$programItemName][IPSLIGHT_PROGRAMLEVEL]; + $switches = explode(',', $switches); + for ($idx=0; $idx
+ */ + class IPSPowerControl_Manager { + + /** + * @private + * ID Kategorie für die berechneten Werte + */ + private $categoryIdValues; + + /** + * @private + * ID Kategorie für allgemeine Steuerungs Daten + */ + private $categoryIdCommon; + + + /** + * @private + * Konfigurations Daten Array der Sensoren + */ + private $sensorConfig; + + /** + * @private + * Konfigurations Daten Array der berechneten Werte + */ + private $valueConfig; + + /** + * @public + * + * Initialisierung des IPSPowerControl_Manager Objektes + * + */ + public function __construct() { + $baseId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSPowerControl'); + $this->categoryIdValues = IPS_GetObjectIDByIdent('Values', $baseId); + $this->categoryIdCommon = IPS_GetObjectIDByIdent('Common', $baseId); + $this->sensorConfig = IPSPowerControl_GetSensorConfiguration(); + $this->valueConfig = IPSPowerControl_GetValueConfiguration(); + } + + /** + * @public + * + * Modifiziert einen Variablen Wert der Kamera Steuerung + * + * @param integer $variableId ID der Variable die geändert werden soll + * @param variant $value Neuer Wert der Variable + */ + public function ChangeSetting($variableId, $value) { + $variableIdent = IPS_GetIdent($variableId); + if (substr($variableIdent,0,-1)==IPSPC_VAR_SELECTVALUE) { + $powerIdx = substr($variableIdent,-1,-1); + $variableIdent = substr($variableIdent,0,-1); + } + if (substr($variableIdent,0,-2)==IPSPC_VAR_SELECTVALUE) { + $powerIdx = substr($variableIdent,-1,-2); + $variableIdent = substr($variableIdent,0,-2); + } + switch ($variableIdent) { + case IPSPC_VAR_SELECTVALUE: + SetValue($variableId, $value); + $this->CheckValueSelection(); + $this->RebuildGraph(); + break; + case IPSPC_VAR_TYPEOFFSET: + case IPSPC_VAR_PERIODCOUNT: + $this->Navigation($variableId, $value); + $this->RebuildGraph(); + break; + case IPSPC_VAR_VALUEKWH: + case IPSPC_VAR_VALUEWATT: + case IPSPC_VAR_CHARTHTML: + case IPSPC_VAR_TIMEOFFSET: + case IPSPC_VAR_TIMECOUNT: + trigger_error('Variable'.$variableIdent.' could NOT be modified!!!'); + break; + default: + trigger_error('Unknown VariableID'.$variableId); + } + } + + private function CheckValueSelection() { + $valueSelected = false; + foreach ($this->valueConfig as $valueIdx=>$valueData) { + if ($valueData[IPSPC_PROPERTY_DISPLAY]) { + $variableIdValueDisplay = IPS_GetVariableIDByName(IPSPC_VAR_SELECTVALUE.$valueIdx, $this->categoryIdCommon); + $valueSelected = ($valueSelected or GetValue($variableIdValueDisplay)); + } + } + if (!$valueSelected) { + SetValue(IPS_GetVariableIDByName(IPSPC_VAR_SELECTVALUE.'0', $this->categoryIdCommon), true); + + } + + } + + private function Navigation($variableId, $value) { + $lastValue = GetValue($variableId); + $variableIdOffset = IPS_GetObjectIDByIdent(IPSPC_VAR_TIMEOFFSET, $this->categoryIdCommon); + $variableIdCount = IPS_GetObjectIDByIdent(IPSPC_VAR_TIMECOUNT, $this->categoryIdCommon); + SetValue($variableId, $value); + $restoreOldValue = false; + Switch($value) { + case IPSPC_COUNT_MINUS: + if (GetValue($variableIdCount) > 1) { + SetValue($variableIdCount, GetValue($variableIdCount) - 1); + } + IPS_SetVariableProfileAssociation('IPSPowerControl_PeriodAndCount', IPSPC_COUNT_VALUE, GetValue($variableIdCount), "", -1); + $restoreOldValue = true; + break; + case IPSPC_COUNT_PLUS: + SetValue($variableIdCount, GetValue($variableIdCount) + 1); + IPS_SetVariableProfileAssociation('IPSPowerControl_PeriodAndCount', IPSPC_COUNT_VALUE, GetValue($variableIdCount), "", -1); + $restoreOldValue = true; + break; + case IPSPC_OFFSET_PREV: + SetValue($variableIdOffset, GetValue($variableIdOffset) - 1); + IPS_SetVariableProfileAssociation('IPSPowerControl_TypeAndOffset', IPSPC_OFFSET_VALUE, GetValue($variableIdOffset), "", -1); + $restoreOldValue = true; + break; + case IPSPC_OFFSET_NEXT: + if (GetValue($variableIdOffset) < 0) { + SetValue($variableIdOffset, GetValue($variableIdOffset) + 1); + } + IPS_SetVariableProfileAssociation('IPSPowerControl_TypeAndOffset', IPSPC_OFFSET_VALUE, GetValue($variableIdOffset), "", -1); + $restoreOldValue = true; + break; + case IPSPC_OFFSET_VALUE: + case IPSPC_OFFSET_SEPARATOR: + case IPSPC_COUNT_VALUE: + case IPSPC_COUNT_SEPARATOR: + SetValue($variableId, $lastValue); + break; + default: + // other Values + } + if ($restoreOldValue) { + IPS_Sleep(200); + SetValue($variableId, $lastValue); + } + } + + /** + * @public + * + * Diese Funktion wird beim Auslösen eines Timers aufgerufen + * + * @param integer $timerId ID des Timers + */ + public function ActivateTimer($timerId) { + $timerName = IPS_GetName($timerId); + switch($timerName) { + case 'CalculateWattValues'; + $this->CalculateWattValues(); + break; + case 'CalculateKWHValues'; + $this->CalculateKWHValues(); + break; + default: + trigger_error('Unknown Timer '.$timerName.'(ID='.$timerId.')'); + } + } + + private function GetGraphStartTime() { + $variableIdOffset = IPS_GetObjectIDByIdent(IPSPC_VAR_TIMEOFFSET, $this->categoryIdCommon); + $variableIdCount = IPS_GetObjectIDByIdent(IPSPC_VAR_TIMECOUNT, $this->categoryIdCommon); + $variableIdPeriod = IPS_GetObjectIDByIdent(IPSPC_VAR_PERIODCOUNT, $this->categoryIdCommon); + + $offset = abs(GetValue($variableIdOffset)); + $count = GetValue($variableIdCount); + $return = mktime(0,0,0, date("m", time()), date("d",time()), date("Y",time())); + switch(GetValue($variableIdPeriod)) { + case IPSPC_PERIOD_DAY: + $return = strtotime('-'.($offset+$count-1).' day', $return); + break; + case IPSPC_PERIOD_WEEK: + $return = strtotime('-'.($offset+$count).' week', $return); + break; + case IPSPC_PERIOD_MONTH: + $return = strtotime('-'.($offset+$count).' month', $return); + break; + case IPSPC_PERIOD_YEAR: + $return = strtotime('-'.($offset+$count).' year', $return); + break; + default: + trigger_error('Unknown Period '.GetValue($variableIdPeriod)); + } + return $return; + } + + private function GetGraphEndTime() { + $variableIdOffset = IPS_GetObjectIDByIdent(IPSPC_VAR_TIMEOFFSET, $this->categoryIdCommon); + $variableIdCount = IPS_GetObjectIDByIdent(IPSPC_VAR_TIMECOUNT, $this->categoryIdCommon); + $variableIdPeriod = IPS_GetObjectIDByIdent(IPSPC_VAR_PERIODCOUNT, $this->categoryIdCommon); + + $offset=abs(GetValue($variableIdOffset)); + $return = mktime(23,59,59, date("m", time()), date("d",time()), date("Y",time())); + switch(GetValue($variableIdPeriod)) { + case IPSPC_PERIOD_DAY: + $return = strtotime('-'.($offset).' day', $return); + break; + case IPSPC_PERIOD_WEEK: + $return = strtotime('-'.($offset).' week', $return); + break; + case IPSPC_PERIOD_MONTH: + $return = strtotime('-'.($offset).' month', $return); + break; + case IPSPC_PERIOD_YEAR: + $return = strtotime('-'.($offset).' year', $return); + break; + default: + trigger_error('Unknown Period '.$GetValue($variableIdPeriod)); + } + return $return; + } + + private function RebuildGraph () { + $variableIdChartType = IPS_GetObjectIDByIdent(IPSPC_VAR_TYPEOFFSET, $this->categoryIdCommon); + $variableIdPeriod = IPS_GetObjectIDByIdent(IPSPC_VAR_PERIODCOUNT, $this->categoryIdCommon); + $variableIdChartHTML = IPS_GetObjectIDByIdent(IPSPC_VAR_CHARTHTML, $this->categoryIdCommon); + + $periodList = array (IPSPC_PERIOD_DAY => 'Tag', + IPSPC_PERIOD_WEEK => 'Woche', + IPSPC_PERIOD_MONTH => 'Monat', + IPSPC_PERIOD_YEAR => 'Jahr'); + + $valueTypeList = array (IPSPC_TYPE_KWH => 'kWh', + IPSPC_TYPE_EURO => 'Euro', + IPSPC_TYPE_WATT => 'Watt', + IPSPC_TYPE_STACK => 'Details', + IPSPC_TYPE_STACK2 => 'Total', + IPSPC_TYPE_OFF => 'Off', + IPSPC_TYPE_PIE => 'Pie'); + + if (!array_key_exists(GetValue($variableIdChartType), $valueTypeList)) { + SetValue($variableIdChartType, IPSPC_TYPE_KWH); + } + if (!array_key_exists(GetValue($variableIdPeriod), $periodList)) { + SetValue($variableIdPeriod, IPSPC_PERIOD_DAY); + } + + $archiveHandlerList = IPS_GetInstanceListByModuleID ('{43192F0B-135B-4CE7-A0A7-1475603F3060}'); + $archiveHandlerId = $archiveHandlerList[0]; + $chartType = GetValue($variableIdChartType); + + $CfgDaten['ContentVarableId'] = $variableIdChartHTML ; + $CfgDaten['Ips']['ChartType'] = 'Highcharts'; // Highcharts oder Highstock (default = Highcharts) + $CfgDaten['StartTime'] = $this->GetGraphStartTime(); + $CfgDaten['EndTime'] = $this->GetGraphEndTime(); + $CfgDaten['RunMode'] = "file"; // file, script, popup + + // Serienübergreifende Einstellung für das Laden von Werten + $CfgDaten['AggregatedValues']['HourValues'] = -1; // ist der Zeitraum größer als X Tage werden Stundenwerte geladen + $CfgDaten['AggregatedValues']['DayValues'] = -1; // ist der Zeitraum größer als X Tage werden Tageswerte geladen + $CfgDaten['AggregatedValues']['WeekValues'] = -1; // ist der Zeitraum größer als X Tage werden Wochenwerte geladen + $CfgDaten['AggregatedValues']['MonthValues'] = -1; // ist der Zeitraum größer als X Tage werden Monatswerte geladen + $CfgDaten['AggregatedValues']['YearValues'] = -1; // ist der Zeitraum größer als X Tage werden Jahreswerte geladen + $CfgDaten['AggregatedValues']['NoLoggedValues'] = 1000; // ist der Zeitraum größer als X Tage werden keine Boolean Werte mehr geladen, diese werden zuvor immer als Einzelwerte geladen $CfgDaten['AggregatedValues']['MixedMode'] = false; // alle Zeitraumbedingungen werden kombiniert + $CfgDaten['AggregatedValues']['MixedMode'] = false; + $CfgDaten['title']['text'] = "Energieverbrauch"; + $CfgDaten['subtitle']['text'] = "Zeitraum: %STARTTIME% - %ENDTIME%"; + $CfgDaten['subtitle']['Ips']['DateTimeFormat'] = "(D) d.m.Y H:i"; + $CfgDaten['HighChart']['Theme'] = "ips.js"; + $CfgDaten['HighChart']['Width'] = 0; // in px, 0 = 100% + $CfgDaten['HighChart']['Height'] = 400; // in px + + switch (GetValue($variableIdPeriod)) { + case IPSPC_PERIOD_DAY: $aggType = 0; break; + case IPSPC_PERIOD_WEEK: $aggType = 1; break; + case IPSPC_PERIOD_MONTH: $aggType = 1; break; + case IPSPC_PERIOD_YEAR: $aggType = 3; break; + default: + trigger_error('Unknown Period '.GetValue($variableIdPeriod)); + } + + foreach ($this->valueConfig as $valueIdx=>$valueData) { + $valueType = $valueData[IPSPC_PROPERTY_VALUETYPE]; + if ($valueData[IPSPC_PROPERTY_DISPLAY]) { + $variableIdValueDisplay = IPS_GetVariableIDByName(IPSPC_VAR_SELECTVALUE.$valueIdx, $this->categoryIdCommon); + $variableIdValueKWH = @IPS_GetVariableIDByName(IPSPC_VAR_VALUEKWH.$valueIdx, $this->categoryIdValues); + $variableIdValueWatt = @IPS_GetVariableIDByName(IPSPC_VAR_VALUEWATT.$valueIdx, $this->categoryIdValues); + $variableIdValueM3 = @IPS_GetVariableIDByName(IPSPC_VAR_VALUEM3.$valueIdx, $this->categoryIdValues); + + $serie = array(); + $serie['type'] = 'column'; + $serie['ReplaceValues'] = false; + $serie['step'] = false; + $serie['shadow'] = true; + $serie['AggType'] = $aggType; + $serie['AggValue'] = 'Avg'; + $serie['yAxis'] = 0; + $serie['zIndex'] = 110; + $serie['step'] = false; + $serie['visible'] = true; + $serie['showInLegend'] = true; + $serie['allowDecimals'] = false; + $serie['enableMouseTracking'] = true; + $serie['states']['hover']['lineWidth'] = 2; + $serie['marker']['enabled'] = false; + $serie['marker']['states']['hover']['enabled'] = true; + $serie['marker']['states']['hover']['symbol'] = 'circle'; + $serie['marker']['states']['hover']['radius'] = 4; + $serie['marker']['states']['hover']['lineWidth'] = 1; + + switch ($chartType) { + case IPSPC_TYPE_OFF: + SetValue($variableIdChartHTML, ''); + return; + case IPSPC_TYPE_STACK: + case IPSPC_TYPE_STACK2: + $serie['Unit'] = "kWh"; + $serie['ScaleFactor'] = 1; + $serie['name'] = $valueData[IPSPC_PROPERTY_NAME]; + $serie['Id'] = $variableIdValueKWH; + if ($variableIdValueKWH!==false and $valueData[IPSPC_PROPERTY_VALUETYPE]==IPSPC_VALUETYPE_TOTAL and $chartType==IPSPC_TYPE_STACK2) { + $serie['zIndex'] = 100; + $serie['stack'] = 'Total'; + $CfgDaten['series'][] = $serie; + } elseif ($variableIdValueKWH!==false and $valueData[IPSPC_PROPERTY_VALUETYPE]==IPSPC_VALUETYPE_DETAIL) { + $serie['zIndex'] = 110; + $serie['stack'] = 'Detail'; + $CfgDaten['series'][] = $serie; + } else { + } + $CfgDaten['yAxis'][0]['title']['text'] = "Verbrauch"; + $CfgDaten['yAxis'][0]['stackLabels']['enabled'] = true; + $CfgDaten['yAxis'][0]['stackLabels']['formatter'] = "@function() { return this.total.toFixed(1) }@"; + $CfgDaten['yAxis'][0]['Unit'] = "kWh"; + $CfgDaten['plotOptions']['column']['stacking'] = "normal"; + $CfgDaten['plotOptions']['column']['borderColor'] = "#666666"; + $CfgDaten['plotOptions']['column']['borderWidth'] = 0; + $CfgDaten['plotOptions']['column']['shadow'] = true; + break; + case IPSPC_TYPE_PIE: + $serie['type'] = 'pie'; + if ($variableIdValueKWH!==false and $valueData[IPSPC_PROPERTY_VALUETYPE]==IPSPC_VALUETYPE_DETAIL) { + $data_array = AC_GetAggregatedValues($archiveHandlerId, $variableIdValueKWH, $aggType, $CfgDaten["StartTime"],$CfgDaten["EndTime"], 100); + $value=0; + for($i=0;$i
+ * + * Funktionen zum Bewegen der Beschattung + */ + + IPSUtils_Include ("IPSLogger.inc.php", "IPSLibrary::app::core::IPSLogger"); + IPSUtils_Include ("IPSInstaller.inc.php", "IPSLibrary::install::IPSInstaller"); + IPSUtils_Include ("IPSComponent.class.php", "IPSLibrary::app::core::IPSComponent"); + IPSUtils_Include ("IPSShadowing_Constants.inc.php", "IPSLibrary::app::modules::IPSShadowing"); + IPSUtils_Include ("IPSShadowing_Configuration.inc.php", "IPSLibrary::config::modules::IPSShadowing"); + IPSUtils_Include ("IPSShadowing_Custom.inc.php", "IPSLibrary::config::modules::IPSShadowing"); + IPSUtils_Include ("IPSShadowing_Logging.inc.php", "IPSLibrary::app::modules::IPSShadowing"); + + /** + * @class IPSShadowing_Device + * + * Definiert ein IPSShadowing_Device Objekt + * + * @author Andreas Brauneis + * @version + * Version 2.50.1, 01.04.2012
+ */ + class IPSShadowing_Device { + + /** + * @private + * ID des Shadowing Device + */ + private $deviceId; + + /** + * @public + * + * Initialisierung des IPSShadowing_Device Objektes + * + * @param integer $deviceId Instance ID + */ + public function __construct($deviceId) { + $this->deviceId = IPSUtil_ObjectIDByPath($deviceId); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + private function GetPropertyValue($propertyName) { + $deviceConfig = get_ShadowingConfiguration(); + $deviceName = IPS_GetName($this->deviceId); + + $propertyValue = $deviceConfig[$deviceName][$propertyName]; + return $propertyValue; + } + + // ---------------------------------------------------------------------------------------------------------------------------- + private function GetVariableValue($variableIdent) { + $variableId = IPS_GetObjectIDByIdent($variableIdent, $this->deviceId); + if ($variableId === false) { + throw new Exception('Variable '.$variableIdent.' could NOT be found for DeviceId='.$this->deviceId); + } + return GetValue($variableId); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + private function SetVariableValue($variableIdent, $value) { + $variableId = IPS_GetObjectIDByIdent($variableIdent, $this->deviceId); + if ($variableId === false) { + throw new Exception('Variable '.$variableIdent.' could NOT be found for DeviceId='.$this->deviceId); + } + SetValue($variableId, $value); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + private function SetStatus() { + if ($this->GetVariableValue(c_Control_StepsToDo)<>"") { + return; + } + + $Position = $this->GetVariableValue(c_Control_Position); + $MovementId = $this->GetVariableValue(c_Control_Movement); + if (!$this->GetVariableValue(c_Control_Automatic)) { + if ($MovementId<=c_MovementId_Space and $MovementId>=c_MovementId_Closed) { + $Status = 'Manuell'; + } elseif ($Position<=10) { + $Status = 'Manuell'; + } else { + $Status = "Manuell / $Position%"; + } + } elseif ($this->GetVariableValue(c_Control_ManualChange)) { + if ($MovementId<=c_MovementId_Space and $MovementId>=c_MovementId_Closed) { + $Status = 'Autom./Manuell'; + } elseif ($Position<=10) { + $Status = 'Autom./Manuell'; + } else { + $Status = "Autom./Manuell $Position%"; + } + } else { + $Status = 'Automatik'; + } + $this->SetVariableValue(c_Control_Display, $Status); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + public function MoveByCommand($command) { + $componentParams = $this->GetPropertyValue(c_Property_Component); + + if (IPSShadowing_BeforeActivateShutter($this->deviceId, $command)) { + $component = IPSComponent::CreateObjectByParams($componentParams); + switch ($command) { + case c_MovementId_Up: + case c_MovementId_MovingIn: + $component->MoveUp(); + break; + case c_MovementId_Down: + case c_MovementId_MovingOut: + $component->MoveDown(); + break; + case c_MovementId_Stop: + $component->Stop(); + break; + default: + } + IPSShadowing_AfterActivateShutter($this->deviceId, $command); + } + + if ($this->GetVariableValue(c_Control_Movement) <> $command) { + $this->SetVariableValue(c_Control_Movement, $command); + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + private function MoveByStatus() { + $this->CalcNextSteps(); + $this->SetVariableValue(c_Control_Movement, -1); + $this->ExecuteNextStep(); + $this->StartRefreshTimer(true); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + public function SyncStatus($status) { + if ($this->GetVariableValue(c_Control_StepsToDo)=="") { + IPSLogger_Inf(__file__, "Sync State=".$status." from Shutter '".IPS_GetName($this->deviceId)); + $this->SetVariableValue(c_Control_Movement, $status); + $this->SetVariableValue(c_Control_ManualChange, true); + } + $this->SetStatus(); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + public function MoveByEvent($Level) { + IPSLogger_Dbg(__file__, "Received StateChange from Shutter '".IPS_GetName($this->deviceId)."', NewLevel=".round($Level).", CurrentLevel=".$this->GetVariableValue(c_Control_Position)); + if ($this->GetVariableValue(c_Control_Position) <> $Level and + $this->GetVariableValue(c_Control_StepsToDo)=="") { + IPSLogger_Inf(__file__, "Apply StateChange from Shutter '".IPS_GetName($this->deviceId)."', Level=".round($Level)); + $shadowingType = $this->GetPropertyValue(c_Property_ShadowingType); + if ($Level <= 5) { + switch($shadowingType) { + case c_ShadowingType_Marquees: + $this->SetVariableValue(c_Control_Movement, c_MovementId_MovedIn); break; + default: + $this->SetVariableValue(c_Control_Movement, c_MovementId_Opened); break; + } + } else if ($Level >= 95) { + switch($shadowingType) { + case c_ShadowingType_Marquees: + $this->SetVariableValue(c_Control_Movement, c_MovementId_MovedOut); break; + case c_ShadowingType_Shutter: + $this->SetVariableValue(c_Control_Movement, c_MovementId_Closed); break; + default: + $this->SetVariableValue(c_Control_Movement, c_MovementId_Shadowing); break; + } + } else if ($Level > 45 and $Level < 55) { + switch($shadowingType) { + case c_ShadowingType_Marquees: + case c_ShadowingType_Shutter: + $this->SetVariableValue(c_Control_Movement, c_MovementId_50); break; + default: + $this->SetVariableValue(c_Control_Movement, c_MovementId_Stop); break; + } + } else if ($Level > 70 and $Level < 80) { + switch($shadowingType) { + case c_ShadowingType_Marquees: + case c_ShadowingType_Shutter: + $this->SetVariableValue(c_Control_Movement, c_MovementId_75); break; + default: + $this->SetVariableValue(c_Control_Movement, c_MovementId_Stop); break; + } + } else if ($Level > 85 and $Level < 95) { + switch($shadowingType) { + case c_ShadowingType_Shutter: + $this->SetVariableValue(c_Control_Movement, c_MovementId_90); break; + default: + $this->SetVariableValue(c_Control_Movement, c_MovementId_Stop); break; + } + } else { + $this->SetVariableValue(c_Control_Movement, c_MovementId_Stop); + } + $this->SetVariableValue(c_Control_Position, $Level); + if (!$this->GetVariableValue(c_Control_ManualChange) and + $this->GetVariableValue(c_Control_Automatic)) { + $this->SetVariableValue(c_Control_ManualChange, true); + } + $this->SetStatus(); + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + public function MoveByProgram($ProgramId, $logMessage, $DimoutOption=null, $TriggeredByTemp=false) { + $MovementStatus = $this->GetVariableValue(c_Control_Movement); + + $DoBeMoved = $MovementStatus; + switch ($ProgramId) { + case c_ProgramId_Manual: + break; + case c_ProgramId_Opened: + case c_ProgramId_OpenedDay: + case c_ProgramId_OpenedNight: + $DoBeMoved = c_MovementId_Opened; + break; + case c_ProgramId_MovedIn: + $DoBeMoved = c_MovementId_MovedIn; + break; + case c_ProgramId_OpenedOrShadowing: + if ($MovementStatus<>c_MovementId_Opened and $MovementStatus<>c_MovementId_Shadowing) {$DoBeMoved = c_MovementId_Shadowing;} + break; + case c_ProgramId_MovedOut: + case c_ProgramId_MovedOutTemp: + $DoBeMoved = c_MovementId_MovedOut; + break; + case c_ProgramId_Closed: + $DoBeMoved = c_MovementId_Closed; + break; + case c_ProgramId_90: + $DoBeMoved = c_MovementId_90; + break; + case c_ProgramId_75: + $DoBeMoved = c_MovementId_75; + break; + case c_ProgramId_50: + $DoBeMoved = c_MovementId_50; + break; + case c_ProgramId_25: + $DoBeMoved = c_MovementId_25; + break; + case c_ProgramId_Dimout: + $DoBeMoved = c_MovementId_Dimout; + break; + case c_ProgramId_DimoutOrShadowing: + if ($MovementStatus<>c_MovementId_Dimout and $MovementStatus<>c_MovementId_Shadowing) {$DoBeMoved = c_MovementId_Shadowing;} + break; + case c_ProgramId_DimoutAndShadowing: + if ($DimoutOption) { + $DoBeMoved = c_MovementId_Dimout; + } else { + $DoBeMoved = c_MovementId_Shadowing; + } + break; + case c_ProgramId_LastPosition: + $DoBeMoved = $this->GetVariableValue(c_Control_TempLastPos); + break; + default: + IPSLogger_Err(__file__, "Unknown ProgramId $ProgramId, DeviceId=".$this->DeviceId); + exit; + } + if ($DoBeMoved<>$MovementStatus) { + if ($TriggeredByTemp and !$this->GetVariableValue(c_Control_TempChange)) { + $this->SetVariableValue(c_Control_TempChange, true); + $this->SetVariableValue(c_Control_TempLastPos, $this->GetMovementIdByPosition()); + } + $this->SetVariableValue(c_Control_Movement, $DoBeMoved); + $this->MoveByStatus(); + IPSShadowing_LogMoveByProgram($this->deviceId, $ProgramId, $logMessage, $TriggeredByTemp); + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + private function GetMovementIdByPosition() { + $shadowingType = $this->GetPropertyValue(c_Property_ShadowingType); + $currentMovementId = $this->GetVariableValue(c_Control_Movement); + $currentPosition = $this->GetVariableValue(c_Control_Position); + + if ($currentMovementId<>c_MovementId_Stop) { + $lastPosition = $currentMovementId; + } elseif ($currentPosition<10) { + if ($shadowingType==c_ShadowingType_Marquees) { + $lastPosition = c_MovementId_MovedIn; + } else { + $lastPosition = c_MovementId_Opened; + } + } elseif ($currentPosition<30) { + $lastPosition = c_MovementId_25; + } elseif ($currentPosition<55) { + $lastPosition = c_MovementId_50; + } elseif ($currentPosition<80) { + $lastPosition = c_MovementId_75; + } elseif ($currentPosition<92) { + $lastPosition = c_MovementId_90; + } else { + if ($shadowingType==c_ShadowingType_Marquees) { + $lastPosition = c_MovementId_MovedOut; + } elseif ($shadowingType==c_ShadowingType_Shutter) { + $lastPosition = c_MovementId_Closed; + } else { + $lastPosition = c_MovementId_Shadowing; + } + } + return $lastPosition; + } + + // ---------------------------------------------------------------------------------------------------------------------------- + public function MoveByControl($Value) { + if ($Value==c_MovementId_Space) { + return; + } elseif ($this->GetVariableValue(c_Control_Movement)==$Value) { + return; + } else { + if (!$this->GetVariableValue(c_Control_ManualChange)) { + $this->SetVariableValue(c_Control_ManualChange, true); + } + $this->SetVariableValue(c_Control_Movement, $Value); + $this->MoveByStatus(); + IPSShadowing_LogMoveByControl($this->deviceId); + } + } + + + // ---------------------------------------------------------------------------------------------------------------------------- + private function AddNextStep(&$StepsToDo, $Command, $SecondsToDo, $Display, $SecondsTotal, $PercentagePosition) { + $Step = count($StepsToDo); + $StepsToDo[$Step] = $Command; + $StepsToDo[$Step+1] = $SecondsToDo; + $StepsToDo[$Step+2] = $Display; + $StepsToDo[$Step+3] = $SecondsTotal; + $StepsToDo[$Step+4] = $PercentagePosition; + } + + // ---------------------------------------------------------------------------------------------------------------------------- + private function CalcNextSteps() { + $DeviceName = IPS_GetIdent($this->deviceId); + $DeviceConfig = get_ShadowingConfiguration(); + + $Position = $this->GetVariableValue(c_Control_Position); + $ToBeMoved = $this->GetVariableValue(c_Control_Movement); + $StepsToDo = array(); + + if ($ToBeMoved==c_MovementId_Opened or $ToBeMoved==c_MovementId_Up) { + $SecTotal = $DeviceConfig[$DeviceName][c_Property_TimeOpening]; + $SecNullToPos = $SecTotal*$Position/100; + $SecPosTo100 = $SecTotal-$SecNullToPos; + $this->AddNextStep($StepsToDo, c_MovementId_Up, $SecTotal-$SecPosTo100, null, $SecTotal, $SecPosTo100); + $this->AddNextStep($StepsToDo, c_MovementId_Stop, $DeviceConfig[$DeviceName][c_Property_TimePause], 'Offen (Stop)', null, null); + $this->AddNextStep($StepsToDo, c_MovementId_Opened, 1, null, null , null); + + } elseif ($ToBeMoved==c_MovementId_MovedIn or $ToBeMoved==c_MovementId_MovingIn) { + $SecTotal = $DeviceConfig[$DeviceName][c_Property_TimeOpening]; + $SecNullToPos = $SecTotal*$Position/100; + $SecPosTo100 = $SecTotal-$SecNullToPos; + $this->AddNextStep($StepsToDo, c_MovementId_MovingIn, $SecTotal-$SecPosTo100, null, $SecTotal, $SecPosTo100); + $this->AddNextStep($StepsToDo, c_MovementId_Stop, $DeviceConfig[$DeviceName][c_Property_TimePause], 'Offen (Stop)', null, null); + $this->AddNextStep($StepsToDo, c_MovementId_MovedIn, 1, null, null , null); + + } elseif ($ToBeMoved==c_MovementId_Shadowing or $ToBeMoved==c_MovementId_Down or $ToBeMoved==c_MovementId_Dimout or $ToBeMoved==c_MovementId_Closed or $ToBeMoved==c_MovementId_MovingOut or $ToBeMoved==c_MovementId_MovedOut) { + $SecTotal = $DeviceConfig[$DeviceName][c_Property_TimeClosing]; + $SecNullToPos = $SecTotal*$Position/100; + if ($ToBeMoved==c_MovementId_Dimout) { + $this->AddNextStep($StepsToDo, c_MovementId_Down, $SecTotal-$SecNullToPos, null, $SecTotal, $SecNullToPos); + $this->AddNextStep($StepsToDo, c_MovementId_Stop, $DeviceConfig[$DeviceName][c_Property_TimePause], 'Abdunkelung (Pause)', null, null); + $this->AddNextStep($StepsToDo, c_MovementId_Up, $DeviceConfig[$DeviceName][c_Property_TimeDimoutUp], 'Abdunkelung (Hoch)', null, null); + $this->AddNextStep($StepsToDo, c_MovementId_Stop, $DeviceConfig[$DeviceName][c_Property_TimePause], 'Abdunkelung (Pause)', null, null); + $this->AddNextStep($StepsToDo, c_MovementId_Down, $DeviceConfig[$DeviceName][c_Property_TimeDimoutDown], 'Abdunkelung (Runter)', null, null); + $this->AddNextStep($StepsToDo, c_MovementId_Stop, $DeviceConfig[$DeviceName][c_Property_TimePause], 'Abdunkelung (Stop)', null, null); + $this->AddNextStep($StepsToDo, c_MovementId_Dimout, 1, null, null, null); + } elseif ($ToBeMoved==c_MovementId_Down) { + $this->AddNextStep($StepsToDo, c_MovementId_Down, $SecTotal-$SecNullToPos, null, $SecTotal, $SecNullToPos); + $this->AddNextStep($StepsToDo, c_MovementId_Stop, 1, null, null, null); + } elseif ($ToBeMoved==c_MovementId_MovedOut or $ToBeMoved==c_MovementId_MovingOut) { + $this->AddNextStep($StepsToDo, c_MovementId_MovingOut, $SecTotal-$SecNullToPos, null, $SecTotal, $SecNullToPos); + $this->AddNextStep($StepsToDo, c_MovementId_Stop, 1, null, null, null); + $this->AddNextStep($StepsToDo, c_MovementId_MovedOut, 1, null, null, null); + } elseif ($ToBeMoved==c_MovementId_Shadowing) { + $this->AddNextStep($StepsToDo, c_MovementId_Down, $SecTotal-$SecNullToPos, null, $SecTotal, $SecNullToPos); + $this->AddNextStep($StepsToDo, c_MovementId_Stop, 1, "$Position%", null, null); + $this->AddNextStep($StepsToDo, c_MovementId_Up, $DeviceConfig[$DeviceName][c_Property_TimeDimoutUp], 'Beschattung (Hoch)', null, null); + $this->AddNextStep($StepsToDo, c_MovementId_Stop, $DeviceConfig[$DeviceName][c_Property_TimePause], 'Beschattung (Stop)', null, null); + $this->AddNextStep($StepsToDo, c_MovementId_Shadowing, 1, null, null, null); + } else { + $this->AddNextStep($StepsToDo, c_MovementId_Down, $SecTotal-$SecNullToPos, null, $SecTotal, $SecNullToPos); + $this->AddNextStep($StepsToDo, c_MovementId_Stop, 1, "$Position%", null, null); + $this->AddNextStep($StepsToDo, c_MovementId_Closed, 1, null, null, null); + } + + } elseif ($ToBeMoved==c_MovementId_90 or$ToBeMoved==c_MovementId_75 or $ToBeMoved==c_MovementId_50 or $ToBeMoved==c_MovementId_25) { + $SecTotal = $DeviceConfig[$DeviceName][c_Property_TimeClosing]; + $ShadowingType = $DeviceConfig[$DeviceName][c_Property_ShadowingType]; + $SecNullToPos = $SecTotal*$Position/100; + $SecPosTo100 = $SecTotal-$SecNullToPos; + if ($ToBeMoved==c_MovementId_90) { + $SecNullToNew = $SecTotal*90/100; + $Position = 90; + } elseif ($ToBeMoved==c_MovementId_75) { + $SecNullToNew = $SecTotal*75/100; + $Position = 75; + } elseif ($ToBeMoved==c_MovementId_50) { + $SecNullToNew = $SecTotal*50/100; + $Position = 50; + } else { + $SecNullToNew = $SecTotal*25/100; + $Position = 25; + } + if ($SecNullToNew > $SecNullToPos) { + if ($ShadowingType==c_ShadowingType_Marquees) { + $this->AddNextStep($StepsToDo, c_MovementId_MovingOut, $SecNullToNew-$SecNullToPos, null, $SecTotal, $SecNullToPos); + } else { + $this->AddNextStep($StepsToDo, c_MovementId_Down, $SecNullToNew-$SecNullToPos, null, $SecTotal, $SecNullToPos); + } + } elseif ($SecNullToNew < $SecNullToPos) { + if ($ShadowingType==c_ShadowingType_Marquees) { + $this->AddNextStep($StepsToDo, c_MovementId_MovingIn, $SecNullToPos-$SecNullToNew, null, $SecTotal, $SecPosTo100); + } else { + $this->AddNextStep($StepsToDo, c_MovementId_Up, $SecNullToPos-$SecNullToNew, null, $SecTotal, $SecPosTo100); + } + } else { + } + $this->AddNextStep($StepsToDo, c_MovementId_Stop, 1, "$Position%", null, null); + $this->AddNextStep($StepsToDo, $ToBeMoved, 1, null, null, null); + + } elseif ($ToBeMoved==c_MovementId_Stop) { + $this->AddNextStep($StepsToDo, c_MovementId_Stop, 1, null, null, null); + + } else { + throw new Exception ("Unknown MovementId $ToBeMoved, DeviceId=".$this->deviceId); + exit; + } + + $this->SetVariableValue(c_Control_StepsToDo, implode('|', $StepsToDo)); + $this->SetVariableValue(c_Control_Step, -5); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + private function ExecuteNextStep() { + $DeviceName = IPS_GetIdent($this->deviceId); + $Step = $this->GetVariableValue(c_Control_Step)+5; + $NextStepsToDo = $this->GetVariableValue(c_Control_StepsToDo); + $NextStepsToDo = Explode('|', $NextStepsToDo); + + if ($Step < count($NextStepsToDo)) { + $Command = $NextStepsToDo[$Step]; + $Time = $NextStepsToDo[$Step+1]; + IPSLogger_Trc(__file__, "Shadowing for Device '$DeviceName', Step $Step, Command=$Command, Time=$Time"); + $this->MoveByCommand($Command); + + $this->SetVariableValue(c_Control_Step, $Step); + $this->SetVariableValue(c_Control_StartTime, time()); + } else { + IPSLogger_Dbg(__file__, "Finished all Steps for Device '$DeviceName'"); + $this->SetVariableValue(c_Control_Step, -1); + $this->SetVariableValue(c_Control_StepsToDo, ""); + $this->SetVariableValue(c_Control_StartTime, -1); + $this->StartRefreshTimer(false); + $this->SetStatus(); + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + public function Refresh() { + $NextStepsToDo = Explode('|', $this->GetVariableValue(c_Control_StepsToDo)); + $StepCount = count($NextStepsToDo); + $Step = $this->GetVariableValue(c_Control_Step); + if ($StepCount >= ($Step+4) and $Step>=0) { + $StartTime = $this->GetVariableValue(c_Control_StartTime); + $SecsDone = time()-$StartTime; + $SecsToDo = $NextStepsToDo[$Step+1]; + $Display = $NextStepsToDo[$Step+2]; + $SecsTotal = $NextStepsToDo[$Step+3]; + $SecStepBegin = $NextStepsToDo[$Step+4]; + $Command = $NextStepsToDo[$Step]; + + if ($SecsTotal <> null) { + // SecTotal ... 100% + // Begin+Done ... x% + $Position = round(($SecStepBegin+$SecsDone)*100/$SecsTotal); + if ($Command==c_MovementId_Up or $Command==c_MovementId_MovingIn) { + $Position = 100-$Position; + } + if ($Position>100) {$Position=100;} + if ($Position<0) {$Position=0;} + $this->SetVariableValue(c_Control_Position, $Position); + $SecsOpen = $SecsToDo-$SecsDone; + if ($SecsOpen < 0) {$SecsOpen=0;} + $Display = "$Position% ($SecsOpen Sek)"; + } + + if ($Display!=null) { + $this->SetVariableValue(c_Control_Display, $Display); + } + + if ($SecsDone >= $SecsToDo) { + $this->ExecuteNextStep(); + } + return true; + } else { + return false; + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + private function StartRefreshTimer($Value) { + if ($Value) { + $Name = 'Refresh'; + $refreshTimerScriptId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSShadowing.IPSShadowing_RefreshTimer'); + + $TimerId = @IPS_GetEventIDByName($Name, $refreshTimerScriptId); + if ($TimerId === false) { + $TimerId = IPS_CreateEvent(1 /*Cyclic Event*/); + IPS_SetName($TimerId, $Name); + IPS_SetParent($TimerId, $refreshTimerScriptId); + if (!IPS_SetEventCyclic($TimerId, 2 /*Daily*/, 1 /*Int*/,0 /*Days*/,0 /*DayInt*/,1 /*TimeType Sec*/,1 /*Sec*/)) { + throw new Exception ("IPS_SetEventCyclic failed for Refresh Timer!!!"); + } + } + IPS_SetEventActive($TimerId, true); + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + public function ChangeSetting($controlId, $value) { + if (GetValue($controlId)<>$value) { + if (IPS_GetIdent($controlId)==c_Control_Automatic) { + if (GetValue(IPS_GetObjectIDByIdent(c_Control_TempChange, $this->deviceId))) { + SetValue(IPS_GetObjectIDByIdent(c_Control_TempChange, $this->deviceId), false); + } + } else { + } + if (GetValue(IPS_GetObjectIDByIdent(c_Control_ManualChange, $this->deviceId))) { + SetValue(IPS_GetObjectIDByIdent(c_Control_ManualChange, $this->deviceId), false); + } + SetValue($controlId, $value); + IPSShadowing_LogChange($this->deviceId, $value, $controlId); + $this->SetStatus(); + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + public function CheckPrograms($profileManager) { + $deviceName = IPS_GetIdent($this->deviceId); + $profileIdTemp = GetValue(IPS_GetObjectIDByIdent(c_Control_ProfileTemp, $this->deviceId)); + $profileIdSun = GetValue(IPS_GetObjectIDByIdent(c_Control_ProfileSun, $this->deviceId)); + $profileIdBgnOfDay = GetValue(IPS_GetObjectIDByIdent(c_Control_ProfileBgnOfDay, $this->deviceId)); + $profileIdEndOfDay = GetValue(IPS_GetObjectIDByIdent(c_Control_ProfileEndOfDay, $this->deviceId)); + $profileIdWeather = null; + $programPresent = GetValue(IPS_GetObjectIDByIdent(c_Control_ProgramPresent, $this->deviceId)); + $programTemp = GetValue(IPS_GetObjectIDByIdent(c_Control_ProgramTemp, $this->deviceId)); + $programDay = GetValue(IPS_GetObjectIDByIdent(c_Control_ProgramDay, $this->deviceId)); + $programNight = GetValue(IPS_GetObjectIDByIdent(c_Control_ProgramNight, $this->deviceId)); + $programWeather = null; + $automaticActive = GetValue(IPS_GetObjectIDByIdent(c_Control_Automatic, $this->deviceId)); + $tempIndoorPath = $this->GetPropertyValue(c_Property_TempSensorIndoor); + + $controlId = @IPS_GetObjectIDByIdent(c_Control_ProfileWeather, $this->deviceId); + if ($controlId!==false) { + $profileIdWeather = GetValue($controlId); + $programWeather = GetValue(IPS_GetObjectIDByIdent(c_Control_ProgramWeather, $this->deviceId)); + } + + $isDay = $profileManager->IsDay($profileIdBgnOfDay, $profileIdEndOfDay); + $isDayNightChange = $profileManager->IsDayNightChange($profileIdBgnOfDay, $profileIdEndOfDay); + $closeByTemp = $profileManager->CloseByTemp($profileIdSun, $profileIdTemp, $tempIndoorPath); + $shadowingByTemp = $profileManager->ShadowingByTemp($profileIdSun, $profileIdTemp, $tempIndoorPath); + $openByTemp = $profileManager->OpenByTemp($profileIdSun, $profileIdTemp, $tempIndoorPath); + $activationByWeather = $profileManager->ActivationByWeather($profileIdWeather); + $programInfo = ''; + + + // Reset Manual Change Flag + if ($isDayNightChange) { + if (GetValue(IPS_GetObjectIDByIdent(c_Control_ManualChange, $this->deviceId))) { + IPSLogger_Dbg(__file__, "Reset ManualChange Flag for Device '$deviceName'"); + SetValue(IPS_GetObjectIDByIdent(c_Control_ManualChange, $this->deviceId), false); + } + if (GetValue(IPS_GetObjectIDByIdent(c_Control_TempChange, $this->deviceId))) { + IPSLogger_Dbg(__file__, "Reset TempChange Flag for Device '$deviceName'"); + SetValue(IPS_GetObjectIDByIdent(c_Control_TempChange, $this->deviceId), false); + } + } + + $changeByTemp = GetValue(IPS_GetObjectIDByIdent(c_Control_TempChange, $this->deviceId)); + $changeByUser = GetValue(IPS_GetObjectIDByIdent(c_Control_ManualChange, $this->deviceId)); + + $func_reflection = new ReflectionFunction('IPSShadowing_ProgramCustom'); + $paramCountCustom = $func_reflection->getNumberOfParameters(); + + // Check all Programs + // -------------------------------------------------------------------------------- + // Automatic Off ... + if (!$automaticActive) { + $programInfo = 'Automatic Off'; + + // Activation by Wind/Rain + } elseif ($activationByWeather and $programWeather<>c_ProgramId_Manual) { + $programInfo = 'Wetterprogramm'; + $this->MoveByProgram($programWeather, 'Wetterprogramm'); + + // Custom + } elseif ( ($paramCountCustom == 3 and IPSShadowing_ProgramCustom($this->deviceId, $isDay, $programInfo)) + or ($paramCountCustom == 2 and IPSShadowing_ProgramCustom($this->deviceId, $isDay))) { + if ($programInfo=='') {$programInfo = 'CustomProgram';} + // Action done in Custom Procedure + + // Manual Change ... + } elseif ($changeByUser) { + $programInfo = 'Manuelle Änderung'; + + // Present ... + } elseif ($profileManager->GetPresent() and $programPresent==c_ProgramId_OpenedDay and $isDay) { + $programInfo = 'Anwesenheit (Tag)'; + $this->MoveByProgram($programPresent, 'Anwesenheitsprogramm'); + } elseif ($profileManager->GetPresent() and $programPresent==c_ProgramId_OpenedNight and !$isDay) { + $programInfo = 'Anwesenheit (Nacht)'; + $this->MoveByProgram($programPresent, 'Anwesenheitsprogramm'); + } elseif ($profileManager->GetPresent() and $programPresent==c_ProgramId_Opened) { + $programInfo = 'Anwesenheit'; + $this->MoveByProgram($programPresent, 'Anwesenheitsprogramm'); + } elseif ($profileManager->GetPresent() and $programPresent==c_ProgramId_MovedOutTemp and $isDay and $closeByTemp) { + $programInfo = 'Anwesenheit (Temperatur)'; + $this->MoveByProgram($programPresent, 'Anwesenheitsprogramm (Beschattung bei Temp und Anwesenheit)'); + + // Temperature/Sun + } elseif ($isDay and ($closeByTemp or $shadowingByTemp) and $programTemp<>c_ProgramId_Manual) { + if ($closeByTemp) { + $programInfo = 'Temperatur'; + $this->MoveByProgram($programTemp, 'Temperaturprogramm', true/*DimoutOption*/, true/*TriggeredByTemp*/); + } elseif ($changeByTemp) { + $programInfo = 'Temperatur (Warte Öffnen)'; + } elseif ($shadowingByTemp) { + $programInfo = 'Temperatur (Beschattung)'; + $this->MoveByProgram($programTemp, 'Temperaturprogramm (Beschattung)', false/*DimoutOption*/, true/*TriggeredByTemp*/); + } else { + $programInfo = 'Temperatur (Error)'; + } + + // Day + } elseif ($isDay) { + if (!$openByTemp and $changeByTemp) { + $programInfo = 'Tag (Warte Öffnen)'; + } elseif ($openByTemp and $changeByTemp) { + SetValue(IPS_GetObjectIDByIdent(c_Control_TempChange, $this->deviceId), false); + if ($programDay<>c_ProgramId_Manual) { + $programInfo = 'Temperatur Reset (Tag)'; + $this->MoveByProgram($programDay, 'Temperatur Reset (Tag)'); + } else { + $programInfo = 'Temperatur Reset (LastPosition)'; + $this->MoveByProgram(c_ProgramId_LastPosition, 'Temperatur Reset (LastPosition)'); + } + } else { + $programInfo = 'Tagesprogramm'; + $this->MoveByProgram($programDay, 'Tagesprogramm'); + } + + // Night + } else { + $programInfo = 'Nachtprogramm'; + $this->MoveByProgram($programNight, '"Nachtprogramm"'); + } + $profileInfo = $profileManager->GetProfileInfo($profileIdBgnOfDay, $profileIdEndOfDay, $profileIdTemp, $tempIndoorPath); + $deviceName = IPSShadowing_GetDeviceName($this->deviceId); + echo "$deviceName -> $programInfo, $profileInfo \n"; + SetValue(IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $this->deviceId), $programInfo.', '.$profileInfo); + } + } + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_Logging.inc.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_Logging.inc.php new file mode 100644 index 0000000..0cd4341 --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_Logging.inc.php @@ -0,0 +1,201 @@ + + * + * Application Logging von IPSShadowing + */ + + // ---------------------------------------------------------------------------------------------------------------------------- + function IPSShadowing_GetMessageByMovement($deviceId) { + $ToBeMoved = GetValue(IPS_GetObjectIDByIdent(c_Control_Movement, $deviceId)); + + if ($ToBeMoved==c_MovementId_Opened) { + $Message = "Öffnen"; + } elseif ($ToBeMoved==c_MovementId_Dimout) { + $Message = "Abdunkelung"; + } elseif ($ToBeMoved==c_MovementId_Closed) { + $Message = "Geschlossen"; + } elseif ($ToBeMoved==c_MovementId_25) { + $Message = "25%"; + } elseif ($ToBeMoved==c_MovementId_50) { + $Message = "50%"; + } elseif ($ToBeMoved==c_MovementId_75) { + $Message = "75%"; + } elseif ($ToBeMoved==c_MovementId_90) { + $Message = "90%"; + } elseif ($ToBeMoved==c_MovementId_Shadowing) { + $Message = "Beschattung"; + } elseif ($ToBeMoved==c_MovementId_Up) { + $Message = "Öffnen"; + } elseif ($ToBeMoved==c_MovementId_Down) { + $Message = "Schliessen"; + } elseif ($ToBeMoved==c_MovementId_MovingOut) { + $Message = "Ausfahren"; + } elseif ($ToBeMoved==c_MovementId_MovingIn) { + $Message = "Einfahren"; + } elseif ($ToBeMoved==c_MovementId_MovedOut) { + $Message = "Ausfahrt"; + } elseif ($ToBeMoved==c_MovementId_MovedIn) { + $Message = "Einfahrt"; + } else { + $Message = "Stop"; + } + return $Message; + } + + // ---------------------------------------------------------------------------------------------------------------------------- + function IPSShadowing_GetProgramName($ProgramId) { + $ProgramList = array( + c_ProgramId_Manual => c_Program_Manual, + c_ProgramId_Opened => c_Program_Opened, + c_ProgramId_MovedIn => c_Program_MovedIn, + c_ProgramId_OpenedOrShadowing => c_Program_OpenedOrShadowing, + c_ProgramId_OpenedAndShadowing => c_Program_OpenedAndShadowing, + c_ProgramId_OpenedDay => c_Program_OpenedDay, + c_ProgramId_OpenedNight => c_Program_OpenedNight, + c_ProgramId_Closed => c_Program_Closed, + c_ProgramId_90 => c_Program_90, + c_ProgramId_75 => c_Program_75, + c_ProgramId_50 => c_Program_50, + c_ProgramId_25 => c_Program_25, + c_ProgramId_MovedOut => c_Program_MovedOut, + c_ProgramId_MovedOutTemp => c_Program_MovedOutTemp, + c_ProgramId_Dimout => c_Program_Dimout, + c_ProgramId_DimoutOrShadowing => c_Program_DimoutOrShadowing, + c_ProgramId_DimoutAndShadowing => c_Program_DimoutAndShadowing, + c_ProgramId_LastPosition => c_Program_LastPosition + ); + + return $ProgramList[$ProgramId]; + } + + // ---------------------------------------------------------------------------------------------------------------------------- + function IPSShadowing_GetDeviceName($deviceId) { + $deviceConfig = get_ShadowingConfiguration(); + $deviceIdent = IPS_GetIdent($deviceId); + $deviceName = $deviceConfig[$deviceIdent]['Name']; + return $deviceName; + } + + // ---------------------------------------------------------------------------------------------------------------------------- + function IPSShadowing_LogMoveByControl($DeviceId) { + $DeviceName = IPSShadowing_GetDeviceName($DeviceId); + $Message = IPSShadowing_GetMessageByMovement($DeviceId)." von '$DeviceName' (Manuelle Steuerung)"; + IPSLogger_Inf(__file__, $Message); + IPSShadowing_Log($Message); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + function IPSShadowing_LogMoveByProgram($DeviceId, $ProgramId, $LogMessage, $TriggeredByTemp) { + $Message = IPSShadowing_GetMessageByMovement($DeviceId); + $DeviceName = IPSShadowing_GetDeviceName($DeviceId); + $ProgramName = IPSShadowing_GetProgramName($ProgramId); + + $Message .= " von '$DeviceName' durch $LogMessage, Programm='$ProgramName'"; + if ($TriggeredByTemp) { + $Priority = GetValue(IPSShadowing_GetSettingControlId(c_Control_MsgPrioTemp, $DeviceId)); + } else { + $Priority = GetValue(IPSShadowing_GetSettingControlId(c_Control_MsgPrioProg, $DeviceId)); + } + + IPSShadowing_Log($Message); + IPSLogger_Not(__file__, $Message, $Priority); + } + + function IPSShadowing_LogActivateScenario($scenarioId) { + $scenarioName = IPS_GetName($scenarioId); + IPSLogger_Inf(__file__,'Activation of Scenario "'.$scenarioName.'"'); + IPSShadowing_Log('Aktivierung von Szenario "'.$scenarioName.'"'); + } + + + // ---------------------------------------------------------------------------------------------------------------------------- + function IPSShadowing_LogChange($DeviceId, $Value, $ControlId) { + $ObjectType = IPS_GetName(IPS_GetParent($DeviceId)); + $ObjectName = IPS_GetName($DeviceId); + $ControlType = IPS_GetIdent($ControlId); + if ($Value===true) { + $Value = 'Ein'; + } elseif ($Value===false) { + $Value = 'Aus'; + } else { + } + switch($ObjectType) { + case 'Temp': + IPSLogger_Inf(__file__,"Configuration Change for $ObjectType=$ObjectName: $ControlType=$Value"); + IPSShadowing_Log("Änderung von Temperatur Profil '$ObjectName', '$ControlType'=$Value"); + break; + case 'Sun': + IPSLogger_Inf(__file__,"Configuration Change for $ObjectType=$ObjectName: $ControlType=$Value"); + IPSShadowing_Log("Änderung von Sonnenstand Profil '$ObjectName', '$ControlType'=$Value"); + break; + case 'Weather': + IPSLogger_Inf(__file__,"Configuration Change for $ObjectType=$ObjectName: $ControlType=$Value"); + IPSShadowing_Log("Änderung von Wetter Profil '$ObjectName', '$ControlType'=$Value"); + break; + case 'BgnOfDay': + IPSLogger_Inf(__file__,"Configuration Change for $ObjectType=$ObjectName: $ControlType=$Value"); + IPSShadowing_Log("Änderung von Tagesbeginn Profil '$ObjectName', '$ControlType'=$Value"); + break; + case 'EndOfDay': + IPSLogger_Inf(__file__,"Configuration Change for $ObjectType=$ObjectName: $ControlType=$Value"); + IPSShadowing_Log("Änderung von Tagesende Profil '$ObjectName', '$ControlType'=$Value"); + break; + case 'Scenarios': + IPSLogger_Inf(__file__,"Configuration Change for $ObjectType=$ObjectName: $ControlType=$Value"); + IPSShadowing_Log("Änderung von Szenario '$ObjectName', '$ControlType'=$Value"); + break; + case 'Devices': + $deviceName = IPSShadowing_GetDeviceName($DeviceId); + IPSLogger_Inf(__file__,"Configuration Change for $ObjectType=$ObjectName: $ControlType=$Value"); + IPSShadowing_Log("Änderung von Beschattungs Element '$deviceName', '$ControlType'=$Value"); + break; + default: + IPSLogger_Inf(__file__,"Configuration Change for '$ObjectName': $ControlType=$Value"); + IPSShadowing_Log("Änderung von '$ControlType' auf $Value von '$ObjectName'"); + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + function IPSShadowing_Log($Msg) { + $logMessages = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Log.LogMessages'); + $logId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Log.LogId'); + + IPSLogger_OutProgram($Msg, $logMessages, $logId, IPSSHADOWING_LOGMESSAGECOUNT, 12); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + function IPSShadowing_GetSettingControlId($ControlName) { + $categoryIdSettings = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Settings'); + $VariableId = IPS_GetVariableIDByName($ControlName, $categoryIdSettings); + if ($VariableId === false) { + throw new Exception ("Control '$ControlName' could NOT be found in Settings"); + } + + return $VariableId; + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileBgnOfDayCreate.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileBgnOfDayCreate.ips.php new file mode 100644 index 0000000..8352568 --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileBgnOfDayCreate.ips.php @@ -0,0 +1,36 @@ + + * + * Erzeugen eines "BgnOfDay" Profiles + */ + + include_once "IPSShadowing.inc.php"; + + $profileManager = new IPSShadowing_ProfileManager(); + $profileManager->CreateBgnOfDay('Neues Profil'); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileBgnOfDayDelete.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileBgnOfDayDelete.ips.php new file mode 100644 index 0000000..2e8c352 --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileBgnOfDayDelete.ips.php @@ -0,0 +1,37 @@ + + * + * Löschen eines "BgnOfDay" Profiles + */ + + include_once "IPSShadowing.inc.php"; + + $profileManager = new IPSShadowing_ProfileManager(); + $profileManager->DeleteBgnOfDay(); + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileEndOfDayCreate.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileEndOfDayCreate.ips.php new file mode 100644 index 0000000..d61d0ec --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileEndOfDayCreate.ips.php @@ -0,0 +1,37 @@ + + * + * Erzeugen eines "EndOfDay" Profiles + */ + + include_once "IPSShadowing.inc.php"; + + $profileManager = new IPSShadowing_ProfileManager(); + $profileManager->CreateEndOfDay('Neues Profil'); + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileEndOfDayDelete.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileEndOfDayDelete.ips.php new file mode 100644 index 0000000..f56289c --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileEndOfDayDelete.ips.php @@ -0,0 +1,37 @@ + + * + * Löschen eines "EndOfDay" Profiles + */ + + include_once "IPSShadowing.inc.php"; + + $profileManager = new IPSShadowing_ProfileManager(); + $profileManager->DeleteEndOfDay(); + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileManager.class.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileManager.class.php new file mode 100644 index 0000000..e754a7a --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileManager.class.php @@ -0,0 +1,406 @@ + + */ + class IPSShadowing_ProfileManager { + + private $instanceId; + private $profilesTemp; + private $profilesSun; + private $profilesWeather; + private $profilesBgnOfDay; + private $profilesEndOfDay; + private $profileIDsTemp; + private $profileIDsSun; + private $profileIDsWeather; + private $profileIDsBgnOfDay; + private $profileIDsEndOfDay; + private $present; + + /** + * @public + * + * Initialisierung des IPSShadowing_ProfileManager Objektes + * + */ + public function __construct() { + $this->instanceId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.ProfileManager'); + $this->Init(); + $this->present = null; + if (IPSSHADOWING_PRESENT <> '') { + $this->present = GetValue(IPSUtil_ObjectIDByPath(IPSSHADOWING_PRESENT)); + } + if (IPSSHADOWING_ABSENCE <> '') { + $this->present = !GetValue(IPSUtil_ObjectIDByPath(IPSSHADOWING_ABSENCE)); + } + } + + public function UpdateProfileInfos() { + foreach ($this->profilesTemp as $profile) { + $profile->UpdateProfileInfo(); + } + foreach ($this->profilesSun as $profile) { + $profile->UpdateProfileInfo(); + } + foreach ($this->profilesWeather as $profile) { + $profile->UpdateProfileInfo(); + } + foreach ($this->profilesBgnOfDay as $profile) { + $profile->UpdateProfileInfo(); + } + foreach ($this->profilesEndOfDay as $profile) { + $profile->UpdateProfileInfo(); + } + } + + public function GetProfileInfo($profileIdBgnOfDay, $profileIdEndOfDay, $profileIdTemp, $tempIndoorPath='') { + $profileBgnOfDay = $this->GetProfileBgnOfDay($profileIdBgnOfDay); + $profileEndOfDay = $this->GetProfileEndOfDay($profileIdEndOfDay); + $profileBgnOfDayInfo = date('H:i', $profileBgnOfDay->GetTime()); + $profileEndOfDayInfo = date('H:i', $profileEndOfDay->GetTime()); + $profileTemp = $this->GetProfileTemp($profileIdTemp); + $profileTempInfo = $profileTemp->GetProfileInfo($tempIndoorPath); + + $info = 'Tag='.$profileBgnOfDayInfo.'-'.$profileEndOfDayInfo.', '.$profileTempInfo; + return $info; + } + + public function AssignAllProfileAssociations() { + foreach ($this->profileIDsTemp as $profileId) { + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileTemp', $profileId, IPS_GetName($profileId), '', -1); + } + foreach ($this->profileIDsSun as $profileId) { + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileSun', $profileId, IPS_GetName($profileId), '', -1); + } + foreach ($this->profileIDsWeather as $profileId) { + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileWeather', $profileId, IPS_GetName($profileId), '', -1); + } + foreach ($this->profileIDsBgnOfDay as $profileId) { + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileBgnOfDay', $profileId, IPS_GetName($profileId), '', -1); + } + foreach ($this->profileIDsEndOfDay as $profileId) { + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileEndOfDay', $profileId, IPS_GetName($profileId), '', -1); + } + } + + public function CorrectDeletedDeviceProfile($controlName, $idList, $profileList) { + $categoryIdDevices = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Devices'); + $deviceIds = IPS_GetChildrenIDs($categoryIdDevices); + foreach ($deviceIds as $deviceIdx=>$deviceId) { + $controlId = @IPS_GetObjectIDByIdent($controlName, $deviceId); + if ($controlId!==false) { + $profileId = GetValue($controlId); + if (!array_key_exists($profileId, $profileList)) { + SetValue($controlId, $idList[0]); + IPSShadowing_LogChange($deviceId, $idList[0], $controlId); + } + } + } + } + + public function CorrectDeletedDeviceProfiles() { + $this->CorrectDeletedDeviceProfile(c_Control_ProfileBgnOfDay, $this->profileIDsBgnOfDay, $this->profilesBgnOfDay); + $this->CorrectDeletedDeviceProfile(c_Control_ProfileEndOfDay, $this->profileIDsEndOfDay, $this->profilesEndOfDay); + $this->CorrectDeletedDeviceProfile(c_Control_ProfileTemp, $this->profileIDsTemp, $this->profilesTemp); + $this->CorrectDeletedDeviceProfile(c_Control_ProfileSun, $this->profileIDsSun, $this->profilesSun); + $this->CorrectDeletedDeviceProfile(c_Control_ProfileWeather, $this->profileIDsWeather, $this->profilesWeather); + } + + private function Init() { + $categoryId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Profiles.Temp'); + $this->profileIDsTemp = IPS_GetChildrenIds($categoryId); + foreach ($this->profileIDsTemp as $profileId) { + $this->profilesTemp[$profileId] = new IPSShadowing_ProfileTemp($profileId); + } + + $categoryId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Profiles.Sun'); + $this->profileIDsSun = IPS_GetChildrenIds($categoryId); + foreach ($this->profileIDsSun as $profileId) { + $this->profilesSun[$profileId] = new IPSShadowing_ProfileSun($profileId); + } + + $categoryId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Profiles.Weather'); + $this->profileIDsWeather = IPS_GetChildrenIds($categoryId); + foreach ($this->profileIDsWeather as $profileId) { + $this->profilesWeather[$profileId] = new IPSShadowing_ProfileWeather($profileId); + } + + $categoryId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Profiles.BgnOfDay'); + $this->profileIDsBgnOfDay = IPS_GetChildrenIds($categoryId); + foreach ($this->profileIDsBgnOfDay as $profileId) { + $this->profilesBgnOfDay[$profileId] = new IPSShadowing_ProfileTime($profileId); + } + + $categoryId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Profiles.EndOfDay'); + $this->profileIDsEndOfDay = IPS_GetChildrenIds($categoryId); + foreach ($this->profileIDsEndOfDay as $profileId) { + $this->profilesEndOfDay[$profileId] = new IPSShadowing_ProfileTime($profileId); + } + } + + public function GetProfileTemp($profileId) { + return $this->profilesTemp[$profileId]; + } + + public function GetProfileSun($profileId) { + return $this->profilesSun[$profileId]; + } + + public function GetProfileWeather($profileId) { + return $this->profilesWeather[$profileId]; + } + + public function GetProfileBgnOfDay($profileId) { + return $this->profilesBgnOfDay[$profileId]; + } + + public function GetProfileEndOfDay($profileId) { + return $this->profilesEndOfDay[$profileId]; + } + + public function ShadowingByTemp($profileIdSun, $profileIdTemp, $tempIndoorPath='') { + $profileTemp = $this->profilesTemp[$profileIdTemp]; + $profileSun = $this->profilesSun[$profileIdSun]; + return ($profileTemp->ShadowingByTemp($tempIndoorPath) and $profileSun->ActivationBySun()); + } + + public function CloseByTemp($profileIdSun, $profileIdTemp, $tempIndoorPath='') { + $profileTemp = $this->profilesTemp[$profileIdTemp]; + $profileSun = $this->profilesSun[$profileIdSun]; + return ($profileTemp->CloseByTemp($tempIndoorPath) and $profileSun->ActivationBySun()); + } + + public function OpenByTemp($profileIdSun, $profileIdTemp, $tempIndoorPath='') { + $profileTemp = $this->profilesTemp[$profileIdTemp]; + $profileSun = $this->profilesSun[$profileIdSun]; + return ($profileTemp->OpenByTemp($tempIndoorPath)); + } + + public function ActivationByWeather($profileIdWeather) { + if ($profileIdWeather==null) { + return; + } + $profileWeather = $this->profilesWeather[$profileIdWeather]; + return $profileWeather->ActivationByWeather(); + } + + public function IsDay($profileIdBgnOfDay, $profileIdEndOfDay) { + $profileBgnOfDay = $this->profilesBgnOfDay[$profileIdBgnOfDay]; + $profileEndOfDay = $this->profilesEndOfDay[$profileIdEndOfDay]; + return (time() >= $profileBgnOfDay->GetTime() and time() < $profileEndOfDay->GetTime()); + } + + public function IsNight($profileIdBgnOfDay, $profileIdEndOfDay) { + return !$this->IsDay($profileIdBgnOfDay, $profileIdEndOfDay); + } + + public function IsDayNightChange($profileIdBgnOfDay, $profileIdEndOfDay) { + $profileBgnOfDay = $this->profilesBgnOfDay[$profileIdBgnOfDay]; + $profileEndOfDay = $this->profilesEndOfDay[$profileIdEndOfDay]; + $timeCurrent = time(); + $timeLast = time()-300; + + // Examples + // BgnOfDay=07:00, timeCurrent=06:55, timeLast=06:50 ==> FALSE + // BgnOfDay=07:00, timeCurrent=07:00, timeLast=06:55 ==> TRUE + // BgnOfDay=07:00, timeCurrent=07:05, timeLast=07:00 ==> FALSE + return (($timeCurrent >= $profileBgnOfDay->GetTime() and $timeLast < $profileBgnOfDay->GetTime()) or + ($timeCurrent >= $profileEndOfDay->GetTime() and $timeLast < $profileEndOfDay->GetTime())); + } + + public function GetPresent() { + return $this->present; + } + + public function SelectTemp($profileId) { + $displayId = IPS_GetObjectIDByIdent('DisplayTemp', $this->instanceId); + $profile = new IPSShadowing_ProfileTemp($profileId); + $profile->Display($displayId); + SetValue(IPS_GetObjectIDByIdent(c_Control_ProfileTempSelect, $this->instanceId), $profileId); + } + + public function SelectSun($profileId) { + $displayId = IPS_GetObjectIDByIdent('DisplaySun', $this->instanceId); + $profile = new IPSShadowing_ProfileSun($profileId); + $profile->Display($displayId); + SetValue(IPS_GetObjectIDByIdent(c_Control_ProfileSunSelect, $this->instanceId), $profileId); + } + + public function SelectWeather($profileId) { + $displayId = IPS_GetObjectIDByIdent('DisplayWeather', $this->instanceId); + $profile = new IPSShadowing_ProfileWeather($profileId); + $profile->Display($displayId); + SetValue(IPS_GetObjectIDByIdent(c_Control_ProfileWeatherSelect, $this->instanceId), $profileId); + } + + public function SelectBgnOfDay($profileId) { + $displayId = IPS_GetObjectIDByIdent('DisplayBgnOfDay', $this->instanceId); + $profile = new IPSShadowing_ProfileTime($profileId); + $profile->Display($displayId); + SetValue(IPS_GetObjectIDByIdent(c_Control_ProfileBgnOfDaySelect, $this->instanceId), $profileId); + } + + public function SelectEndOfDay($profileId) { + $displayId = IPS_GetObjectIDByIdent('DisplayEndOfDay', $this->instanceId); + $profile = new IPSShadowing_ProfileTime($profileId); + $profile->Display($displayId); + SetValue(IPS_GetObjectIDByIdent(c_Control_ProfileEndOfDaySelect, $this->instanceId), $profileId); + } + + public function CreateTemp($profileName='Neues Profile') { + $profileId = IPSShadowing_ProfileTemp::Create($profileName); + $this->SelectTemp($profileId); + } + public function CreateSun($profileName='Neues Profile', $anzimutBgn=120, $anzimutEnd=240, $elevation=25) { + $profileId = IPSShadowing_ProfileSun::Create($profileName, $anzimutBgn, $anzimutEnd, $elevation); + $this->SelectSun($profileId); + } + public function CreateWeather($profileName='Neues Profile', $rainCheck=true, $windLevel=40) { + $profileId = IPSShadowing_ProfileWeather::Create($profileName, $rainCheck, $windLevel); + $this->SelectWeather($profileId); + } + public function CreateBgnOfDay($name='Neues Profil', $workdayMode=c_ModeId_Individual, $workdayTime='07:00', $workdayOffset=0, $weekendMode=c_ModeId_Individual, $weekendTime='08:00', $weekendOffset=0) { + $profileId = IPSShadowing_ProfileTime::Create($name, 'BgnOfDay', $workdayMode, $workdayTime, $workdayOffset, $weekendMode, $weekendTime, $weekendOffset); + $this->SelectBgnOfDay($profileId); + } + public function CreateEndOfDay($name='Neues Profil', $workdayMode=c_ModeId_Individual, $workdayTime='20:00', $workdayOffset=0, $weekendMode=c_ModeId_Individual, $weekendTime='21:00', $weekendOffset=0) { + $profileId = IPSShadowing_ProfileTime::Create($name, 'EndOfDay', $workdayMode, $workdayTime, $workdayOffset, $weekendMode, $weekendTime, $weekendOffset); + $this->SelectEndOfDay($profileId); + } + + public function DeleteTemp() { + if (count($this->profilesTemp)==1) { + return; + } + $controlId = IPS_GetObjectIDByIdent(c_Control_ProfileTempSelect, $this->instanceId); + $profileId = GetValue($controlId); + $profile = new IPSShadowing_ProfileTemp($profileId); + $profile->Delete(); + $this->Init(); + $this->CorrectDeletedDeviceProfiles(); + $this->SelectTemp($this->profileIDsTemp[0]); + } + + public function DeleteSun() { + if (count($this->profilesSun)==1) { + return; + } + $controlId = IPS_GetObjectIDByIdent(c_Control_ProfileSunSelect, $this->instanceId); + $profileId = GetValue($controlId); + $profile = new IPSShadowing_ProfileSun($profileId); + $profile->Delete(); + $this->Init(); + $this->CorrectDeletedDeviceProfiles(); + $this->SelectSun($this->profileIDsSun[0]); + } + + public function DeleteWeather() { + if (count($this->profilesWeather)==1) { + return; + } + $controlId = IPS_GetObjectIDByIdent(c_Control_ProfileWeatherSelect, $this->instanceId); + $profileId = GetValue($controlId); + $profile = new IPSShadowing_ProfileWeather($profileId); + $profile->Delete(); + $this->Init(); + $this->CorrectDeletedDeviceProfiles(); + $this->SelectWeather($this->profileIDsWeather[0]); + } + + public function DeleteBgnOfDay() { + if (count( $this->profilesBgnOfDay)==1) { + return; + } + $controlId = IPS_GetObjectIDByIdent(c_Control_ProfileBgnOfDaySelect, $this->instanceId); + $profileId = GetValue($controlId); + $profile = new IPSShadowing_ProfileTime($profileId); + $profile->Delete(); + $this->Init(); + $this->CorrectDeletedDeviceProfiles(); + $this->SelectBgnOfDay($this->profileIDsBgnOfDay[0]); + } + + public function DeleteEndOfDay() { + if (count($this->profilesEndOfDay)==1) { + return; + } + $controlId = IPS_GetObjectIDByIdent(c_Control_ProfileEndOfDaySelect, $this->instanceId); + $profileId = GetValue($controlId); + $profile = new IPSShadowing_ProfileTime($profileId); + $profile->Delete(); + $this->Init(); + $this->CorrectDeletedDeviceProfiles(); + $this->SelectEndOfDay($this->profileIDsEndOfDay[0]); + } + + private function GetProfileByControlId($controlId) { + $profileId = IPS_GetParent($controlId); + $profileType = IPS_GetIdent(IPS_GetParent($profileId)); + switch ($profileType) { + case 'Temp'; + $profile = $this->GetProfileTemp($profileId); + break; + case 'Sun'; + $profile = $this->GetProfileSun($profileId); + break; + case 'Weather'; + $profile = $this->GetProfileWeather($profileId); + break; + case 'BgnOfDay'; + $profile = $this->GetProfileBgnOfDay($profileId); + break; + case 'EndOfDay'; + $profile = $this->GetProfileEndOfDay($profileId); + break; + default: + throw new Exception('Unknown Profile Type '.$profileType); + } + return $profile; + } + + public function Rename($controlId, $newName) { + $profile = $this->GetProfileByControlId($controlId); + $profile->Rename($newName); + } + + public function SetValue($controlId, $value) { + $profile = $this->GetProfileByControlId($controlId); + $profile->SetValue($controlId, $value); + } + + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileSun.class.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileSun.class.php new file mode 100644 index 0000000..6e93994 --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileSun.class.php @@ -0,0 +1,250 @@ + + */ + class IPSShadowing_ProfileSun { + + /** + * @private + * ID des Sonnenstand Profiles + */ + private $instanceId; + + /** + * @private + */ + private $azimuth; + + /** + * @private + */ + private $activationBySun; + + /** + * @private + */ + private $elevation; + + /** + * @public + * + * Initialisierung des IPSShadowing_ProfileSun Objektes + * + * @param integer $instanceId InstanceId Profiles + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->Init(); + } + + /** + * @private + * + * Initialisierung der internen Variablen + * + */ + private function Init() { + $data = Get_AnzimuatAndElevation(time(), IPSSHADOWING_LONGITUDE, IPSSHADOWING_LATITUDE); + $this->azimuth = $data['Azimuth']; + $this->elevation = $data['Elevation']; + + $azimuthBgn = GetValue(IPS_GetObjectIDByIdent(c_Control_AzimuthBgn, $this->instanceId)); + $azimuthEnd = GetValue(IPS_GetObjectIDByIdent(c_Control_AzimuthEnd, $this->instanceId)); + $elevationLevel = GetValue(IPS_GetObjectIDByIdent(c_Control_Elevation, $this->instanceId)); + + $activationBySun = true; + $activationBySun = ($activationBySun and $this->elevation>=$elevationLevel); + $activationBySun = ($activationBySun and $this->azimuth>=$azimuthBgn); + $activationBySun = ($activationBySun and $this->azimuth<=$azimuthEnd); + + $this->activationBySun = $activationBySun; + } + + public function UpdateProfileInfo() { + $info=''.($this->activationBySun?'Profil aktiv':'Profil inaktiv').' (Azimuth='.round($this->azimuth).', Elevation='.round($this->elevation).')'; + if (GetValue(IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $this->instanceId)) <> $info or true) { + SetValue(IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $this->instanceId), $info); + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileSun', + $this->instanceId, + GetValue(IPS_GetObjectIDByIdent(c_Control_ProfileName, $this->instanceId)), + '', + ($this->activationBySun?c_Color_ProfileActive:-1)); + } + } + + public function GetProfileInfo() { + $info = ''; + return $info; + } + + public function ActivationBySun() { + return $this->activationBySun; + } + + /** + * @public + * + * Neues Profile generieren + * + * @param string $profileName Name des Profiles + * @param integer $azimuthBgn Startwert Sonnenstand + * @param integer $azimuthEnd Endwert Sonnendstand + * @param integer $elevation Sonnenstand (Höhe) + */ + public static function Create($profileName, $azimuthBgn=0, $azimuthEnd=360, $elevation=30) { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + + $ScriptIdChangeSettings = IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSShadowing.IPSShadowing_ChangeSettings'); + $categoryIdprofiles = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Profiles.Sun'); + $profileIdx = count(IPS_GetChildrenIds($categoryIdprofiles)) + 10; + $profileId = CreateCategory ($profileName, $categoryIdprofiles, $profileIdx); + IPS_SetIdent($profileId, (string)$profileId); + CreateVariable(c_Control_ProfileName, 3 /*String*/, $profileId, 0, '~String', $ScriptIdChangeSettings, $profileName, 'Title'); + CreateVariable(c_Control_AzimuthBgn, 1 /*Integer*/, $profileId, 10, 'IPSShadowing_AzimuthBgn', $ScriptIdChangeSettings, $azimuthBgn, 'HollowLargeArrowLeft'); + CreateVariable(c_Control_AzimuthEnd, 1 /*Integer*/, $profileId, 20, 'IPSShadowing_AzimuthEnd', $ScriptIdChangeSettings, $azimuthEnd, 'HollowLargeArrowRight'); + CreateVariable(c_Control_Elevation, 1 /*Integer*/, $profileId, 30, 'IPSShadowing_Elevation', $ScriptIdChangeSettings, $elevation, 'HollowLargeArrowUp'); + CreateVariable(c_Control_Date, 1 /*Integer*/, $profileId, 40, 'IPSShadowing_Date', $ScriptIdChangeSettings, 1, 'Calendar'); + CreateVariable(c_Control_Simulation, 0 /*Boolean*/, $profileId, 50, '~Switch', $ScriptIdChangeSettings, false, 'Repeat'); + CreateVariable(c_Control_Orientation, 0 /*Boolean*/, $profileId, 60, '~Switch', $ScriptIdChangeSettings, false, 'WindDirection'); + CreateVariable(c_Control_ProfileInfo, 3 /*String*/, $profileId, 70, '~String', null, '', 'Information'); + + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileSun', $profileId, $profileName, "", -1); + + return $profileId; + } + + /** + * @public + * + * Visualisierung des Profiles in einer übergebenen Kategorie + * + * @param integer $categoryId ID der Kategory in der die Visualisierungs Links abgelegt werden sollen + */ + public function Display($categoryId) { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + CreateLink('Profil Name', IPS_GetObjectIDByIdent(c_Control_ProfileName, $this->instanceId), $categoryId, 10); + $instanceId = CreateDummyInstance("Sonnenstand", $categoryId, 20); + CreateLink('Azimuth Start', IPS_GetObjectIDByIdent(c_Control_AzimuthBgn, $this->instanceId), $instanceId, 10); + CreateLink('Azimuth Ende', IPS_GetObjectIDByIdent(c_Control_AzimuthEnd, $this->instanceId), $instanceId, 20); + CreateLink('Elevation', IPS_GetObjectIDByIdent(c_Control_Elevation, $this->instanceId), $instanceId, 30); + $instanceId = CreateDummyInstance("Visualisierung", $categoryId, 30); + CreateLink('Monat', IPS_GetObjectIDByIdent(c_Control_Date, $this->instanceId), $instanceId, 10); + CreateLink('Simulation', IPS_GetObjectIDByIdent(c_Control_Simulation, $this->instanceId), $instanceId, 20); + CreateLink('Ausrichtung Süden', IPS_GetObjectIDByIdent(c_Control_Orientation, $this->instanceId), $instanceId, 30); + CreateLink('Profil Info', IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $this->instanceId), $categoryId, 40); + + $this->GenerateGraphic(); + } + + /** + * @public + * + * Profile löschen + * + */ + public function Delete() { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileSun', $this->instanceId, '', '', -1); + DeleteCategory($this->instanceId); + } + + /** + * @public + * + * Profile umbenennen + * + * @param string $newName Neuer Name des Profiles + */ + public function Rename($newName) { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileSun', $this->instanceId, $newName, '', -1); + IPS_SetName($this->instanceId, $newName); + SetValue(IPS_GetObjectIDByIdent(c_Control_ProfileName, $this->instanceId), $newName); + } + + /** + * @public + * + * Profil verändern + * + * @param integer $controlId ID der Variable die verändert werden soll + * @param integer $value neuer Wert + */ + public function SetValue($controlId, $value) { + if (GetValue($controlId)<>$value) { + SetValue($controlId, $value); + IPSShadowing_LogChange($this->instanceId, $value, $controlId); + $controlIdent = IPS_GetIdent($controlId); + if ($controlIdent==c_Control_Date) { + $this->GenerateGraphic(mktime(12, 0, 0, $value, date('d'), date("Y"))); + } elseif ($controlIdent==c_Control_Orientation) { + $this->GenerateGraphic(mktime(12, 0, 0, GetValue(IPS_GetObjectIDByIdent(c_Control_Date, $this->instanceId)), date('d'), date("Y"))); + } elseif ($controlIdent==c_Control_Simulation) { + for ($month=1;$month<=12;$month++) { + $this->GenerateGraphic(mktime(12, 0, 0, $month, date('d'), date("Y"))); + SetValue(IPS_GetObjectIDByIdent(c_Control_Date, $this->instanceId), $month); + usleep(500000); + } + $this->GenerateGraphic(); + SetValue(IPS_GetObjectIDByIdent(c_Control_Date, $this->instanceId), date('n')); + SetValue($controlId, false); + } else { + SetValue(IPS_GetObjectIDByIdent(c_Control_Date, $this->instanceId), date('n')); + $this->GenerateGraphic(); + $this->Init(); + $this->UpdateProfileInfo(); + } + } + } + + /** + * @private + * + * Grafik generieren + */ + private function GenerateGraphic ($date=null) { + if ($date==null) { + $date = time(); + } + IPSShadowing_GenerateSunGraphic($date, + GetValue(IPS_GetObjectIDByIdent(c_Control_AzimuthBgn, $this->instanceId)), + GetValue(IPS_GetObjectIDByIdent(c_Control_AzimuthEnd, $this->instanceId)), + GetValue(IPS_GetObjectIDByIdent(c_Control_Elevation, $this->instanceId)), + GetValue(IPS_GetObjectIDByIdent(c_Control_Orientation,$this->instanceId))); + } + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileSunCreate.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileSunCreate.ips.php new file mode 100644 index 0000000..ca96e6d --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileSunCreate.ips.php @@ -0,0 +1,36 @@ + + * + * Erzeugen eines Temperatur Profiles + */ + + include_once "IPSShadowing.inc.php"; + + $profileManager = new IPSShadowing_ProfileManager(); + $profileManager->CreateSun('Neues Profil'); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileSunDelete.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileSunDelete.ips.php new file mode 100644 index 0000000..6a3f5f0 --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileSunDelete.ips.php @@ -0,0 +1,37 @@ + + * + * Löschen eines "Temperatur" Profiles + */ + + include_once "IPSShadowing.inc.php"; + + $profileManager = new IPSShadowing_ProfileManager(); + $profileManager->DeleteSun(); + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileTemp.class.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileTemp.class.php new file mode 100644 index 0000000..4936498 --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileTemp.class.php @@ -0,0 +1,296 @@ + + */ + class IPSShadowing_ProfileTemp { + + /** + * @private + * ID des Zeit Profiles + */ + private $instanceId; + + /** + * @private + * Aktivierung durch Helligkeit aktiv + */ + private $activationByBrigthness; + private $brightnessLevel; + private $brightnessValue; + private $tempOutdoor; + private $tempIndoor; + private $tempLevelOutShadow; + private $tempLevelOutClose; + private $tempLevelOutOpen; + private $tempLevelInShadow; + private $tempLevelInClose; + private $tempLevelInOpen; + + /** + * @public + * + * Initialisierung des IPSShadowing_ProfileTime Objektes + * + * @param integer $instanceId InstanceId Profiles + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->Init(); + } + + /** + * @private + * + * Initialisierung der internen Variablen + * + */ + private function Init() { + $this->brightnessLevel = GetValue(IPS_GetObjectIDByIdent(c_Control_Brightness, $this->instanceId)); + $this->brightnessValue = null; + $this->tempLevelOutShadow = GetValue(IPS_GetObjectIDByIdent(c_Control_TempLevelOutShadow, $this->instanceId)); + $this->tempLevelOutClose = GetValue(IPS_GetObjectIDByIdent(c_Control_TempLevelOutClose, $this->instanceId)); + $this->tempLevelOutOpen = GetValue(IPS_GetObjectIDByIdent(c_Control_TempLevelOutOpen, $this->instanceId)); + $this->tempLevelInShadow = GetValue(IPS_GetObjectIDByIdent(c_Control_TempLevelInShadow, $this->instanceId)); + $this->tempLevelInClose = GetValue(IPS_GetObjectIDByIdent(c_Control_TempLevelInClose, $this->instanceId)); + $this->tempLevelInOpen = GetValue(IPS_GetObjectIDByIdent(c_Control_TempLevelInOpen, $this->instanceId)); + $this->tempIndoor = null; + $this->tempOutdoor = null; + $this->activationByBrigthness = true; + if (IPSSHADOWING_TEMPSENSORINDOOR <> '') { + $this->tempIndoor = round(GetValue(IPSUtil_ObjectIDByPath(IPSSHADOWING_TEMPSENSORINDOOR)),1); + } + if (IPSSHADOWING_TEMPSENSOROUTDOOR <> '') { + $this->tempOutdoor = round(GetValue(IPSUtil_ObjectIDByPath(IPSSHADOWING_TEMPSENSOROUTDOOR)),1); + } + if (IPSSHADOWING_BRIGHTNESSSENSOR <> '') { + $this->brightnessValue = round(GetValue(IPSUtil_ObjectIDByPath(IPSSHADOWING_BRIGHTNESSSENSOR)),1); + $this->activationByBrigthness = ($this->brightnessValue>=$this->brightnessLevel); + } + } + + public function UpdateProfileInfo() { + $tempIndoor = (IPSSHADOWING_TEMPSENSORINDOOR<>'' ? $this->tempIndoor.'°C' :'"nicht vorhanden"'); + $tempOutdoor = (IPSSHADOWING_TEMPSENSOROUTDOOR<>''? $this->tempOutdoor.'°C' :'"nicht vorhanden"'); + $brightness = (IPSSHADOWING_BRIGHTNESSSENSOR<>'' ? $this->brightnessValue.' Lux':'"nicht vorhanden"'); + $activationByTemp = $this->CloseByTemp(''); + $info = ''.($activationByTemp?'Profil aktiv':'Profil inaktiv').' (Innen='.$tempIndoor.', Aussen='.$tempOutdoor.', Helligkeit='.$brightness.')'; + if (GetValue(IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $this->instanceId)) <> $info) { + SetValue(IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $this->instanceId), $info); + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileTemp', + $this->instanceId, + GetValue(IPS_GetObjectIDByIdent(c_Control_ProfileName, $this->instanceId)), + '', + ($activationByTemp?c_Color_ProfileActive:-1)); + } + } + + public function GetProfileInfo($tempIndoorPath) { + $info = ''; + if ($tempIndoorPath <> '') { + $info .= ' Innen='.round(GetValue(IPSUtil_ObjectIDByPath($tempIndoorPath)),1).'°C'; + } elseif (IPSSHADOWING_TEMPSENSORINDOOR <> '') { + $info .= ' Innen='.$this->tempIndoor.'°C'; + } + if (IPSSHADOWING_TEMPSENSOROUTDOOR <> '') { + if ($info<>'') { $info.=', ';} + $info .= ' Aussen='.$this->tempOutdoor.'°C'; + } + return $info; + } + + private function GetActivationByIndoorTemp($tempIndoorPath, $tempLevel, $reverse=false) { + $activationByTemp = true; + if ($tempLevel<>c_TempLevel_Ignore) { + if (IPSSHADOWING_TEMPSENSORINDOOR<>'' or $tempIndoorPath<>'') { + $tempIndoor = $this->tempIndoor; + if ($tempIndoorPath <> '') { + $tempIndoor = round(GetValue(IPSUtil_ObjectIDByPath($tempIndoorPath)),1); + } + if ($reverse) { + $activationByTemp = ($tempIndoor <= $tempLevel); + } else { + $activationByTemp = ($tempIndoor >= $tempLevel); + } + } + } + return $activationByTemp; + } + + private function GetActivationByOutdoorTemp($tempLevel, $reverse=false) { + $activationByTemp = true; + if ($tempLevel<>c_TempLevel_Ignore) { + if (IPSSHADOWING_TEMPSENSOROUTDOOR) { + if ($reverse) { + $activationByTemp = ($this->tempOutdoor <= $tempLevel); + } else { + $activationByTemp = ($this->tempOutdoor >= $tempLevel); + } + } + } + return $activationByTemp; + } + + public function ShadowingByTemp($tempIndoorPath) { + if ($this->tempLevelOutShadow==c_TempLevel_Ignore and $this->tempLevelInShadow==c_TempLevel_Ignore) { + return false; + } else { + return ($this->activationByBrigthness and + $this->GetActivationByOutdoorTemp($this->tempLevelOutShadow) and + $this->GetActivationByIndoorTemp($tempIndoorPath, $this->tempLevelInShadow)); + } + } + + public function CloseByTemp($tempIndoorPath) { + return ($this->activationByBrigthness and + $this->GetActivationByOutdoorTemp($this->tempLevelOutClose) and + $this->GetActivationByIndoorTemp($tempIndoorPath, $this->tempLevelInClose)); + } + + public function OpenByTemp($tempIndoorPath) { + return ($this->GetActivationByOutdoorTemp($this->tempLevelOutOpen, true) and + $this->GetActivationByIndoorTemp($tempIndoorPath, $this->tempLevelInOpen, true)); + } + + /** + * @public + * + * Neues Profile generieren + * + * @param string $profileName Name des Profiles + * @param integer $tempLevelOutShadow Temperatur Grenze Aussen für Beschattung + * @param integer $tempLevelInShadow Temperatur Grenze Innen für Beschattung + * @param integer $tempLevelOutClose Temperatur Grenze Aussen für Abdunkelung + * @param integer $tempLevelInClose Temperatur Grenze Innen für Abdunkelung + * @param integer $tempLevelOutOpen Temperatur Grenze Aussen für Öffnen + * @param integer $tempLevelInOpen Temperatur Grenze Innen für Öffnen + * @param integer $brightness Helligkeit + */ + public static function Create($profileName, $tempLevelOutShadow=c_TempLevel_Ignore, $tempLevelOutClose=c_TempLevel_Ignore, + $tempLevelOutOpen=c_TempLevel_Ignore, $tempLevelInShadow=c_TempLevel_Ignore, $tempLevelInClose=c_TempLevel_Ignore, + $tempLevelInOpen=c_TempLevel_Ignore, $brightness=0) { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + + $ScriptIdChangeSettings = IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSShadowing.IPSShadowing_ChangeSettings'); + $categoryIdprofiles = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Profiles.Temp'); + $profileIdx = count(IPS_GetChildrenIds($categoryIdprofiles)) + 10; + $profileId = CreateCategory ($profileName, $categoryIdprofiles, $profileIdx); + IPS_SetIdent($profileId, (string)$profileId); + CreateVariable(c_Control_ProfileName, 3 /*String*/, $profileId, 0, '~String', $ScriptIdChangeSettings, $profileName, 'Title'); + CreateVariable(c_Control_TempLevelOutShadow, 1 /*Integer*/, $profileId, 10, 'IPSShadowing_TempLevelOutShadow', $ScriptIdChangeSettings, $tempLevelOutShadow, 'Temperature'); + CreateVariable(c_Control_TempLevelInShadow, 1 /*Integer*/, $profileId, 20, 'IPSShadowing_TempLevelInShadow', $ScriptIdChangeSettings, $tempLevelInShadow, 'Temperature'); + CreateVariable(c_Control_TempLevelOutClose, 1 /*Integer*/, $profileId, 30, 'IPSShadowing_TempLevelOutClose', $ScriptIdChangeSettings, $tempLevelOutClose, 'Temperature'); + CreateVariable(c_Control_TempLevelInClose, 1 /*Integer*/, $profileId, 40, 'IPSShadowing_TempLevelInClose', $ScriptIdChangeSettings, $tempLevelInClose, 'Temperature'); + CreateVariable(c_Control_TempLevelOutOpen, 1 /*Integer*/, $profileId, 50, 'IPSShadowing_TempLevelOutOpen', $ScriptIdChangeSettings, $tempLevelOutOpen, 'Temperature'); + CreateVariable(c_Control_TempLevelInOpen, 1 /*Integer*/, $profileId, 60, 'IPSShadowing_TempLevelInOpen', $ScriptIdChangeSettings, $tempLevelInOpen, 'Temperature'); + CreateVariable(c_Control_Brightness, 1 /*Integer*/, $profileId, 70, 'IPSShadowing_Brightness', $ScriptIdChangeSettings, $brightness, 'Sun'); + CreateVariable(c_Control_ProfileInfo, 3 /*String*/, $profileId, 80, '~String', null, '', 'Information'); + + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileTemp', $profileId, $profileName, "", -1); + + return $profileId; + } + + /** + * @public + * + * Visualisierung des Profiles in einer übergebenen Kategorie + * + * @param integer $categoryId ID der Kategory in der die Visualisierungs Links abgelegt werden sollen + */ + public function Display($categoryId) { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + CreateLink('Profil Name', IPS_GetObjectIDByIdent(c_Control_ProfileName, $this->instanceId), $categoryId, 10); + $instanceId = CreateDummyInstance("Temperatur Grenzen", $categoryId, 20); + CreateLink('Beschattung Aussen', IPS_GetObjectIDByIdent(c_Control_TempLevelOutShadow, $this->instanceId), $instanceId, 10); + CreateLink('Beschattung Innen', IPS_GetObjectIDByIdent(c_Control_TempLevelInShadow, $this->instanceId), $instanceId, 20); + CreateLink('Schliessen Aussen', IPS_GetObjectIDByIdent(c_Control_TempLevelOutClose, $this->instanceId), $instanceId, 30); + CreateLink('Schliessen Innen', IPS_GetObjectIDByIdent(c_Control_TempLevelInClose, $this->instanceId), $instanceId, 40); + CreateLink('Öffnen Aussen', IPS_GetObjectIDByIdent(c_Control_TempLevelOutOpen, $this->instanceId), $instanceId, 50); + CreateLink('Öffnen Innen', IPS_GetObjectIDByIdent(c_Control_TempLevelInOpen, $this->instanceId), $instanceId, 60); + $id = @IPS_GetObjectIdByName("Hellingkeits Grenze", $categoryId); + if ($id!==false) { + EmptyCategory($id); + IPS_DeleteInstance($id); + } + $instanceId = CreateDummyInstance("Helligkeits Grenze", $categoryId, 30); + CreateLink('Helligkeit', IPS_GetObjectIDByIdent(c_Control_Brightness, $this->instanceId), $instanceId, 10); + CreateLink('Profil Info', IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $this->instanceId), $categoryId, 40); + } + + /** + * @public + * + * Profile löschen + * + */ + public function Delete() { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileTemp', $this->instanceId, '', '', -1); + DeleteCategory($this->instanceId); + } + + /** + * @public + * + * Profile umbenennen + * + * @param string $newName Neuer Name des Profiles + */ + public function Rename($newName) { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileTemp', $this->instanceId, $newName, '', -1); + IPS_SetName($this->instanceId, $newName); + SetValue(IPS_GetObjectIDByIdent(c_Control_ProfileName, $this->instanceId), $newName); + } + + /** + * @public + * + * Profil verändern + * + * @param integer $controlId ID der Variable die verändert werden soll + * @param integer $value neuer Wert + */ + public function SetValue($controlId, $value) { + SetValue($controlId, $value); + IPSShadowing_LogChange($this->instanceId, $value, $controlId); + $this->Init(); + $this->UpdateProfileInfo(); + } + + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileTempCreate.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileTempCreate.ips.php new file mode 100644 index 0000000..fac2bcd --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileTempCreate.ips.php @@ -0,0 +1,36 @@ + + * + * Erzeugen eines "Sonnenstand" Profiles + */ + + include_once "IPSShadowing.inc.php"; + + $profileManager = new IPSShadowing_ProfileManager(); + $profileManager->CreateTemp('Neues Profil'); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileTempDelete.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileTempDelete.ips.php new file mode 100644 index 0000000..60d8aab --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileTempDelete.ips.php @@ -0,0 +1,37 @@ + + * + * Löschen eines "Sonnenstand" Profiles + */ + + include_once "IPSShadowing.inc.php"; + + $profileManager = new IPSShadowing_ProfileManager(); + $profileManager->DeleteTemp(); + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileTime.class.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileTime.class.php new file mode 100644 index 0000000..5324003 --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileTime.class.php @@ -0,0 +1,278 @@ + + */ + class IPSShadowing_ProfileTime { + + /** + * @private + * ID des Zeit Profiles + */ + private $instanceId; + + /** + * @private + * Type of Profile (BgnOfDay or EndOfDay) + */ + private $profileType; + + /** + * @private + * current Time of Profile + */ + private $time; + + /** + * @public + * + * Initialisierung des IPSShadowing_ProfileTime Objektes + * + * @param integer $instanceId InstanceId Profiles + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->profileType = IPS_GetName(IPS_GetParent($this->instanceId)); + $this->CalculateTime(); + } + + private function GetTimeByParams($mode, $time, $offset) { + switch ($mode) { + case c_ModeId_Individual: + break; + case c_ModeId_Twillight: + if ($this->profileType=='BgnOfDay') { + $time = GetValue(IPSUtil_ObjectIDByPath(IPSSHADOWING_TWILIGHTSUNRISE)); + } else { + $time = GetValue(IPSUtil_ObjectIDByPath(IPSSHADOWING_TWILIGHTSUNSET)); + } + break; + case c_ModeId_LimitedTwillight: + if ($this->profileType=='BgnOfDay') { + $time = GetValue(IPSUtil_ObjectIDByPath(IPSSHADOWING_TWILIGHTSUNRISELIMITED)); + } else { + $time = GetValue(IPSUtil_ObjectIDByPath(IPSSHADOWING_TWILIGHTSUNSETLIMITED)); + } + break; + default: + throw new Exception('Unknown Mode '.$mode.' for Profile '.$this->instanceId); + } + $time = mktime(substr($time,0,2), substr($time,3,2), 0); + $time = strtotime("$offset minutes", $time); + return $time; + } + + private function CalculateTime() { + $timeWorkday = $this->GetTimeByParams( + GetValue(IPS_GetObjectIDByIdent(c_Control_WorkdayMode, $this->instanceId)), + GetValue(IPS_GetObjectIDByIdent(c_Control_WorkdayTime, $this->instanceId)), + GetValue(IPS_GetObjectIDByIdent(c_Control_WorkdayOffset, $this->instanceId))); + $timeWeekend = $this->GetTimeByParams( + GetValue(IPS_GetObjectIDByIdent(c_Control_WeekendMode, $this->instanceId)), + GetValue(IPS_GetObjectIDByIdent(c_Control_WeekendTime, $this->instanceId)), + GetValue(IPS_GetObjectIDByIdent(c_Control_WeekendOffset, $this->instanceId))); + + $timeStringWorkday = date('H:i', $timeWorkday); + if ($timeStringWorkday<>GetValue(IPS_GetObjectIDByIdent(c_Control_WorkdayTime, $this->instanceId)) + and GetValue(IPS_GetObjectIDByIdent(c_Control_WorkdayMode, $this->instanceId))<>c_ModeId_Individual) { + SetValue(IPS_GetObjectIDByIdent(c_Control_WorkdayTime, $this->instanceId), $timeStringWorkday); + } + $timeStringWeekend = date('H:i', $timeWeekend); + if ($timeStringWeekend<>GetValue(IPS_GetObjectIDByIdent(c_Control_WeekendTime, $this->instanceId)) + and GetValue(IPS_GetObjectIDByIdent(c_Control_WeekendMode, $this->instanceId))<>c_ModeId_Individual) { + SetValue(IPS_GetObjectIDByIdent(c_Control_WeekendTime, $this->instanceId), $timeStringWeekend); + } + + + $isWorkingDay = IPSShadowing_IsWorkingDay(); + if ($isWorkingDay===null) { + $dayOfWeek = date("w"); + $isWorkingDay = ($dayOfWeek >= 1 and $dayOfWeek <= 5); + } + if ($isWorkingDay) { + $this->time = $timeWorkday; + } else { + $this->time = $timeWeekend; + } + } + + public function UpdateProfileInfo() { + $info = 'Zeit='.date('H:i', $this->time); + if (GetValue(IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $this->instanceId)) <> $info) { + SetValue(IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $this->instanceId), $info); + } + } + + + /** + * @public + * + * Liefert die aktuelle Zeit des Zeit Profiles + * + * @return float Zeitpunkt des eingestellten Profiles + */ + public function GetTime() { + return $this->time; + } + + /** + * @public + * + * Neues Profile generieren + * + * @param string $profileName Name des Profiles + * @param string $profileType Type des Profiles (BgnOfDay or EndOfDay) + * @param integer $workdayMode Zeitmodus für Werktage + * @param string $workdayTime Zeitpunkt für Werktage + * @param integer $workdayOffset Offset in Minuten für Werktage + * @param integer $weekendMode Zeitmodus für Wochenende + * @param string $weekendTime Zeitpunkt für Wochenende + * @param integer $weekendOffset Offset in Minuten für Wochenende + */ + public static function Create($profileName, $profileType='BgnOfDay', $workdayMode=c_ModeId_Individual, $workdayTime='07:00', $workdayOffset=0, $weekendMode=c_ModeId_Individual, $weekendTime='08:00', $weekendOffset=0) { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + + $ScriptIdChangeSettings = IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSShadowing.IPSShadowing_ChangeSettings'); + $categoryIdprofiles = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Profiles.'.$profileType); + $profileIdx = count(IPS_GetChildrenIds($categoryIdprofiles)) + 10; + + $profileId = CreateCategory ($profileName, $categoryIdprofiles, $profileIdx); + IPS_SetIdent($profileId, (string)$profileId); + + CreateVariable(c_Control_ProfileName, 3 /*String*/, $profileId, 0, '~String', $ScriptIdChangeSettings, $profileName, 'Title'); + CreateVariable(c_Control_WorkdayMode, 1 /*Integer*/, $profileId, 10, 'IPSShadowing_TimeMode', $ScriptIdChangeSettings, $workdayMode, 'Gear'); + CreateVariable(c_Control_WorkdayTime, 3 /*String*/, $profileId, 20, '~String', ($workdayMode==c_ModeId_Individual?$ScriptIdChangeSettings:null), $workdayTime, 'Clock'); + CreateVariable(c_Control_WorkdayOffset, 1 /*Integer*/, $profileId, 30, 'IPSShadowing_TimeOffset', ($workdayMode==c_ModeId_Individual?null:$ScriptIdChangeSettings), $workdayOffset, 'Distance'); + CreateVariable(c_Control_WeekendMode, 1 /*Integer*/, $profileId, 40, 'IPSShadowing_TimeMode', $ScriptIdChangeSettings, $weekendMode, 'Gear'); + CreateVariable(c_Control_WeekendTime, 3 /*String*/, $profileId, 50, '~String', ($weekendMode==c_ModeId_Individual?$ScriptIdChangeSettings:null), $weekendTime, 'Clock'); + CreateVariable(c_Control_WeekendOffset, 1 /*Integer*/, $profileId, 60, 'IPSShadowing_TimeOffset', ($weekendMode==c_ModeId_Individual?null:$ScriptIdChangeSettings), $weekendOffset, 'Distance'); + CreateVariable(c_Control_ProfileInfo, 3 /*String*/, $profileId, 70, '~String', null, '', 'Information'); + + IPS_SetVariableProfileAssociation('IPSShadowing_Profile'.$profileType, $profileId, $profileName, "", -1); + + return $profileId; + } + + /** + * @public + * + * Profile löschen + * + */ + public function Delete() { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + IPS_SetVariableProfileAssociation('IPSShadowing_Profile'.$this->profileType, $this->instanceId, '', '', -1); + DeleteCategory($this->instanceId); + } + + /** + * @public + * + * Profile umbenennen + * + * @param string $newName Neuer Name des Profiles + */ + public function Rename($newName) { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + IPS_SetVariableProfileAssociation('IPSShadowing_Profile'.$this->profileType, $this->instanceId, $newName, '', -1); + IPS_SetName($this->instanceId, $newName); + SetValue(IPS_GetObjectIDByIdent(c_Control_ProfileName, $this->instanceId), $newName); + } + + /** + * @public + * + * Profil verändern + * + * @param integer $controlId ID der Variable die verändert werden soll + * @param integer $value neuer Wert + */ + public function SetValue($controlId, $value) { + if (GetValue($controlId)<>$value) { + $controlIdent = IPS_GetIdent($controlId); + $scriptIdChangeSettings = IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSShadowing.IPSShadowing_ChangeSettings'); + + if ($controlIdent==c_Control_WorkdayMode) { + if ($value==c_ModeId_Individual) { + IPS_SetVariableCustomAction(IPS_GetObjectIDByIdent(c_Control_WorkdayTime, $this->instanceId), $scriptIdChangeSettings); + SetValue(IPS_GetObjectIDByIdent(c_Control_WorkdayOffset, $this->instanceId), 0); + IPS_SetVariableCustomAction(IPS_GetObjectIDByIdent(c_Control_WorkdayOffset, $this->instanceId), null); + } else { + IPS_SetVariableCustomAction(IPS_GetObjectIDByIdent(c_Control_WorkdayTime, $this->instanceId), null); + IPS_SetVariableCustomAction(IPS_GetObjectIDByIdent(c_Control_WorkdayOffset, $this->instanceId), $scriptIdChangeSettings); + } + } + if ($controlIdent==c_Control_WeekendMode) { + if ($value==c_ModeId_Individual) { + IPS_SetVariableCustomAction(IPS_GetObjectIDByIdent(c_Control_WeekendTime, $this->instanceId), $scriptIdChangeSettings); + SetValue(IPS_GetObjectIDByIdent(c_Control_WeekendOffset, $this->instanceId), 0); + IPS_SetVariableCustomAction(IPS_GetObjectIDByIdent(c_Control_WeekendOffset, $this->instanceId), null); + } else { + IPS_SetVariableCustomAction(IPS_GetObjectIDByIdent(c_Control_WeekendTime, $this->instanceId), null); + IPS_SetVariableCustomAction(IPS_GetObjectIDByIdent(c_Control_WeekendOffset, $this->instanceId), $scriptIdChangeSettings); + } + } + SetValue($controlId, $value); + IPSShadowing_LogChange($this->instanceId, $value, $controlId); + $this->CalculateTime(); + } + } + + /** + * @public + * + * Visualisierung des Profiles in einer übergebenen Kategorie + * + * @param integer $categoryId ID der Kategory in der die Visualisierungs Links abgelegt werden sollen + */ + public function Display($categoryId) { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + CreateLink('Profil Name', IPS_GetObjectIDByIdent(c_Control_ProfileName, $this->instanceId), $categoryId, 10); + $instanceId = CreateDummyInstance("Werktag", $categoryId, 20); + CreateLink('Modus', IPS_GetObjectIDByIdent(c_Control_WorkdayMode, $this->instanceId), $instanceId, 10); + CreateLink('Zeit', IPS_GetObjectIDByIdent(c_Control_WorkdayTime, $this->instanceId), $instanceId, 20); + CreateLink('Versatz', IPS_GetObjectIDByIdent(c_Control_WorkdayOffset, $this->instanceId), $instanceId, 30); + $instanceId = CreateDummyInstance("Wochenende", $categoryId, 30); + CreateLink('Modus', IPS_GetObjectIDByIdent(c_Control_WeekendMode, $this->instanceId), $instanceId, 10); + CreateLink('Zeit', IPS_GetObjectIDByIdent(c_Control_WeekendTime, $this->instanceId), $instanceId, 20); + CreateLink('Versatz', IPS_GetObjectIDByIdent(c_Control_WeekendOffset, $this->instanceId), $instanceId, 30); + CreateLink('Profil Info', IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $this->instanceId), $categoryId, 40); + } + + + } + + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileWeather.class.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileWeather.class.php new file mode 100644 index 0000000..d7b2aa5 --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileWeather.class.php @@ -0,0 +1,253 @@ + + */ + + /**@defgroup IPSShadowing_ProfileWeather + * update Windlevel with Beaufort level functions + * @author Günter Strassnigg + */ + + class IPSShadowing_ProfileWeather { + + /** + * @private + * ID des Wetter Profiles + */ + private $instanceId; + + /** + * @private + * Aktivierung bei Sonnenstand und Helligkeit + */ + private $activationByWeather; + + private $rainSensor; + private $windSensor; + private $rainCheck; + private $windLevel; + + /** + * @public + * + * Initialisierung des IPSShadowing_ProfileWeather Objektes + * + * @param integer $instanceId InstanceId Profile + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->Init(); + } + + /** + * @private + * + * Initialisierung der internen Variablen + * + */ + private function Init() { + $this->windLevel = GetValue(IPS_GetObjectIDByIdent(c_Control_WindLevel, $this->instanceId)); + $this->rainCheck = GetValue(IPS_GetObjectIDByIdent(c_Control_RainCheck, $this->instanceId)); + $this->windSensor = null; + $this->rainSensor = null; + + $activationByWeather = false; + if (IPSSHADOWING_WINDSENSOR <> '') { + $this->windSensor = GetValue(IPSUtil_ObjectIDByPath(IPSSHADOWING_WINDSENSOR)); + if (defined('IPSSHADOWING_WINDLEVEL_CLASSIFICATION') and IPSSHADOWING_WINDLEVEL_CLASSIFICATION) { + $activationByWeather = ($activationByWeather or ($this->ConvertKMHtoBeaufort($this->windSensor) >= $this->windLevel)); + } else { + $activationByWeather = ($activationByWeather or ($this->windSensor >= $this->windLevel)); + } + } + + if (IPSSHADOWING_RAINSENSOR <> '') { + $this->rainSensor = GetValue(IPSUtil_ObjectIDByPath(IPSSHADOWING_RAINSENSOR)); + if ($this->rainCheck) { + $activationByWeather = ($activationByWeather and ($this->rainSensor and $this->rainCheck)); + } + } + + $this->activationByWeather = $activationByWeather; + } + + public function UpdateProfileInfo() { + $info = ''.($this->activationByWeather?'Profil aktiv':'Profil inaktiv').' (WindSensor='.($this->windSensor===null?'"nicht vorhanden"':$this->windSensor.' kmh'); + if (IPSSHADOWING_RAINSENSOR <> '') { + $info .= ', RegenSensor='.($this->rainSensor?'Regen)':'kein Regen)'); + } else { + $info .= ', RegenSensor="nicht vorhanden")'; + } + if (GetValue(IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $this->instanceId)) <> $info or true) { + SetValue(IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $this->instanceId), $info); + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileWeather', + $this->instanceId, + GetValue(IPS_GetObjectIDByIdent(c_Control_ProfileName, $this->instanceId)), + '', + ($this->activationByWeather?c_Color_ProfileActive:-1)); + } + } + + + public function GetProfileInfo() { + $info = ''; + if ($this->windSensor <> '') { + $activationByWeather = ($activationByWeather or ($this->windSensor >= $this->windLevel)); + $info .= 'Wind='.$this->windSensor.' kmh'; + } + if ($this->RainSensor <> '') { + if ($info<>'') { $info.=', ';} + ' Regen='.($this->RainSensor?'Ja':'Nein'); + } + return $info; + } + + public function ActivationByWeather() { + return $this->activationByWeather; + } + + /** + * @public + * + * Neues Profile generieren + * + * @param string $profileName Name des Profiles + * @param boolean $rainCheck Überprüfung Regensensor + * @param integer $windLevel Level für Wind Aktivierung + */ + public static function Create($profileName, $rainCheck=true, $windLevel=40) { + IPSUtils_Include ("IPSShadowing_Configuration.inc.php", "IPSLibrary::config::modules::IPSShadowing"); + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + + $ScriptIdChangeSettings = IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSShadowing.IPSShadowing_ChangeSettings'); + $categoryIdprofiles = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Profiles.Weather'); + $profileIdx = count(IPS_GetChildrenIds($categoryIdprofiles)) + 10; + $profileId = CreateCategory ($profileName, $categoryIdprofiles, $profileIdx); + IPS_SetIdent($profileId, (string)$profileId); + CreateVariable(c_Control_ProfileName, 3 /*String*/, $profileId, 0, '~String', $ScriptIdChangeSettings, $profileName, 'Title'); + CreateVariable(c_Control_RainCheck, 0 /*Boolean*/, $profileId, 10, '~Switch', $ScriptIdChangeSettings, $rainCheck, 'Drops'); + if (defined('IPSSHADOWING_WINDLEVEL_CLASSIFICATION') and IPSSHADOWING_WINDLEVEL_CLASSIFICATION) { + $windLevel=intval($windLevel/3.6); + CreateVariable(c_Control_WindLevel, 1 /*Integer*/, $profileId, 20, 'IPSShadowing_WindBeaufort', $ScriptIdChangeSettings, $windLevel, 'WindSpeed'); + } else { + CreateVariable(c_Control_WindLevel, 1 /*Integer*/, $profileId, 20, 'IPSShadowing_Wind', $ScriptIdChangeSettings, $windLevel, 'WindSpeed'); + } + CreateVariable(c_Control_ProfileInfo, 3 /*String*/, $profileId, 30, '~String', null, '', 'Information'); + + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileWeather', $profileId, $profileName, "", -1); + + return $profileId; + } + + /** + * @public + * + * Visualisierung des Profiles in einer übergebenen Kategorie + * + * @param integer $categoryId ID der Kategory in der die Visualisierungs Links abgelegt werden sollen + */ + public function Display($categoryId) { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + CreateLink('Profil Name', IPS_GetObjectIDByIdent(c_Control_ProfileName, $this->instanceId), $categoryId, 10); + $instanceId = CreateDummyInstance("Regen", $categoryId, 20); + CreateLink('Aktivierung bei Regen', IPS_GetObjectIDByIdent(c_Control_RainCheck, $this->instanceId), $instanceId, 10); + $instanceId = CreateDummyInstance("Wind", $categoryId, 30); + CreateLink('Windgeschwindigkeits Grenze', IPS_GetObjectIDByIdent(c_Control_WindLevel, $this->instanceId), $instanceId, 10); + CreateLink('Profil Info', IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $this->instanceId), $categoryId, 40); + + } + + /** + * @public + * + * Profile löschen + * + */ + public function Delete() { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileWeather', $this->instanceId, '', '', -1); + DeleteCategory($this->instanceId); + } + + /** + * @public + * + * Profile umbenennen + * + * @param string $newName Neuer Name des Profiles + */ + public function Rename($newName) { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + IPS_SetVariableProfileAssociation('IPSShadowing_ProfileWeather', $this->instanceId, $newName, '', -1); + IPS_SetName($this->instanceId, $newName); + SetValue(IPS_GetObjectIDByIdent(c_Control_ProfileName, $this->instanceId), $newName); + } + + /** + * @public + * + * Profil verändern + * + * @param integer $controlId ID der Variable die verändert werden soll + * @param integer $value neuer Wert + */ + public function SetValue($controlId, $value) { + SetValue($controlId, $value); + IPSShadowing_LogChange($this->instanceId, $value, $controlId); + $this->Init(); + $this->UpdateProfileInfo(); + } + + + /** + * @private + * + * Umrechnung der Windgeschwindigkeit in Beaufort + * + * @param variant $value Windgeschwindigkeit (in km/h) + * @param variant $beaufort Windgeschwindigkeit (lt Beaufortskala) + */ + private function ConvertKMHtoBeaufort($value) { + $beauforttable=explode(';','0;0.3;1.6;3.4;5.5;8;10.8;13.9;17.2;20.8;24.8;28.5;32.7'); + for ($beaufort=count($beauforttable)-1;$beaufort>0;$beaufort--) { + if (($value/3.6)>=$beauforttable[$beaufort]) {break;} + } + return $beaufort; + } + + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileWeatherCreate.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileWeatherCreate.ips.php new file mode 100644 index 0000000..da9bbf9 --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileWeatherCreate.ips.php @@ -0,0 +1,36 @@ + + * + * Erzeugen eines Wetter Profiles + */ + + include_once "IPSShadowing.inc.php"; + + $profileManager = new IPSShadowing_ProfileManager(); + $profileManager->CreateWeather('Neues Profil'); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileWeatherDelete.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileWeatherDelete.ips.php new file mode 100644 index 0000000..ae68911 --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProfileWeatherDelete.ips.php @@ -0,0 +1,37 @@ + + * + * Löschen eines "Wetter" Profiles + */ + + include_once "IPSShadowing.inc.php"; + + $profileManager = new IPSShadowing_ProfileManager(); + $profileManager->DeleteWeather(); + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProgramTimer.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProgramTimer.ips.php new file mode 100644 index 0000000..b0a532e --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ProgramTimer.ips.php @@ -0,0 +1,47 @@ + + * + * Program Timer Script - Kontrolliert zyklisch, ob auf Grund der Programm Einstellung eine Änderung der + * Beschattung erforderlich ist + */ + + include_once "IPSShadowing.inc.php"; + + $_IPS['ABORT_ON_ERROR'] = true; + + $profileManager = new IPSShadowing_ProfileManager(); + $profileManager->UpdateProfileInfos(); + + $categoryIdDevices = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Devices'); + $deviceIds = IPS_GetChildrenIds($categoryIdDevices); + + foreach($deviceIds as $deviceId) { + $device = new IPSShadowing_Device($deviceId); + $device->CheckPrograms($profileManager); + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_RefreshTimer.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_RefreshTimer.ips.php new file mode 100644 index 0000000..c4484dd --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_RefreshTimer.ips.php @@ -0,0 +1,54 @@ + + * + * Refresh Timer Script - Update der ausstehenden Fahrzeiten + */ + + include_once "IPSShadowing.inc.php"; + + $result = IPS_SemaphoreEnter('IPSShadowing_Refresh', 500); + + if ($result) { + $categoryIdDevices = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Devices'); + $deviceIds = IPS_GetChildrenIds($categoryIdDevices); + $oneOrMoreDevicesActive = false; + + foreach($deviceIds as $deviceId) { + $device = new IPSShadowing_Device($deviceId); + $deviceActive = $device->Refresh(); + $oneOrMoreDevicesActive = ($oneOrMoreDevicesActive or $deviceActive); + } + + if (!$oneOrMoreDevicesActive) { + $refreshTimerId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSShadowing.IPSShadowing_RefreshTimer.Refresh'); + IPS_SetEventActive($refreshTimerId, false); + } + + IPS_SemaphoreLeave('IPSShadowing_Refresh'); + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ResetTimer.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ResetTimer.ips.php new file mode 100644 index 0000000..ef6fb92 --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ResetTimer.ips.php @@ -0,0 +1,34 @@ + + * Version 2.50.2, 29.12.2012 Removed Reset of Flags, now done after Change of Day/Night
+ * + * Reset of Flags + */ + + include_once "IPSShadowing.inc.php"; + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_Scenario.class.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_Scenario.class.php new file mode 100644 index 0000000..f182018 --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_Scenario.class.php @@ -0,0 +1,236 @@ + + */ + class IPSShadowing_Scenario { + + /** + * @private + * ID des Zeit Profiles + */ + private $instanceId; + + /** + * @public + * + * Initialisierung des IPSShadowing_Scenario Objektes + * + * @param integer $instanceId InstanceId des Scenarios + */ + public function __construct($instanceId) { + $this->instanceId = $instanceId; + } + + /** + * @public + * + * Scenario aktivieren + * + */ + public function Activate() { + IPSShadowing_LogActivateScenario($this->instanceId); + $categoryIdDevices = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Devices'); + $devices = get_ShadowingConfiguration(); + foreach ($devices as $deviceIdent=>$device) { + $controlId = @IPS_GetObjectIDByIdent($deviceIdent, $this->instanceId); + if ($controlId!==false) { + $movementValue = GetValue($controlId); + if ($movementValue<>c_MovementId_NoAction) { + $deviceId = IPS_GetObjectIDByIdent($deviceIdent, $categoryIdDevices); + $device = new IPSShadowing_Device($deviceId); + $device->MoveByControl($movementValue); + } + } + } + } + + /** + * @public + * + * Umbenennen eines Scenarios + * + * @param string $newName Neuer Name des Scenarios + */ + public function Rename($newName) { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + IPS_SetVariableProfileAssociation('IPSShadowing_ScenarioSelect', $this->instanceId, $newName, '', -1); + IPS_SetVariableProfileAssociation('IPSShadowing_ScenarioActivate', $this->instanceId, $newName, '', -1); + IPS_SetName($this->instanceId, $newName); + SetValue(IPS_GetObjectIDByIdent(c_Control_ScenarioName, $this->instanceId), $newName); + } + + /** + * @public + * + * Szenario verändern verändern + * + * @param integer $controlId ID der Variable die verändert werden soll + * @param integer $value neuer Wert + */ + public function SetValue($controlId, $value) { + if (GetValue($controlId)<>$value) { + SetValue($controlId, $value); + IPSShadowing_LogChange($this->instanceId, $value, $controlId); + } + } + + /** + * @public + * + * Scenario löschen + * + */ + public function Delete() { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + IPS_SetVariableProfileAssociation('IPSShadowing_ScenarioSelect', $this->instanceId, '', '', -1); + IPS_SetVariableProfileAssociation('IPSShadowing_ScenarioActivate', $this->instanceId, '', '', -1); + DeleteCategory($this->instanceId); + } + + /** + * @public + * + * Scenario in den EDIT Mode setzen + * + * @param integer $defaultValue default Wert für alle Beschattungs Elemente + */ + public function SetEditMode($defaultValue=c_MovementId_NoAction) { + $ScriptIdChangeSettings = IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSShadowing.IPSShadowing_ChangeSettings'); + IPS_SetVariableCustomAction(IPS_GetObjectIDByIdent(c_Control_ScenarioName, $this->instanceId), $ScriptIdChangeSettings); + //IPS_SetVariableCustomAction(IPS_GetObjectIDByIdent(c_Control_ScenarioEdit, $this->instanceId), $ScriptIdChangeSettings); + SetValue(IPS_GetObjectIDByIdent(c_Control_ScenarioEdit, $this->instanceId), true); + + $devices = get_ShadowingConfiguration(); + $position = 100; + foreach ($devices as $deviceIdent=>$device) { + $position = $position + 10; + $controlId = @IPS_GetObjectIDByIdent($deviceIdent, $this>instanceId); + if ($controlId===false) { + if ($device[c_Property_ShadowingType]==c_ShadowingType_Shutter) { + if ($defaultValue==c_MovementId_Closed) $defaultValue=c_MovementId_Dimout; + $controlId = CreateVariable ($deviceIdent, 1 /*Boolean*/, $this->instanceId, $position, 'IPSShadowing_ScenarioShutter', null, $defaultValue, 'Shutter'); + } elseif ($device[c_Property_ShadowingType]==c_ShadowingType_Jalousie) { + if ($defaultValue==c_MovementId_Dimout) $defaultValue=c_MovementId_Close; + $controlId = CreateVariable ($deviceIdent, 1 /*Boolean*/, $this->instanceId, $position, 'IPSShadowing_ScenarioJalousie', null, $defaultValue, 'Shutter'); + } elseif ($device[c_Property_ShadowingType]==c_ShadowingType_Marquees) { + $controlId = CreateVariable ($deviceIdent, 1 /*Boolean*/, $this->instanceId, $position, 'IPSShadowing_ScenarioMarquees', null, c_MovementId_NoAction, 'Shutter'); + } else { + throw new Exception ('Unknown ShadowingType='.$device[c_Property_ShadowingType]); + } + IPS_SetName($controlId, $device[c_Property_Name]); + } + IPS_SetVariableCustomAction($controlId, $ScriptIdChangeSettings); + } + + } + + /** + * @public + * + * Reset des EDIT Modes + * + */ + public function ReSetEditMode() { + IPS_SetVariableCustomAction(IPS_GetObjectIDByIdent(c_Control_ScenarioName, $this->instanceId), null); + SetValue(IPS_GetObjectIDByIdent(c_Control_ScenarioEdit, $this->instanceId), false); + + $devices = get_ShadowingConfiguration(); + foreach ($devices as $deviceIdent=>$device) { + $controlId = @IPS_GetObjectIDByIdent($deviceIdent, $this->instanceId); + if ($controlId===false) { + } elseif (GetValue($controlId)==c_MovementId_NoAction) { + IPS_DeleteVariable($controlId); + } else { + IPS_SetVariableCustomAction($controlId, null); + } + } + } + + /** + * @public + * + * Visualisierung des Szenarios in einer übergebenen Kategorie + * + * @param integer $categoryId ID der Kategory in der die Visualisierungs Links abgelegt werden sollen + */ + public function Display($categoryId) { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + CreateLink('Szenario Name', IPS_GetObjectIDByIdent(c_Control_ScenarioName, $this->instanceId), $categoryId, 10); + CreateLink('Editier Modus', IPS_GetObjectIDByIdent(c_Control_ScenarioEdit, $this->instanceId), $categoryId, 20); + $instanceIdDevices = CreateDummyInstance("Beschattungs Elemente", $categoryId, 30); + + $devices = get_ShadowingConfiguration(); + $position = 100; + foreach ($devices as $deviceIdent=>$device) { + $position = $position+10; + $controlId = @IPS_GetObjectIDByIdent($deviceIdent, $this->instanceId); + if ($controlId!==false) { + CreateLink($device[c_Property_Name], $controlId, $instanceIdDevices, $position); + } else { + $linkId = @IPS_GetObjectIDByName($device[c_Property_Name], $instanceIdDevices); + if ($linkId!==false) { + IPS_DeleteLink($linkId); + } + } + } + } + + /** + * @public + * + * Neues Scenario erzeugen + * + * @param string $name Name des Scenarios + * @param integer $defaultValue default Wert für alle Beschattungs Elemente + * @return IPSShadowing_Scenario das erzeugte IPSShadowing_Scenario Object + */ + public static function Create($name='Neues Szenario', $defaultValue=c_MovementId_NoAction) { + IPSUtils_Include ('IPSInstaller.inc.php', 'IPSLibrary::install::IPSInstaller'); + $ScriptIdChangeSettings = IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSShadowing.IPSShadowing_ChangeSettings'); + $instanceId = CreateCategoryPath('Program.IPSLibrary.data.modules.IPSShadowing.Scenarios.'.$name); + IPS_SetIdent($instanceId, $instanceId); + $controlId = CreateVariable (c_Control_ScenarioName, 3 /*String*/, $instanceId, 10, '~String', $ScriptIdChangeSettings, $name, 'Title'); + $controlId = CreateVariable (c_Control_ScenarioEdit, 0 /*Boolean*/, $instanceId, 20, '~Switch', $ScriptIdChangeSettings, false, 'Gear'); + $scenario = new IPSShadowing_Scenario($instanceId); + $scenario->SetEditMode($defaultValue); + IPS_SetVariableProfileAssociation('IPSShadowing_ScenarioSelect', $instanceId, $name, '', -1); + IPS_SetVariableProfileAssociation('IPSShadowing_ScenarioActivate', $instanceId, $name, '', -1); + return $instanceId; + } + + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ScenarioCreate.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ScenarioCreate.ips.php new file mode 100644 index 0000000..bae55c4 --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ScenarioCreate.ips.php @@ -0,0 +1,36 @@ + + * + * Erzeugen eines neues Szenarios + */ + + include_once "IPSShadowing.inc.php"; + + $scenarioManager = new IPSShadowing_ScenarioManager(); + $scenarioManager->Create(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ScenarioDelete.ips.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ScenarioDelete.ips.php new file mode 100644 index 0000000..22afc2c --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ScenarioDelete.ips.php @@ -0,0 +1,36 @@ + + * + * Löschen eines Szenario + */ + + include_once "IPSShadowing.inc.php"; + + $scenarioManager = new IPSShadowing_ScenarioManager(); + $scenarioManager->Delete(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ScenarioManager.class.php b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ScenarioManager.class.php new file mode 100644 index 0000000..4fe060c --- /dev/null +++ b/IPSLibrary/app/modules/IPSShadowing/IPSShadowing_ScenarioManager.class.php @@ -0,0 +1,187 @@ + + */ + class IPSShadowing_ScenarioManager { + + /** + * @private + * ID des Scenarios + */ + private $instanceId; + + /** + * @private + * ID der Scenario Visualisierung + */ + private $displayId; + + /** + * @public + * + * Initialisierung des IPSShadowing_ScenarioManager Objektes + * + */ + public function __construct() { + $this->instanceId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.ScenarioManager'); + $this->displayId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.ScenarioManager.Display'); + } + + /** + * @public + * + * Initialisierung aller Assoziationen der Variablen Profile + * + */ + public function AssignAllScenarioAssociations() { + $categoryId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Scenarios'); + $childIds = IPS_GetChildrenIDs($categoryId); + foreach ($childIds as $scenarioId) { + IPS_SetVariableProfileAssociation('IPSShadowing_ScenarioActivate', $scenarioId, IPS_GetName($scenarioId), '', -1); + IPS_SetVariableProfileAssociation('IPSShadowing_ScenarioSelect', $scenarioId, IPS_GetName($scenarioId), '', -1); + } + } + + /** + * @public + * + * Neues Scenario erzeugen + * + * @param string $name Name des Scenarios + * @return IPSShadowing_Scenario das erzeugte IPSShadowing_Scenario Object + */ + public function Create($name='Neues Szenario', $defaultValue=c_MovementId_NoAction) { + $scenarioId = IPSShadowing_Scenario::Create($name, $defaultValue); + $this->Select($scenarioId); + return $scenarioId; + } + + /** + * @public + * + * Umbenennen eines Scenarios + * + * @param integer $scenarioId InstanceId des Scenarios + * @param string $newName Neuer Name des Scenarios + */ + public function Rename($scenarioId, $newName) { + $scenario = new IPSShadowing_Scenario($scenarioId); + $scenario->Rename($newName); + } + + /** + * @public + * + * Scenario löschen + */ + public function Delete() { + $categoryId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Scenarios'); + $childIds = IPS_GetChildrenIDs($categoryId); + if (count($childIds)==1) { + return; + } + $scenarioId = GetValue(IPS_GetObjectIDByIdent(c_Control_ScenarioSelect, $this->instanceId)); + $scenario = new IPSShadowing_Scenario($scenarioId); + $scenario->Delete(); + $childIds = IPS_GetChildrenIDs($categoryId); + $this->Select($childIds[0]); + + } + + /** + * @public + * + * Scenario in den EDIT Mode setzen + * + * @param integer $scenarioId InstanceId des Scenarios + * @param boolean $mode Set/Reset des Edit Modus + */ + public function SetEditMode($scenarioId, $mode) { + $scenario = new IPSShadowing_Scenario($scenarioId); + if ($mode) { + $scenario->SetEditMode(); + } else { + $scenario->ReSetEditMode(); + } + $scenario->Display($this->displayId); + } + + /** + * @public + * + * Scenario auswählen + * + * @param integer $scenarioId InstanceId des Scenarios + */ + public function Select($scenarioId) { + $dipslayId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.ScenarioManager.Display'); + SetValue(IPS_GetObjectIDByIdent(c_Control_ScenarioSelect, $this->instanceId), $scenarioId); + $scenario = new IPSShadowing_Scenario($scenarioId); + $scenario->Display($dipslayId); + } + + /** + * @public + * + * Scenario aktivieren + * + * @param integer $scenarioId InstanceId des Scenarios + */ + public function Activate($scenarioId) { + SetValue(IPS_GetObjectIDByIdent(c_Control_ScenarioActivate, $this->instanceId), $scenarioId); + $scenario = new IPSShadowing_Scenario($scenarioId); + $scenario->Activate(); + usleep(500000); + SetValue(IPS_GetObjectIDByIdent(c_Control_ScenarioActivate, $this->instanceId), 0); + } + + /** + * @public + * + * Scenario aktivieren + * + * @param integer $controlId ID der Variable die verändert werden soll + * @param string $value Wert der gesetzt werden soll + */ + public function SetValue($controlId, $value) { + $scenarioId = IPS_GetParent($controlId); + $scenario = new IPSShadowing_Scenario($scenarioId); + $scenario->SetValue($controlId, $value); + } + + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSWatering/IPSWatering.inc.php b/IPSLibrary/app/modules/IPSWatering/IPSWatering.inc.php index dbeee93..657e0e1 100644 --- a/IPSLibrary/app/modules/IPSWatering/IPSWatering.inc.php +++ b/IPSLibrary/app/modules/IPSWatering/IPSWatering.inc.php @@ -66,8 +66,11 @@ function IPSWatering_ActivateWatering($CycleId, $Value, $Mode) { return false; } + $DurationMin = GetValue(get_ControlId(c_Control_Duration, $CycleId)); + $DurationSec = 60*$DurationMin+5; + $component = IPSComponent::CreateObjectByParams($ComponentParams); - $component->SetState($Value); + $component->SetState($Value, $DurationSec); IPSWatering_AfterActivateWatering($CycleId, $Value, $Mode); diff --git a/IPSLibrary/app/modules/IPSWatering/IPSWatering_ActivationTimer.ips.php b/IPSLibrary/app/modules/IPSWatering/IPSWatering_ActivationTimer.ips.php index e22f56e..9fac2bb 100644 --- a/IPSLibrary/app/modules/IPSWatering/IPSWatering_ActivationTimer.ips.php +++ b/IPSLibrary/app/modules/IPSWatering/IPSWatering_ActivationTimer.ips.php @@ -61,7 +61,7 @@ // Bewässerung Starten if ($SensorLimit > 0 and $SensorValue!==false and $SensorLimit<=$SensorValue) { - IPSWatering_LogNoActivationByRainfall($CircleId, $SensorLimit, $Rainfall); + IPSWatering_LogNoActivationByRainfall($CircleId, $SensorLimit, $SensorValue.' mm'); IPSWatering_CalcNextScheduleDateTime($CircleId); } else { IPSWatering_SetActive($ControlId, true, c_Mode_StartAutomatic); diff --git a/IPSLibrary/app/modules/IPSWatering/IPSWatering_Constants.inc.php b/IPSLibrary/app/modules/IPSWatering/IPSWatering_Constants.inc.php index 106049f..311ecbd 100644 --- a/IPSLibrary/app/modules/IPSWatering/IPSWatering_Constants.inc.php +++ b/IPSLibrary/app/modules/IPSWatering/IPSWatering_Constants.inc.php @@ -52,7 +52,7 @@ define ("c_Control_ToBeDone", "ToBeDone"); define ("c_Program_Manual", "Manuell"); - define ("c_Program_EveryDay", "Jeden Tag"); + define ("c_Program_EveryDay", "Jeden Tag"); define ("c_Program_Every2Day", "Jeden 2. Tag"); define ("c_Program_Every3Day", "Jeden 3. Tag"); define ("c_Program_Every4Day", "Jeden 4. Tag"); @@ -60,11 +60,11 @@ define ("c_Program_MonTur", "Mon und Don"); define ("c_Program_Sunday", "Sonntags"); define ("c_Program_Monday", "Montags"); - define ("c_Program_Tuesday", "Dienstags"); - define ("c_Program_Wednesday", "Mitwochs"); - define ("c_Program_Thursday", "Donnerstags"); + define ("c_Program_Tuesday", "Dienstags"); + define ("c_Program_Wednesday", "Mittwochs"); + define ("c_Program_Thursday", "Donnerstags"); define ("c_Program_Friday", "Freitags"); - define ("c_Program_Saturday", "Samstags"); + define ("c_Program_Saturday", "Samstags"); define ("c_ProgramId_Manual", 0); define ("c_ProgramId_EveryDay", 1); diff --git a/IPSLibrary/app/modules/NetPlayer/NetPlayer.inc.php b/IPSLibrary/app/modules/NetPlayer/NetPlayer.inc.php index f1aedd6..d44db9a 100644 --- a/IPSLibrary/app/modules/NetPlayer/NetPlayer.inc.php +++ b/IPSLibrary/app/modules/NetPlayer/NetPlayer.inc.php @@ -92,6 +92,14 @@ function NetPlayer_GetIPSComponentPlayer() { return $player ; } + function NetPlayer_Switch() { + if (GetValue(NP_ID_CONTROLTYPE)==2) { + NetPlayer_SwitchToMP3Player(); + } else { + NetPlayer_SwitchToRadio(); + } + } + function NetPlayer_SwitchToMP3Player($loadDirectory=true,$forceLoad=false) { if (GetValue(NP_ID_CONTROLTYPE)==0 and !$forceLoad) return; if ($loadDirectory) { @@ -116,8 +124,8 @@ function NetPlayer_SwitchToMP3Selection() { SetValue(NP_ID_MOBILECONTROL, '', 'Window'); + $variableIdHtml = CreateVariable(IPSCAM_VAR_HTML, 3 /*String*/, $categoryIdCommon,110, '~HTMLBox', $scriptIdActionScript, '', 'Window'); + $variableIdiHtml = CreateVariable(IPSCAM_VAR_IHTML, 3 /*String*/, $categoryIdCommon,120, '~HTMLBox', $scriptIdActionScript, '', 'Window'); + $variableIdCamPict = CreateMedia (IPSCAM_VAR_CAMPICT, $categoryIdCommon, IPS_GetKernelDir().'\\Cams\\0\\Picture\\Common.jpg', false, 1 /*Image*/, 'Image', 110); + $variableIdCamHist = CreateMedia (IPSCAM_VAR_CAMHIST, $categoryIdCommon, IPS_GetKernelDir().'\\Cams\\0\\History\\20120101.jpg', false, 1 /*Image*/, 'Clock', 110); + $variableIdMode = CreateVariable(IPSCAM_VAR_MODE, 1 /*Integer*/, $categoryIdCommon, 20, 'IPSCam_Mode', $scriptIdActionScript, 0, 'Gear'); + $variableIdModeLive = CreateVariable(IPSCAM_VAR_MODELIVE, 0 /*Boolean*/, $categoryIdCommon, 30, '~Switch', $scriptIdActionScript, false, 'Window'); + $variableIdModePict = CreateVariable(IPSCAM_VAR_MODEPICT, 0 /*Boolean*/, $categoryIdCommon, 40, '~Switch', $scriptIdActionScript, false, 'Image'); + $variableIdModeHist = CreateVariable(IPSCAM_VAR_MODEHIST, 0 /*Boolean*/, $categoryIdCommon, 50, '~Switch', $scriptIdActionScript, false, 'Clock'); + $variableIdModeSett = CreateVariable(IPSCAM_VAR_MODESETT, 0 /*Boolean*/, $categoryIdCommon, 60, '~Switch', $scriptIdActionScript, false, 'Gear'); + $variableIdSize = CreateVariable(IPSCAM_VAR_SIZE, 1 /*Integer*/, $categoryIdCommon, 65, 'IPSCam_Size', $scriptIdActionScript, 1, 'Distance'); + $variableIdNavPict = CreateVariable(IPSCAM_VAR_NAVPICT, 1 /*Integer*/, $categoryIdCommon, 70, 'IPSCam_NavPict', $scriptIdActionScript, -1, 'HollowArrowRight'); + $variableIdNavDays = CreateVariable(IPSCAM_VAR_NAVDAYS, 1 /*Integer*/, $categoryIdCommon, 80, 'IPSCam_NavDays', $scriptIdActionScript, -1, 'HollowDoubleArrowRight'); + $variableIdNavTime = CreateVariable(IPSCAM_VAR_NAVTIME, 3 /*String*/, $categoryIdCommon, 90, '~String', null, date(IPSCAM_NAV_DATEFORMATDISP), 'Clock'); + $variableIdNavFile = CreateVariable(IPSCAM_VAR_NAVFILE, 3 /*String*/, $categoryIdCommon, 95, '~String', null, date(IPSCAM_NAV_DATEFORMATFILE), ''); + + $camConfig = IPSCam_GetConfiguration(); + foreach ($camConfig as $idx=>$data) { + $categoryIdCamX = CreateCategory($idx, $categoryIdCams, $idx); + $variableIdCamPowerX = CreateVariable(IPSCAM_VAR_CAMPOWER, 0 /*Boolean*/, $categoryIdCamX, 10, '~Switch', $scriptIdActionScript, false, 'Power'); + $variableIdCamHtmlX = CreateVariable(IPSCAM_VAR_CAMHTML, 3 /*String*/, $categoryIdCamX, 20, '~HTMLBox', $scriptIdActionScript, '', 'Information'); + + // ---------------------------------------------------------------------------------------------------------------------------- + // Webfront Installation + // ---------------------------------------------------------------------------------------------------------------------------- + if ($WFC10_Enabled) { + $categoryId_WebFront = CreateCategoryPath($WFC10_Path); + EmptyCategory($categoryId_WebFront); + CreateLink('IPSLibrary', $variableIdHTML, $categoryId_WebFront, 10); + + // System Tabpane + CreateWFCItemTabPane ($WFC10_ConfigId, $WFC10_TabPaneItem, $WFC10_TabPaneParent, $WFC10_TabPaneOrder, $WFC10_TabPaneName, $WFC10_TabPaneIcon); + + // IPSLibrary Tabpane + $tabItem = $WFC10_TabPaneItem.$WFC10_TabItem; + DeleteWFCItems($WFC10_ConfigId, $tabItem); + //CreateWFCItemExternalPage ($WFC10_ConfigId, $tabItem, $WFC10_TabPaneItem, $WFC10_TabOrder, $WFC10_TabName, $WFC10_TabIcon, "user\/IPSModuleManagerGUI\/IPSModuleManagerGUI.php", 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $tabItem, $WFC10_TabPaneItem, $WFC10_TabOrder, $WFC10_TabName, $WFC10_TabIcon, $categoryId_WebFront, 'false' /*BarBottomVisible*/); + + ReloadAllWebFronts(); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + // Mobile Installation + // ---------------------------------------------------------------------------------------------------------------------------- + // Not Supported + +?> \ No newline at end of file diff --git a/IPSLibrary/install/InstallationScripts/IPSModuleManager_Installation.ips.php b/IPSLibrary/install/InstallationScripts/IPSModuleManager_Installation.ips.php index 5234c5b..1a093a4 100644 --- a/IPSLibrary/install/InstallationScripts/IPSModuleManager_Installation.ips.php +++ b/IPSLibrary/install/InstallationScripts/IPSModuleManager_Installation.ips.php @@ -189,8 +189,6 @@ * */ - return; - if (!isset($moduleManager)) { IPSUtils_Include ('IPSModuleManager.class.php', 'IPSLibrary::install::IPSModuleManager'); @@ -200,5 +198,111 @@ $moduleManager->VersionHandler()->CheckModuleVersion('IPS','2.50'); + RemoveBlanksBeforePHPTags('IPSWatering_Configuration.inc.php', 'IPSLibrary::config::modules::IPSWatering::Default'); + RemoveBlanksBeforePHPTags('IPSWatering_Configuration.inc.php', 'IPSLibrary::config::modules::IPSWatering'); + RemoveBlanksBeforePHPTags('IPSLogger_Configuration.inc.php', 'IPSLibrary::config::core::IPSLogger::Default'); + RemoveBlanksBeforePHPTags('IPSLogger_Configuration.inc.php', 'IPSLibrary::config::core::IPSLogger'); + RemoveBlanksBeforePHPTags('IPSMessageHandler_Configuration.inc.php', 'IPSLibrary::config::core::IPSMessageHandler::Default'); + RemoveBlanksBeforePHPTags('IPSMessageHandler_Configuration.inc.php', 'IPSLibrary::config::core::IPSMessageHandler'); + + SearchLastRepositories(); + + $moduleManager->VersionHandler()->ReloadVersionData(); + + + // --------------------------------------------------------------------------------------------- + // Search for Last Repositories + // --------------------------------------------------------------------------------------------- + function SearchLastRepositories() { + IPSUtils_Include ("IPSModuleManager.class.php", "IPSLibrary::install::IPSModuleManager"); + $moduleManager = $_IPS['MODULEMANAGER']; + $infos = $moduleManager->GetModuleInfos(); + $modules = $moduleManager->GetInstalledModules(); + + //print_r($modules); + foreach ($modules as $module=>$data) { + $downloadFile = IPS_GetKernelDir().'scripts\\IPSLibrary\\install\\DownloadListFiles\\'.$module.'_FileList.ini'; + $configFile = IPS_GetKernelDir().'scripts\\IPSLibrary\\install\\InitializationFiles\\'.$module.'.ini'; + if (!file_exists($downloadFile) or !file_exists($configFile)) { + $moduleManager->LogHandler()->Debug('Remove Module "'.$module.'" from InstalledModules (No Ini Files found)'); + $versionHandler = new IPSFileVersionHandler($module); + $versionHandler->DeleteModule(); + } else { + $moduleManager = new IPSModuleManager($module, '', sys_get_temp_dir(), true); + $versionHandler = $moduleManager->VersionHandler(); + $repository = $versionHandler->GetModuleRepository(); + + // Search current Repository + if ($repository=='') { + $files = scandir(IPS_GetKernelDir().'\\logs\\', 1); + foreach ($files as $file) { + // Found LogFile + if ($repository<>'') { + break; + } elseif (strpos($file,'IPSModuleManager_')!==false) { + $fileContent = file_get_contents(IPS_GetKernelDir().'\\logs\\'.$file); + $lines = explode(PHP_EOL, $fileContent); + $line1 = ''; + $line2 = ''; + if (count($lines)>0) { + $line1 = $lines[0]; + } + if (count($lines)>1) { + $line2 = $lines[1]; + } + + // Found LogFile for Module + if ( strpos($line1,'Set Version '.$module.'=')!==false + or strpos($line2,''.$module.'_FileList.ini')!==false) { + //echo 'found '.$module; //return; + + // Search Repository + foreach ($lines as $idx=>$line) { + + // Found Repository + if (strpos($line,' --> '.IPS_GetKernelDir().'scripts\\IPSLibrary\\install\\DownloadListFiles\\'.$module.'_FileList.ini')!==false) { + $start = strpos($line,'Copy ')+5; + $end = strpos($line,'IPSLibrary',strpos($line,'IPSLibrary')+1); + $repository = substr($line, $start, $end-$start); + break; + } + } + } + } + } + $moduleManager->LogHandler()->Debug('Add Last Repository: '.$module.'='.$repository); + $versionHandler->SetModuleRepository($repository); + } + echo $module.'='.$repository.PHP_EOL; + } + } + } + + // ------------------------------------------------------------------------------------------------ + function RemoveBlanksBeforePHPTags ($file, $namespace) { + $moduleManager = $_IPS['MODULEMANAGER']; + + if ($namespace<>'') { + $namespace = str_replace('::','\\',$namespace).'\\'; + } + $fileNameFull = IPS_GetKernelDir().'scripts\\'.$namespace.$file; + if (!file_exists($fileNameFull)) { + echo 'File '.$file.' not exists (Namespace='.$namespace.')'.PHP_EOL; + return; + } + + $fileContent = file_get_contents($fileNameFull, true); + + $pos = strpos($fileContent, ' '); + if ($pos === false or $pos > 0) { + return; + } + $fileContentNew = substr($fileContent, 1); + $moduleManager->LogHandler()->Debug('Remove Blanks before PHP Tag from File '.$file.'(Namespace='.$namespace.')'); + file_put_contents($fileNameFull, $fileContentNew); + } + + + /** @}*/ ?> \ No newline at end of file diff --git a/IPSLibrary/install/InstallationScripts/IPSPowerControl_Installation.ips.php b/IPSLibrary/install/InstallationScripts/IPSPowerControl_Installation.ips.php new file mode 100644 index 0000000..f06fc34 --- /dev/null +++ b/IPSLibrary/install/InstallationScripts/IPSPowerControl_Installation.ips.php @@ -0,0 +1,287 @@ += 2.50 + * - IPSModuleManager >= 2.50.2 + * - IPSLogger >= 2.50.1 + * - IPSComponent >= 2.50.1 + * + * @page install_IPSPowerControl Installations Schritte + * Folgende Schritte sind zur Installation der IPSPowerControl Ansteuerung nötig: + * - Laden des Modules (siehe IPSModuleManager) + * - Konfiguration (Details siehe Konfiguration) + * - Installation (siehe IPSModuleManager) + * + * @file IPSPowerControl_Installation.ips.php + * @author Andreas Brauneis + * @version + * Version 2.50.1, 29.09.2012
+ * + */ + if (!isset($moduleManager)) { + IPSUtils_Include ('IPSModuleManager.class.php', 'IPSLibrary::install::IPSModuleManager'); + + echo 'ModuleManager Variable not set --> Create "default" ModuleManager'; + $moduleManager = new IPSModuleManager('IPSPowerControl'); + } + + $moduleManager->VersionHandler()->CheckModuleVersion('IPS','2.50'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSModuleManager','2.50.2'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSLogger','2.50.2'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSComponent','2.50.1'); + + IPSUtils_Include ("IPSInstaller.inc.php", "IPSLibrary::install::IPSInstaller"); + IPSUtils_Include ("IPSPowerControl.inc.php", "IPSLibrary::app::modules::IPSPowerControl"); + IPSUtils_Include ("IPSPowerControl_Constants.inc.php", "IPSLibrary::app::modules::IPSPowerControl"); + IPSUtils_Include ("IPSPowerControl_Configuration.inc.php", "IPSLibrary::config::modules::IPSPowerControl"); + + $WFC10_Enabled = $moduleManager->GetConfigValue('Enabled', 'WFC10'); + $WFC10_ConfigId = $moduleManager->GetConfigValueIntDef('ID', 'WFC10', GetWFCIdDefault()); + $WFC10_Path = $moduleManager->GetConfigValue('Path', 'WFC10'); + $WFC10_TabPaneItem = $moduleManager->GetConfigValue('TabPaneItem', 'WFC10'); + $WFC10_TabPaneParent = $moduleManager->GetConfigValue('TabPaneParent', 'WFC10'); + $WFC10_TabPaneName = $moduleManager->GetConfigValue('TabPaneName', 'WFC10'); + $WFC10_TabPaneIcon = $moduleManager->GetConfigValue('TabPaneIcon', 'WFC10'); + $WFC10_TabPaneOrder = $moduleManager->GetConfigValueInt('TabPaneOrder', 'WFC10'); + $WFC10_TabItem = $moduleManager->GetConfigValue('TabItem', 'WFC10'); + $WFC10_TabName = $moduleManager->GetConfigValue('TabName', 'WFC10'); + $WFC10_TabIcon = $moduleManager->GetConfigValue('TabIcon', 'WFC10'); + $WFC10_TabOrder = $moduleManager->GetConfigValueInt('TabOrder', 'WFC10'); + + $Mobile_Enabled = $moduleManager->GetConfigValue('Enabled', 'Mobile'); + $Mobile_Path = $moduleManager->GetConfigValue('Path', 'Mobile'); + $Mobile_PathOrder = $moduleManager->GetConfigValueInt('PathOrder', 'Mobile'); + $Mobile_PathIcon = $moduleManager->GetConfigValue('PathIcon', 'Mobile'); + $Mobile_Name = $moduleManager->GetConfigValue('Name', 'Mobile'); + $Mobile_Order = $moduleManager->GetConfigValueInt('Order', 'Mobile'); + $Mobile_Icon = $moduleManager->GetConfigValue('Icon', 'Mobile'); + + // ---------------------------------------------------------------------------------------------------------------------------- + // Program Installation + // ---------------------------------------------------------------------------------------------------------------------------- + $CategoryIdData = $moduleManager->GetModuleCategoryID('data'); + $CategoryIdApp = $moduleManager->GetModuleCategoryID('app'); + + $categoryIdCommon = CreateCategory('Common', $CategoryIdData, 10); + $categoryIdValues = CreateCategory('Values', $CategoryIdData, 20); + $categoryIdCustom = CreateCategory('Custom', $CategoryIdData, 30); + + // Add Scripts + $scriptIdActionScript = IPS_GetScriptIDByName('IPSPowerControl_ActionScript', $CategoryIdApp); + $scriptIdNavPrev = IPS_GetScriptIDByName('IPSPowerControl_NavigatePrev', $CategoryIdApp); + $scriptIdNavNext = IPS_GetScriptIDByName('IPSPowerControl_NavigateNext', $CategoryIdApp); + IPS_SetIcon($scriptIdNavPrev, 'HollowArrowLeft'); + IPS_SetIcon($scriptIdNavNext, 'HollowArrowRight'); + $scriptIdCountPlus = IPS_GetScriptIDByName('IPSPowerControl_NavigatePlus', $CategoryIdApp); + $scriptIdCountMinus = IPS_GetScriptIDByName('IPSPowerControl_NavigateMinus', $CategoryIdApp); + IPS_SetIcon($scriptIdCountPlus, 'HollowArrowUp'); + IPS_SetIcon($scriptIdCountMinus, 'HollowArrowDown'); + + $timerId_Refresh = CreateTimer_CyclicBySeconds ('CalculateWattValues', $scriptIdActionScript, IPSPC_REFRESHINTERVAL_WATT) ; + $timerId_Refresh = CreateTimer_CyclicByMinutes ('CalculateKWHValues', $scriptIdActionScript, IPSPC_REFRESHINTERVAL_KWH) ; + + $associationsTypeAndOffset = array( + IPSPC_TYPE_WATT => 'Watt', + IPSPC_TYPE_KWH => 'kWh', + IPSPC_TYPE_EURO => 'Euro', + IPSPC_TYPE_STACK => 'Details', + IPSPC_TYPE_STACK2 => 'Total', + IPSPC_TYPE_PIE => 'Pie', + IPSPC_TYPE_OFF => 'Off', + IPSPC_OFFSET_SEPARATOR => ' ', + IPSPC_OFFSET_PREV => '<<', + IPSPC_OFFSET_VALUE => '0', + IPSPC_OFFSET_NEXT => '>>' + ); + CreateProfile_Associations ('IPSPowerControl_TypeAndOffset', $associationsTypeAndOffset); + + $associationsPeriodAndCount = array( + //IPSPC_PERIOD_HOUR => 'Stunde', + IPSPC_PERIOD_DAY => 'Tag', + IPSPC_PERIOD_WEEK => 'Woche', + IPSPC_PERIOD_MONTH => 'Monat', + IPSPC_PERIOD_YEAR => 'Jahr', + IPSPC_COUNT_SEPARATOR => ' ', + IPSPC_COUNT_MINUS => '-', + IPSPC_COUNT_VALUE => '1', + IPSPC_COUNT_PLUS => '+', + ); + CreateProfile_Associations ('IPSPowerControl_PeriodAndCount', $associationsPeriodAndCount); + + $associationsValues = array(); + foreach (IPSPowerControl_GetValueConfiguration() as $idx=>$data) { + $associationsValues[$idx] = $data[IPSPC_PROPERTY_NAME]; + } + CreateProfile_Associations ('IPSPowerControl_SelectValues', $associationsValues); + + + // =================================================================================================== + // Add Variables + // =================================================================================================== + $variableIdTypeOffset = CreateVariable(IPSPC_VAR_TYPEOFFSET, 1 /*Integer*/, $categoryIdCommon, 10, 'IPSPowerControl_TypeAndOffset', $scriptIdActionScript, IPSPC_TYPE_KWH, 'Clock'); + $variableIdPeriodCount = CreateVariable(IPSPC_VAR_PERIODCOUNT, 1 /*Integer*/, $categoryIdCommon, 20, 'IPSPowerControl_PeriodAndCount', $scriptIdActionScript, IPSPC_PERIOD_DAY, 'Clock'); + $variableIdTimeOffset = CreateVariable(IPSPC_VAR_TIMEOFFSET, 1 /*Integer*/, $categoryIdCommon, 40, '', null, 0, ''); + $variableIdTimeCount = CreateVariable(IPSPC_VAR_TIMECOUNT, 1 /*Integer*/, $categoryIdCommon, 50, '', null, 1, ''); + $variableIdChartHtml = CreateVariable(IPSPC_VAR_CHARTHTML, 3 /*String*/, $categoryIdCommon, 100, '~HTMLBox', $scriptIdActionScript, ''); + $iForecast = CreateVariable("iForecast", 3 /*String*/, $categoryId_Data, 1000, '~HTMLBox', null, '', 'Cloud'); + SetValue($iForecast, '