From 4e5d33164f5d59d90f0e03ee7ae3dd13c03ee948 Mon Sep 17 00:00:00 2001
From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Mon, 11 Jan 2021 21:44:21 +0100
Subject: [PATCH] Updated Mercedes Me with lock/unlock feature

---
 .secrets_travis.yaml                          |  2 +
 .storage/lovelace                             |  2 +-
 .../mercedes/mercedes_customizations.yaml     |  4 +-
 ...gle.yaml.disabled => mercedes_google.yaml} |  0
 packages/mercedes/mercedes_lock.yaml          | 38 +++++++++++++++++++
 .../mercedes/mercedes_switch.yaml.disabled    | 22 -----------
 6 files changed, 43 insertions(+), 25 deletions(-)
 rename packages/mercedes/{mercedes_google.yaml.disabled => mercedes_google.yaml} (100%)
 create mode 100644 packages/mercedes/mercedes_lock.yaml
 delete mode 100644 packages/mercedes/mercedes_switch.yaml.disabled

diff --git a/.secrets_travis.yaml b/.secrets_travis.yaml
index 0c3aec87..158a5ff6 100644
--- a/.secrets_travis.yaml
+++ b/.secrets_travis.yaml
@@ -48,5 +48,7 @@ darksky_key: 0
 
 hacs_token: 0
 
+mb_vin: vin
+
 netatmo_client_id: client_id
 netatmo_client_secret: password
diff --git a/.storage/lovelace b/.storage/lovelace
index b06fdef2..02ac01db 100644
--- a/.storage/lovelace
+++ b/.storage/lovelace
@@ -990,7 +990,7 @@
                         {
                             "entities": [
                                 {
-                                    "entity": "binary_sensor.ff590mr_locked"
+                                    "entity": "lock.ff590mr_lock"
                                 },
                                 {
                                     "entity": "binary_sensor.ff590mr_doors_closed"
diff --git a/packages/mercedes/mercedes_customizations.yaml b/packages/mercedes/mercedes_customizations.yaml
index ed38cfd1..8e0d60c8 100644
--- a/packages/mercedes/mercedes_customizations.yaml
+++ b/packages/mercedes/mercedes_customizations.yaml
@@ -58,8 +58,8 @@ homeassistant:
 
     # Lock
     lock.ff590mr_lock:
-      friendly_name: Blocco Sblocco 
-      icon: mdi:lock-open
+      friendly_name: Blocco Auto 
+      icon: mdi:lock
       
     # Sensore Carburante
     sensor.ff590mr_fuel_level:
diff --git a/packages/mercedes/mercedes_google.yaml.disabled b/packages/mercedes/mercedes_google.yaml
similarity index 100%
rename from packages/mercedes/mercedes_google.yaml.disabled
rename to packages/mercedes/mercedes_google.yaml
diff --git a/packages/mercedes/mercedes_lock.yaml b/packages/mercedes/mercedes_lock.yaml
new file mode 100644
index 00000000..67b0b1a4
--- /dev/null
+++ b/packages/mercedes/mercedes_lock.yaml
@@ -0,0 +1,38 @@
+######################################################################
+# Mercedes Package - Switch
+######################################################################
+
+#switch:
+#  - platform: template
+#    switches:
+#      ff590mr_lock:
+#        friendly_name: Blocco Auto
+#        value_template: "{{ is_state('binary_sensor.ff590mr_locked', 'off') }}"
+#        turn_on:
+#          - service: mbapi2020.doors_lock
+#            data:
+#              vin: !secret mb_vin
+#        turn_off:
+#          - service: mbapi2020.doors_unlock
+#            data:
+#              vin: !secret mb_vin
+#        icon_template: >-
+#          {% if is_state('binary_sensor.ff590mr_locked', 'off') %}
+#            mdi:lock
+#          {% else %}
+#            mdi:lock-open
+#          {% endif %}
+
+lock:
+  - platform: template
+    name: ff590mr_lock
+    value_template: "{{ is_state('binary_sensor.ff590mr_locked', 'off') }}"
+    optimistic: true
+    lock:
+      - service: mbapi2020.doors_lock
+        data:
+          vin: !secret mb_vin
+    unlock:
+      - service: mbapi2020.doors_unlock
+        data:
+          vin: !secret mb_vin
diff --git a/packages/mercedes/mercedes_switch.yaml.disabled b/packages/mercedes/mercedes_switch.yaml.disabled
deleted file mode 100644
index 6b1bfccf..00000000
--- a/packages/mercedes/mercedes_switch.yaml.disabled
+++ /dev/null
@@ -1,22 +0,0 @@
-######################################################################
-# Mercedes Package - Switch
-######################################################################
-
-switch:
-  - platform: template
-    switches:
-      ff590mr_lock:
-        friendly_name: Blocco Auto
-        value_template: "{{ is_state('lock.ff590mr_lock', 'locked') }}"
-        turn_on:
-          - service: lock.lock
-            entity_id: lock.ff590mr_lock
-        turn_off:
-        - service: lock.unlock
-          entity_id: lock.ff590mr_lock      
-        icon_template: >-
-          {% if is_state('lock.ff590mr_lock', 'locked') %}
-            mdi:lock
-          {% else %}
-            mdi:lock-open
-          {% endif %}
-- 
2.47.3