From: Vincent Vanwaelscappel Date: Sun, 15 Oct 2023 17:51:09 +0000 (+0200) Subject: . X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=8dac257bbcc7a8e7ae0a2291827e789cc65d90e8;p=tortuga-home.git . --- diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index 6823b71..0cedba0 100644 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -1,6 +1,6 @@ - + " diff --git a/.idea/misc.xml b/.idea/misc.xml index 712d804..3e0d580 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,8 @@ + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 454d095..b6f6bb3 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,8 +5,11 @@ + - + + + - { + "keyToString": { + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "WebServerToolWindowFactoryState": "true", + "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true", + "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true", + "WebServerToolWindowPanel.toolwindow.show.date": "false", + "WebServerToolWindowPanel.toolwindow.show.permissions": "false", + "WebServerToolWindowPanel.toolwindow.show.size": "false", + "deletionFromPopupRequiresConfirmation": "false", + "git-widget-placeholder": "master", + "ignore.virus.scanning.warn.message": "true", + "last_opened_file_path": "D:/Works/rodadocavaco", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "project.structure.last.edited": "Project", + "project.structure.proportion": "0.0", + "project.structure.side.proportion": "0.2", + "ruby.rails.projectView.checked": "true", + "settings.editor.selected.configurable": "preferences.pluginManager", + "vue.rearranger.settings.migration": "true" } -}]]> +} @@ -1282,6 +1285,7 @@ + 1641726946298 @@ -1626,7 +1630,7 @@ - diff --git a/config/rooms.php b/config/rooms.php index b80261c..030095a 100644 --- a/config/rooms.php +++ b/config/rooms.php @@ -178,7 +178,7 @@ function cour() ['type' => 'light', 'scene' => 'cour/lumineux', 'label' => 'lumineux'], ['type' => 'light', 'scene' => 'cour/daylight', 'label' => 'jour'], ['type' => 'light', 'scene' => 'cour/grow', 'label' => 'croissance'], - ['type' => 'light', 'scene' => 'cour/tropical', 'label' => 'crepuscule tropical'], + ['type' => 'light', 'scene' => 'cour/tropical', 'label' => 'crépuscule tropical'], ['type' => 'separator', 'label' => 'Projecteurs'], ['type' => 'light', 'scene' => 'cour/projecteurs/on', 'label' => 'Allumer'], ['type' => 'light', 'scene' => 'cour/projecteurs/off', 'label' => 'éteindre'], diff --git a/scripts/lib/homeassistant.php b/scripts/lib/homeassistant.php index 253cfd0..3115f31 100644 --- a/scripts/lib/homeassistant.php +++ b/scripts/lib/homeassistant.php @@ -8,6 +8,7 @@ const HA_ECO_BASIC = 'switch.ecomode_basic'; const HA_ECO_SUPER = 'switch.ecomode_super'; const HA_HOTTE = 'switch.hotte'; const HA_BAR = 'switch.bar'; +const HA_GROW_LAMPS='switch.0x00124b0025e24358'; const HA_PLANETARIUM = 'switch.0xa4c138788071821e'; const HA_OFFICE_CURTAIN='cover.office_curtain'; diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php index 467b6d1..9269591 100644 --- a/scripts/lib/scenes.php +++ b/scripts/lib/scenes.php @@ -756,11 +756,9 @@ $scenes = [ ], 'sdb/ampli/on' => [ ['type' => 'ha', 'device' => HA_SDB_AMPLI, 'priority' => true], - //['type' => 'domoticz', 'device' => $amplisdb, 'command' => true, 'priority' => true], ], 'sdb/ampli/off' => [ ['type' => 'ha', 'device' => HA_SDB_AMPLI, 'command' => 'turn_off', 'priority' => true], - //['type' => 'domoticz', 'device' => $amplisdb, 'command' => false, 'priority' => true], ], 'sdb/hotwater/auto' => [ ['type' => 'function', 'function' => 'hotwaterAutoMode', 'args' => ['1']], @@ -804,12 +802,6 @@ $scenes = [ ['type' => 'domoticz', 'scene' => 22, 'command' => true, 'priority' => true], ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['Nature sounds', $squeezeboxPlayers['Salle de bains'], 65]], ], - 'salon/freebox/on' => [ - ['type' => 'domoticz', 'device' => '1439', 'command' => true, 'priority' => true], - ], - 'salon/freebox/off' => [ - ['type' => 'domoticz', 'device' => '1439', 'command' => false], - ], 'cuisine/hotte/on' => [ ['type' => 'ha', 'device' => HA_HOTTE], ], @@ -831,15 +823,6 @@ $scenes = [ ['type' => 'scene', 'scene' => 'cuisine/hotte/off'], //['type' => 'hue', 'group' => $cuisine, 'scene' => array('on' => false)] ], - 'cuisine/toaster/toggle' => [ - ['type' => 'domoticz', 'device' => '1453', 'command' => 'Toggle', 'priority' => true], - ], - 'cuisine/toaster/on' => [ - ['type' => 'domoticz', 'device' => '1453', 'command' => true, 'priority' => true], - ], - 'cuisine/toaster/off' => [ - ['type' => 'domoticz', 'device' => '1453', 'command' => false, 'priority' => true], - ], 'cuisine/coffee/on' => [ ['type' => 'function', 'function' => 'coffee_on'], ], @@ -847,35 +830,28 @@ $scenes = [ ['type' => 'function', 'function' => 'coffee_off'], ], 'cour/auto' => [ - ['type' => 'domoticz', 'device' => '6899', 'command' => true], ['type' => 'function', 'function' => 'courAuto', 'args' => [true]], ], 'cour/daylight' => [ - ['type' => 'domoticz', 'device' => '6899', 'command' => true], - ['type' => 'hue', 'group' => $cour, 'scene' => '8RyJJ3Dn7ayPQ8t'], + ['type' => 'ha', 'device' => 'scene.cour_daylight'], ], 'cour/lumineux' => [ - ['type' => 'domoticz', 'device' => '6899', 'command' => true], - ['type' => 'hue', 'group' => $cour, 'scene' => 'XzV1CuYIdHXPKoJ'], + ['type' => 'ha', 'device' => 'scene.cour_light'], ], 'cour/tropical' => [ - ['type' => 'domoticz', 'device' => '6899', 'command' => true], - ['type' => 'hue', 'group' => $cour, 'scene' => 'wBdbymg1w5ZZvtS'], + ['type' => 'ha', 'device' => 'scene.cour_tropical'], ], 'cour/grow' => [ - ['type' => 'domoticz', 'device' => '6899', 'command' => true], - ['type' => 'hue', 'group' => $cour, 'scene' => 'WVanIpWUWjkBjsS'], + ['type' => 'ha', 'device' => 'scene.cour_grow'], ], 'cour/off' => [ - ['type' => 'hue', 'group' => $cour, 'scene' => ['on' => false]], - ['type' => 'function', 'function' => 'courAuto', 'args' => [false]], - ['type' => 'domoticz', 'device' => '6899', 'command' => false], + ['type' => 'ha', 'device' => 'scene.cour_off'], ], 'cour/projecteurs/on' => [ - ['type' => 'domoticz', 'device' => '6898', 'command' => true], + ['type' => 'ha', 'device' => HA_GROW_LAMPS], ], 'cour/projecteurs/off' => [ - ['type' => 'domoticz', 'device' => '6898', 'command' => false], + ['type' => 'ha', 'device' => HA_GROW_LAMPS, 'command' => 'turn_off'], ], 'ecomode/basic' => [ ['type' => 'ha', 'device' => HA_ECO_BASIC, 'command' => 'turn_off'],