Merge d071a58b6e into b1b679701e

.github/workflows/builder.yaml

@@ -100,7 +100,7 @@ jobs:
 
       - name: Build ${{ matrix.addon }} add-on
         if: steps.check.outputs.build_arch == 'true'
-        uses: home-assistant/builder@2024.01.0
+        uses: home-assistant/builder@2023.12.0
         with:
           args: |
             ${{ env.BUILD_ARGS }} \

appdaemon/appdaemon.yaml

@@ -1,5 +1,5 @@
 ---
-secrets: /config/secrets.yaml
+secrets: /homeassistant/secrets.yaml
 appdaemon:
   latitude: 52.0
   longitude: 4.0

appdaemon/apps-theme.yaml

@@ -7,7 +7,7 @@ nspanel-1:
     panelSendTopic: "cmnd/tasmota_your_mqtt_topic/CustomSend"
     screensaver:
       entity: weather.k3ll3r
-      theme: !include /config/appdaemon/apps/screensaver-theme.yaml
+      theme: !include /config/apps/screensaver-theme.yaml
         #background:       [220, 0, 0]
         #time:             [220, 0, 255]
         #timeAMPM:         [220, 0, 255]
@@ -53,4 +53,4 @@ nspanel-1:
     cards:
       - type: cardEntities
         entities:
-          - entity: switch.example_item
+          - entity: switch.example_item

appdaemon/screensaver-theme-include/apps.yaml

@@ -8,8 +8,8 @@ nspanel-1:
     updateMode: "auto-notify"
     screensaver:
       entity: weather.k3ll3r
-      theme: !include /config/appdaemon/apps/screensaver-theme.yaml
+      theme: !include /config/apps/screensaver-theme.yaml
     cards:
       - type: cardEntities
         entities:
-          - entity: switch.example_item
+          - entity: switch.example_item

docs/configure_mqtt.md

@@ -22,17 +22,16 @@ The configuration has been moved out of the config folder from homeassistant. Th
 
 For the app to work you need a working MQTT Configuration in AppDaemon. Please add the configuration of your mqtt server, user and password to your existing `appdaemon.yaml` Restart your AppDaemon Container (not HomeAssistant) after adding the MQTT Configuration.
 
-You will find this file in the following location: `/addon_configs/a0d7b954_appdaemon/appdeamon.yaml`
+You will find this file in the following location: `/addon_configs/a0d7b954_appdaemon/appdaemon.yaml` (if using Home Assistant Addon)
 
 ```yaml
 ---
-secrets: /homeassistant/secrets.yaml
+secrets: /homeassistant/secrets.yaml # !!! Note this has changed for AppDaemon Addon >= v 0.15.0
 appdaemon:
   latitude: 52.0
   longitude: 4.0
   elevation: 2
   time_zone: Europe/Berlin
-  app_dir: /homeassistant/appdaemon/apps/ # !!! This is really important for AppDaemon HA Addon >= 15
   plugins:
     HASS:
       type: hass
@@ -52,10 +51,16 @@ admin:
 api:
 hadashboard:
 ```
+If you are migrating from AppDaemon Addon < v 0.15.0, your configuration folders should have been automatically moved by the addon. However, if it wasn't or if you prefer to have your configuration files stored elsewhere include the following yaml:
+
+```yaml
+appdaemon:
+  app_dir: /homeassistant/appdaemon/apps/ # !!! This would point to /config/appdaemon/apps in your Home Assistant instance.
+```
 
 # Configure NsPanel on AppDaemon
 
-Please add the following minimal configuration to your apps.yaml, which is located in `config/appdaemon/apps/apps.yaml`
+Please add the following minimal configuration to your apps.yaml, which is located in `/addon_configs/a0d7b954_appdaemon/apps/apps.yaml` (if using Home Assistant Addon).
 
 Note: You need to move your `apps.yaml` to this location if it isn't there.
 

docs/faq.md

@@ -32,6 +32,18 @@ Please don't modify the Full Topic in your Tasmota Config, unless you know the i
     - the appdaemon log, after restarting the container
   
 
+## This isn't working since AppDaemon v0.15.x
+
+There has been an upstream change made to AppDaemon which changes where the configuration files are stored.
+
+You may need to change your yaml files to reflect this:
+
+filename | Home Assistant Share | Docker Container Location 
+-- | -- | -- 
+appdaemon.yaml | /addon_configs/a0d7b954_appdaemon/appdaemon.yaml | /config/appdaemon.yaml  
+apps.yaml | /addon_configs/a0d7b954_appdaemon/apps/apps.yaml | /config/apps/apps.yaml 
+secrets.yaml | /config/secrets.yaml | /homeassistant/secrets.yaml
+
 ## How to update
 
 ### Update AppDaemon Script

ioBroker/Blockly/Alarm_Page_Erweitertes_Skript_mit_PopupNotifyPage.xml

@@ -971,37 +971,12 @@
                             </value>
                           </block>
                         </value>
-  <value name="VALUE">
-    <shadow type="logic_boolean" id="I4PsJQb;6k+70^g*Xt/}">
-      <field name="BOOL">TRUE</field>
-    </shadow>
-    <block type="text_join" id="XdhGC7#MxGw|KhC1x#MY">
-      <mutation items="2"></mutation>
-      <value name="ADD0">
-        <block type="text" id="[(_1;{xE-xfzeB4]$uk;">
-          <field name="TEXT">ID</field>
-        </block>
-      </value>
-      <value name="ADD1">
-        <block type="convert_tostring" id="g{jZOA*6Clhc5`9::h.S">
-          <value name="VALUE">
-            <block type="math_random_int" id="SXG?j1]Jza!2fg[(cl!i">
-              <value name="FROM">
-                <shadow type="math_number" id="#/-;$~`{=}8wYY$kbvA9">
-                  <field name="NUM">1</field>
-                </shadow>
-              </value>
-              <value name="TO">
-                <shadow type="math_number" id="0x8~a;asHsiJ2Its%!VJ">
-                  <field name="NUM">100</field>
-                </shadow>
-              </value>
-            </block>
-          </value>
-        </block>
-      </value>
-    </block>
-  </value>
+                        <value name="VALUE">
+                          <shadow type="logic_boolean" id="I4PsJQb;6k+70^g*Xt/}">
+                            <field name="BOOL">TRUE</field>
+                          </shadow>
+                          <block type="math_random_float" id="C5/h)jq=yPM?,9J=(w65"></block>
+                        </value>
                         <value name="DELAY_MS">
                           <shadow type="math_number" id="+6#n%fO}e4h%;FhKPV0c">
                             <field name="NUM">0</field>

ioBroker/tsconfig.json

@@ -1,28 +0,0 @@
-{
-  "compileOnSave": true,
-  "compilerOptions": {
-    "noEmit": true,
-    "allowJs": true,
-    "checkJs": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "strict": true,
-    "noImplicitReturns": true,
-    "noImplicitAny": false,
-    "target": "ES2022",
-    "typeRoots": [
-      ".iobroker/types",
-      "node_modules/@types"
-    ]
-  },
-  "include": [
-    "**/*.js",
-    "**/*.ts",
-    "./.iobroker/types/javascript.d.ts"
-  ],
-  "exclude": [
-    "node_modules/**"
-  ]
-}