diff --git a/.HA_VERSION b/.HA_VERSION index b37dc74c..49466b69 100755 --- a/.HA_VERSION +++ b/.HA_VERSION @@ -1 +1 @@ -0.33.4 \ No newline at end of file +0.34.3 \ No newline at end of file diff --git a/automation/holiday.yaml b/automation/holiday.yaml index b35b7ae4..b70cda34 100755 --- a/automation/holiday.yaml +++ b/automation/holiday.yaml @@ -7,7 +7,7 @@ - platform: sun event: sunset - platform: event - event_type: halloween_lights_on + event_type: holiday_lights_on action: - service: switch.turn_on @@ -22,13 +22,9 @@ event: sunrise offset: '-03:30:00' - platform: event - event_type: halloween_lights_off + event_type: holiday_lights_off action: - - service: switch.turn_off - entity_id: switch.outlet_den - - delay: 00:00:30 - - service: switch.turn_off - entity_id: switch.outlet_living_room + - service: script.switch_turn_off_all \ No newline at end of file diff --git a/automation/mealtime.yaml b/automation/mealtime.yaml index 550c5c5f..18872132 100755 --- a/automation/mealtime.yaml +++ b/automation/mealtime.yaml @@ -14,5 +14,4 @@ - group.kitchen_lights - service: light.turn_off entity_id: - - light.office_lamp - group.living_room_lights \ No newline at end of file diff --git a/automation/sunrise_turnon_and_off.yaml b/automation/sunrise_turnon_and_off.yaml index 28dd339c..beb9e69d 100755 --- a/automation/sunrise_turnon_and_off.yaml +++ b/automation/sunrise_turnon_and_off.yaml @@ -8,12 +8,21 @@ event: sunset action: + - service: script.monthly_front_house_scene + - service: switch.turn_on + entity_id: switch.living_room_outlet + - delay: '00:00:30' + - service: switch.turn_on + entity_id: switch.den_outlet + - delay: '00:00:30' + - service: switch.turn_on + entity_id: switch.living_room_outlet + - delay: '00:00:30' - service: switch.turn_on entity_id: switch.foyer_outlet - service: light.turn_on entity_id: light.outdoor_bathroom - - service: script.monthly_front_house_scene - + ###################################################################### diff --git a/configuration.yaml b/configuration.yaml index eef16413..58d6416d 100755 --- a/configuration.yaml +++ b/configuration.yaml @@ -79,10 +79,10 @@ mqtt: zwave: usb_path: /dev/ttyACM0 config_path: /srv/hass/hass_venv/lib/python3.4/site-packages/libopenzwave-0.3.1-py3.4-linux-armv7l.egg/config - + nest: - username: !secret nest_username - password: !secret nest_password + client_id: !secret nest_client_id + client_secret: !secret nest_client_secret climate: platform: nest diff --git a/group/views.yaml b/group/views.yaml.old similarity index 100% rename from group/views.yaml rename to group/views.yaml.old diff --git a/nest.conf b/nest.conf new file mode 100644 index 00000000..32101700 --- /dev/null +++ b/nest.conf @@ -0,0 +1 @@ +{"expires_in": 315360000, "access_token": "c.qZwzHcUwWHfK927A4CvobNIq3exgmG2kMAV2LcFYVaFd74xfWJXHfQJCGDkqJrybO9UFf6n6bs13cPDgWersBwhA0e3JZMYHZBBxMIOY7KegK78dYoVs4pnaMVQ6k3WUWoJHE8G3TixOnx5F"} \ No newline at end of file diff --git a/scene/monthly_front_colors.yaml b/scene/monthly_front_colors.yaml index c01ed4f5..f28597a1 100755 --- a/scene/monthly_front_colors.yaml +++ b/scene/monthly_front_colors.yaml @@ -12,17 +12,14 @@ entities: light.outdoor_sconce_2: state: on - transition: 400 rgb_color: [206,22,32] brightness: 255 light.outdoor_sconce_1: state: on - transition: 400 rgb_color: [61,178,112] brightness: 255 light.outdoor_foyer: state: on - transition: 400 rgb_color: [206,22,32] brightness: 255 light.outdoor_sconce_3: @@ -33,17 +30,14 @@ entities: light.outdoor_sconce_2: state: on - transition: 400 rgb_color: [206,22,32] brightness: 255 light.outdoor_sconce_1: state: on - transition: 400 rgb_color: [61,178,112] brightness: 255 light.outdoor_foyer: state: on - transition: 400 rgb_color: [206,22,32] brightness: 255 light.outdoor_sconce_3: diff --git a/script/front_house_motion.yaml b/script/front_house_motion.yaml index ef1f594d..5e25bda7 100755 --- a/script/front_house_motion.yaml +++ b/script/front_house_motion.yaml @@ -16,7 +16,10 @@ front_house_motion: after: 'sunset' - service: scene.turn_on entity_id: scene.front_full_brightness - - delay: 00:15:00 + - delay: '00:15:00' + - service: light.turn_off + entity_id: group.outdoor_front_lights + - delay: '00:00:10' - service: script.monthly_front_house_scene