From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 5 Jul 2023 07:10:29 +0000 (+0200)
Subject: .
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d0d082183004849cff5bef978bf04448005521bc;p=tortuga-home.git

.
---

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f8034d5..29fdf77 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,6 +9,7 @@
       <change beforePath="$PROJECT_DIR$/scripts/homeassistant.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/homeassistant.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/harmony.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/harmony.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/homeassistant.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/homeassistant.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1217,7 +1218,7 @@
       <workItem from="1687359859243" duration="1495000" />
       <workItem from="1688295154056" duration="11039000" />
       <workItem from="1688414368761" duration="11417000" />
-      <workItem from="1688478993471" duration="3221000" />
+      <workItem from="1688478993471" duration="43245000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1562,7 +1563,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="552" />
+    <option name="localTasksCounter" value="553" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/scripts/homeassistant.php b/scripts/homeassistant.php
index 7ced31d..06a3dbd 100644
--- a/scripts/homeassistant.php
+++ b/scripts/homeassistant.php
@@ -1,7 +1,9 @@
 <?php
 require_once "import.php";
 if (!isset($_GET['action']) || $_GET['action'] === 'state') {
-	print_r(haGetState($_GET['id'],$_GET['attribute']??null));
+	print_r(haGetState($_GET['id'], $_GET['attribute'] ?? null));
 } else {
-	print_r(haAction($_GET['id'], $_GET['action']));
+	$data = $_GET;
+	unset($data['id'], $data['action'], $data['c']);
+	print_r(haAction($_GET['id'], $_GET['action'], null, $data));
 }
\ No newline at end of file
diff --git a/scripts/lib/harmony.php b/scripts/lib/harmony.php
index 63a6622..7a9c2a3 100644
--- a/scripts/lib/harmony.php
+++ b/scripts/lib/harmony.php
@@ -1,12 +1,12 @@
 <?php
 
-$harmonymap = ['musique' => 'Musique', 'tv' => 'TV', 'switch' => 'Switch', 'poweroff' => 'Power Off'];
+$harmonymap = ['musique' => 'Musique', 'tv' => 'TV', 'switch' => 'Switch', 'poweroff' => 'power_off'];
 function harmonyActivity($activity) {
 	global $harmonymap;
-	if($activity=='off'){
-		$activity='poweroff';
+	if ($activity == 'off') {
+		$activity = 'poweroff';
 	}
-	if ($activity == 'poweroff' ) {
+	if ($activity == 'poweroff') {
 		setPlaying('mycanal', 'bureau');
 	}
 	$wait = 0;
@@ -23,13 +23,12 @@ function harmonyActivity($activity) {
 		shieldWakeup('bureau');
 	}
 
-
-	haAction("select.bureau_activities", $harmonymap[$activity]);
+	haAction("select.bureau_activities", 'select_option', null, ['option' => $harmonymap[$activity]]);
 	if ($wait > 0) {
 		sleep($wait);
 	}
 	if ($activity == 'tv') {
-		runAtEnd('sleep(15);/*harmonyDeviceCommand(\'sony-projecteur\', \'power-on\');*/');
+		runAtEnd('sleep(15);haAction(\'script.bureau_projector_on\');');
 	}
 }
 
@@ -45,9 +44,4 @@ function getCurrentHarmonyActivity() {
 
 function stopHarmony() {
 	harmonyActivity('off');
-}
-
-function harmonyDeviceCommand($device, $command) {
-//	haEvent();
-//	return harmonyRequest('devices/' . $device . '/commands/' . $command, 'POST');
 }
\ No newline at end of file
diff --git a/scripts/lib/homeassistant.php b/scripts/lib/homeassistant.php
index 2332fc1..4c33dd3 100644
--- a/scripts/lib/homeassistant.php
+++ b/scripts/lib/homeassistant.php
@@ -39,11 +39,12 @@ function haGetState($id, $attribute = null) { //ID to read - for example sensor.
 }
 
 
-function haAction($id, $action = 'turn_on', $domain = null) {
+function haAction($id, $action = 'turn_on', $domain = null, $data = []) {
+	$data['entity_id'] = $id;
 	$opts = [
 		"http" => [
 			"method" => "POST",
-			'content' => json_encode(['entity_id' => $id]),
+			'content' => json_encode($data),
 			"header" =>
 				"Content-Type: application/json\r\n" .
 				"Authorization: Bearer " . HA_KEY . "\r\n"
@@ -56,7 +57,7 @@ function haAction($id, $action = 'turn_on', $domain = null) {
 	}
 
 	$ctx = stream_context_create($opts);
-	$data = @file_get_contents(HA_URL . 'api/services/' . $domain . '/' . $action, false, $ctx);
+	$data = file_get_contents(HA_URL . 'api/services/' . $domain . '/' . $action, false, $ctx);
 	if (!$data)
 		return false;
 	$data = json_decode($data);
diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 7f6280a..1b8de03 100644
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -472,7 +472,7 @@ $scenes = [
 		['type' => 'domoticz', 'device' => '3529', 'command' => true, 'priority' => true],
 	],
 	'bureau/fan/toggle' => [
-		['type' => 'function', 'function' => 'harmonyDeviceCommand', 'args' => ['klarstein-whisperwind', 'power-toggle']],
+		['type' => 'ha', 'device' => 'script.klarstein_fan_toggle'],
 	],
 	'bureau/auto' => [
 		['type' => 'function', 'function' => 'bureauAuto', 'args' => [true]],
@@ -900,7 +900,7 @@ $scenes = [
 		['type' => 'ha', 'device' => HA_ECO_SUPER, 'command' => 'turn_off'],
 	],
 	'ecomode/notsuper' => [
-		['type' => 'ha', 'device' => HA_ECO_SUPER, 'command' => 'turn_on'],
+		['type' => 'ha', 'device' => HA_ECO_SUPER],
 	],
 	'ecomode/on' => [
 		['type' => 'scene', 'scene' => 'ecomode/basic'],
@@ -908,7 +908,7 @@ $scenes = [
 	],
 	'ecomode/off' => [
 		['type' => 'scene', 'scene' => 'ecomode/notsuper'],
-		['type' => 'ha', 'device' => HA_ECO_BASIC, 'command' => 'turn_on'],
+		['type' => 'ha', 'device' => HA_ECO_BASIC],
 	],
 ];
 
@@ -1009,7 +1009,7 @@ function execScene($name, $fromUserAction = false, $transitionTime = null) {
 			}
 			domoticzSwitch($action['device'], $action['command'], isset($action['switchtype']) ? $action['switchtype'] : 'light', $action['priority'] ?? false);
 		} else if ($action['type'] === 'ha') {
-			haAction($action['device'], $action['command']);
+			haAction($action['device'], $action['command'] ?? null);
 		} else if ($action['type'] == 'ir') {
 			irsend($action['room'], $action['device'], $action['command']);
 		} else if ($action['type'] == 'ifttt') {