ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Moved find device to its own utility method, and added a specific equals method and reworked some test.

Browse source
This commit is contained in:
Ziver Koc 2021-03-23 01:57:12 +01:00
parent 7e8938c38c
commit c7e286f51e
166 changed files with 618 additions and 374 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/hal-zigbee/build.gradle
View file

@ -1,5 +1,6 @@
dependencies {
def ZIGBEE_LIB_VERSION = "1.3.10"
//def ZIGBEE_LIB_VERSION = "1.3.11-SNAPSHOT"
implementation project(':hal-core')

24
plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeJSerialCommPort.java
View file

@ -58,8 +58,8 @@ public class ZigBeeJSerialCommPort implements ZigBeePort {
private final FlowControl flowControl;
private SerialPort serialPort;
private InputStream serialInputstream;
private OutputStream serialOutputstream;
private InputStream serialInputStream;
private OutputStream serialOutputStream;
/**
@ -140,8 +140,8 @@ public class ZigBeeJSerialCommPort implements ZigBeePort {
throw new RuntimeException("Error opening serial port: " + portName);
}
serialInputstream = serialPort.getInputStream();
serialOutputstream = serialPort.getOutputStream();
serialInputStream = serialPort.getInputStream();
serialOutputStream = serialPort.getOutputStream();
switch (flowControl) {
case FLOWCONTROL_OUT_NONE:
@ -170,8 +170,8 @@ public class ZigBeeJSerialCommPort implements ZigBeePort {
purgeRxBuffer();
serialPort.closePort();
serialInputstream = null;
serialOutputstream = null;
serialInputStream = null;
serialOutputStream = null;
serialPort = null;
} catch (Exception e) {
logger.warn("Error closing portName portName: '" + portName + "'", e);
@ -180,11 +180,11 @@ public class ZigBeeJSerialCommPort implements ZigBeePort {
@Override
public void write(int value) {
if (serialOutputstream == null)
if (serialOutputStream == null)
throw new RuntimeException("Unable to write, Serial port is not open.");
try {
serialOutputstream.write(value);
serialOutputStream.write(value);
} catch (IOException e) {
logger.error("Was unable to write to serial port.", e);
}
@ -197,14 +197,14 @@ public class ZigBeeJSerialCommPort implements ZigBeePort {
@Override
public int read(int timeout) {
if (serialInputstream == null)
if (serialInputStream == null)
throw new RuntimeException("Unable to read, Serial port is not open.");
try {
if (serialPort.getReadTimeout() != timeout)
serialPort.setComPortTimeouts(SerialPort.TIMEOUT_READ_BLOCKING, timeout, 0);
return serialInputstream.read();
return serialInputStream.read();
} catch (IOException e) {
logger.error("Was unable to read from serial port.", e);
}
@ -213,11 +213,11 @@ public class ZigBeeJSerialCommPort implements ZigBeePort {
@Override
public void purgeRxBuffer() {
if (serialOutputstream == null)
if (serialOutputStream == null)
return;
try {
serialOutputstream.flush();
serialOutputStream.flush();
} catch (IOException e) {
logger.error("Was unable to flush serial data.", e);
}