Sync with upstream

8559a89

alarm-control-panel.yaml

+- platform: mqtt
+  state_topic: "smartthings/alarm system status/alarmSystemStatus"
+  command_topic: "smartthings/alarm system status/alarmSystemStatus"
+  name: "SHM"
+  payload_disarm: "off"
+  payload_arm_home: "stay"
+  payload_arm_away: "away"
\ No newline at end of file

configuration.yaml

@@ -64,14 +64,7 @@ binary_sensor: !include_dir_list binary-sensors
 
 device_tracker: !include device-tracker.yaml
 
-alarm_control_panel:
-  platform: mqtt
-  state_topic: "smartthings/alarm system status/alarmSystemStatus"
-  command_topic: "smartthings/alarm system status/alarmSystemStatus"
-  name: "SHM"
-  payload_disarm: "off"
-  payload_arm_home: "stay"
-  payload_arm_away: "away"
+alarm_control_panel: !include alarm-control-panel.yaml
 
 # Display
 group: !include groups.yaml

groups.yaml

@@ -61,7 +61,6 @@ master_bedroom:
     - scene.master_bedroom_dimmed
     - scene.master_bedroom_relax
     - scene.master_bedroom_read
-    - scene.master_bedroom_concentrate
 master_bathroom:
   name: Master Bathroom
   entities:
@@ -91,7 +90,6 @@ dining_area:
     - scene.da_dimmed
     - scene.da_relax
     - scene.da_read
-    - scene.da_concentrate
 office:
   name: Office
   entities:
@@ -102,7 +100,6 @@ office:
     - scene.office_dimmed
     - scene.office_relax
     - scene.office_read
-    - scene.office_concentrate
     - scene.ericks_desk_lamp_nightlight
     - scene.ericks_desk_lamp_relax
 balcony:

switches.yaml

@@ -17,12 +17,12 @@
     august_interior:
       oncmd: 'curl "http://localhost:3000/api/lock/interior"'
       offcmd: 'curl "http://localhost:3000/api/unlock/interior"'
-      statecmd: 'curl --silent "http://localhost:3000/api/status/interior" | grep -oP "(\bunlocked\b)" | wc -l'
+      statecmd: 'curl --silent "http://localhost:3000/api/status/interior" | jq ".status"'
       value_template: '{{ value == "0" }}'
 - platform: command_line
   switches:
     august_keyed:
       oncmd: 'curl "http://localhost:3000/api/lock/keyed"'
       offcmd: 'curl "http://localhost:3000/api/unlock/keyed"'
-      statecmd: 'curl --silent "http://localhost:3000/api/status/keyed" | grep -oP "(\bunlocked\b)" | wc -l'
+      statecmd: 'curl --silent "http://localhost:3000/api/status/keyed" | jq ".status"'
       value_template: '{{ value == "0" }}'