]> git.giorgioravera.it Git - homeassistant.git/commitdiff
Moved google calendar and netatmo to UI, added media_source, removed hass update...
authorGiorgio Ravera <giorgio.ravera@gmail.com>
Fri, 3 Jun 2022 12:52:01 +0000 (14:52 +0200)
committerGiorgio Ravera <giorgio.ravera@gmail.com>
Fri, 3 Jun 2022 12:52:01 +0000 (14:52 +0200)
.secrets_travis.yaml
README.md
automations/update_notifications.yaml
components/google_calendar.yaml [deleted file]
components/netatmo.yaml [deleted file]
configuration.yaml
light/sala.yaml
mqtt/light/sala.yaml [new file with mode: 0644]

index a716f72114bc20063f23965c19995c06f3a541a8..9fb08150d4b8e0644b490db7446cfb2b0feba887 100644 (file)
@@ -32,9 +32,6 @@ google_pin: "0000"
 google_maps_username: email@domain.com
 google_maps_password: password
 
-google_calendar_id: id
-google_calendar_secret: password
-
 proxmox_host: host
 proxmox_user: user
 proxmox_password: password
@@ -57,9 +54,6 @@ hacs_token: 0
 
 mb_vin: vin
 
-netatmo_client_id: client_id
-netatmo_client_secret: password
-
 telegram_bot_name: "name_bot"
 telegram_bot_username: "telegram_bot"
 telegram_bot_access_token: token
