diff --git a/README.md b/README.md index f71ce2d..bc0f6f5 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,9 @@ Just now it can detect via ping, UPnP (serial planned). ## Changelog +### 2.3.5 (2020-05-01) +* (Apollon77) serial device discovery fixed + ### 2.3.4 (2020-04-30) * (Apollon77) make sure to check if initialization was done when ending (Sentry IOBROKER-DISCOVERY-8) * (APollon77) fix megad discovery error diff --git a/io-package.json b/io-package.json index 2da3c6d..a2c4670 100644 --- a/io-package.json +++ b/io-package.json @@ -1,8 +1,20 @@ { "common": { "name": "discovery", - "version": "2.3.4", + "version": "2.3.5", "news": { + "2.3.5": { + "en": "serial device discovery fixed", + "de": "Erkennung serieller Geräte behoben", + "ru": "исправлено обнаружение серийного устройства", + "pt": "descoberta de dispositivo serial corrigida", + "nl": "seriële apparaatdetectie opgelost", + "fr": "détection de périphérique série corrigée", + "it": "rilevamento dispositivo seriale fisso", + "es": "descubrimiento de dispositivo en serie arreglado", + "pl": "naprawiono wykrywanie urządzeń szeregowych", + "zh-cn": "修复了串行设备发现" + }, "2.3.4": { "en": "potential crash case fixed", "de": "Möglicher Crash-Fall behoben", diff --git a/lib/methods/serial.js b/lib/methods/serial.js index de4e920..ee03980 100644 --- a/lib/methods/serial.js +++ b/lib/methods/serial.js @@ -16,18 +16,18 @@ function listPorts(self) { let wait = false; if (SerialPort) { wait = true; - SerialPort.list((err, ports) => { + SerialPort.list().then(ports => { ports.forEach(port => { let found = false; for (let f = 0; f < list.length; f++) { - if (list[f]._addr === port.comName) { + if (list[f]._addr === port.path) { found = true; break; } } if (!found) { const device = { - _addr: port.comName, + _addr: port.path, _name: port.manufacturer, _data: port }; @@ -36,6 +36,8 @@ function listPorts(self) { } }); self.done(); + }). catch(e => { + self.adapter.log.warn('Some error by listing of serial ports: ' + e); }); } else if (fs.existsSync('/dev/')) { try { @@ -60,7 +62,7 @@ function listPorts(self) { } } } catch (e) { - self.adapter.log.warn('Some error by list of /dev/: ' + e); + self.adapter.log.warn('Some error by listing of /dev/: ' + e); } } diff --git a/package-lock.json b/package-lock.json index 2949f3d..a29860e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "iobroker.discovery", - "version": "2.3.4", + "version": "2.3.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f0d9213..7b49f3f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "iobroker.discovery", "description": "This adapter tries to detect devices in local network.", - "version": "2.3.4", + "version": "2.3.5", "author": "bluefox ", "contributors": [ "bluefox ",