diff options
| -rw-r--r-- | .storage/lovelace.lovelace_control | 4 | ||||
| -rw-r--r-- | .storage/lovelace.lovelace_power | 4 | ||||
| -rw-r--r-- | .storage/lovelace.lovelace_status | 12 | ||||
| -rw-r--r-- | .storage/person | 3 | ||||
| -rw-r--r-- | automations.yaml | 406 | ||||
| -rw-r--r-- | blueprints/automation/motion/halabyan24.yaml | 8 | ||||
| -rw-r--r-- | custom/group.yaml | 9 | ||||
| -rw-r--r-- | custom/scripts/turn-on-office-lights.yaml | 11 | ||||
| -rw-r--r-- | scripts.yaml | 2 |
9 files changed, 105 insertions, 354 deletions
diff --git a/.storage/lovelace.lovelace_control b/.storage/lovelace.lovelace_control index ee93ce8..b15033c 100644 --- a/.storage/lovelace.lovelace_control +++ b/.storage/lovelace.lovelace_control @@ -155,7 +155,7 @@ }, { "type": "light", - "entity": "light.yeelight_color_0x7caaf86", + "entity": "light.office_bulb_office_bulb", "name": "Office Bulb" } ] @@ -189,7 +189,7 @@ "name": "Office" }, { - "entity": "light.yeelight_color_0x7caaf86", + "entity": "light.office_bulb_office_bulb", "name": "Bulb" }, { diff --git a/.storage/lovelace.lovelace_power b/.storage/lovelace.lovelace_power index 2046dad..89a53dd 100644 --- a/.storage/lovelace.lovelace_power +++ b/.storage/lovelace.lovelace_power @@ -117,6 +117,10 @@ { "entity": "sensor.hall_camera_power", "name": "AubergineView" + }, + { + "entity": "sensor.living_livingviewswitch_living_livingviewswitch_power", + "name": "LivingView" } ] }, diff --git a/.storage/lovelace.lovelace_status b/.storage/lovelace.lovelace_status index 202ad33..b7abfe6 100644 --- a/.storage/lovelace.lovelace_status +++ b/.storage/lovelace.lovelace_status @@ -285,16 +285,16 @@ "name": "Asgard clients" }, { - "entity": "device_tracker.legion8", - "name": "Legion8/Asgard" + "entity": "device_tracker.samsa", + "name": "Samsa/Asgard" }, { - "entity": "device_tracker.lm_g810", - "name": "Legion8/Hass" + "entity": "device_tracker.sm_s926b", + "name": "Samsa/Hass" }, { - "entity": "device_tracker.nyx", - "name": "Nyx/Asgard" + "entity": "device_tracker.tir", + "name": "Tir/Asgard" } ] } diff --git a/.storage/person b/.storage/person index 4913fd8..1aa6c7a 100644 --- a/.storage/person +++ b/.storage/person @@ -9,7 +9,8 @@ "user_id": "31a296cc30a243089f121cef93b46cc0", "device_trackers": [ "device_tracker.lm_g810", - "device_tracker.control" + "device_tracker.control", + "device_tracker.sm_s926b" ], "id": "suren_a_chilingaryan" } diff --git a/automations.yaml b/automations.yaml index 68d248d..621c215 100644 --- a/automations.yaml +++ b/automations.yaml @@ -119,13 +119,13 @@ default: [] mode: single - id: '1654901560778' - alias: 'Living: Office Light' + alias: 'Living: LED' description: '' use_blueprint: path: lights/light_switch.yaml input: switch: switch.living_lights_right - light: light.lights_office + light: light.living_led dblclick: - parallel: - service: script.sleep_and_wake @@ -136,14 +136,11 @@ data: {} target: entity_id: switch.lights_living -- id: '1654986053564' - alias: 'Hall: Kitchen LED' - description: '' - use_blueprint: - path: lights/light_switch.yaml - input: - switch: switch.kitchen_lights_center - light: switch.kitchen_ledlights + - service: light.turn_off + metadata: {} + data: {} + target: + entity_id: light.lights_office - id: '1654986378177' alias: 'Bedroom: Bulb' description: '' @@ -494,7 +491,7 @@ sequence: - type: toggle device_id: 95931a9049849e575f2de543adf111eb - entity_id: light.yeelight_color_0x7caaf86 + entity_id: light.office_bulb_office_bulb domain: light - conditions: - condition: template @@ -642,14 +639,6 @@ message: 'Unsupported command: {{ trigger.event.data.command }} with params: {{ trigger.event.data.args }}' mode: single -- id: '1672608894803' - alias: 'Hall: Hall Camera Switch' - description: '' - use_blueprint: - path: lights/light_switch.yaml - input: - switch: switch.hall_lights_center - light: switch.hall_camera - id: '1672624569107' alias: 'Hall: Entrance Combo' description: '' @@ -791,7 +780,7 @@ use_blueprint: path: lights/knob-bulb-control.yaml input: - light: light.yeelight_color_0x7caaf86 + light: light.office_bulb_office_bulb knob: sensor.office_knob_action toggle: - if: @@ -819,7 +808,7 @@ input: knob: sensor.office_knob_action lights: - - light.yeelight_color_0x7caaf86 + - light.office_bulb_office_bulb - light.smart_light - id: '1672987670623' alias: 'Office: Dimming Button' @@ -828,7 +817,7 @@ path: lights/light_button.yaml input: button: sensor.office_button_action - light: light.yeelight_color_0x7caaf86 + light: light.office_bulb_office_bulb on_click: - service: homeassistant.turn_off data: {} @@ -852,7 +841,7 @@ hold: - device_id: 95931a9049849e575f2de543adf111eb domain: light - entity_id: light.yeelight_color_0x7caaf86 + entity_id: light.office_bulb_office_bulb type: brightness_decrease - id: '1672989606410' alias: 'Office: Button' @@ -861,66 +850,57 @@ path: lights/light_button.yaml input: button: sensor.office_button_action - light: light.yeelight_color_0x7caaf86 + light: light.office_led_office_led on_click: - - if: + if: - condition: state - entity_id: switch.living_tablelampsocket + entity_id: light.office_chair_led_office_chair_led state: 'on' then: - - service: switch.turn_off - data: {} + - service: light.turn_off target: - entity_id: switch.living_tablelampsocket + entity_id: light.office_chair_led_office_chair_led else: - - if: - - condition: state - entity_id: light.office_led_office_led - state: 'on' + if: + - condition: or + conditions: + - condition: state + entity_id: switch.smart_power_strip_pro_socket_2 + state: 'off' + - condition: state + entity_id: switch.office_table + state: unavailable then: - parallel: - - service: homeassistant.turn_off - target: - entity_id: - - light.office_led_office_led - - service: switch.turn_on - target: - entity_id: switch.living_tablelampsocket - else: - - if: - - condition: or - conditions: - - condition: state - entity_id: switch.smart_power_strip_pro_socket_2 - state: 'off' - - condition: state - entity_id: switch.office_table - state: unavailable - then: - - parallel: - - service: script.sleep_and_wake - data: - mode: wake - target: office - - if: - - condition: numeric_state - entity_id: sun.sun - attribute: elevation - below: '5' - then: - - service: script.turn_on_office_lights - data: - temperature: 4000 - else: - - service: script.turn_on_office_lights + - service: script.sleep_and_wake data: - temperature: 4000 + mode: wake + target: office + - if: + - condition: numeric_state + entity_id: sun.sun + attribute: elevation + below: '5' + then: + - service: script.turn_on_office_lights + data: + temperature: 4000 + else: + - service: script.turn_on_office_lights + data: + temperature: 4000 off_click: - - service: homeassistant.turn_on - target: - entity_id: - - light.office_led_office_led - data: {} + - parallel: + - service: homeassistant.turn_on + target: + entity_id: + - light.office_chair_led_office_chair_led + data: {} + - service: homeassistant.turn_off + target: + entity_id: + - light.office_bulb_office_bulb + data: {} dblclick: - if: - condition: state @@ -1027,9 +1007,6 @@ entity_id: input_boolean.mode_away state: 'off' - condition: state - entity_id: input_boolean.mode_alone - state: 'on' - - condition: state entity_id: input_boolean.mode_bright state: 'on' then: @@ -1060,168 +1037,6 @@ domain: light door_entity: - binary_sensor.entrance_door_contact -- id: '1673153262822' - alias: 'Motions: Global v1' - description: '' - trigger: - - platform: state - id: home - entity_id: - - group.master_phones - from: not_home - to: home - for: - hours: 0 - minutes: 1 - seconds: 0 - - platform: state - id: away - entity_id: - - group.master_phones - from: home - to: not_home - for: - hours: 1 - minutes: 0 - seconds: 0 - - type: no_motion - platform: device - device_id: 6deb0a6fb7a4a849ba22afc166cf9919 - entity_id: binary_sensor.hall_motions_occupancy - domain: binary_sensor - for: - hours: 24 - minutes: 0 - seconds: 0 - id: empty_day - - type: no_motion - platform: device - device_id: 6deb0a6fb7a4a849ba22afc166cf9919 - entity_id: binary_sensor.hall_motions_occupancy - domain: binary_sensor - for: - hours: 120 - minutes: 0 - seconds: 0 - id: empty_week - - type: motion - platform: device - device_id: 6deb0a6fb7a4a849ba22afc166cf9919 - entity_id: binary_sensor.hall_motions_occupancy - domain: binary_sensor - for: - hours: 0 - minutes: 1 - seconds: 0 - id: motions - - platform: state - entity_id: - - input_boolean.mode_away - from: 'on' - to: 'off' - id: away_gone - condition: [] - action: - - choose: - - conditions: - - condition: state - entity_id: input_boolean.mode_house_sleep - state: 'off' - - condition: or - conditions: - - condition: trigger - id: empty_day - - condition: and - conditions: - - condition: trigger - id: away - - condition: state - entity_id: input_boolean.mode_alone - state: 'on' - - condition: state - entity_id: binary_sensor.hall_motions_occupancy - state: 'off' - for: - hours: 2 - minutes: 0 - seconds: 0 - sequence: - - service: script.sleep_and_wake - data: - mode: sleep - target: house - - service: input_boolean.turn_on - data: {} - target: - entity_id: input_boolean.mode_house_sleep - - conditions: - - condition: trigger - id: empty_week - - condition: state - entity_id: input_boolean.mode_house_hibernate - state: 'off' - sequence: - - service: script.sleep_and_wake - data: - mode: hibernate - target: house - - service: input_boolean.turn_on - data: {} - target: - entity_id: input_boolean.mode_house_hibernate - - conditions: - - condition: trigger - id: home - sequence: - - service: switch.turn_off - data: {} - target: - entity_id: switch.hall_lights_right - - conditions: - - condition: or - conditions: - - condition: state - entity_id: input_boolean.mode_house_sleep - state: 'on' - - condition: state - entity_id: input_boolean.mode_house_hibernate - state: 'on' - - condition: or - conditions: - - condition: and - conditions: - - condition: trigger - id: motions - - condition: state - entity_id: input_boolean.mode_away - state: 'off' - - condition: and - conditions: - - condition: trigger - id: away_gone - - type: is_motion - condition: device - device_id: 6deb0a6fb7a4a849ba22afc166cf9919 - entity_id: binary_sensor.hall_motions_occupancy - domain: binary_sensor - sequence: - - if: - - condition: state - entity_id: input_boolean.mode_house_hibernate - state: 'on' - then: - - service: script.sleep_and_wake - data: - mode: wake - target: house - - service: input_boolean.turn_off - data: {} - target: - entity_id: - - input_boolean.mode_house_sleep - - input_boolean.mode_house_hibernate - default: [] - mode: single - id: '1673156009695' alias: 'Motions: Office' description: '' @@ -1324,23 +1139,6 @@ domain: switch reentry_wait: 10 reentry_timeout: 45 -- id: '1673331563280' - alias: 'Motions: Bathroom' - description: '' - use_blueprint: - path: motion/occupancy_tracking.yaml - input: - entrance: binary_sensor.bathroom_motions_occupancy - inside: binary_sensor.bathroom_motions_occupancy - light: switch.bathroom_lights_left - occupancy: input_boolean.occupancy_bathroom - on_action: - - type: turn_on - device_id: ad2aac96e3377b6e1f336d194b7ba792 - entity_id: switch.bathroom_lights_left - domain: switch - reentry_wait: 5 - reentry_timeout: 45 - id: '1674140368136' alias: 'Office: Sven Scene Switch' description: '' @@ -1364,7 +1162,7 @@ input: knob: sensor.office_knob_action lights: - - light.yeelight_color_0x7caaf86 + - light.office_bulb_office_bulb media_player: media_player.smartpi toggle_actions: - choose: @@ -1402,31 +1200,6 @@ data: message: CRD net failure mode: single -- id: '1680824553612' - alias: 'Motions: Bedroom' - description: '' - use_blueprint: - path: motion/motion_switch.yaml - input: - light_target: - - switch.bedroom_lights_left - - switch.bedroom_lights_center - motion_entity: binary_sensor.bedroom_motions_occupancy - illumination_test: sun - illuminance_entity: sensor.kitchen_motions_illuminance_lux - lux_threshold: 60 - no_motion_wait: 60 - on_cond_should_be_off: - - switch.lights_bedroom - on_cond_should_be_on: - - binary_sensor.hall_motions_occupancy - off_cond_should_be_off: - - switch.lights_bedroom - on_click: - - service: automation.turn_on - data: {} - target: - entity_id: automation.motions_bedroom_from_hall - id: '1680827972411' alias: 'Motions: Guestroom' description: '' @@ -1569,49 +1342,6 @@ target: entity_id: - automation.motions_bedroom_v2 -- id: '1680923844207' - alias: 'Motions: Bedroom from Hall' - description: '' - trigger: - - type: no_motion - platform: device - device_id: 6deb0a6fb7a4a849ba22afc166cf9919 - entity_id: binary_sensor.hall_motions_occupancy - domain: binary_sensor - for: - hours: 0 - minutes: 0 - seconds: 30 - condition: - - condition: state - entity_id: input_boolean.mode_alone - state: 'on' - - condition: state - entity_id: - - binary_sensor.bedroom_bedsidelamp - - switch.bedroom_tablelamp - - switch.bedroom_lights_right - state: 'off' - - condition: state - entity_id: - - binary_sensor.bedroom_motions_occupancy - - binary_sensor.bedroom_presence_presence - state: 'off' - for: - hours: 0 - minutes: 0 - seconds: 20 - action: - - service: homeassistant.turn_off - data: {} - target: - entity_id: switch.lights_bedroom - - service: automation.turn_off - data: - stop_actions: false - target: - entity_id: automation.motions_bedroom_from_hall - mode: single - id: '1681005500468' alias: 'Bedroom: Switch3' description: '' @@ -1961,7 +1691,7 @@ metadata: {} mode: single - id: '1687227285061' - alias: 'Hall: Hall Camera ' + alias: 'Hall: Security Cameras' description: '' trigger: - platform: state @@ -1976,20 +1706,18 @@ state: 'on' sequence: - parallel: - - type: turn_on - device_id: 26d4f61d01f392350cd4375fcc3dbf50 - entity_id: switch.hall_camera - domain: switch + - service: switch.turn_on + target: + entity_id: switch.security_cameras - conditions: - condition: state entity_id: input_boolean.mode_away state: 'off' sequence: - parallel: - - type: turn_off - device_id: 26d4f61d01f392350cd4375fcc3dbf50 - entity_id: switch.hall_camera - domain: switch + - service: switch.turn_off + target: + entity_id: switch.security_cameras mode: single - id: '1687256985181' alias: Power Outtage @@ -2006,7 +1734,7 @@ seconds: 0 - platform: state entity_id: - - light.yeelight_color_0x7caaf86 + - light.office_bulb_office_bulb from: unavailable id: office_bulb for: @@ -2030,7 +1758,7 @@ entity_id: switch.plugs_infrastructure - type: turn_off device_id: 95931a9049849e575f2de543adf111eb - entity_id: light.yeelight_color_0x7caaf86 + entity_id: light.office_bulb_office_bulb domain: light - type: turn_off device_id: bf45f1d630db6e2aa1307866603f548a @@ -2132,3 +1860,11 @@ data: message: SmartPI out of power mode: single +- id: '1757282812187' + alias: 'Guestroom: Lights sync' + description: '' + use_blueprint: + path: lights/light_sync.yaml + input: + master: switch.guestroom_lights_left + slave: switch.guestroom_lights_center diff --git a/blueprints/automation/motion/halabyan24.yaml b/blueprints/automation/motion/halabyan24.yaml index 03f4ff3..f665303 100644 --- a/blueprints/automation/motion/halabyan24.yaml +++ b/blueprints/automation/motion/halabyan24.yaml @@ -32,7 +32,7 @@ trigger: - platform: state id: around_home entity_id: - - device_tracker.lm_g810 + - device_tracker.sm_s926b from: not_home to: HomeHalabyanExtended for: @@ -43,7 +43,7 @@ trigger: - platform: state id: around_home2 entity_id: - - device_tracker.lm_g810 + - device_tracker.sm_s926b from: not_home to: home for: @@ -55,7 +55,7 @@ trigger: - platform: state id: away_from_home entity_id: - - device_tracker.lm_g810 + - device_tracker.sm_s926b from: HomeHalabyanExtended to: not_home for: @@ -66,7 +66,7 @@ trigger: - platform: state id: away_from_home2 entity_id: - - device_tracker.lm_g810 + - device_tracker.sm_s926b from: home to: not_home for: diff --git a/custom/group.yaml b/custom/group.yaml index 7815cce..979d2c8 100644 --- a/custom/group.yaml +++ b/custom/group.yaml @@ -1,10 +1,13 @@ master_phones: name: "master_phones" entities: - - device_tracker.legion8 - - device_tracker.lm_g810 + - device_tracker.samsa + - device_tracker.sm_s926b +# - device_tracker.legion8 +# - device_tracker.lm_g810 master_laptops: name: "master_laptops" entities: - - device_tracker.nyx + - device_tracker.tir +# - device_tracker.nyx diff --git a/custom/scripts/turn-on-office-lights.yaml b/custom/scripts/turn-on-office-lights.yaml index f9615a0..e1a7e80 100644 --- a/custom/scripts/turn-on-office-lights.yaml +++ b/custom/scripts/turn-on-office-lights.yaml @@ -23,8 +23,15 @@ turn_on_office_lights: brightness_pct: 100 kelvin: "{{ temp }}" target: - entity_id: light.yeelight_color_0x7caaf86 + entity_id: + - light.office_bulb_office_bulb + - light.office_led_office_led - service: homeassistant.turn_off data: {} target: - entity_id: switch.lights_living_lustre + entity_id: + - switch.lights_living_lustre + - light.office_chair_led_office_chair_led + - switch.living_tablesocket + + diff --git a/scripts.yaml b/scripts.yaml index 8011f96..e8be6cf 100644 --- a/scripts.yaml +++ b/scripts.yaml @@ -104,7 +104,7 @@ turn_on_office_lights_v1: brightness_pct: 100 kelvin: 4500 target: - entity_id: light.yeelight_color_0x7caaf86 + entity_id: light.office_bulb_office_bulb - service: homeassistant.turn_off data: {} target: |