v4.3.3.34 - Bose Soundtouch final Proto

Fix: Disabled Icon Status while bug by updating data points in ioBroker (reason unknown)

.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@2023.09.0
+        uses: home-assistant/builder@2024.01.0
         with:
           args: |
             ${{ env.BUILD_ARGS }} \

.github/workflows/docs-dev.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - run: pip install mkdocs-material mkdocs-video markdown-include mike

.github/workflows/docs-release.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - run: pip install mkdocs-material mkdocs-video markdown-include mike

ioBroker/Blockly/Alarm_Page_Erweitertes_Skript_mit_PopupNotifyPage.xml

@@ -971,12 +971,37 @@
                             </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="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="DELAY_MS">
                           <shadow type="math_number" id="+6#n%fO}e4h%;FhKPV0c">
                             <field name="NUM">0</field>

ioBroker/Blockly/Alarm_clock.ts

@@ -0,0 +1,44 @@
+const dp_userdata: string = '0_userdata.0.NSPanel';
+const dp_alias: string = 'alias.0.NSPanel';
+
+// dpAction wird wenn der Wecker gestellt wird auf false geschaltet
+// dpAction wird wenn die Weckzeit erreicht ist auf true geschaltet
+// Der nachfolgende Datenpunkt muss manuell erstellt werden...
+const dpAction: string = '0_userdata.0.example_boolean';
+
+const Debug = true;
+
+let time: number;
+let scheduleAlarmTime: any = null;
+on({ id: dp_userdata + '.AlarmTime.State', change: 'ne' }, async (obj) => {
+
+    time = getState(dp_userdata + '.AlarmTime.Time').val;
+    if (Debug) log('Uhrzeit: ' + time, 'info');
+    if ('paused' == obj.state.val) {
+        (function () { if (scheduleAlarmTime) { 
+            clearSchedule(scheduleAlarmTime); 
+            scheduleAlarmTime = null; 
+            } 
+        });
+    } else if ('active' == obj.state.val) {
+        let stunde: number = Math.floor(time / 60);
+        let minute: number = time % 60;
+        if (Debug) log('Weckzeit: ' + ('0' + stunde).slice(-2) + ':' + ('0' + minute).slice(-2), 'info');
+        scheduleAlarmTime = schedule(minute + ' ' + stunde + ' * * *', async () => {
+            await setStateAsync(dpAction, <iobJS.State>{ val: true, ack: true });
+            await setStateAsync(dp_userdata + '.AlarmTime.State', <iobJS.State>{ val: 'paused', ack: true });
+        });
+    }
+});
+
+async function Init_Datenpunkte() {
+    if (existsState(dp_alias + '.AlarmTime.ACTUAL') == false) {
+        await createStateAsync(dp_userdata + '.AlarmTime.Time', '0', { type: 'number' });
+        await createStateAsync(dp_userdata + '.AlarmTime.State', 'paused', { type: 'string' });
+        setObject(dp_alias + '.AlarmTime', { type: 'channel', common: { role: 'value.alarmtime', name: 'Alarmtime' }, native: {} });
+        await createAliasAsync(dp_alias + '.AlarmTime.ACTUAL', dp_userdata + '.AlarmTime.Time', true, <iobJS.StateCommon>{ type: 'number', role: 'state', name: 'ACTUAL' });
+        await createAliasAsync(dp_alias + '.AlarmTime.STATE', dp_userdata + '.AlarmTime.State', true, <iobJS.StateCommon>{ type: 'string', role: 'state', name: 'STATE' });
+        log("<PageItem>{id: '"+ dp_alias + ".AlarmTime', name: 'Wecker', onColor: Red, offColor: Green, useColor: true}", 'info');
+    }
+}
+Init_Datenpunkte();

ioBroker/Blockly/Countdown_Timer.ts

