Fixed welcome automation

diff --git a/automation/speech.yaml b/automation/speech.yaml
index b15ef80de6c08c59090d798061e11247ae07d6b4..9e2d0d7906c9e8c3dac27ab959a007ba4fe2161a 100644 (file)
--- a/automation/speech.yaml
+++ b/automation/speech.yaml
@@ -57,9 +57,11 @@
           false
         {% endif %}
 
-      timeout: '00:10:00'
+      timeout: '00:30:00'
       continue_on_timeout: 'false'
 
+#    - delay: 00:30
+
     - service: script.speech_engine
       data_template:
         language: 'it'

diff --git a/script/speech_engine.yaml b/script/speech_engine.yaml
index f23cd64a1ff2b64287e11b85c6edd51749113261..f7533883a30835f8e224ef2f693763f0a6eb74aa 100644 (file)
--- a/script/speech_engine.yaml
+++ b/script/speech_engine.yaml
@@ -72,7 +72,8 @@ speech_engine:
             {% else %}\r
               {% set car_parkbreak = "non inserito" %}\r
             {% endif %}\r
-            La Mercedes si trova {{ car_position }}. è {{ car_lock }}, con i finestrini {{ car_windows }} e il freno a mano {{ car_parkbreak }}.            \r
+            La Mercedes si trova {{ car_position }}. è {{ car_lock }}, con i finestrini {{ car_windows }} e il freno a mano {{ car_parkbreak }}.\r
+            Il livello del carburante è {{ states('sensor.ff590mr_tank_level') }} percento.\r
             {% if is_state('binary_sensor.ff590mr_warning_breakfluid', 'on') or\r
                   is_state('binary_sensor.ff590mr_warning_engine_light', 'on') or\r
                   is_state('binary_sensor.ff590mr_warning_washwater', 'on') %}\r
@@ -82,10 +83,18 @@ speech_engine:
           \r
           {# Location Status #}\r
           {%- macro status_location() -%}\r
-            {% set giorgio_position = states('device_tracker.google_maps_115265981849847357125') %}\r
-            {% set laura_position = states('device_tracker.google_maps_103158638433668748797') %}\r
-            La posizione di Giorgio è {{ giorgio_position }}.\r
+            {% if is_state('device_tracker.google_maps_115265981849847357125', 'not_home') %}\r
+              {% set giorgio_position = 'fuori casa' %}\r
+            {% else %}\r
+              {% set giorgio_position = states('device_tracker.google_maps_115265981849847357125') %}\r
+            {% endif %}\r
             La posizione di Laura è {{ laura_position }}.\r
+            {% if is_state('device_tracker.google_maps_103158638433668748797', 'not_home') %}\r
+              {% set laura_position = 'fuori casa' %}\r
+            {% else %}\r
+              {% set laura_position = states('device_tracker.google_maps_103158638433668748797') %}\r
+            {% endif %}\r
+            La posizione di Giorgio è {{ giorgio_position }}.\r
           {%- endmacro -%}\r
 \r
           {# *********************************************** #}\r