From aa7fdf6457b06b19afced9a6d1f347837c610134 Mon Sep 17 00:00:00 2001
From: ccostan <carlo@ipm.com>
Date: Fri, 19 Jan 2018 14:52:57 -0500
Subject: [PATCH] More work on #285

---
 packages/alarm.yaml          | 22 ----------------------
 packages/battery_levels.yaml |  5 ++---
 packages/network.yaml        | 13 ++++---------
 packages/twitter.yaml        |  4 ----
 4 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/packages/alarm.yaml b/packages/alarm.yaml
index 066eb48e..00e2ab01 100755
--- a/packages/alarm.yaml
+++ b/packages/alarm.yaml
@@ -8,10 +8,6 @@ homeassistant:
     "device_tracker.nodemcu*":
       icon: mdi:chip
 
-      hidden: True
-    "sensor.nodemcu*":
-      icon: mdi:alarm-bell
-
       hidden: False
     "binary_sensor.mcu?_gpio*":
       icon: mdi:security-home
@@ -182,24 +178,6 @@ binary_sensor:
 #   elephant:
 #     name: Elephant
 #     initial: off
-#-------------------------------------------
-sensor:
-  - platform: template
-    sensors:
-      nodemcu1:
-        friendly_name: 'NodeMCU1'
-        value_template: "{{ 'Online' if is_state('device_tracker.NodeMCU1', 'home') else 'Offline' }}"
-  - platform: template
-    sensors:
-      nodemcu2:
-        friendly_name: 'NodeMCU2'
-        value_template: "{{ 'Online' if is_state('device_tracker.NodeMCU2', 'home') else 'Offline' }}"
-  - platform: template
-    sensors:
-      nodemcu3:
-        friendly_name: 'NodeMCU3'
-        value_template: "{{ 'Online' if is_state('device_tracker.NodeMCU3', 'home') else 'Offline' }}"
-
 #-------------------------------------------
 group:
   entry_points:
diff --git a/packages/battery_levels.yaml b/packages/battery_levels.yaml
index f389ef2d..aeac3215 100755
--- a/packages/battery_levels.yaml
+++ b/packages/battery_levels.yaml
@@ -6,10 +6,10 @@
 # homeassistant:
 #   customize_glob:
 #     "sensor.*_alarm_panel*":
-#       
+#
 #       hidden: False
 #     "binary_sensor.*_alarm_panel*":
-#       
+#
 #       hidden: False
 
 sensor:
@@ -34,7 +34,6 @@ sensor:
             {%- endfor -%}
           {%- endfor -%}
 
-
 automation:
   - alias: 'Battery Alert'
     initial_state: 'on'
diff --git a/packages/network.yaml b/packages/network.yaml
index 148c2248..b8250a3f 100755
--- a/packages/network.yaml
+++ b/packages/network.yaml
@@ -14,8 +14,7 @@ sensor:
           {%- set domains = ['device_tracker'] -%}
           {%- for domain in domains -%}
             {%- for item in states[domain] if (item.attributes.source_type is defined and item.state != 'home') -%}
-              {{ item.attributes.friendly_name }} -
-              {{item.state}}
+              {{ item.attributes.friendly_name }}
               {%- if not loop.last -%}
                 {{', '}}
               {%- endif -%}
@@ -40,19 +39,15 @@ automation:
     trigger:
          - platform: state
            entity_id:
-             - sensor.wii
-           to: 'Offline'
-           for:
-             minutes: 5
+             - sensor.network
 
     action:
       - service: script.notify_engine
         data_template:
-          value1: 'Device Status:'
-          value2: "{{ trigger.to_state.attributes.friendly_name }} is "
+          value1: 'Offline Devices:'
           value3: "{{ trigger.to_state.state }}"
           who: 'carlo'
 
       - service: script.speech_engine
         data_template:
-          value1: "{{ trigger.to_state.attributes.friendly_name }} is now {{ trigger.to_state.state }}"
+          value1: "The following Devices are in an Offline state {{ trigger.to_state.state }}"
diff --git a/packages/twitter.yaml b/packages/twitter.yaml
index 7c8803dc..b3c28683 100755
--- a/packages/twitter.yaml
+++ b/packages/twitter.yaml
@@ -23,10 +23,6 @@ notify:
 ### Building out some Historical stats for tweeting. #####################
 sensor:
 
-  - platform: mqtt
-    state_topic: "ifttt/message"
-    name: "ifttt formatted message"
-
   - platform: history_stats
     name: Doorbell Presses
     entity_id: binary_sensor.skybell_stone_door_button