Improved speech engine after notification modifications

diff --git a/scripts/speech_engine.yaml b/scripts/speech_engine.yaml
index 499ff0af1d7a81dd01b3dd3762e840367fc46c47..f94b586385543602daae8a0ed9d926d15d885f99 100644 (file)
--- a/scripts/speech_engine.yaml
+++ b/scripts/speech_engine.yaml
@@ -6,6 +6,7 @@
 # - message
 # - enable_greeting
 # - enable_status
+# - enable_consumption
 # - enable_location
 # - location_people_start
 # - location_people_num
@@ -17,7 +18,84 @@
 
 speech_engine:
   alias: Speech Engine
-  sequence: 
+  description: Il servizio costituisce il motore vocale del sistema. Tramite opportuni parametri è possibile riprodurre testi e diverse informazioni sullo stato della casa, dell'auto e altro ancora.
+  variables:
+    defaulMediaPlayer: 'media_player.google_home'
+    defaultVolume: 0.35
+    media_player: >-
+      {# Check Null Input #}
+      {% if media_player | length == 0 %}
+        {% set media_player = defaulMediaPlayer %}
+      {% endif %}
+      {{ media_player }}
+    volume_level: >-
+      {# Check Null Input #}
+      {% if volume_level | length == 0 %}
+        {% set volume_level = defaultVolume %}
+      {% endif %}
+      {{ volume_level }}
+    message: >-
+      {# Check Null Input #}
+      {% if message | length == 0 %}
+        {% set message = "" %}
+      {% endif %}
+      {{ message }}
+
+  fields:
+    media_player:
+      description: "Destinazione della notifica"
+      example: "media_player.google_home"
+      selector:
+        entity:
+          domain: media_player
+    volume_level:
+      description: "Livello del volume"
+      example: "0.35"
+      default: 0.35
+      selector:
+        number:
+          min: 0.0
+          max: 1.0
+          step: 0.05
+    message:
+      description: "Messaggio"
+      example: "Testo Messaggio"
+      selector:
+        text:
+    enable_greeting:
+      description: "Riprodurre il saluto"
+      example: "false"
+      default: false
+      selector:
+        boolean:
+    enable_status:
+      description: "Riprodurre lo stato della casa"
+      example: "false"
+      default: false
+      selector:
+        boolean:
+    enable_consumption:
+      description: "Riprodurre il consumo energetico"
+      example: "false"
+      default: false
+      selector:
+        boolean:
+    enable_location:
+      description: "Riprodurre la posizione delle persone"
+      example: "false"
+      default: false
+      selector:
+        boolean:
+    #location_people_start:
+    #location_people_num:
+    enable_car:
+      description: "Riprodurre lo stato dell'auto"
+      example: "false"
+      default: false
+      selector:
+        boolean:
+
+  sequence:
     - service: script.notify_voice
       data_template:
         media_player: "{{ media_player }}"
@@ -33,11 +111,12 @@ speech_engine:
 
 speech_status:
   alias: Stato Casa
-  sequence: 
+  description: Riproduce le informazioni principali sullo stato della casa
+  sequence:
     - service: script.speech_engine
       data:
-        enable_greeting: 1
-        enable_status: 1
+        enable_greeting: true
+        enable_status: true
 
 ######################################################################
 # Speech Consumption
@@ -48,7 +127,8 @@ speech_status:
 
 speech_consumption:
   alias: Consumo Energetico
+  description: Riproduce il consumo energetico istantaneo
   sequence:
     - service: script.speech_engine
       data:
-        enable_consumption: 1
+        enable_consumption: true

diff --git a/templates/speech_message.yaml b/templates/speech_message.yaml
index 61cdc301758688ffc80d04ae2938efc99f30988d..2342f535d1230c764d337582407de96bf8038308 100644 (file)
--- a/templates/speech_message.yaml
+++ b/templates/speech_message.yaml
@@ -7,16 +7,16 @@
   {# ***************** Check Input ***************** #}\r
   {# *********************************************** #}\r
   {% if enable_greeting is not defined %}\r
-    {% set enable_greeting=0 %}\r
+    {% set enable_greeting=false %}\r
   {% endif %}\r
   {% if enable_status is not defined %}\r
-    {% set enable_status=0 %}\r
+    {% set enable_status=false %}\r
   {% endif %}\r
   {% if enable_consumption is not defined %}\r
-    {% set enable_consumption=0 %}\r
+    {% set enable_consumption=false %}\r
   {% endif %}\r
   {% if enable_location is not defined %}\r
-    {% set enable_location=0 %}\r
+    {% set enable_location=false %}\r
   {% endif %}\r
   {% if location_people_start is not defined %}\r
     {% set location_people_start=1 %}\r
@@ -25,7 +25,7 @@
     {% set location_people_num=2 %}\r
   {% endif %}\r
   {% if enable_car is not defined %}\r
-    {% set enable_car=0 %}\r
+    {% set enable_car=false %}\r
   {% endif %}\r
 \r
   {# *********************************************** #}\r
@@ -165,7 +165,7 @@
 \r
   {# End Message #}\r
   {%- macro end_message() -%}\r
-    {% if enable_status | int == 1 %}\r
+    {% if enable_status == true %}\r
       {{ [\r
       "Spero che il report ti abbia soddisfatto!",\r
       "Il report è concluso.",\r
@@ -181,12 +181,12 @@
   {# *********************************************** #}\r
 \r
   {# Greeting Message #}\r
-  {% if enable_greeting | int == 1 %}\r
+  {% if enable_greeting == true %}\r
     {{ greeting() }}\r
   {% endif %}\r
 \r
   {# Home Status #}\r
-  {% if enable_status | int == 1 %}\r
+  {% if enable_status == true %}\r
 \r
     {{ time_and_date() }}\r
 \r
@@ -200,17 +200,17 @@
 \r
   {% endif %}\r
 \r
-  {% if (enable_status | int == 1) or (enable_consumption | int == 1) %}\r
+  {% if (enable_status == true) or (enable_consumption == true) %}\r
     {{ status_consumption() }}\r
   {% endif %}\r
 \r
   {# Location Status #}\r
-  {% if (enable_status | int == 1) or (enable_location | int == 1) %}\r
+  {% if (enable_status == true) or (enable_location == true) %}\r
     {{ status_location(location_people_start, location_people_num) }}\r
   {% endif %}\r
 \r
   {# Car Status #}\r
-  {% if (enable_status | int == 1) or (enable_car | int == 1) %}\r
+  {% if (enable_status == true) or (enable_car == true) %}\r
     {{ status_car() }}\r
   {% endif %}\r
 \r