From 416c3b766fe6ba4cb48f96f6c3bf4ad5cde229bc Mon Sep 17 00:00:00 2001
From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Sun, 19 Apr 2020 16:49:13 +0200
Subject: [PATCH] Reviewed google assistant - manual sync not work:(

---
 .gitignore                                    |  6 ++--
 components/google_assistant.yaml              |  3 +-
 components/google_assistant/alarms.yaml       |  8 ++++++
 .../google_assistant/home_assistant.yaml      | 28 ++++++-------------
 components/google_assistant/light.yaml        |  2 +-
 components/google_assistant/speech.yaml       | 12 ++++++++
 6 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 components/google_assistant/alarms.yaml
 create mode 100644 components/google_assistant/speech.yaml

diff --git a/.gitignore b/.gitignore
index 0eda71a0..e24a65dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Home Assistant Components
 deps/
 .HA_VERSION
+home-assistant.log
 home-assistant_v2.db
 html5_push_registrations.conf
 .storage
@@ -12,10 +13,7 @@ tts/
 .mercedesme-token-cache
 bravia.conf
 secrets.yaml
-components/google_assistant/service_account.json
-
-# Log Files
-*.log
+credentials/
 
 # Disabled Files
 #*.disabled
diff --git a/components/google_assistant.yaml b/components/google_assistant.yaml
index 7903a36a..07dc15f0 100644
--- a/components/google_assistant.yaml
+++ b/components/google_assistant.yaml
@@ -3,7 +3,8 @@
 ######################################################################
 
 project_id: !secret google_project
-service_account: !include google_assistant/service_account.json
+service_account: !include ../credentials/google.json
+#report_state: true
 expose_by_default: false
 exposed_domains:
   - climate
diff --git a/components/google_assistant/alarms.yaml b/components/google_assistant/alarms.yaml
new file mode 100644
index 00000000..ece283d6
--- /dev/null
+++ b/components/google_assistant/alarms.yaml
@@ -0,0 +1,8 @@
+######################################################################
+# Google Assistant: Alarms
+######################################################################
+
+script.stop_alarm:
+  name: Disattiva Allarmi
+  expose: true
+  room: Generale
\ No newline at end of file
diff --git a/components/google_assistant/home_assistant.yaml b/components/google_assistant/home_assistant.yaml
index 7fdf46ec..c1783c55 100644
--- a/components/google_assistant/home_assistant.yaml
+++ b/components/google_assistant/home_assistant.yaml
@@ -6,27 +6,15 @@ input_boolean.home_mode_away:
   name: Modalità Vacanza
   room: Generale
   expose: true
-script.speech_status:
-  name: Stato Casa
-  expose: true
-  room: Generale
-script.speech_consumption:
-  name: Consumo Casa
-  expose: true
-  room: Generale
 script.homeassistant_restart:
   name: Riavvia Homeassistant
   expose: true
   room: Generale
-script.homeassistant_google_home_sync:
-  name: Sincronizza Homeassistant
-  expose: true
-  room: Generale
-script.shelly_upgrade:
-  name: Aggiorna Shelly
-  expose: true
-  room: Generale
-script.stop_alarm:
-  name: Disattiva Allarmi
-  expose: true
-  room: Generale
+#script.homeassistant_google_home_sync:
+#  name: Sincronizza Homeassistant
+#  expose: true
+#  room: Generale
+#script.shelly_upgrade:
+#  name: Aggiorna Shelly
+#  expose: true
+#  room: Generale
diff --git a/components/google_assistant/light.yaml b/components/google_assistant/light.yaml
index cc64abfd..2017a3e6 100644
--- a/components/google_assistant/light.yaml
+++ b/components/google_assistant/light.yaml
@@ -28,4 +28,4 @@ light.luce_camera:
   room: Camera
 light.luce_balcone:
   expose: true
-  room: Balcone
\ No newline at end of file
+  room: Balcone
diff --git a/components/google_assistant/speech.yaml b/components/google_assistant/speech.yaml
new file mode 100644
index 00000000..199470d5
--- /dev/null
+++ b/components/google_assistant/speech.yaml
@@ -0,0 +1,12 @@
+######################################################################
+# Google Assistant: Speech
+######################################################################
+
+script.speech_status:
+  name: Stato Casa
+  expose: true
+  room: Generale
+script.speech_consumption:
+  name: Consumo Casa
+  expose: true
+  room: Generale
-- 
2.47.3