Merge pull request #9 from strfl89/testing

Version 2.3

Author: strfl89

.DS_Store

@@ -1,4 +1,17 @@
 # phpTradfri - Version History
+## Version 2.3 - 22nd Sep 2019
+* devices.php
+  + add Last Seen Information for Lamps and Remote Controls
+  + add statuscontroloutlet()
+  + add functions for dimming lamps
+  + extend poweron() and poweroff() for control outlets
+  + extend getPowerStatus() for control outlets
+* gateway.php
+  * bugfixing ntp in status
+* general.php
+  + adding return for action()
+* groups.php
+  + add functions for dimming lamps
 ## Version 2.2 - 16th Sep 2019
 + getDimmer() and setDimmer() added to devices.php
 ## Version 2.1.1 - 14th Sep 2019

Release-Notes.md

@@ -27,5 +27,6 @@
 define('GATEWAY_GOOGLE_STATUS', 9105);
 define('GATEWAY_TIME_UNIX', 9059);
 define('GATEWAY_SETUP_TIME', 9069);
+define('LAST_SEEN', 9020);
 
 ?>

defines.php

@@ -49,14 +49,38 @@ function getPowerStatus($Id){
 
 		$psid = $this->getDetails("15001/$Id");
 
-		return $psid['3311']['0'][ONOFF];
+		switch ($psid[TYPE]) {
+			case TYPE_LIGHT:
+				return $psid['3311']['0'][ONOFF];
+				break;
+
+			case TYPE_CONTROL_OUTLET:
+				return $psid['3312']['0'][ONOFF];
+				break;
+			
+			default:
+				return NULL;
+				break;
+			}
 
 		}
 
 	function poweroff($path){
 
-		if($this->getTypeId($path) == TYPE_LIGHT){
-			$payload = '{ "3311": [{ "5850": 0 }] }';
+		switch($this->getTypeId($path)){
+			case TYPE_LIGHT:
+				$payload = '{ "3311": [{ "5850": 0 }] }';
+				break;
+
+  			case TYPE_CONTROL_OUTLET:
+				$payload = '{ "3312": [{ "5850": 0 }] }';
+				break;
+
+			default:
+				$payload = NULL;
+			}
+
+		if (!is_null($payload)){
 			$this->action("put", $payload, "15001/$path");
 
 			if($this->getPowerStatus($path) == 0)
@@ -72,8 +96,21 @@ function poweroff($path){
 
 	function poweron($path){
 
-		if($this->getTypeId($path) == TYPE_LIGHT){
-			$payload = '{ "3311": [{ "5850": 1 }] }';
+		switch($this->getTypeId($path)){
+			case TYPE_LIGHT:
+				$payload = '{ "3311": [{ "5850": 1 }] }';
+				break;
+
+  			case TYPE_CONTROL_OUTLET:
+				$payload = '{ "3312": [{ "5850": 1 }] }';
+				break;
+
+			default:
+				$payload = NULL;
+			}
+
+		if (!is_null($payload)){
+
 			$this->action("put", $payload, "15001/$path");
 
 			if($this->getPowerStatus($path) == 1)
@@ -108,13 +145,31 @@ function setDimmer($path, $dimmer, $transition = NULL){
 
 		}
 
+	function statuscontroloutlet(){
+
+		$Ids = $this->getIds();
+		sort($Ids, SORT_NUMERIC);
+		
+		foreach($Ids as $device){
+			$details = $this->getDetails("15001/$device");
+			if($details[TYPE] == TYPE_CONTROL_OUTLET){
+				$output[] = array("id" => $device,"name" => $details[NAME], "type" => $details['3']['1'], "firmware" => $details['3']['3'], "lastseen" => date('H:i:s d.m.Y', $details[LAST_SEEN]), "lastseenunix" => $details[LAST_SEEN], "power" => $details['3312']['0'][ONOFF]);
+				}
+			}
+
+		return $output;
+
+		}
+
 	function statusremotecontrol(){
 
 		$Ids = $this->getIds();
+		sort($Ids, SORT_NUMERIC);
+
 		foreach($Ids as $device){
 			$details = $this->getDetails("15001/$device");
 			if($details[TYPE] == TYPE_REMOTE_CONTROL || $details[TYPE] == TYPE_MOTION_SENSOR){
-				$output[] = array("id" => $device,"name" => $details[NAME], "type" => $details['3']['1'], "battery" => $details['3']['9'], "firmware" => $details['3']['3']);
+				$output[] = array("id" => $device,"name" => $details[NAME], "type" => $details['3']['1'], "battery" => $details['3']['9'], "firmware" => $details['3']['3'], "lastseen" => date('H:i:s d.m.Y', $details[LAST_SEEN]), "lastseenunix" => $details[LAST_SEEN]);
 				}
 			}
 
@@ -140,7 +195,7 @@ function statuslamps(){
 				//Set Dimmer to the INT Value in %
 				$details[LIGHT]['0'][DIMMER] = round($details[LIGHT]['0'][DIMMER] * 100 / 255);
 
-				$output[] = array("id" => $device,"name" => $details[NAME], "type" => $details['3']['1'], "power" => $details[LIGHT]['0'][ONOFF], "dimmer" => $details[LIGHT]['0'][DIMMER], "colorhex" => $colorhex, "colorx" => $colorx, "colory" => $colory, "colortemp" => $colortemp, "transition" => $transition);
+				$output[] = array("id" => $device,"name" => $details[NAME], "type" => $details['3']['1'], "power" => $details[LIGHT]['0'][ONOFF], "dimmer" => $details[LIGHT]['0'][DIMMER], "colorhex" => $colorhex, "colorx" => $colorx, "colory" => $colory, "colortemp" => $colortemp, "transition" => $transition, "firmware" => $details['3']['3'], "lastseen" => date('H:i:s d.m.Y', $details[LAST_SEEN]), "lastseenunix" => $details[LAST_SEEN]);
 
 				//Clean up
 				unset($colorhex, $colorx, $colory, $colortemp, $transition);

devices.php

@@ -20,7 +20,7 @@ function statusgateway(){
 
 			$details = $this->getDetails(GATEWAY."/15012");
 
-			$output = array('setup' => $details[GATEWAY_SETUP_TIME], 'ntp' => $details['GATEWAY_NTP'], 'time' => $details[GATEWAY_TIME_UNIX], 'firmware' => $details[GATEWAY_FIRMWARE], 'alexa' => $details[GATEWAY_ALEXA_STATUS], 'google' => $details[GATEWAY_GOOGLE_STATUS]);
+			$output = array('setup' => $details[GATEWAY_SETUP_TIME], 'ntp' => $details[GATEWAY_NTP], 'time' => $details[GATEWAY_TIME_UNIX], 'firmware' => $details[GATEWAY_FIRMWARE], 'alexa' => $details[GATEWAY_ALEXA_STATUS], 'google' => $details[GATEWAY_GOOGLE_STATUS]);
 
 			return $output;
 		}

gateway.php

@@ -48,7 +48,7 @@ function action($method, $payload, $path){
 		else
 			$cmd = "coap-client -m {$method} -u '{$this->gateway['user']}' -k '{$this->gateway['secretkey']}' 'coaps://{$this->gateway['ip']}:5684/{$path}'";
 
-		exec($cmd);
+		return exec($cmd);
 
 		}
 

general.php

@@ -5,6 +5,14 @@
 class tradfrigroups extends tradfri
 	{
 
+	function getDimmer($Id){
+
+		$dimid = $this->getDetails("15004/$Id");
+
+		return $dimid[DIMMER];
+
+		}
+
 	function getIds(){
 
 		return explode(",", trim(str_replace(['[',']'], "" ,strstr($this->query("15004"), '[13'))));
@@ -63,6 +71,20 @@ function poweron($path){
 
 		}
 
+	function setDimmer($path, $dimmer){
+
+		$dim = round(254 * (int)str_replace("%", "", trim($dimmer)) / 100, 0);
+
+		$payload = '{ "'.DIMMER.'": '.$dim.' }';
+		$this->action("put", $payload, "15004/$path");
+
+		if($this->getDimmer($path) == $dim)
+			return $this->getName("15004/$path")." wurde auf {$dimmer} gedimmt.";
+		else
+			return $this->getName("15004/$path")." konnte nicht auf {$dimmer} gedimmt werden.";
+
+		}
+
 	} // End of class tradfrigroups
 
 ?>