From 02ba4e5d6f67b23994324a521b5d9821a3421613 Mon Sep 17 00:00:00 2001 From: JonatanRek Date: Fri, 15 May 2020 19:48:53 +0200 Subject: [PATCH] Git additional Updates --- app/api/GoogleHomeApi.php | 3 +-- app/models/GoogleHome.php | 8 ++++++++ app/models/types/GoogleHomeDeviceTypes.php | 10 ++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/api/GoogleHomeApi.php b/app/api/GoogleHomeApi.php index 895176a..40f67cd 100644 --- a/app/api/GoogleHomeApi.php +++ b/app/api/GoogleHomeApi.php @@ -19,7 +19,6 @@ class GoogleHomeApi { //$apiLogManager->write("[Google Home] action.devices.QUERY", LogRecordType::INFO); break; - case 'action.devices.EXECUTE': GoogleHome::execute($obj['requestId'], $obj['inputs'][0]['payload']); $apiLogManager->write("[Google Home] action.devices.EXECUTE", LogRecordType::INFO); @@ -36,7 +35,7 @@ class GoogleHomeApi { $apiLogManager->write("[API] GET body\n" . json_encode($_GET, JSON_PRETTY_PRINT), LogRecordType::INFO); $get = [ - "access_token"=>"23165133", + "access_token"=>"2222255888", "token_type"=>"Bearer", "state"=>$_GET["state"], ]; diff --git a/app/models/GoogleHome.php b/app/models/GoogleHome.php index 8882be9..1f17d6c 100644 --- a/app/models/GoogleHome.php +++ b/app/models/GoogleHome.php @@ -12,6 +12,14 @@ class GoogleHome { //Google Compatibile Action Type $actionType = GoogleHomeDeviceTypes::getAction($subDeviceData['type']); + + if ( + strpos($deviceData['name'], 'Světlo') !== false || + strpos($deviceData['name'], 'světlo') !== false + ) { + $actionType = 'action.devices.types.LIGHT'; + } + $tempDevice = [ 'id' => (string) $subDeviceData['subdevice_id'], 'type' => $actionType, diff --git a/app/models/types/GoogleHomeDeviceTypes.php b/app/models/types/GoogleHomeDeviceTypes.php index e3e9ca6..6f142b7 100644 --- a/app/models/types/GoogleHomeDeviceTypes.php +++ b/app/models/types/GoogleHomeDeviceTypes.php @@ -82,6 +82,7 @@ class GoogleHomeDeviceTypes { static function getSyncObj($deviceBaseObj, $deviceType){ switch ($deviceType) { + case 'action.devices.types.LIGHT': case 'action.devices.types.OUTLET': $deviceBaseObj['traits'] = [ 'action.devices.traits.OnOff' @@ -92,15 +93,8 @@ class GoogleHomeDeviceTypes { 'action.devices.traits.TemperatureSetting', ]; $deviceBaseObj['attributes'] = [ - "availableThermostatModes" => "off,heat,on", - "thermostatTemperatureRange" => [ - 'minThresholdCelsius' => 5, - 'maxThresholdCelsius' => 30, - ], + "availableThermostatModes" => "off,heat", "thermostatTemperatureUnit" => "C", - "commandOnlyTemperatureSetting" => true, - "queryOnlyTemperatureSetting" => true, - "bufferRangeCelsius" => 0, ]; break; }