diff --git a/appdaemon/settings/apps/light/lightbutton.yaml b/appdaemon/settings/apps/light/lightbutton.yaml index 2bd19fc..8587aba 100644 --- a/appdaemon/settings/apps/light/lightbutton.yaml +++ b/appdaemon/settings/apps/light/lightbutton.yaml @@ -5,7 +5,7 @@ light_button_main: module: lightbutton class: LightButton sensor: binary_sensor.switch_158d00013f81a9 - entities: light.yeelight_rgb_34ce008fe328,light.yeelight_rgb_286c071065c7,light.yeelight_white_34ce0087ff33,light.yeelight_white_f0b4290e5444,light.yeelight_white_f0b429a8f6df + entities: light.yeelight_color1_34ce008fe328,light.yeelight_color1_286c071065c7,light.yeelight_mono1_34ce0087ff33,light.yeelight_mono1_f0b4290e5444,light.yeelight_mono1_f0b429a8f6df global_dependencies: - globals @@ -43,4 +43,4 @@ light_button_balcony: entities: group.balcony_light control_input: input_boolean.balcony_light_control global_dependencies: - - globals \ No newline at end of file + - globals diff --git a/appdaemon/settings/apps/presence/home/entities_action.yaml b/appdaemon/settings/apps/presence/home/entities_action.yaml index 4935f28..98c4ca9 100644 --- a/appdaemon/settings/apps/presence/home/entities_action.yaml +++ b/appdaemon/settings/apps/presence/home/entities_action.yaml @@ -10,9 +10,9 @@ entities_action: - switch.plug_158d0001104a0c # телевизор - switch.plug_158d0001a68b18 # термопот return_entities: - - light.yeelight_rgb_34ce008fe328 + - light.yeelight_color1_34ce008fe328 - light.hall - switch.plug_158d0001104a0c # телевизор - switch.plug_158d0001a68b18 # термопот global_dependencies: - - globals \ No newline at end of file + - globals diff --git a/appdaemon/settings/apps/security/lock.py b/appdaemon/settings/apps/security/lock.py index a79ff35..94537ba 100644 --- a/appdaemon/settings/apps/security/lock.py +++ b/appdaemon/settings/apps/security/lock.py @@ -38,5 +38,13 @@ class Lock(hass.Hass): user_var = "user_{}".format(changed_by) if user_var in self.args: user = self.args[user_var] + self.disarm() message = "Открыта дверь пользователем: {}.".format(user) self.notify(message, name = self.args['notify']) + + def disarm(self): + if "ha_panel" in self.args: + state = self.get_state(self.args['ha_panel']) + if (state == "armed_away"): + self.call_service("alarm_control_panel/alarm_disarm", entity_id=self.args['ha_panel']) + diff --git a/appdaemon/settings/apps/security/lock.yaml b/appdaemon/settings/apps/security/lock.yaml index 2f9c009..c91be0a 100644 --- a/appdaemon/settings/apps/security/lock.yaml +++ b/appdaemon/settings/apps/security/lock.yaml @@ -7,6 +7,7 @@ lock: user_65538: Света (указ) user_65539: Мама (указ) user_65540: Саня + ha_panel: alarm_control_panel.ha_alarm notify: telegram global_dependencies: - globals \ No newline at end of file diff --git a/appdaemon/settings/apps/timers/entity_timer.yaml b/appdaemon/settings/apps/timers/entity_timer.yaml index 38dfee4..801f155 100644 --- a/appdaemon/settings/apps/timers/entity_timer.yaml +++ b/appdaemon/settings/apps/timers/entity_timer.yaml @@ -29,7 +29,7 @@ fitolamp_timer: module: entity_timer class: EntityTimer on_time: "00:00:00" - off_time: "07:00:00" + off_time: "03:00:00" entity: switch.plug_158d0002924779 global_dependencies: - globals diff --git a/hass/settings/configuration.yaml b/hass/settings/configuration.yaml index 0a1f078..48f434a 100644 --- a/hass/settings/configuration.yaml +++ b/hass/settings/configuration.yaml @@ -69,3 +69,9 @@ mysensors: !include configuration/mysensors.yaml utility_meter: !include_dir_merge_named configuration/utility_meter speedtestdotnet: !include configuration/speedtest.yaml + +# fan: +# - platform: xiaomi_miio +# host: 192.168.1.14 +# token: '411cf70bb69052c0121813388f30e193' +# model: zhimi.airpurifier.mc1 \ No newline at end of file diff --git a/hass/settings/configuration/amazon/alexa.yaml b/hass/settings/configuration/amazon/alexa.yaml index 8c2c793..cf1bdfb 100644 --- a/hass/settings/configuration/amazon/alexa.yaml +++ b/hass/settings/configuration/amazon/alexa.yaml @@ -35,15 +35,15 @@ smart_home: name: hall light.kitchen: name: kitchen - light.yeelight_rgb_286c071065c7: + light.yeelight_color1_286c071065c7: name: color1 - light.yeelight_rgb_34ce008fe328: + light.yeelight_color1_34ce008fe328: name: color2 - light.yeelight_white_34ce0087ff33: + light.yeelight_mono1_34ce0087ff33: name: living3 - light.yeelight_white_f0b4290e5444: + light.yeelight_mono1_f0b4290e5444: name: living4 - light.yeelight_white_f0b429a8f6df: + light.yeelight_mono1_f0b429a8f6df: name: living5 sensor.temperature_158d00012d9ad7: name: "Temperature Bath" diff --git a/hass/settings/configuration/customize/light.yaml b/hass/settings/configuration/customize/light.yaml index a76881a..76c0d9c 100644 --- a/hass/settings/configuration/customize/light.yaml +++ b/hass/settings/configuration/customize/light.yaml @@ -1,16 +1,16 @@ -light.yeelight_rgb_34ce008fe328: +light.yeelight_color1_34ce008fe328: friendly_name: Цветная1 -light.yeelight_rgb_286c071065c7: +light.yeelight_color1_286c071065c7: friendly_name: Цветная2 -light.yeelight_white_34ce0087ff33: +light.yeelight_mono1_34ce0087ff33: friendly_name: Лампа3 -light.yeelight_white_f0b4290e5444: +light.yeelight_mono1_f0b4290e5444: friendly_name: Лампа4 -light.yeelight_white_f0b429a8f6df: +light.yeelight_mono1_f0b429a8f6df: friendly_name: Лампа5 light.hall: @@ -25,7 +25,7 @@ light.bath: light.balcony: friendly_name: Свет -light.yeelight_white_286c07f12bed: +light.yeelight_mono1_286c07f12bed: friendly_name: Балкон1 -light.yeelight_white_f0b429a8d936: - friendly_name: Балкон2 \ No newline at end of file +light.yeelight_mono1_f0b429a8d936: + friendly_name: Балкон2 diff --git a/hass/settings/configuration/group/hidden/light/balcony_light.yaml b/hass/settings/configuration/group/hidden/light/balcony_light.yaml index 93e646e..b9c146c 100644 --- a/hass/settings/configuration/group/hidden/light/balcony_light.yaml +++ b/hass/settings/configuration/group/hidden/light/balcony_light.yaml @@ -2,5 +2,5 @@ balcony_light: name: Свет (балкон) control: hidden entities: - - light.yeelight_white_286c07f12bed - - light.yeelight_white_f0b429a8d936 + - light.yeelight_mono1_286c07f12bed + - light.yeelight_mono1_f0b429a8d936 diff --git a/hass/settings/configuration/group/hidden/light/mainroom_color.yaml b/hass/settings/configuration/group/hidden/light/mainroom_color.yaml index 1504a21..5049687 100644 --- a/hass/settings/configuration/group/hidden/light/mainroom_color.yaml +++ b/hass/settings/configuration/group/hidden/light/mainroom_color.yaml @@ -2,5 +2,5 @@ mainroom_color: name: Цветные лампы(Гостиная) control: hidden entities: - - light.yeelight_rgb_34ce008fe328 - - light.yeelight_rgb_286c071065c7 + - light.yeelight_colot1_34ce008fe328 + - light.yeelight_color1_286c071065c7 diff --git a/hass/settings/configuration/group/hidden/light/mainroom_light.yaml b/hass/settings/configuration/group/hidden/light/mainroom_light.yaml index dbd850e..91643c5 100644 --- a/hass/settings/configuration/group/hidden/light/mainroom_light.yaml +++ b/hass/settings/configuration/group/hidden/light/mainroom_light.yaml @@ -2,8 +2,8 @@ mainroom_light: name: Свет (гостиная) control: hidden entities: - - light.yeelight_rgb_34ce008fe328 - - light.yeelight_rgb_286c071065c7 - - light.yeelight_white_34ce0087ff33 - - light.yeelight_white_f0b4290e5444 - - light.yeelight_white_f0b429a8f6df + - light.yeelight_color1_34ce008fe328 + - light.yeelight_color1_286c071065c7 + - light.yeelight_mono1_34ce0087ff33 + - light.yeelight_mono1_f0b4290e5444 + - light.yeelight_mono1_f0b429a8f6df diff --git a/hass/settings/configuration/group/hidden/report/report_entities.yaml b/hass/settings/configuration/group/hidden/report/report_entities.yaml index a5bb16a..d447dbb 100644 --- a/hass/settings/configuration/group/hidden/report/report_entities.yaml +++ b/hass/settings/configuration/group/hidden/report/report_entities.yaml @@ -2,11 +2,11 @@ report_entities: name: Датчики для отправки отчета control: hidden entities: - - light.yeelight_rgb_34ce008fe328 #mainbulb1 - - light.yeelight_rgb_286c071065c7 - - light.yeelight_white_34ce0087ff33 - - light.yeelight_white_f0b4290e5444 - - light.yeelight_white_f0b429a8f6df + - light.yeelight_color1_34ce008fe328 #mainbulb1 + - light.yeelight_color1_286c071065c7 + - light.yeelight_mono1_34ce0087ff33 + - light.yeelight_mono1_f0b4290e5444 + - light.yeelight_mono1_f0b429a8f6df - light.kitchen - switch.kitchen_mini_light - light.hall diff --git a/hass/settings/secrets.yaml.sample b/hass/settings/secrets.yaml.sample index 536a28f..dd993e1 100644 --- a/hass/settings/secrets.yaml.sample +++ b/hass/settings/secrets.yaml.sample @@ -55,6 +55,8 @@ wifi_socket_key: xxxxxxxxx philips_downlight_ip: xxxxxxxxx philips_downlight_token: xxxxxxxxx +purifier_ip: xxxxxxxxx +purifier_key: xxxxxxxxx ################################### # NEST # ################################### diff --git a/hass/settings/ui-lovelace.yaml b/hass/settings/ui-lovelace.yaml index f7b176c..49c847a 100644 --- a/hass/settings/ui-lovelace.yaml +++ b/hass/settings/ui-lovelace.yaml @@ -22,11 +22,11 @@ views: entities: - sensor.temperature_158d0001149b3c - sensor.humidity_158d0001149b3c - - light.yeelight_rgb_34ce008fe328 - - light.yeelight_rgb_286c071065c7 - - light.yeelight_white_34ce0087ff33 - - light.yeelight_white_f0b4290e5444 - - light.yeelight_white_f0b429a8f6df + - light.yeelight_color1_34ce008fe328 + - light.yeelight_color1_286c071065c7 + - light.yeelight_mono1_34ce0087ff33 + - light.yeelight_mono1_f0b4290e5444 + - light.yeelight_mono1_f0b429a8f6df - cover.curtain_158d0002b0c46a - switch.plug_158d0001104a0c - switch.plug_158d00010dd98d @@ -61,8 +61,8 @@ views: title: "Балкон" show_header_toggle: false entities: - - light.yeelight_white_286c07f12bed - - light.yeelight_white_f0b429a8d936 + - light.yeelight_mono1_286c07f12bed + - light.yeelight_mono1_f0b429a8d936 - sensor.temperature_158d000117d37a - sensor.humidity_158d000117d37a - type: entities