index 99b9d3dfb9c45d4d3f6d262313a30daf89ea2059..07f1baf97fa40f08d59baee4fd5967003bf7ec51 100644 (file)
--- a/README.md
+++ b/README.md
@@ -69,6 +69,7 @@ My server is an Intel NUC (NUC10i5FNH) with [Proxmox Virtual Environment](https:
   * LG webOS Smart TV
   * Mercedes Me
   * MQTT
+  * Netatmo
   * Shelly Devices (with the exception of Shelly Bulb)
   * Sony Bravia
   * SpeedTest
index 6b491a3d355c5aa87b2146fcd7470f8803c884f4..48d25dd1b404aeecf9e7003c8f30abeae78b5173 100644 (file)
@@ -1,34 +1,3 @@
-######################################################################\r
-# Update Notification: Home Assistant\r
-######################################################################\r
-\r
-- alias: "Update Notification: Home Assistant"\r
-\r
-  trigger:\r
-    - platform: state\r
-      entity_id: binary_sensor.updater\r
-      to: 'on'\r
-\r
-    - platform: homeassistant\r
-      event: start\r
-\r
-  condition:\r
-    condition: state\r
-    entity_id: binary_sensor.updater\r
-    state: 'on'\r
-\r
-  action:\r
-    - delay: '00:00:5'\r
-    - service: script.notify_text\r
-      data_template:\r
-        title: "Home Assistant - Aggiornamento"\r
-        message: "E' disponibile un aggiornamento per Home Assistant {{ state_attr('binary_sensor.updater', 'newest_version') }}. {{now().strftime('%Y-%m-%d %I:%M %p')}}"\r
-        notification_id: "update"\r
-        enable_persistent: true\r
-\r
-    - service: input_boolean.turn_on\r
-      entity_id: input_boolean.update_homeassistant\r
-\r
 ######################################################################\r
 # Update Notification: Shelly\r
 ######################################################################\r
diff --git a/components/google_calendar.yaml b/components/google_calendar.yaml
deleted file mode 100644 (file)
index aa837af..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-######################################################################
-# Component: Google Calendar Integration
-######################################################################
-
-client_id: !secret google_calendar_id
-client_secret: !secret google_calendar_secret
diff --git a/components/netatmo.yaml b/components/netatmo.yaml
deleted file mode 100644 (file)
index bfccae5..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-######################################################################
-# Component: Netatmo
-######################################################################
-
-client_id: !secret netatmo_client_id
-client_secret: !secret netatmo_client_secret
index 6847df048d1c7fa0776c1f4f38329998f148be93..237dac750ffd35404b7c15ddd2ec2917d28349b0 100644 (file)
@@ -14,11 +14,15 @@ homeassistant:
   unit_system: metric
   # Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
   time_zone: Europe/Rome
+  # Pick your currency code from the column Code of Wikipedia’s list of ISO 4217 active codes
+  currency: EUR
   # URL
-  internal_url: !secret base_url
   external_url: !secret base_url
+  internal_url: !secret base_url
   # Customization folder
   customize: !include_dir_merge_named customizations/
+  media_dirs:
+    media: "media"
   # Packages:
   packages: !include_dir_named packages/
 
@@ -72,7 +76,7 @@ input_text: !include_dir_merge_named input_text/
 map:
 
 # Media Source
-#media_source:
+media_source:
 
 # Mobile App Support
 mobile_app:
@@ -104,15 +108,6 @@ tag:
 # Timer
 timer:
 
-# Checks for available updates
-# Note: This component will send some information about your system to
-# the developers to assist with development of Home Assistant.
-# For more information, please see:
-# https://home-assistant.io/blog/2016/10/25/explaining-the-updater/
-updater:
-  # Optional, allows Home Assistant developers to focus on popular components.
-  # include_used_components: true
-
 # Webhooks
 webhook:
 
@@ -204,17 +199,15 @@ weather: !include components/weather.yaml
 # Google Assistant
 google_assistant: !include components/google_assistant.yaml
 
-# Google Calendar
-google: !include components/google_calendar.yaml
-
-# Proxmox
-proxmoxve: !include components/proxmox.yaml
-
 # Homekit
 homekit: !include components/homekit.yaml
 
-# Netatmo
-netatmo: !include components/netatmo.yaml
+# MQTT
+mqtt:
+  light: !include_dir_merge_list mqtt/light/
+
+# Proxmox
+proxmoxve: !include components/proxmox.yaml
 
 # Telegram
 telegram_bot: !include components/telegram.yaml
index 3b834b56ed195005db83b28cf70d0d6551161edf..6191d538dfd9da5839f17d93b9b305f1df3ca1b1 100644 (file)
@@ -1,130 +1,3 @@
-######################################################################
-# Living Room Couch Light (Color)
-######################################################################
-
-- platform: mqtt
-  name: Luce Divano
-  schema: template
-  command_topic: "shellies/shellybulb-BC8610/color/0/set"
-  state_topic: "shellies/shellybulb-BC8610/color/0/status"
-  command_on_template: >
-    {
-      "turn": "on",
-      "mode": "color",
-      {%- if red is defined and green is defined and blue is defined -%}
-        "red": {{ red }},
-        "green": {{ green }},
-        "blue": {{ blue }},
-      {%- endif -%}
-      {%- if white_value is defined -%}
-        "white": {{ white_value }},
-      {%- endif -%}
-      {%- if brightness is defined -%}
-        "gain": {{ (brightness/255*100) | int }},
-      {%- endif -%}
-      {%- if effect is defined -%}
-        {%- if effect == 'Pioggia di Meteore' -%}
-          "effect": 1
-        {%- elif effect == 'Cambio Graduale' -%}
-          "effect": 2
-        {%- elif effect == 'Respiro' -%}
-          "effect": 3
-        {%- elif effect == 'Flash' -%}
-          "effect": 4
-        {%- elif effect == 'On/Off Graduale' -%}
-          "effect": 5
-        {%- elif effect == 'Rosso/Verde' -%}
-          "effect": 6
-        {%- else -%}
-          "effect": 0
-        {%- endif -%}
-      {%- else -%}
-        "effect": 0
-      {%- endif -%}
-    }
-  command_off_template: >
-    {
-      "turn": "off",
-      "mode": "color"
-    }
-  state_template: >
-    {% if value_json.ison == true and value_json.mode == "color" %}
-      on
-    {% else %}
-      off
-    {% endif %}
-  brightness_template: '{{ (value_json.gain/100*255) | int }}'
-  red_template: '{{ value_json.red }}'
-  green_template: '{{ value_json.green }}'
-  blue_template: '{{ value_json.blue }}'
-  white_value_template: '{{ value_json.white }}'
-  effect_template: >
-    {%- if value_json.effect == 1 -%}
-      Pioggia di Meteore
-    {%- elif value_json.effect == 2 -%}
-      Cambio Graduale
-    {%- elif value_json.effect == 3 -%}
-      Respiro
-    {%- elif value_json.effect == 4 -%}
-      Flash
-    {%- elif value_json.effect == 5 -%}
-      On/Off Graduale
-    {%- elif value_json.effect == 6 -%}
-      Rosso/Verde
-    {%- else -%}
-      Off
-    {%- endif -%}
-  effect_list:
-    - "Off"
-    - Pioggia di Meteore
-    - Cambio Graduale
-    - Respiro
-    - Flash
-    - On/Off Graduale
-    - Rosso/Verde
-  retain: false
-  qos: 0
-  optimistic: false
-
-######################################################################
-# Living Room Couch Light (White)
-######################################################################
-
-#- platform: mqtt
-#  name: Luce Divano Bianca
-#  schema: template
-#  command_topic: "shellies/shellybulb-BC8610/color/0/set"
-#  state_topic: "shellies/shellybulb-BC8610/color/0/status"
-#  command_on_template: >
-#    {
-#      "turn": "on",
-#      "mode": "white",
-#      {%- if color_temp is defined -%}
-#        "temp": {{ (1000000/(((float(color_temp)-153)/354*180)+153)-35) | int }},
-#      {%- endif -%}
-#      {%- if brightness is defined -%}
-#        "brightness": {{ (brightness/255*100) | int }},
-#      {%- endif -%}
-#      "effect": 0
-#    }
-#  command_off_template: >
-#    {
-#      "turn": "off",
-#      "mode": "white",
-#      "effect": 0
-#    }
-#  state_template: >
-#    {% if value_json.ison == true and value_json.mode == "white" %}
-#      on
-#    {% else %}
-#      off
-#    {% endif %}
-#  brightness_template: '{{ (value_json.brightness/100*255)|int }}'
-#  color_temp_template: "{{ (1000000/(((float(value_json.temp)-3000)/3500*4500)+2000)) | int }}"
-#  retain: false
-#  qos: 0
-#  optimistic: false
-
 ######################################################################
 # Living Room Global
 ######################################################################
diff --git a/mqtt/light/sala.yaml b/mqtt/light/sala.yaml
new file mode 100644 (file)
index 0000000..dd96c52
--- /dev/null
@@ -0,0 +1,124 @@
+######################################################################
+# Living Room Couch Light (Color)
+######################################################################
+
+- name: Luce Divano
+  schema: template
+  command_topic: "shellies/shellybulb-BC8610/color/0/set"
+  state_topic: "shellies/shellybulb-BC8610/color/0/status"
+  command_on_template: >
+    {
+      "turn": "on",
+      "mode": "color",
+      {%- if red is defined and green is defined and blue is defined -%}
+        "red": {{ red }},
+        "green": {{ green }},
+        "blue": {{ blue }},
+      {%- endif -%}
+      {%- if white_value is defined -%}
+        "white": {{ white_value }},
+      {%- endif -%}
+      {%- if brightness is defined -%}
+        "gain": {{ (brightness/255*100) | int }},
+      {%- endif -%}
+      {%- if effect is defined -%}
+        {%- if effect == 'Pioggia di Meteore' -%}
+          "effect": 1
+        {%- elif effect == 'Cambio Graduale' -%}
+          "effect": 2
+        {%- elif effect == 'Respiro' -%}
+          "effect": 3
+        {%- elif effect == 'Flash' -%}
+          "effect": 4
+        {%- elif effect == 'On/Off Graduale' -%}
+          "effect": 5
+        {%- elif effect == 'Rosso/Verde' -%}
+          "effect": 6
+        {%- else -%}
+          "effect": 0
+        {%- endif -%}
+      {%- else -%}
+        "effect": 0
+      {%- endif -%}
+    }
+  command_off_template: >
+    {
+      "turn": "off",
+      "mode": "color"
+    }
+  state_template: >
+    {% if value_json.ison == true and value_json.mode == "color" %}
+      on
+    {% else %}
+      off
+    {% endif %}
+  brightness_template: '{{ (value_json.gain/100*255) | int }}'
+  red_template: '{{ value_json.red }}'
+  green_template: '{{ value_json.green }}'
+  blue_template: '{{ value_json.blue }}'
+  white_value_template: '{{ value_json.white }}'
+  effect_template: >
+    {%- if value_json.effect == 1 -%}
+      Pioggia di Meteore
+    {%- elif value_json.effect == 2 -%}
+      Cambio Graduale
+    {%- elif value_json.effect == 3 -%}
+      Respiro
+    {%- elif value_json.effect == 4 -%}
+      Flash
+    {%- elif value_json.effect == 5 -%}
+      On/Off Graduale
+    {%- elif value_json.effect == 6 -%}
+      Rosso/Verde
+    {%- else -%}
+      Off
+    {%- endif -%}
+  effect_list:
+    - "Off"
+    - Pioggia di Meteore
+    - Cambio Graduale
+    - Respiro
+    - Flash
+    - On/Off Graduale
+    - Rosso/Verde
+  retain: false
+  qos: 0
+  optimistic: false
+
+######################################################################
+# Living Room Couch Light (White)
+######################################################################
+
+#- name: Luce Divano Bianca
+#  schema: template
+#  command_topic: "shellies/shellybulb-BC8610/color/0/set"
+#  state_topic: "shellies/shellybulb-BC8610/color/0/status"
+#  command_on_template: >
+#    {
+#      "turn": "on",
+#      "mode": "white",
+#      {%- if color_temp is defined -%}
+#        "temp": {{ (1000000/(((float(color_temp)-153)/354*180)+153)-35) | int }},
+#      {%- endif -%}
+#      {%- if brightness is defined -%}
+#        "brightness": {{ (brightness/255*100) | int }},
+#      {%- endif -%}
+#      "effect": 0
+#    }
+#  command_off_template: >
+#    {
+#      "turn": "off",
+#      "mode": "white",
+#      "effect": 0
+#    }
+#  state_template: >
+#    {% if value_json.ison == true and value_json.mode == "white" %}
+#      on
+#    {% else %}
+#      off
+#    {% endif %}
+#  brightness_template: '{{ (value_json.brightness/100*255)|int }}'
+#  color_temp_template: "{{ (1000000/(((float(value_json.temp)-3000)/3500*4500)+2000)) | int }}"
+#  retain: false
+#  qos: 0
+#  optimistic: false