Merge branch 'master' into dependabot/npm_and_yarn/serialport-11.0.0

.github/workflows/dependabot-automerge.yml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   auto-merge:
+    if: github.actor == 'dependabot[bot]'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -19,4 +20,4 @@ jobs:
           # This must be a personal access token with push access
           github-token: ${{ secrets.AUTO_MERGE_TOKEN }}
           # By default, squash and merge, so Github chooses nice commit messages
-          command: squash and merge
+          command: squash and merge

.github/workflows/test-and-release.yml

@@ -4,15 +4,20 @@ name: Test and Release
 # as well as tags with a semantic version
 on:
   push:
-    branches:
-      - "*"
+     branches:
+      - "master"
     tags:
       # normal versions
       - "v[0-9]+.[0-9]+.[0-9]+"
       # pre-releases
       - "v[0-9]+.[0-9]+.[0-9]+-**"
   pull_request: {}
-
+
+# Cancel previous PR/branch runs when a new commit is pushed
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   # Performs quick checks before the expensive test runs
   check-and-lint:
@@ -22,23 +27,17 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
 
+
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: ioBroker/testing-action-check@v1
         with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install Dependencies
-        run: npm i
-
-      - name: Test package files
-        run: npm run test:package
-
+          node-version: "16.x"
+          # Uncomment the following line if your adapter cannot be installed using 'npm ci'
+          # install-command: 'npm install'
+          lint: true
+
   # Runs adapter tests on all supported node versions and OSes
   adapter-tests:
     if: contains(github.event.head_commit.message, '[skip ci]') == false
@@ -48,46 +47,37 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
-        os: [ubuntu-latest, macos-latest]
+        node-version: [16.x, 18.x]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: ioBroker/testing-action-adapter@v1
         with:
           node-version: ${{ matrix.node-version }}
+          os: ${{ matrix.os }}
+          # Uncomment the following line if your adapter cannot be installed using 'npm ci'
+          # install-command: 'npm install'
 
-      - name: Install Dependencies
-        run: npm i
-
-      - name: Run unit tests
-        run: npm run test:unit
-
-      - name: Run integration tests (unix only)
-        if: startsWith(runner.OS, 'windows') == false
-        run: DEBUG=testing:* npm run test:integration
-
-      - name: Run integration tests (windows only)
-        if: startsWith(runner.OS, 'windows')
-        run: set DEBUG=testing:* & npm run test:integration
+  # TODO: To enable automatic npm releases, create a token on npmjs.org
+  # Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options
+  # Then uncomment the following block:
 
   # Deploys the final package to NPM
+  # Deploys the final package to NPM and Github Actions
   deploy:
-    needs: [adapter-tests]
-
-    # Trigger this step only when a commit on any branch is tagged with a version number
+    # Trigger this step only when a commit on master is tagged with a version number
     if: |
       contains(github.event.head_commit.message, '[skip ci]') == false &&
       github.event_name == 'push' &&
       startsWith(github.ref, 'refs/tags/v')
 
+    # Define which jobst must succeed before the release
+    needs: [adapter-tests]
+
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
 
     steps:
       - name: Checkout code
@@ -119,31 +109,27 @@ jobs:
           npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
           npm whoami
           npm publish
-
-#      - name: Create Github Release
-#        uses: actions/create-release@v1
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.Github_Token}}
-#        with:
-#          tag_name: ${{ github.ref }}
-#          release_name: Release v${{ steps.extract_release.outputs.VERSION }}
-#          draft: false
-#          # Prerelease versions create prereleases on Github
-#          prerelease: ${{ contains(steps.extract_release.outputs.VERSION, '-') }}
-#          body: ${{ steps.extract_release.outputs.BODY }}
-#
-#      - name: Notify Sentry.io about the release
-#        run: |
-#          npm i -g @sentry/cli
-#          export SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-#          export SENTRY_URL=https://sentry.iobroker.net
-#          export SENTRY_ORG=iobroker
-#          export SENTRY_PROJECT=iobroker-zigbee
-#          export SENTRY_VERSION=iobroker.zigbee@${{ steps.extract_release.outputs.VERSION }}
-#          sentry-cli releases new $SENTRY_VERSION
-#          sentry-cli releases finalize $SENTRY_VERSION
-#        # Add the following line BEFORE finalize if repositories are connected in Sentry
-#        # sentry-cli releases set-commits $SENTRY_VERSION --auto
-#
-#        # Add the following line BEFORE finalize if sourcemap uploads are needed
-#        # sentry-cli releases files $SENTRY_VERSION upload-sourcemaps build/
+ # b) For monorepos managed with lerna (requires lerna to be installed globally)
+      #- name: Publish packages to npm
+      #  run: |
+      #    npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
+      #    npm whoami
+      #    lerna publish from-package --yes
+      # c) For monorepos managed with yarn v3.1+ (no lerna)
+      #- name: Publish packages to npm
+      #  run: |
+      #    yarn config set npmAuthToken "${{ secrets.NPM_TOKEN }}"
+      #    yarn npm whoami
+      #    yarn workspaces foreach -vti --no-private npm publish --tolerate-republish
+
+      - name: Create Github Release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release v${{ steps.extract_release.outputs.VERSION }}
+          draft: false
+          # Prerelease versions create prereleases on Github
+          prerelease: ${{ contains(steps.extract_release.outputs.VERSION, '-') }}
+          body: ${{ steps.extract_release.outputs.BODY }}

