From 9e5004efa86dddcaa0d06214bd121eb80cab7c37 Mon Sep 17 00:00:00 2001
From: joBr99 <29555657+joBr99@users.noreply.github.com>
Date: Sat, 5 Mar 2022 23:00:01 +0100
Subject: [PATCH] moved config from json files to apps.yaml

---
 appdaemon/apps/apps.yaml               | 21 +++++++++++++++++++++
 appdaemon/apps/nspanel.py              | 20 +++-----------------
 appdaemon/nspanel_config/shutters.json | 18 ------------------
 3 files changed, 24 insertions(+), 35 deletions(-)
 delete mode 100644 appdaemon/nspanel_config/shutters.json

diff --git a/appdaemon/apps/apps.yaml b/appdaemon/apps/apps.yaml
index 3609d527..87738bb9 100644
--- a/appdaemon/apps/apps.yaml
+++ b/appdaemon/apps/apps.yaml
@@ -2,3 +2,24 @@
 nspanel:
   module: nspanel
   class: NsPanelLovelanceUIManager
+  config:
+    panelRecvTopic: "tele/tasmota_NsPanelTerrasse/RESULT"
+    panelSendTopic: "cmnd/tasmota_NsPanelTerrasse/CustomSend"
+    locale: "de_DE"
+    timeFormat: "%H : %M"
+    dateFormat: "%A, %d. %B %Y"
+    pages:
+      - type: cardEntities
+        heading: Rolladen
+        items:
+          - cover.rolladenfenster_cover_1
+          - cover.nspterrasse_cover_1
+          - cover.rolladenterasse_cover_1
+          - sensor.nspterrasse_analog_temperature1
+      - type: cardEntities
+        heading: TestPage
+        items:
+          - button.beamer_key_left
+          - cover.rolladenterasse_cover_1
+          - light.schreibtischlampe
+          - delete
diff --git a/appdaemon/apps/nspanel.py b/appdaemon/apps/nspanel.py
index b31601a3..41ab58a9 100644
--- a/appdaemon/apps/nspanel.py
+++ b/appdaemon/apps/nspanel.py
@@ -7,23 +7,8 @@ import appdaemon.plugins.hass.hassapi as hass
 class NsPanelLovelanceUIManager(hass.Hass):
   def initialize(self):
 
-    # Check if config folder exists
-    config_folder = "/config/appdaemon/nspanel_config"
-    if not os.path.exists(config_folder):
-      self.log("Config folder not found, creating ...")
-      os.makedirs(config_folder)
-
-    # Check config folder for config files
-    for file in os.listdir(config_folder):
-      filename = os.fsdecode(file)
-      if filename.endswith(".json"): 
-        filename = os.path.join(config_folder, filename)
-        self.log("Found Config file: %s", filename)
-        # Parse config file
-        with open(filename, 'r') as f:
-          data = json.loads(f.read())
-          # Create Instance of NsPanelLovelanceUI class
-          NsPanelLovelanceUI(self, data)
+    data = self.args["config"]
+    NsPanelLovelanceUI(self, data)
 
 
 class NsPanelLovelanceUI:
@@ -124,6 +109,7 @@ class NsPanelLovelanceUI:
           switch_val = 1 if entity.state == "on" else 0
           # scale 0-255 brightness from ha to 0-100
           brightness = int(self.scale(entity.attributes.brightness,(0,255),(0,100)))
+          # TODO: Check if color temp feature is avalible
           # scale ha color temp range to 0-100
           color_temp = self.scale(entity.attributes.color_temp,(entity.attributes.min_mireds, entity.attributes.max_mireds),(0,100))
           self.send_mqtt_msg("entityUpdateDetail,{0},{1},{2}".format(switch_val,brightness,color_temp))
diff --git a/appdaemon/nspanel_config/shutters.json b/appdaemon/nspanel_config/shutters.json
deleted file mode 100644
index 7888de34..00000000
--- a/appdaemon/nspanel_config/shutters.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"panelRecvTopic": "tele/tasmota_NsPanelTerrasse/RESULT",
-	"panelSendTopic": "cmnd/tasmota_NsPanelTerrasse/CustomSend",
-	"locale": "de_DE",
-	"timeFormat": "%H : %M",
-	"dateFormat": "%A, %d. %B %Y",
-	"pages": [{
-			"type": "cardEntities",
-			"heading": "Rolladen",
-			"items": ["cover.rolladenfenster_cover_1", "cover.nspterrasse_cover_1", "cover.rolladenterasse_cover_1", "sensor.nspterrasse_analog_temperature1"]
-		},
-		{
-			"type": "cardEntities",
-			"heading": "TestPage",
-			"items": ["button.beamer_key_left", "cover.rolladenterasse_cover_1", "light.schreibtischlampe", "delete"]
-		}
-	]
-}
\ No newline at end of file