chore: release v1.10.7

* (arteck) add flow control option * (asgothian) add new NewHerdsman * (arteck) add new ezsp coordinator Firmware (7.4.1.0)
ioBroker · Sep 5, 2024 · a720c11 · a720c11
1 parent 14664f4
commit a720c11
Show file tree

Hide file tree

Showing 11 changed files with 107 additions and 47 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,2 @@
+package.json
+package-lock.json
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,9 @@
+module.exports = {
+    semi: true,
+	   trailingComma: 'es5',
+	   singleQuote: true,
+	   printWidth: 120,
+	   useTabs: false,
+	   tabWidth: 4,
+	  endOfLine: 'auto',
+};
diff --git a/README.md b/README.md
@@ -131,8 +131,9 @@ You can thank the authors by these links:
 * to Arthur Rupp https://paypal.me/ArthurRupp
 
 -----------------------------------------------------------------------------------------------------
-
-### **WORK IN PROGRESS**
+### 1.10.7 (2024-09-05)
+* (arteck) add flow control option 
+* (asgothian) add new NewHerdsman
 * (arteck) add new ezsp coordinator Firmware (7.4.1.0)
 
 ### 1.10.5 (2024-06-21)

diff --git a/admin/admin.js b/admin/admin.js
@@ -31,7 +31,7 @@ const updateCardInterval = setInterval(updateCardTimer, 6000);
 
 const savedSettings = [
     'port', 'panID', 'channel', 'disableLed', 'countDown', 'groups', 'extPanID', 'precfgkey', 'transmitPower',
-    'adapterType', 'debugHerdsman', 'disableBackup', 'disablePing', 'external', 'startWithInconsistent', 'warnOnDeviceAnnouncement', 'baudRate'
+    'adapterType', 'debugHerdsman', 'disableBackup', 'disablePing', 'external', 'startWithInconsistent', 'warnOnDeviceAnnouncement', 'baudRate', 'flowCTRL'
 ];
 
 function getDeviceByID(ID) {

diff --git a/admin/index_m.html b/admin/index_m.html
@@ -600,6 +600,12 @@ <h5 class="translate center-align">Zigbee adapter</h5>
                     </select>
                     <label class="translate">Type</label>
                 </div>
+
+               <div class="input-field col s6 m3 l2 col-flowCTRL">">
+                    <input id="flowCTRL" type="checkbox" class="value"/>
+                    <label class="translate" for="flowCTRL">flow control</label>
+                </div>
+
                 <div class="input-field col s6 m3 l2">
                     <input id="baudRate" type="number" min="38400" max="115200" class="value"/>
                     <label class="translate" for="baudRate">Baudate Deconz/Conbee</label>

diff --git a/eslint.config.cjs b/eslint.config.cjs
@@ -0,0 +1,58 @@
+const globals = require('globals');
+const js = require('@eslint/js');
+
+const { FlatCompat } = require('@eslint/eslintrc');
+
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all,
+});
+
+module.exports = [
+    {
+        ignores: ['.dev-server/**'],
+    },
+    ...compat.extends('eslint:recommended', 'plugin:prettier/recommended'),
+    {
+        languageOptions: {
+            globals: {
+                ...globals.node,
+                ...globals.mocha,
+            },
+
+            ecmaVersion: 2022,
+            sourceType: 'commonjs',
+
+            parserOptions: {
+                ecmaFeatures: {
+                    jsx: true,
+                },
+            },
+        },
+
+        rules: {
+            indent: ['error', 4, { SwitchCase: 1 }],
+            'prettier/prettier': ['off', { endOfLine: 'auto' }],
+            'no-unused-vars': 'off',
+            'no-fallthrough': 'off',
+            'no-console': 'off',
+            'no-prototype-builtins': 'off',
+            'no-undef': 'warn',
+            'no-empty': 'warn',
+            'no-var': 'warn',
+            'prefer-const': 'warn',
+            'no-unsafe-finally': 'warn',
+            'no-cond-assign': 'warn',
+            'no-func-assign': 'warn',
+            'no-trailing-spaces': 'error',
+            quotes: ['warn',
+                'single',
+                {
+                    avoidEscape: true,
+                    allowTemplateLiterals: true,
+                },
+            ],
+        },
+    },
+];
diff --git a/io-package.json b/io-package.json
@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "1.10.6",
+    "version": "1.10.7",
     "news": {
+      "1.10.7": {
+        "en": "add flow control option \nadd new NewHerdsman\nadd new ezsp coordinator Firmware (7.4.1.0)",
+        "de": "möglichkeit der durchflussregelung\nneues hinzufügen NewHerdsman\nezsp Koordinator Firmware hinzufügen (7.4.1.0)",
+        "ru": "добавить параметр управления потоком\nдобавить новый NewHerdsman\nдобавить новый координатор ezsp Firmware (7.4.1.0)",
+        "pt": "adicionar opção de controle de fluxo\nadicionar novo NewHerdsman\nadicionar novo coordenador ezsp Firmware (7.4.1.0)",
+        "nl": "flow control optie toevoegen\nnieuwe NewHerdsman toevoegen\nnieuwe ezsp coördinator Firmware (7.4.1.0) toevoegen",
+        "fr": "ajouter l'option de contrôle du débit\najouter un nouveau NewHerdsman\najouter un nouveau logiciel ezsp coordinator (7.4.1.0)",
+        "it": "aggiungere opzione di controllo del flusso\naggiungere nuovo NewHerdsman\naggiungere nuovo coordinatore ezsp Firmware (7.4.1.0)",
+        "es": "añadir opción de control de flujo\nañadir nuevo NewHerdsman\nañadir nuevo coordinador de ezsp Firmware (7.4.1.0)",
+        "pl": "dodaj opcję kontroli przepływu\ndodaj nowy NewHerdsman\ndodaj nowego koordynatora ezsp Firmware (7.4.1.0)",
+        "uk": "додати варіант контролю потоку\nдодати новийHerdsman\nadd new ezsp manager Прошивка (7.4.1.0)",
+        "zh-cn": "添加流量控制选项\n添加新赫兹曼\n添加新的 ezsp 协调员 Firmware (7.4.1.0)"
+      },
       "1.10.6": {
         "en": "core update\ndependency update",
         "de": "kern-update\naktualisierung der abhängigkeit",
@@ -16,7 +29,6 @@
         "uk": "оновлення ядра\nоновлення залежності",
         "zh-cn": "核心更新\n依赖性更新"
       },
-
       "1.10.5": {
         "en": "icon ota device update\nicon fix",
         "de": "icon ota device update\nsymbol fix",
@@ -81,32 +93,6 @@
         "pl": "Baudrate jest teraz konfigurowalny. działa tylko z Deconz / Conbee (38400)\ndodaj nvbackup. json usuń przycisk",
         "uk": "Baudrate тепер конфігурується. працює ONLY з Deconz/Conbee( 38400 )\nдодати nvbackup. json видалити кнопка",
         "zh-cn": "鲍德拉特现在可塑. 仅与Deconz/Conbee(38400)合作\n添加 nv 备份。 json 删除按钮"
-      },
-      "1.10.0": {
-        "en": "new zigbee-herdsman-converters 18.x\nconfigure message is now a warning",
-        "de": "neue zickbee-herdsman-konverter 18.x\nkonfigurieren von meldungen",
-        "ru": "новые зигби-гердсман-конвертеры 18.x\nнастройка сообщения - это предупреждение",
-        "pt": "novos conversores de zigbee-herdsman 18.x\nconfigurar a mensagem é agora um aviso",
-        "nl": "nieuwe zigbee-herdsman-converters 18.x\nconfigureren bericht is nu een waarschuwing",
-        "fr": "nouveaux convertisseurs zigbee-herdsman 18.x\nconfigure message est maintenant un avertissement",
-        "it": "nuovo zigbee-herdsman-converter 18.x\nconfigurare il messaggio è ora un avviso",
-        "es": "nuevos zigbee-herdsman-converters 18.x\nmensaje de configuración es ahora una advertencia",
-        "pl": "nowe konwertery zigbee- herdsman- 18 x\nkonfiguracja wiadomości jest teraz ostrzeżeniem",
-        "uk": "новий zigbee-herdsman-converters 18.х\nналаштування повідомлення тепер попередження",
-        "zh-cn": "新的 zigbee- herdsman- 转换器 18.x 电话\n配置信件现在是警告"
-      },
-      "1.9.7": {
-        "en": "corr configure for some devices",
-        "de": "corr konfigurieren für einige geräte",
-        "ru": "для некоторых устройств",
-        "pt": "corr configurar para alguns dispositivos",
-        "nl": "corr instellen voor sommige apparaten",
-        "fr": "corr configure pour certains appareils",
-        "it": "corr configurare per alcuni dispositivi",
-        "es": "configuración de corr para algunos dispositivos",
-        "pl": "configure corr dla niektórych urządzeń",
-        "uk": "налаштовувати корр для деяких пристроїв",
-        "zh-cn": "一些设备的corr配置"
       }
     },
     "titleLang": {
@@ -142,7 +128,10 @@
     "authors": [
       "Kirov Ilya<[email protected]>"
     ],
-    "license": "MIT",
+    "licenseInformation": {
+      "license": "MIT",
+      "type": "free"
+    },
     "platform": "Javascript/Node.js",
     "mode": "daemon",
     "icon": "zigbee.png",
@@ -275,7 +264,8 @@
     "external": "",
     "startWithInconsistent": false,
     "warnOnDeviceAnnouncement": true,
-    "baudRate": 115200
+    "baudRate": 115200,
+    "flowCTRL": false
   },
   "instanceObjects": [
     {

diff --git a/main.js b/main.js
@@ -961,13 +961,9 @@ class Zigbee extends utils.Adapter {
         const adapterType = this.config.adapterType || 'zstack';
         // https://github.com/ioBroker/ioBroker.zigbee/issues/668
         const extPanIdFix = this.config.extPanIdFix ? this.config.extPanIdFix : false;
-
         const baudRate = parseInt(this.config.baudRate ? this.config.baudRate : 115200);
 
-        let setRtscts = false;
-        if (adapterType == 'ember' || adapterType == 'ezsp') {        // Firmware 7.4.1.0
-            setRtscts = true;
-        }
+        const setRtscts = this.config.baudRate ? this.config.baudRate : false;             
 
         return {
             net: {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.10.6",
+  "version": "1.10.7",
   "author": {
     "name": "Kirov Ilya",
     "email": "[email protected]"
@@ -22,9 +22,9 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.1.3",
-    "@iobroker/dm-utils": "^0.2.2",
+    "@iobroker/dm-utils": "^0.5.0",
     "humanize-duration": "^3.32.1",
-    "tar": "^6.2.0",
+    "tar": "^7.4.3",
     "ajv": "^8.16.0",
     "uri-js": "^4.4.1",
     "typescript": "^5.5.3",
@@ -40,14 +40,14 @@
     "@iobroker/testing": "^4.1.3",
     "chai": "^5.1.1",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.57.0",
+    "eslint": "^9.9.1",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-prettier": "^5.2.1",
     "gulp": "^4.0.2",
     "gulp-jsdoc3": "^3.0.0",
     "gulp-replace": "^1.1.4",
     "mixin-deep": "^2.0.1",
-    "mocha": "^10.4.0"
+    "mocha": "^10.7.3"
   },
   "homepage": "https://github.com/ioBroker/ioBroker.zigbee",
   "keywords": [