README.md

@@ -26,9 +26,8 @@ Only CC26xx/cc1352/cc2538 Devices support extraction of the NVRam backup which s
 Current firmware files for these devices can be found [on GitHub](https://github.com/Koenkk/Z-Stack-firmware)
 
 <span><img src="https://ae01.alicdn.com/kf/HTB1Httue3vD8KJjSsplq6yIEFXaJ/Wireless-Zigbee-CC2531-Sniffer-Bare-Board-Packet-Protocol-Analyzer-Module-USB-Interface-Dongle-Capture-Packet.jpg_640x640.jpg" width="100"></span>
-<span><img src="http://img.dxcdn.com/productimages/sku_429478_2.jpg" width="100"></span>
-<span><img src="http://img.dxcdn.com/productimages/sku_429601_2.jpg" width="100"></span>
 <span><img src="https://ae01.alicdn.com/kf/HTB1zAA5QVXXXXahapXXq6xXFXXXu/RF-TO-USB-CC2530-CC2591-RF-switch-USB-transparent-serial-data-transmission-equipment.jpg_640x640.jpg" width="100"></span>
+<span><img src="docs/de/img/sonoff.png" width="100"></span>
 <span><img src="docs/de/img/CC2538_CC2592_PA.PNG" width="100"></span>
 <span><img src="docs/de/img/cc26x2r.PNG" width="100"></span>
 
@@ -114,6 +113,12 @@ There are knowledge bases that can be useful for working with Zigbee-devices and
 
 Works with devices from this list https://github.com/ioBroker/ioBroker.zigbee/wiki/Supported-devices
 
+
+## More Informations
+https://github.com/ioBroker/ioBroker.zigbee/wiki
+
+
+
 ## Donate
 
 You can thank the authors by these links:
@@ -134,11 +139,17 @@ You can thank the authors by these links:
 
 ## Changelog
 
+### 1.8.13 
+* (arteck) ota corr
+* (arteck) devices are wrong with enum exposes
+* (arteck) select field for groups is larger 
+
+### 1.8.12 (2023-06-30)
+* (arteck) new Documentation (thx Stefan)
 
 ### 1.8.11 (2022-12-10)
 * (arteck) fix compsite exposes with list
 
-
 ### 1.8.10 (2022-12-12)
 * (asgothian) fix group access
 * (asgothian) add option for pairing code:

admin/i18n/pl/translations.json

@@ -5,7 +5,7 @@
     "Binding": "połączenie",
     "Binding configuration": "Konfiguracja wiązania",
     "COM port name": "Nazwa portu COM",
-    "Cancel": "Anuluj",
+    "Cancel": "Pomiń",
     "Channel": "Kanał",
     "ChannelChangeText": "Kanał ustawia używaną częstotliwość radiową. Można go zmienić, aby uniknąć konfliktów z istniejącymi sieciami Wi-Fi. <b>Podczas zmiany wszystkie urządzenia muszą zostać ponownie nauczone!</b>",
     "Check firmware updates": "Sprawdź aktualizacje oprogramowania układowego",
@@ -39,7 +39,7 @@
     "Hide": "Ukryj",
     "Let's pairing!": "Wystartuj łączenie!",
     "Map view config": "Konfiguracja mapy",
-    "Name": "Imię",
+    "Name": "Nazwa",
     "Needs value": "Potrzebuje wartości",
     "Network map": "Mapa sieci",
     "Pairing process": "parowanie",
@@ -83,12 +83,12 @@
     "Touchlink reset and pairing": "Resetowanie i parowanie za pomocą Touchlink",
     "Transport Key Text": "Klucz transportowy to sieciowy klucz szyfrowania.",
     "Transport Key": "Klucz transportowy",
-    "Type": "Rodzaj",
+    "Type": "Typ",
     "Unbind remote from Coordinator (necessary for some remotes like HUE Dimmer Switch)": "Odłącz pilota od Coordinatora (niezbędny do niektórych pilotów, takich jak HUE Dimmer Switch)",
     "View config": "Wyświetl config",
     "Waiting": "Czekaj",
     "Write Attribute": "Napisz atrybut",
-    "Yes": "tak",
+    "Yes": "Tak",
     "You find good explanations what the settings mean": "Znajdziesz dobre wyjaśnienia, co oznaczają ustawienia",
     "Zigbee adapter": "Adapter Zigbee",
     "Zigbee-herdsman debug info": "Informacje debugowania Zigbee-Herdsman",

admin/index_m.html

@@ -985,10 +985,10 @@ <h3 class="translate">Config device</h3>
                         <p class="translate device_with_endpoint">Main Endpoint</p>
                     </div>
                 </div>
-                <div class="col">
+                <div class="col1">
                     <div class="input-field groups">
                         <select id="d_groups_ep0" class="materialSelect" multiple>
-                            <option value="1">Значение</option>
+                            <option value="1">value</option>
                         </select>
                         <label for="d_groups_ep0" class="translate">Groups</label>
                     </div>
@@ -1003,7 +1003,7 @@ <h3 class="translate">Config device</h3>
                 <div class="col">
                     <div class="input-field groups">
                         <select id="d_groups_ep1" class="materialSelect" multiple>
-                            <option value="1">Значение</option>
+                            <option value="1">value</option>
                         </select>
                         <label for="d_groups_ep1" class="translate">Groups</label>
                     </div>
@@ -1018,7 +1018,7 @@ <h3 class="translate">Config device</h3>
                 <div class="col">
                     <div class="input-field groups">
                         <select id="d_groups_ep2" class="materialSelect" multiple>
-                            <option value="1">Значение</option>
+                            <option value="1">value</option>
                         </select>
                         <label for="d_groups_ep2" class="translate">Groups</label>
                     </div>
@@ -1033,7 +1033,7 @@ <h3 class="translate">Config device</h3>
                 <div class="col">
                     <div class="input-field groups">
                         <select id="d_groups_ep3" class="materialSelect" multiple>
-                            <option value="1">Значение</option>
+                            <option value="1">value</option>
                         </select>
                         <label for="d_groups_ep3" class="translate">Groups</label>
                     </div>

admin/tab_m.html

@@ -683,9 +683,9 @@ <h3 class="translate">Config device</h3>
                   <p class="translate device_with_endpoint">Main Endpoint</p>
                 </div>
               </div>
-              <div class="col">
+              <div class="col1">
                 <div class="input-field groups">
-                    <select id="d_groups_ep0" class="materialSelect" multiple><option value="1">Значение</option></select>
+                    <select id="d_groups_ep0" class="materialSelect" multiple><option value="1">value</option></select>
                     <label for="d_groups_ep0" class="translate">Groups</label>
                 </div>
               </div>
@@ -698,7 +698,7 @@ <h3 class="translate">Config device</h3>
               </div>
               <div class="col">
                 <div class="input-field groups">
-                    <select id="d_groups_ep1" class="materialSelect" multiple><option value="1">Значение</option></select>
+                    <select id="d_groups_ep1" class="materialSelect" multiple><option value="1">value</option></select>
                     <label for="d_groups_ep1" class="translate">Groups</label>
                 </div>
               </div>
@@ -711,7 +711,7 @@ <h3 class="translate">Config device</h3>
               </div>
               <div class="col">
                 <div class="input-field groups">
-                    <select id="d_groups_ep2" class="materialSelect" multiple><option value="1">Значение</option></select>
+                    <select id="d_groups_ep2" class="materialSelect" multiple><option value="1">value</option></select>
                     <label for="d_groups_ep2" class="translate">Groups</label>
                 </div>
               </div>
@@ -724,7 +724,7 @@ <h3 class="translate">Config device</h3>
               </div>
               <div class="col">
                 <div class="input-field groups">
-                    <select id="d_groups_ep3" class="materialSelect" multiple><option value="1">Значение</option></select>
+                    <select id="d_groups_ep3" class="materialSelect" multiple><option value="1">value</option></select>
                     <label for="d_groups_ep3" class="translate">Groups</label>
                 </div>
               </div>
@@ -777,7 +777,7 @@ <h3 class="translate">Edit Group</h3>
                 <div class="col s12">
                   <div class="input-field members">
                     <label for="g_members" class="translate">Members</label>
-                    <select id="g_members" class="materialSelect" multiple><option value="1">Значение</option></select>
+                    <select id="g_members" class="materialSelect" multiple><option value="1">value</option></select>
                   </div>
                 </div>
               </div>