@@ -0,0 +1,46 @@
+const dp_userdata: string = '0_userdata.0.NSPanel';
+const dp_alias: string = 'alias.0.NSPanel';
+
+// Der nachfolgende Datenpunkt muss manuell angelegt werden
+const dpAction: string = '0_userdata.0.example_boolean';  // anpassen
+
+const Debug = false;
+
+let intervallCounter: any;
+
+let sec_timer = getState(dp_userdata + '.Countdown.Time').val;
+on({ id: dp_userdata + '.Countdown.State', change: 'ne' }, async (obj) => {
+
+  switch (obj.state.val) {
+      case 'active':
+    if (intervallCounter) { clearInterval(intervallCounter); intervallCounter = null; };
+    intervallCounter = setInterval(async () => {
+      if (getState(dp_userdata + '.Countdown.Time').val > 0) {
+        sec_timer = getState(dp_userdata + '.Countdown.Time').val;
+        setState(dp_userdata + '.Countdown.Time', (sec_timer - 1), false);
+      } else {
+        setState(dp_userdata + '.Countdown.Time', 0,  false);
+        setState(dp_userdata + '.Countdown.State', 'idle', false);
+        // An dieser Stelle kann auch noch eine Meldung an Alexa oder Telegram, etc. erfolgen
+      }
+    }, 1000);
+
+          break;
+      default:
+    if (intervallCounter) { clearInterval(intervallCounter); intervallCounter = null; };
+
+          break;
+  }
+});
+
+async function Init_Datenpunkte() {
+  if (existsState(dp_alias + '.Countdown.ACTUAL') == false) {
+    await createStateAsync(dp_userdata + '.Countdown.Time', '0', { type: 'number'});
+    await createStateAsync(dp_userdata + '.Countdown.State', 'paused', { type: 'string' });
+    setObject(dp_alias + '.Countdown', { type: 'channel', common: { role: 'level.timer', name: 'Countdown' }, native: {} });
+    await createAliasAsync(dp_alias + '.Countdown.ACTUAL', dp_userdata + '.Countdown.Time', true, <iobJS.StateCommon>{ type: 'number', role: 'state', name: 'ACTUAL' });
+    await createAliasAsync(dp_alias + '.Countdown.STATE', dp_userdata + '.Countdown.State', true, <iobJS.StateCommon>{ type: 'string', role: 'state', name: 'STATE' });
+    log("<PageItem>{id: '"+ dp_alias + ".Countdown', name: 'Timer'}", 'info');
+  }
+}
+Init_Datenpunkte();

ioBroker/ioBroker_NSPanel_locales.json

@@ -1047,6 +1047,14 @@
          "zh-CN":"空闲",
          "zh-TW":"暫停"
       },
+      "on":{
+         "en-US":"On",
+         "de-DE":"Ein"
+      },      
+      "off":{
+         "en-US":"Off",
+         "de-DE":"Aus"
+      },
       "paused":{
          "en-US":"Paused",
          "de-DE":"pausiert",
@@ -2489,6 +2497,14 @@
          "vi-VN":"Mật khẩu",
          "zh-CN":"密码",
          "zh-TW":"密碼"
+      },
+      "Wlan enabled":{
+         "en-US":"Wlan enabled",
+         "de-DE":"Wlan aktiviert"
+      },
+      "Wlan disabled":{
+         "en-US":"Wlan disabled",
+         "de-DE":"Wlan deaktiviert"
       }
    },
    "media":{

ioBroker/ioBroker_NSPanel_locales_service.json

@@ -2693,5 +2693,9 @@
    "update_nextion_tft":{
       "en-US":"Update Nextion TFT",
       "de-DE":"Nextion TFT Update"
+   },
+   "update_message":{
+      "en-US":"Update Notifications",
+      "de-DE":"Update Mitteilungen"
    }
 }

ioBroker/tsconfig.json

@@ -0,0 +1,28 @@
+{
+  "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/**"
+  ]
+}

nspanel-lovelace-ui/config.yaml

@@ -1,6 +1,6 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config
 name: NSPanel Lovelace UI Addon
-version: "4.7.72"
+version: "4.7.74"
 slug: nspanel-lovelace-ui
 description: NSPanel Lovelace UI Addon
 services:

nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/ha_cards.py

@@ -52,6 +52,8 @@ class HAEntity(panel_cards.Entity):
             self.state = data.get("state")
             self.attributes = data.get("attributes", [])
         else:
+            self.state = "not found"
+            self.attributes = []
             return "~text~iid.404~X~6666~not found~"
 
         # HA Entities
@@ -188,7 +190,7 @@ class HAEntity(panel_cards.Entity):
                     icon_char = value
             case 'binary_sensor':
                 device_class = self.attributes.get("device_class", "")
-                value = get_translation(self.locale, f"backend.component.binary_sensor.state.{device_class}.{entity.state}")
+                value = get_translation(self.locale, f"backend.component.binary_sensor.state.{device_class}.{self.state}")
             case 'weather':
                 attr = self.config.get("attribute", "temperature")
                 value = str(self.attributes.get(attr, self.state))
