monster/home-assistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

апгрейд

Browse Source
This commit is contained in:
monster
2019-04-20 10:57:14 +03:00
parent 6c32dd94ba
commit b32423dce2
14 changed files with 56 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
appdaemon/settings/apps/light/lightbutton.yaml
+2 -2
View File
@@ -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
- globals
appdaemon/settings/apps/presence/home/entities_action.yaml
+2 -2
View File
@@ -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
- globals
appdaemon/settings/apps/security/lock.py
+8
View File
@@ -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'])
appdaemon/settings/apps/security/lock.yaml
+1
View File
@@ -7,6 +7,7 @@ lock:
user_65538: Света (указ)
user_65539: Мама (указ)
user_65540: Саня
ha_panel: alarm_control_panel.ha_alarm
notify: telegram
global_dependencies:
- globals
appdaemon/settings/apps/timers/entity_timer.yaml
+1 -1
View File
@@ -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
hass/settings/configuration.yaml
+6
View File
@@ -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
hass/settings/configuration/amazon/alexa.yaml
+5 -5
View File
@@ -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"
hass/settings/configuration/customize/light.yaml
+8 -8
View File
@@ -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
light.yeelight_mono1_f0b429a8d936:
friendly_name: Балкон2
hass/settings/configuration/group/hidden/light/balcony_light.yaml
+2 -2
View File
@@ -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
hass/settings/configuration/group/hidden/light/mainroom_color.yaml
+2 -2
View File
@@ -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
hass/settings/configuration/group/hidden/light/mainroom_light.yaml
+5 -5
View File
@@ -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
hass/settings/configuration/group/hidden/report/report_entities.yaml
+5 -5
View File
@@ -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
hass/settings/secrets.yaml.sample
+2
View File
@@ -55,6 +55,8 @@ wifi_socket_key: xxxxxxxxx
philips_downlight_ip: xxxxxxxxx
philips_downlight_token: xxxxxxxxx
purifier_ip: xxxxxxxxx
purifier_key: xxxxxxxxx
###################################
# NEST #
###################################
hass/settings/ui-lovelace.yaml
+7 -7
View File
@@ -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