From 3786bd139ca51e152700f4484bd2380c9f7f645b Mon Sep 17 00:00:00 2001 From: CCOSTAN Date: Wed, 22 Feb 2017 22:37:15 +0000 Subject: [PATCH] Closes #77 - Made the names much more readable. Garadget is not a good thing to say. --- automation/Speech/garage.yaml | 8 +++---- automation/Speech/home_stats.yaml | 6 +++--- automation/System/device_status.yaml | 4 ++-- automation/garadget.yaml | 26 +++++++++++----------- configuration.yaml | 20 ++++++++--------- customize/covers.yaml | 4 ++-- customize/device_tracker.yaml | 4 ++-- customize/sensors.yaml | 20 ++++++++--------- group/garage.yaml | 26 +++++++++++----------- group/network.yaml | 4 ++-- sensor/devices.yaml | 8 +++---- sensor/garadget.yaml | 32 ++++++++++++++-------------- travis_secrets.yaml | 4 ++-- 13 files changed, 83 insertions(+), 83 deletions(-) diff --git a/automation/Speech/garage.yaml b/automation/Speech/garage.yaml index c7d99900..8963734c 100755 --- a/automation/Speech/garage.yaml +++ b/automation/Speech/garage.yaml @@ -6,16 +6,16 @@ trigger: - platform: state entity_id: - - cover.garadget_large - - cover.garadget_small + - cover.large_garage + - cover.small_garage from: 'closed' to: 'open' for: '00:02:00' - platform: state entity_id: - - cover.garadget_large - - cover.garadget_small + - cover.large_garage + - cover.small_garage from: 'open' to: 'closed' for: '00:02:00' diff --git a/automation/Speech/home_stats.yaml b/automation/Speech/home_stats.yaml index abdd85ba..9c6c1b87 100755 --- a/automation/Speech/home_stats.yaml +++ b/automation/Speech/home_stats.yaml @@ -36,11 +36,11 @@ {%- endmacro -%} {{responsibilities()}} Inside the house, it is {{ states.climate.downstairs.attributes["current_temperature"]}} degrees with around {{states('sensor.downstairs_thermostat_humidity')}} percent humidity. Outside, it is going to be {{states('sensor.dark_sky_minutely_summary')}} - {% if is_state('cover.garadget_large', 'open') -%} + {% if is_state('cover.large_garage', 'open') -%} Also, The Large Garage Door is still open {% endif -%} - {% if is_state('cover.garadget_small', 'open') -%} - {% if is_state('cover.garadget_large', 'open') -%}and + {% if is_state('cover.small_garage', 'open') -%} + {% if is_state('cover.large_garage', 'open') -%}and {%- endif %} The small Garage Door is still open. {% endif %} . There are diff --git a/automation/System/device_status.yaml b/automation/System/device_status.yaml index f96f3345..3149a4e0 100755 --- a/automation/System/device_status.yaml +++ b/automation/System/device_status.yaml @@ -22,8 +22,8 @@ - sensor.nest_downstairs - sensor.cisco_ap - sensor.actiontechap - - sensor.garadget_small - - sensor.garadget_large + - sensor.small_garage + - sensor.large_garage - sensor.led_rgb_garage_left - sensor.led_rgb_garage_small - sensor.led_rgb_outdoor_den diff --git a/automation/garadget.yaml b/automation/garadget.yaml index cf5861ad..4252af04 100755 --- a/automation/garadget.yaml +++ b/automation/garadget.yaml @@ -7,26 +7,26 @@ hide_entity: True trigger: - platform: numeric_state - entity_id: sensor.garadget_large_reflection_rate + entity_id: sensor.large_garage_reflection_rate below: 85 # for: '00:05:00' - platform: numeric_state - entity_id: sensor.garadget_small_reflection_rate + entity_id: sensor.small_garage_reflection_rate below: 85 # for: '00:05:00' condition: - condition: template - value_template: "{{ states('cover.garadget_large') == 'closed' }}" + value_template: "{{ states('cover.large_garage') == 'closed' }}" - condition: template - value_template: "{{ states('cover.garadget_small') == 'closed' }}" + value_template: "{{ states('cover.small_garage') == 'closed' }}" action: - service: script.ifttt_notify data_template: value1: 'Check Garage Doors Reflection:' - value2: "Small: {{ states('sensor.garadget_small_reflection_rate')}}" - value3: "Large: {{ states('sensor.garadget_large_reflection_rate')}}" + value2: "Small: {{ states('sensor.small_garage_reflection_rate')}}" + value3: "Large: {{ states('sensor.large_garage_reflection_rate')}}" ############################################################################## @@ -52,9 +52,9 @@ - condition: or conditions: - condition: template - value_template: "{{ states('cover.garadget_large') == 'opened' }}" + value_template: "{{ states('cover.large_garage') == 'opened' }}" - condition: template - value_template: "{{ states('cover.garadget_small') == 'opened' }}" + value_template: "{{ states('cover.small_garage') == 'opened' }}" - condition: and conditions: - condition: sun @@ -62,18 +62,18 @@ - condition: or conditions: - condition: template - value_template: "{{ states('cover.garadget_large') == 'opened' }}" + value_template: "{{ states('cover.large_garage') == 'opened' }}" - condition: template - value_template: "{{ states('cover.garadget_small') == 'opened'}}" + value_template: "{{ states('cover.small_garage') == 'opened'}}" action: - service: script.ifttt_notify data_template: value1: 'Check Garage Doors:' - value2: "Small: {{ states('cover.garadget_small')}}" - value3: "Large: {{ states('cover.garadget_large')}}" + value2: "Small: {{ states('cover.small_garage')}}" + value3: "Large: {{ states('cover.large_garage')}}" - service: script.Voice_notify data_template: - value1: "Please check the garage doors. The Small garage is {{ states('cover.garadget_small')}} and the large garage is {{ states('cover.garadget_large')}}" + value1: "Please check the garage doors. The Small garage is {{ states('cover.small_garage')}} and the large garage is {{ states('cover.large_garage')}}" \ No newline at end of file diff --git a/configuration.yaml b/configuration.yaml index 0fc5c4b8..01ae9c77 100755 --- a/configuration.yaml +++ b/configuration.yaml @@ -56,14 +56,14 @@ logbook: entities: - sensor.since_last_boot - sensor.since_last_boot_templated - - sensor.garadget_small_status - - sensor.garadget_large_status - - sensor.garadget_small_time_in_state - - sensor.garadget_large_time_in_state - - sensor.garadget_large_wifi_signal_strength - - sensor.garadget_small_wifi_signal_strength - - sensor.garadget_small_reflection_rate - - sensor.garadget_large_reflection_rate + - sensor.small_garage_status + - sensor.large_garage_status + - sensor.small_garage_time_in_state + - sensor.large_garage_time_in_state + - sensor.large_garage_wifi_signal_strength + - sensor.small_garage_wifi_signal_strength + - sensor.small_garage_reflection_rate + - sensor.large_garage_reflection_rate - group.garage_doors - sensor.time - sensor.date @@ -108,11 +108,11 @@ tts: cover: platform: garadget covers: - !secret garadget_large_id: + !secret large_garage_id: username: !secret garadget_username password: !secret garadget_password name: Large Garage - !secret garadget_small_id: + !secret small_garage_id: username: !secret garadget_username password: !secret garadget_password name: Small Garage diff --git a/customize/covers.yaml b/customize/covers.yaml index 17f9c499..646b8e6e 100755 --- a/customize/covers.yaml +++ b/customize/covers.yaml @@ -1,11 +1,11 @@ -cover.garadget_large: +cover.large_garage: friendly_name: 'Garadget Large' emulated_hue: False hidden: False homebridge_cover_type: garage_door -cover.garadget_small: +cover.small_garage: friendly_name: 'Garadget Small' emulated_hue: False hidden: False diff --git a/customize/device_tracker.yaml b/customize/device_tracker.yaml index ef2838de..3cc59110 100755 --- a/customize/device_tracker.yaml +++ b/customize/device_tracker.yaml @@ -54,14 +54,14 @@ device_tracker.cisco_ap: -device_tracker.garadget_large: +device_tracker.large_garage: friendly_name: 'Garadget Large' emulated_hue: False hidden: True -device_tracker.garadget_small: +device_tracker.small_garage: friendly_name: 'Garadget Small' emulated_hue: False hidden: True diff --git a/customize/sensors.yaml b/customize/sensors.yaml index 094405c3..d1ddeba4 100755 --- a/customize/sensors.yaml +++ b/customize/sensors.yaml @@ -166,70 +166,70 @@ sensor.external_ip: -sensor.garadget_large: +sensor.large_garage: friendly_name: 'Garadget Large' emulated_hue: False hidden: False icon: mdi:car-connected -sensor.garadget_large_reflection_rate: +sensor.large_garage_reflection_rate: friendly_name: 'Reflection Rate' emulated_hue: False hidden: False -sensor.garadget_large_status: +sensor.large_garage_status: friendly_name: 'State Of The Door' emulated_hue: False hidden: False -sensor.garadget_large_time_in_state: +sensor.large_garage_time_in_state: friendly_name: 'Time In State' emulated_hue: False hidden: False icon: mdi:timer-sand -sensor.garadget_large_wifi_signal_strength: +sensor.large_garage_wifi_signal_strength: friendly_name: 'Wifi Strength' emulated_hue: False hidden: False icon: mdi:wifi -sensor.garadget_small: +sensor.small_garage: friendly_name: 'Garadget Small' emulated_hue: False hidden: False icon: mdi:car-connected -sensor.garadget_small_reflection_rate: +sensor.small_garage_reflection_rate: friendly_name: 'Reflection Rate' emulated_hue: False hidden: False -sensor.garadget_small_status: +sensor.small_garage_status: friendly_name: 'State Of The Door' emulated_hue: False hidden: False -sensor.garadget_small_time_in_state: +sensor.small_garage_time_in_state: friendly_name: 'Time In State' emulated_hue: False hidden: False icon: mdi:timer-sand -sensor.garadget_small_wifi_signal_strength: +sensor.small_garage_wifi_signal_strength: friendly_name: 'Wifi Strength' emulated_hue: False hidden: False diff --git a/group/garage.yaml b/group/garage.yaml index 917ff77b..f96bacba 100755 --- a/group/garage.yaml +++ b/group/garage.yaml @@ -1,13 +1,13 @@ -garage_doors: - name: Garage doors - entities: - - cover.garadget_large - - sensor.garadget_large_status - - sensor.garadget_large_time_in_state - - sensor.garadget_large_wifi_signal_strength - - sensor.garadget_large_reflection_rate - - cover.garadget_small - - sensor.garadget_small_status - - sensor.garadget_small_time_in_state - - sensor.garadget_small_wifi_signal_strength - - sensor.garadget_small_reflection_rate \ No newline at end of file +garage_doors: + name: Garage doors + entities: + - cover.large_garage + - sensor.large_garage_status + - sensor.large_garage_time_in_state + - sensor.large_garage_wifi_signal_strength + - sensor.large_garage_reflection_rate + - cover.small_garage + - sensor.small_garage_status + - sensor.small_garage_time_in_state + - sensor.small_garage_wifi_signal_strength + - sensor.small_garage_reflection_rate \ No newline at end of file diff --git a/group/network.yaml b/group/network.yaml index 3027d3d6..62e67097 100755 --- a/group/network.yaml +++ b/group/network.yaml @@ -19,8 +19,8 @@ Network: - sensor.chromecast_audio_2 - sensor.nest_upstairs - sensor.nest_downstairs - - sensor.garadget_large - - sensor.garadget_small + - sensor.large_garage + - sensor.small_garage - sensor.led_rgb_garage_left - sensor.led_rgb_garage_small - sensor.led_rgb_outdoor_den diff --git a/sensor/devices.yaml b/sensor/devices.yaml index cb3b98e5..f2a66c50 100755 --- a/sensor/devices.yaml +++ b/sensor/devices.yaml @@ -60,13 +60,13 @@ friendly_name: 'ChromeCast Audio 2' value_template: "{{ 'Online' if is_state('device_tracker.chromecast_audio_2', 'home') else 'Offline' }}" - garadget_large: + large_garage: friendly_name: 'Garadget Large' - value_template: "{{ 'Online' if is_state('device_tracker.garadget_large', 'home') else 'Offline' }}" + value_template: "{{ 'Online' if is_state('device_tracker.large_garage', 'home') else 'Offline' }}" - garadget_small: + small_garage: friendly_name: 'Garadget Small' - value_template: "{{ 'Online' if is_state('device_tracker.garadget_small', 'home') else 'Offline' }}" + value_template: "{{ 'Online' if is_state('device_tracker.small_garage', 'home') else 'Offline' }}" rgb_led_outdoor_den: friendly_name: 'RGB LED Outdoor Den' diff --git a/sensor/garadget.yaml b/sensor/garadget.yaml index b0ccdd45..abeecd9a 100755 --- a/sensor/garadget.yaml +++ b/sensor/garadget.yaml @@ -4,33 +4,33 @@ - platform: template sensors: - garadget_small_status: + small_garage_status: friendly_name: 'State of the door' - value_template: '{{ states.cover.garadget_small.state }}' - garadget_small_time_in_state: + value_template: '{{ states.cover.small_garage.state }}' + small_garage_time_in_state: friendly_name: 'Time Since Change' - value_template: '{{ states.cover.garadget_small.attributes["time in state"] }}' - garadget_small_wifi_signal_strength: + value_template: '{{ states.cover.small_garage.attributes["time in state"] }}' + small_garage_wifi_signal_strength: friendly_name: 'WiFi strength' - value_template: '{{ states.cover.garadget_small.attributes["wifi signal strength (dB)"] }}' + value_template: '{{ states.cover.small_garage.attributes["wifi signal strength (dB)"] }}' unit_of_measurement: 'dB' - garadget_small_reflection_rate: + small_garage_reflection_rate: friendly_name: 'Reflection Rate' - value_template: '{{ states.cover.garadget_small.attributes["sensor reflection rate"] }}' + value_template: '{{ states.cover.small_garage.attributes["sensor reflection rate"] }}' - platform: template sensors: - garadget_large_status: + large_garage_status: friendly_name: 'State of the door' - value_template: '{{ states.cover.garadget_large.state }}' - garadget_large_time_in_state: + value_template: '{{ states.cover.large_garage.state }}' + large_garage_time_in_state: friendly_name: 'Time Since Change' - value_template: '{{ states.cover.garadget_large.attributes["time in state"] }}' - garadget_large_wifi_signal_strength: + value_template: '{{ states.cover.large_garage.attributes["time in state"] }}' + large_garage_wifi_signal_strength: friendly_name: 'WiFi strength' - value_template: '{{ states.cover.garadget_large.attributes["wifi signal strength (dB)"] }}' + value_template: '{{ states.cover.large_garage.attributes["wifi signal strength (dB)"] }}' unit_of_measurement: 'dB' - garadget_large_reflection_rate: + large_garage_reflection_rate: friendly_name: 'Reflection Rate' - value_template: '{{ states.cover.garadget_large.attributes["sensor reflection rate"] }}' \ No newline at end of file + value_template: '{{ states.cover.large_garage.attributes["sensor reflection rate"] }}' \ No newline at end of file diff --git a/travis_secrets.yaml b/travis_secrets.yaml index eaa89d97..298dd244 100755 --- a/travis_secrets.yaml +++ b/travis_secrets.yaml @@ -12,8 +12,8 @@ ifttt_key: iftttKEYPassphrase forecast_key: ForcastKeyphrase nest_client_id: secret_nest_client_id nest_client_secret: secretnestclientid -garadget_large_id: 00000000000000000000000 -garadget_small_id: 00000000000000000000001 +large_garage_id: 00000000000000000000000 +small_garage_id: 00000000000000000000001 garadget_username: user@email.com garadget_password: password google_cal_clientid: clientidsecretsecretsecret.apps.googleusercontent.com