@@ -304,8 +306,6 @@ class QRCard(HACard):
         super().__init__(locale, config, panel)
         self.qrcode = config.get("qrCode", "https://www.youtube.com/watch?v=dQw4w9WgXcQ")
     def render(self):
-        # TODO: Render QRCode as HomeAssistant Template
-        #qrcode = apis.ha_api.render_template(qrcode)
         if self.qrcode.startswith("ha:"):
             self.qrcode = libs.home_assistant.get_template(self.qrcode)[3:]
         result = f"{self.title}~{self.gen_nav()}~{self.qrcode}"
@@ -475,6 +475,8 @@ class AlarmCard(HACard):
         main_entity = self.entities[0]
         main_entity.render()
 
+        print(main_entity.state)
+
         icon = get_icon_char("shield-off")
         color = rgb_dec565([255,255,255])
         supported_modes = []

nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/ha_control.py

@@ -8,6 +8,7 @@ def wait_for_ha_cache():
     while time.time() < mustend:
         if len(libs.home_assistant.home_assistant_entity_state_cache) == 0:
             time.sleep(0.1)
+    time.sleep(1)
 
 def calculate_dim_values(sleepTracking, sleepTrackingZones, sleepBrightness, screenBrightness, sleepOverride, return_involved_entities=False):
     dimmode = 10
