Sync with upstream

253b550

customizations/device-tracker.yaml

+device_tracker.cl_samsung_s5:
+  friendly_name: Chris
+device_tracker.eh_nexus_6:
+  friendly_name: Erick
 device_tracker.green_keys:
+  friendly_name: Green keys
   icon: mdi:key

customizations/scenes.yaml

 scene.master_bedroom_nightlight:
   friendly_name: 'Nightlight'
-  icon: mdi:brightness-7
+  icon: mdi:brightness-4
 scene.master_bedroom_dimmed:
   friendly_name: 'Dimmed'
-  icon: mdi:brightness-4
+  icon: mdi:brightness-7
 scene.master_bedroom_relax:
   friendly_name: 'Relax'
   icon: mdi:brightness-6
@@ -15,10 +15,10 @@ scene.master_bedroom_concentrate:
   icon: mdi:star-circle
 scene.master_bath_nightlight:
   friendly_name: 'Nightlight'
-  icon: mdi:brightness-7
+  icon: mdi:brightness-4
 scene.master_bath_dimmed:
   friendly_name: 'Dimmed'
-  icon: mdi:brightness-4
+  icon: mdi:brightness-7
 scene.master_bath_relax:
   friendly_name: 'Relax'
   icon: mdi:brightness-6
@@ -30,10 +30,10 @@ scene.master_bath_concentrate:
   icon: mdi:star-circle
 scene.lr_nightlight:
   friendly_name: 'Nightlight'
-  icon: mdi:brightness-7
+  icon: mdi:brightness-4
 scene.lr_dimmed:
   friendly_name: 'Dimmed'
-  icon: mdi:brightness-4
+  icon: mdi:brightness-7
 scene.lr_relax:
   friendly_name: 'Relax'
   icon: mdi:brightness-6
@@ -45,10 +45,10 @@ scene.lr_concentrate:
   icon: mdi:star-circle
 scene.da_nightlight:
   friendly_name: 'Nightlight'
-  icon: mdi:brightness-7
+  icon: mdi:brightness-4
 scene.da_dimmed:
   friendly_name: 'Dimmed'
-  icon: mdi:brightness-4
+  icon: mdi:brightness-7
 scene.da_relax:
   friendly_name: 'Relax'
   icon: mdi:brightness-6
@@ -60,10 +60,10 @@ scene.da_concentrate:
   icon: mdi:star-circle
 scene.office_nightlight:
   friendly_name: 'Nightlight'
-  icon: mdi:brightness-7
+  icon: mdi:brightness-4
 scene.office_dimmed:
   friendly_name: 'Dimmed'
-  icon: mdi:brightness-4
+  icon: mdi:brightness-7
 scene.office_relax:
   friendly_name: 'Relax'
   icon: mdi:brightness-6
@@ -81,7 +81,7 @@ scene.ericks_desk_lamp_relax:
   icon: mdi:brightness-1
 scene.balcony_dimmed:
   friendly_name: 'Dimmed'
-  icon: mdi:brightness-4
+  icon: mdi:brightness-7
 scene.balcony_relax:
   friendly_name: 'Relax'
   icon: mdi:brightness-6

customizations/sensors.yaml

@@ -5,32 +5,63 @@ sensor.speedtest_download:
 sensor.speedtest_upload:
   icon: mdi:upload
 sensor.lava_lamp_consumption:
+  friendly_name: Lava Lamp
   icon: mdi:radiator
 sensor.living_room_alarm_battery_level:
+  friendly_name: Living Room Smoke/CO
   icon: mdi:battery
 sensor.master_bedroom_alarm_battery_level:
+  friendly_name: Master Bedroom Smoke/CO
   icon: mdi:battery
 sensor.front_door_battery_level:
+  friendly_name: Front Door
   icon: mdi:battery
 sensor.slider_battery_level:
+  friendly_name: Slider
   icon: mdi:battery
 sensor.master_bedroom_window_battery_level:
+  friendly_name: Master Bedroom Window
   icon: mdi:battery
 sensor.dining_area_window_battery_level:
+  friendly_name: Dining Area Window
   icon: mdi:battery
 sensor.office_window_battery_level:
+  friendly_name: Office Window
   icon: mdi:battery
 sensor.motion_sensor_above_slider_battery_level:
+  friendly_name: Motion sensor over slider
   icon: mdi:battery
 sensor.motion_sensor_over_utility_closet_battery_level:
+  friendly_name: Motion sensor over utility closet
   icon: mdi:battery
 sensor.kitchen_motion_sensor_battery_level:
+  friendly_name: Kitchen
   icon: mdi:battery
 sensor.office_motion_sensor_near_closet_battery_level:
+  friendly_name: Office motion sensor near closet
   icon: mdi:battery
 sensor.office_motion_sensor_far_wall_battery_level:
+  friendly_name: Office motion sensor far wall
   icon: mdi:battery
 sensor.office_cabinet_battery_level:
+  friendly_name: Office cabinet
   icon: mdi:battery
 sensor.green_keys_battery_level:
+  friendly_name: Green keys
   icon: mdi:battery
+binary_sensor.master_bedroom_smoke_detector:
+  friendly_name: Master Bedroom Smoke
+binary_sensor.living_room_smoke_detector:
+  friendly_name: Living Room Smoke
+binary_sensor.master_bedroom_co_detector:
+  friendly_name: Master Bedroom CO
+binary_sensor.living_room_co_detector:
+  friendly_name: Living Room CO
+binary_sensor.lr_motion_sensor_over_slider:
+  friendly_name: LR over slider
+binary_sensor.lr_motion_sensor_over_utility_closet:
+  friendly_name: LR over utility closet
+binary_sensor.office_motion_sensor_over_closet:
+  friendly_name: Office near closet
+binary_sensor.office_motion_sensor_far_wall:
+  friendly_name: Office far wall