Added Thermostat Setpoint device. Added NEST thermostat hardware with get and set heating temperature

Author: rutgerkirkels

src/Client.php

@@ -219,6 +219,15 @@ public function getHardware() {
  return $returnData;
  }
 
+ public function getHardwareById(int $id) {
+ foreach ($this->getHardware() as $hardware) {
+ if ($hardware->getId() === $id) {
+ return $hardware;
+ }
+ }
+ return false;
+ }
+
  protected function getLightSwitch(object $deviceData) {
  return new Factories\LightSwitchFactory($deviceData);
  }

src/Controllers/Thermostat/Setpoint.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace rutgerkirkels\DomoticzPHP\Controllers\Thermostat;
+
+use rutgerkirkels\DomoticzPHP\Controllers\AbstractController;
+
+class Setpoint extends AbstractController
+{
+ /**
+ * @var \rutgerkirkels\DomoticzPHP\Devices\Thermostat\SetPoint
+ */
+ protected $device;
+
+ protected $connector;
+
+ public function __construct(\rutgerkirkels\DomoticzPHP\Devices\Thermostat\SetPoint $device)
+ {
+ parent::__construct($device);
+ }
+
+ public function set(float $data) {
+ $set = $this->connector->executeCommand([
+ 'param' => 'udevice',
+ 'idx' => $this->device->getIdx(),
+ 'nvalue' => 0,
+ 'svalue' => $data
+ ]);
+
+ if ($set) {
+ return true;
+ }
+
+ return false;
+ }
+}

src/Devices/AbstractDevice.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Device class
+ * AbstractDevice class
  *
  * @package rutgerkirkels\domoticz_php
  * @author Rutger Kirkels <rutger@kirkels.nl>a
@@ -39,10 +39,10 @@ abstract class AbstractDevice
  protected $protected;
 // protected $ShowNotifications;
  protected $signalLevel;
-// protected $SubType;
+ protected $subType;
 // protected $Temp;
  protected $timers;
-// protected $Type;
+ protected $type;
 // protected $TypeImg;
 // protected $Unit;
  protected $used;
@@ -69,11 +69,15 @@ public function __construct(object $deviceData) {
  $this->hardwareName = $deviceData->HardwareName;
  $this->hardwareType = $deviceData->HardwareType;
  $this->hardwareId = $deviceData->HardwareID;
- $this->status = $deviceData->Status;
+ if (property_exists($deviceData,'Status')) {
+ $this->status = $deviceData->Status;
+ }
  $this->favorite = $deviceData->Favorite == 1 ? true : false;
  $this->data = $deviceData->Data;
  $this->signalLevel = $deviceData->SignalLevel;
  $this->batteryLevel = $deviceData->BatteryLevel;
+ $this->type = $deviceData->Type;
+ $this->subType = $deviceData->SubType;
  }
 
  /**
@@ -132,5 +136,22 @@ public function getHardwareType()
  return $this->hardwareType;
  }
 
+ /**
+ * @return mixed
+ */
+ public function getSubType()
+ {
+ return $this->subType;
+ }
+
+ /**
+ * @return mixed
+ */
+ public function getType()
+ {
+ return $this->type;
+ }
+
+
 
 }

src/Factories/ControllerFactory.php

@@ -4,8 +4,10 @@
 
 use rutgerkirkels\DomoticzPHP\Controllers\Switches\OnOff;
 use rutgerkirkels\DomoticzPHP\Controllers\Switches\Selector;
+use rutgerkirkels\DomoticzPHP\Devices\AbstractDevice;
 use rutgerkirkels\DomoticzPHP\Devices\Switches\AbstractSwitch;
 use rutgerkirkels\DomoticzPHP\Controllers\Switches\Dimmer;
+use rutgerkirkels\DomoticzPHP\Controllers\Thermostat\SetPoint;
 
 /**
  * Class ControllerFactory
@@ -18,7 +20,7 @@ class ControllerFactory
  */
  protected $device;
 
- public function __construct(AbstractSwitch $device)
+ public function __construct(AbstractDevice $device)
  {
  $this->device = $device;
  }
@@ -39,6 +41,10 @@ public function get() {
  case 'rutgerkirkels\\DomoticzPHP\\Devices\\Switches\\Selector':
  return new Selector($this->device);
  break;
+
+ case 'rutgerkirkels\\DomoticzPHP\\Devices\\Thermostat\\SetPoint':
+ return new SetPoint($this->device);
+ break; 
  }
  }
 }

src/Factories/HardwareFactory.php

@@ -4,7 +4,12 @@
 
 
 use rutgerkirkels\DomoticzPHP\Hardware\General;
+use rutgerkirkels\DomoticzPHP\Hardware\Nest;
 
+/**
+ * Class HardwareFactory
+ * @package rutgerkirkels\DomoticzPHP\Factories
+ */
 class HardwareFactory
 {
  /**
@@ -26,6 +31,12 @@ class HardwareFactory
  */
  protected $devices;
 
+ /**
+ * HardwareFactory constructor.
+ * @param int $id
+ * @param string $name
+ * @param string|null $type
+ */
  public function __construct(int $id, string $name, string $type = null)
  {
  $this->id = $id;
@@ -40,9 +51,13 @@ public function addDevice($device) {
  public function get() {
  switch ($this->type) {
 
+ case 'Nest Thermostat/Protect':
+ $hardware = new Nest($this->id, $this->name, $this->devices, $this->type);
+ break;
+
  default:
- $hardware = new General($this->id, $this->name, $this->type);
- $hardware->setDevices($this->devices);
+ $hardware = new General($this->id, $this->name, $this->devices, $this->type);
+
  }
 
  return $hardware;

src/Hardware/AbstractHardware.php

@@ -24,10 +24,11 @@ abstract class AbstractHardware
  */
  protected $devices;
 
- public function __construct(int $id, string $name, string $type = null)
+ public function __construct(int $id, string $name, array $devices, string $type = null)
  {
  $this->id = $id;
  $this->name =$name;
+ $this->devices = $devices;
  $this->type = $type;
  }
 
@@ -95,5 +96,12 @@ public function setDevices(array $devices): void
  $this->devices = $devices;
  }
 
-
+ public function getDeviceByIdx(int $idx) {
+ foreach ($this->devices as $key => $device) {
+ if ($device->getIdx() === $idx) {
+ return $this->devices[$key];
+ }
+ }
+ return false;
+ }
 }

src/Hardware/General.php

@@ -2,7 +2,10 @@
 
 namespace rutgerkirkels\DomoticzPHP\Hardware;
 
-
+/**
+ * General Hardware class
+ * @package rutgerkirkels\DomoticzPHP\Hardware
+ */
 class General extends AbstractHardware implements HardwareInterface
 {