@@ -17,6 +18,12 @@ def calculate_dim_values(sleepTracking, sleepTrackingZones, sleepBrightness, scr
     if sleepBrightness:
         if isinstance(sleepBrightness, int):
             dimmode = sleepBrightness
+        elif isinstance(sleepBrightness, list):
+            logging.error("list style config for sleepBrightness no longer supported")
+        elif sleepBrightness.startswith("ha:"):
+            time.sleep(1)
+            dimmode = int(float(libs.home_assistant.get_template(sleepBrightness)[3:]))
+            involved_entities.extend(libs.home_assistant.get_template_listener_entities(sleepBrightness))
         elif libs.home_assistant.is_existent(sleepBrightness):
             involved_entities.append(sleepBrightness)
             dimmode = int(float(libs.home_assistant.get_entity_data(sleepBrightness).get('state', 10)))
@@ -24,6 +31,12 @@ def calculate_dim_values(sleepTracking, sleepTrackingZones, sleepBrightness, scr
     if screenBrightness:
         if isinstance(screenBrightness, int):
             dimValueNormal = screenBrightness
+        elif isinstance(screenBrightness, list):
+            logging.error("list style config for screenBrightness no longer supported")
+        elif screenBrightness.startswith("ha:"):
+            time.sleep(1)
+            dimValueNormal = int(float(libs.home_assistant.get_template(screenBrightness)[3:]))
+            involved_entities.extend(libs.home_assistant.get_template_listener_entities(screenBrightness))
         elif libs.home_assistant.is_existent(screenBrightness):
             involved_entities.append(screenBrightness)
             dimValueNormal = int(float(libs.home_assistant.get_entity_data(screenBrightness).get('state', 100)))
@@ -60,7 +73,7 @@ def handle_buttons(entity_id, btype, value, entity_config=None):
         case 'number-set':
             if entity_id.startswith('fan'):
                 attr = libs.home_assistant.get_entity_data(entity_id).get('attributes', [])
-                value = float(value) * float(attr.get(percentage_step, 0))
+                value = float(value) * float(attr.get('percentage_step', 0))
             service_data = {
                 "value": int(value)
             }
@@ -217,30 +230,6 @@ def handle_buttons(entity_id, btype, value, entity_config=None):
         case _:
            logging.error("Not implemented: %s", btype)
 
-
-    #  # for cardUnlock
-    #  if button_type == "cardUnlock-unlock":
-    #      curCard = self._config.get_card_by_uuid(
-    #          entity_id.replace('navigate.', ''))
-    #      if curCard is not None:
-    #          if int(curCard.raw_config.get("pin")) == int(value):
-    #              dstCard = self._config.search_card(
-    #                  curCard.raw_config.get("destination"))
-    #              if dstCard is not None:
-    #                  if dstCard.hidden:
-    #                      self._previous_cards.append(self._current_card)
-    #                  self._current_card = dstCard
-    #                  self._pages_gen.render_card(self._current_card)
-
-    #  if button_type == "opnSensorNotify":
-    #      msg = ""
-    #      entity = apis.ha_api.get_entity(entity_id)
-    #      if "open_sensors" in entity.attributes and entity.attributes.open_sensors is not None:
-    #          for e in entity.attributes.open_sensors:
-    #              msg += f"- {apis.ha_api.get_entity(e).attributes.friendly_name}\r\n"
-    #      self._pages_gen.send_message_page(
-    #          "opnSensorNotifyRes", "", msg, "", "")
-
 def call_ha_service(entity_id, service, service_data = {}):
     etype = entity_id.split(".")[0]
     libs.home_assistant.call_service(

nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/libs/home_assistant.py

@@ -232,7 +232,7 @@ def execute_script(entity_name: str, domain: str, service: str, service_data: di
             ]
         }
         send_message(json.dumps(msg))
-        # busy waiting for response with a timeout of 0.2 seconds - maybe there's a better way of doing this
+        # busy waiting for response with a timeout of 0.4 seconds- maybe there's a better way of doing this
         mustend = time.time() + 0.4
         while time.time() < mustend:
             if response_buffer[call_id] == True:
@@ -246,6 +246,8 @@ def execute_script(entity_name: str, domain: str, service: str, service_data: di
         return {}
 
 def cache_template(template):
+    if not template:
+        raise Exception("Invalid template")
     global next_id, response_buffer
     try:
         call_id = next_id
@@ -273,6 +275,18 @@ def get_template(template):
             else:
                 return template_cache.get(template, []).get("result", "404")
 
+def get_template_listener_entities(template):
+    global template_cache
+    if template in template_cache:
+        return template_cache[template].get("listener-entities")
+    else:
+        mustend = time.time() + 0.5
+        while time.time() < mustend:
+            if template not in template_cache:
+                time.sleep(0.0001)
+            else:
+                return template_cache.get(template, []).get("listener-entities", "404")
+
 def get_entity_data(entity_id: str):
     if entity_id in home_assistant_entity_state_cache:
         return home_assistant_entity_state_cache[entity_id]

nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/libs/panel_cmd.py

@@ -41,3 +41,7 @@ def entityUpdateDetail2(msg_out_queue, topic, data):
 
 def statusUpdate(msg_out_queue, topic, data):
     custom_send(msg_out_queue, topic, f"statusUpdate~{data}")
+
+def send_message_page(msg_out_queue, topic, ident, heading, msg, b1, b2):
+    page_type(msg_out_queue, topic, "popupNotify")
+    custom_send(msg_out_queue, topic, f"entityUpdateDetail~{ident}~{heading}~65535~{b1}~65535~{b2}~65535~{msg}~65535~0")

nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py

@@ -7,7 +7,7 @@ from scheduler import Scheduler
 import scheduler.trigger as trigger
 import time
 import babel.dates
-from ha_cards import Screensaver, EntitiesCard, card_factory, detail_open
+from ha_cards import Screensaver, card_factory, detail_open
 import ha_control
 
 class LovelaceUIPanel:
@@ -67,7 +67,7 @@ class LovelaceUIPanel:
         self.schedule = Scheduler()
         self.schedule.minutely(datetime.time(second=0), self.update_time)
         self.schedule.hourly(datetime.time(
-            minute=0, second=0), self.update_time)
+            minute=0, second=0), self.update_date)
         schedule_thread = threading.Thread(target=self.schedule_thread_target)
         schedule_thread.daemon = True
         schedule_thread.start()
@@ -76,6 +76,10 @@ class LovelaceUIPanel:
         ha_control.wait_for_ha_cache()
 
         #request templates on cards
+        if isinstance(self.settings.get("sleepBrightness",""), str) and self.settings.get("sleepBrightness", "").startswith("ha:"):
+            libs.home_assistant.cache_template(self.settings.get("sleepBrightness"))
+        if isinstance(self.settings.get("sleepBrightness",""), str) and self.settings.get("screenBrightness", "").startswith("ha:"):
+            libs.home_assistant.cache_template(self.settings.get("screenBrightness"))
         for c in self.cards.values():
             if hasattr(c, "qrcode"):
                 if c.qrcode.startswith("ha:"):
@@ -242,12 +246,6 @@ class LovelaceUIPanel:
                     self.render_current_page(switchPages=True)
                     return
 
-                # replace iid with real entity id
-                #if entity_id.startswith("iid."):
-                #    iid = entity_id.split(".")[1]
-                #    if iid in self.entity_iids:
-                #        entity_id = self.entity_iids[iid]
-
                 # replace iid with real entity id
                 if entity_id.startswith("iid."):
                     iid = entity_id.split(".")[1]