diff --git a/configuration.yaml b/configuration.yaml index 553de72..70078a0 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -22,10 +22,8 @@ frontend: config: http: - # Uncomment this to add a password (recommended!) - api_password: !secret http_password # Uncomment this if you are using SSL or running in Docker etc - # base_url: + base_url: !secret base_url ssl_certificate: /home/homeassistant/fullchain.pem ssl_key: /home/homeassistant/privkey.pem @@ -60,8 +58,8 @@ sensor: !include sensors.yaml notify: !include notify.yaml # Text to speech -tts: - platform: google +#tts: +#platform: google group: !include groups.yaml automation: !include automations.yaml @@ -73,19 +71,25 @@ zwave: camera: - platform: generic still_image_url: !secret blueiris_hall + stream_source: !secret blueiris_hall_stream name: Hall username: !secret blueiris_user password: !secret blueiris_pass + authentication: basic - platform: generic still_image_url: !secret blueiris_pizero + stream_source: !secret blueiris_pizero_stream name: PiZero username: !secret blueiris_user password: !secret blueiris_pass - - platform: generic - still_image_url: !secret blueiris_pizero2 - name: PiZero2 - username: !secret blueiris_user - password: !secret blueiris_pass + authentication: basic +# - platform: generic +# still_image_url: !secret blueiris_pizero2 +# stream_source: !secret blueiris_pizero2_stream +# name: PiZero2 +# username: !secret blueiris_user +# password: !secret blueiris_pass +# authentication: basic switch: @@ -100,3 +104,21 @@ ios: hue: bridges: - host: !secret hue_ip + +recorder: + db_url: postgresql://@/hass + +mobile_app: +map: +person: + - name: Ben + id: bcc + device_trackers: + - device_tracker.bcc_2 + - name: Lizzie + id: lizzie + device_trackers: + - device_tracker.europa +script: +ssdp: +system_health: diff --git a/customise.yaml b/customise.yaml index 1c18c47..67efbf6 100644 --- a/customise.yaml +++ b/customise.yaml @@ -14,54 +14,20 @@ sensor.aeotec_zw100_multisensor_6_ultraviolet: friendly_name: Ultraviolet icon: mdi:sunglasses - sensor.aeotec_zw100_multisensor_6_sensor: - friendly_name: Sensor - sensor.aeotec_zw100_multisensor_6_alarm_level: - hidden: true - sensor.aeotec_zw100_multisensor_6_alarm_type: - hidden: true - sensor.aeotec_zw100_multisensor_6_sourcenodeid: - hidden: true sensor.aeotec_zw100_multisensor_6_burglar: friendly_name: Motion sensor icon: mdi:run binary_sensor.aeotec_zw100_multisensor_6_sensor: friendly_name: Motion Detected - #binary_sensor.fibaro_system_fgk10x_door_opening_sensor_sensor: - #friendly_name: Front Door - #binary_sensor.aeotec_zw112_door_window_sensor_6_sensor: - # friendly_name: Back Door + binary_sensor.fibaro_system_fgk10x_door_opening_sensor_sensor: + friendly_name: Front Door + binary_sensor.aeotec_zw112_door_window_sensor_6_sensor: + friendly_name: Back Door - sensor.europa_battery_state: - hidden: true - sensor.europa_battery_level: - hidden: true - sensor.bcc6_battery_state: - hidden: true - sensor.bcc6_battery_level: - hidden: true - sensor.athena_battery_state: - hidden: true - sensor.athena_battery_level: - hidden: true - - light.hall: - friendly_name: All Hall Lights - light.living_room: - friendly_name: All Living Room Lights - light.kitchen: - friendly_name: All Kitchen Lights light.hue_color_lamp_1: hidden: true - light.study: - friendly_name: Study Lights - - device_tracker.bcc6: - friendly_name: Ben's Phone - device_tracker.europa: - friendly_name: Lizzie's Phone - + sensor.hall_motion: icon: mdi:run diff --git a/groups.yaml b/groups.yaml index 005e16d..a667bec 100644 --- a/groups.yaml +++ b/groups.yaml @@ -1,52 +1,3 @@ -Kitchen: - - light.kitchen - - light.kitchen_pair_1 - - light.kitchen_pair_2 - - light.kitchen_six_1 - - light.kitchen_six_2 - - light.kitchen_six_3 - - light.kitchen_six_4 - - light.kitchen_six_5 - - light.kitchen_six_6 - - light.kitchen_strip - - binary_sensor.fibaro_system_fgfs101_flood_sensor_flood - - sensor.fibaro_system_fgfs101_flood_sensor_temperature - - camera.pizero2 - -Hall: - - light.hall - - light.hall_2 - - light.stairs - - light.landing - - camera.hall - - sensor.aeotec_zw100_multisensor_6_temperature - - sensor.aeotec_zw100_multisensor_6_relative_humidity - - sensor.aeotec_zw100_multisensor_6_luminance - - sensor.aeotec_zw100_multisensor_6_ultraviolet - - sensor.aeotec_zw100_multisensor_6_sensor - - sensor.aeotec_zw100_multisensor_6_burglar - - binary_sensor.aeotec_zw100_multisensor_6_sensor - - -Living Room: - - light.living_room - - light.living_room_sofa - - light.living_room_window - - light.hue_play_1 - - light.hue_play_2 - - switch.aeotec_zw096_smart_switch_6_switch_2 - - sensor.aeotec_zw096_smart_switch_6_energy_2 - - sensor.aeotec_zw096_smart_switch_6_power_2 - - sensor.aeotec_zw096_smart_switch_6_voltage_2 - - -Nova: - - sensor.processor_use - - sensor.load_5m - - sensor.disk_use_percent_home - - sensor.memory_free - - sensor.cpu_temperature - Security: - sensor.front_door - sensor.front_door2 @@ -55,55 +6,5 @@ Security: - switch.hall_camera_motion_detection Presence: - - device_tracker.bcc6 - - device_tracker.europa - -Batteries: - - sensor.batt_frontdoor - - sensor.batt_flood - - sensor.batt_back_door - - sensor.batt_multisensor - -zwave: - name: Z-Wave - entities: - - zwave.aeotec_zw090_zstick_gen5_eu - - zwave.aeotec_zw096_smart_switch_6 - - zwave.aeotec_zw100_multisensor_6 - - zwave.aeotec_zw112_door_window_sensor_6 - - zwave.fibaro_system_fgfs101_flood_sensor - - zwave.fibaro_system_fgk10x_door_opening_sensor - -Automation: - - automation.back_door_open - - automation.christmas_lights_off - - automation.christmas_lights_on - - automation.flood_sensor - - automation.front_door_open - - automation.hallway_motion - - automation.pir_arm - - automation.pir_disarm - -Study: - - light.study - -default_view: - name: Home - view: yes - entities: - - group.security - - group.hall - - group.kitchen - - group.living_room - - group.study - - group.nova - - group.presence - - group.batteries - - camera.pizero - -detail: - name: Detail - view: yes - entities: - - group.zwave - - group.automation + - person.ben + - person.lizzie diff --git a/notify.yaml b/notify.yaml index 64c070a..55e53df 100644 --- a/notify.yaml +++ b/notify.yaml @@ -1,5 +1,5 @@ - name: all_phones platform: group services: - - service: ios_bcc6 - - service: ios_europa + - service: mobile_app_bcc + - service: mobile_app_europa diff --git a/sensors.yaml b/sensors.yaml index 55d2b81..740eba0 100644 --- a/sensors.yaml +++ b/sensors.yaml @@ -103,7 +103,8 @@ sensors: batt_multisensor: friendly_name: 'Multisensor Battery' - value_template: '{{ states.zwave.fibaro_system_fgk10x_door_opening_sensor.attributes.battery_level }}' - unit_of_measurement: '%' - entity_id: zwave.fibaro_system_fgk10x_door_opening_sensor + + value_template: '{{ states.zwave.aeotec_zw100_multisensor_6.attributes.battery_level }}' + unit_of_measurement: '%' + entity_id: zwave.aeotec_zw100_multisensor_6