diff --git a/node-red/projects/NerdFlows b/node-red/projects/NerdFlows
index 2ab8c4e..e034074 160000
--- a/node-red/projects/NerdFlows
+++ b/node-red/projects/NerdFlows
@@ -1 +1 @@
-Subproject commit 2ab8c4e976e9b173bfdc49a44936e5638f40de48
+Subproject commit e0340744f165bbb699d033520a6d25411041197e
diff --git a/scripts.yaml b/scripts.yaml
index 70e112b..3918173 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -258,7 +258,7 @@ basement_on:
entity_id: media_player.basement_tv
- service: script.activate_alexa_actionable_notification
data_template:
- text: Would you like me to turn on the computer for Colin?
+ text: Would you like me to turn on the computer for Collin?
event_id: actionable_notification_kallen_computer_on
alexa_device: '{{ states(''sensor.last_alexa'') }}'
mode: single
diff --git a/templates/speech/daily_briefing.yaml b/templates/speech/daily_briefing.yaml
index 4433295..ddb3d35 100644
--- a/templates/speech/daily_briefing.yaml
+++ b/templates/speech/daily_briefing.yaml
@@ -142,7 +142,7 @@
Hope you had a happy birthday Tina!
{% endif %}
{% if is_state('sensor.anniversary_kallen_s_birthday','0') %}
- Hope you had a happy birthday Colin!
+ Hope you had a happy birthday Collin!
{% endif %}
{% if is_state('sensor.anniversary_emmalynn_s_birthday','0') %}
Hope you had a happy birthday Emmalynn!
@@ -164,7 +164,7 @@
{% elif states.sensor.christmas_countdown.state | int < 31 %}
There are only {{states.sensor.christmas_countdown.state}} days until Christmas.
{{ [ 'All I want for Christmas is a Hippopotamus.',
- 'Hey Colin, I know what you are getting for Christmas. But I am not telling.',
+ 'Hey Collin, I know what you are getting for Christmas. But I am not telling.',
'Do not forget to put something under the tree for your favorite
- Good morning, Colin.
+ Good morning, Collin.
It is {{ now().strftime("%I:%M %p") }}
diff --git a/templates/speech/kallen_nightly_briefing.yaml b/templates/speech/kallen_nightly_briefing.yaml
index 437a666..4ffcac3 100644
--- a/templates/speech/kallen_nightly_briefing.yaml
+++ b/templates/speech/kallen_nightly_briefing.yaml
@@ -2,7 +2,7 @@
{# Kallen Nightly Report #}
{%- macro getReport() -%}
- Good Evening, Colin,
+ Good Evening, Collin,
{{ [ 'My sensors are detecting a strange smell. I am running diagnostics. But in the mean time, you should start a shower.',
'It is a shower night, so you need to head upstairs and get on that.',
'Did you ever hear the one about the kid who never took a shower?
- "Hello Colin, " + "Hello Collin, " {% if is_state('input_boolean.school_today','on') %} {% if is_state('input_boolean.kallen_two_hour_delay','on') %} diff --git a/templates/speech/nightly_briefing.yaml b/templates/speech/nightly_briefing.yaml index b8dc881..ad5e6f0 100644 --- a/templates/speech/nightly_briefing.yaml +++ b/templates/speech/nightly_briefing.yaml @@ -11,12 +11,12 @@ {% endif %} {% if is_state('sensor.school_tomorrow','on') %} {% if is_state('sensor.band_tomorrow','on') %} - "Colin has school tomorrow, and there will be band practice in the morning at {{ as_timestamp(strptime(state_attr('calendar.kallen_school_days','start_time'), '%Y-%m-%d %H:%M:%S')) | timestamp_custom("%I:%M %p") }}. " + "Collin has school tomorrow, and there will be band practice in the morning at {{ as_timestamp(strptime(state_attr('calendar.kallen_school_days','start_time'), '%Y-%m-%d %H:%M:%S')) | timestamp_custom("%I:%M %p") }}. " {% else %} - "Colin has school tomorrow at {{ as_timestamp(strptime(state_attr('calendar.kallen_school_days','start_time'), '%Y-%m-%d %H:%M:%S')) | timestamp_custom("%I:%M %p") }}. " + "Collin has school tomorrow at {{ as_timestamp(strptime(state_attr('calendar.kallen_school_days','start_time'), '%Y-%m-%d %H:%M:%S')) | timestamp_custom("%I:%M %p") }}. " {% endif %} {% else %} - "Colin does not have school tomorrow. " + "Collin does not have school tomorrow. " {% endif %} {% if is_state('input_boolean.work_today','on') %} "Tina is still at work right now, she will be done at approximately {{ (state_attr('input_datetime.tina_workday_end','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " @@ -325,18 +325,18 @@ {% endif %} {% if is_state('input_boolean.kallen_overnight','off') %} {% if is_state('fan.kallen_fan_socket_1','on') %} - "Colins fan is already running. " + "Collins fan is already running. " {% elif is_state('input_boolean.white_noise_kallen_bedroom','on') %} - "Colins white noise generator is already running. " + "Collins white noise generator is already running. " {% elif is_state('input_select.scheduled_climate_mode_kallen_fan','Fan') %} - "Colins fan will activate at {{ (state_attr('input_datetime.kallen_bedtime','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " + "Collins fan will activate at {{ (state_attr('input_datetime.kallen_bedtime','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " {% elif is_state('input_select.scheduled_climate_mode_kallen_fan','White Noise') %} - "Colins white noise generator will activate at {{ (state_attr('input_datetime.kallen_bedtime','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " + "Collins white noise generator will activate at {{ (state_attr('input_datetime.kallen_bedtime','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " {% elif is_state('input_select.scheduled_climate_mode_kallen_fan','N/A') %} - "Colins room will have no devices activated tonight. " + "Collins room will have no devices activated tonight. " {% endif %} {% else %} - "Colins room will be left alone, as he is spending the night elsewhere tonight. " + "Collins room will be left alone, as he is spending the night elsewhere tonight. " {% endif %} {% if is_state('fan.emma_air_conditioner','on') %} "Emma's air conditioner is already running. " diff --git a/templates/speech/welcome_home.yaml b/templates/speech/welcome_home.yaml index f313f72..5962c73 100644 --- a/templates/speech/welcome_home.yaml +++ b/templates/speech/welcome_home.yaml @@ -26,7 +26,7 @@ {% set endafter = state_attr('input_datetime.school_day_end','timestamp') + 3600 %} {% set current = ((now().hour * 60 + now().minute) * 60 ) %} {% if is_state('input_boolean.school_today_extended','on') and current > endbefore and current < endafter %} - "Welcome home Colin as well, " + "Welcome home Collin as well, " {{ [ 'I hope you had a great day at school! ', 'I hope school was as boring, uh I mean exciting as ever! ', @@ -43,7 +43,7 @@ ] | random }} {% endif %} {% elif is_state('input_boolean.kallen_school_cancelled','on') %} - "I hope you are enjoying your free day off from school, Colin. " + "I hope you are enjoying your free day off from school, Collin. " {% endif %}
@@ -54,7 +54,7 @@ Happy Birthday Tina! {% endif %} {% if is_state('sensor.anniversary_kallen_s_birthday','0') %} - Happy Birthday Colin! + Happy Birthday Collin! {% endif %} {% if is_state('sensor.anniversary_emmalynn_s_birthday','0') %} Happy Birthday Emmalynn!