rusefi
/
jSerialComm
mirror of https://github.com/rusefi/jSerialComm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make all config update safety sleep timeouts configurable

This commit is contained in:
hedgecrw85 2019-11-04 10:49:10 -06:00
parent b764c88d75
commit 9189732c3d
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/com/fazecast/jSerialComm/SerialPort.java
View File

@ -2,7 +2,7 @@
* SerialPort.java * SerialPort.java
* *
* Created on: Feb 25, 2012 * Created on: Feb 25, 2012
* Last Updated on: Oct 15, 2019 * Last Updated on: Nov 04, 2019
* Author: Will Hedgecock * Author: Will Hedgecock
* *
* Copyright (C) 2012-2019 Fazecast, Inc. * Copyright (C) 2012-2019 Fazecast, Inc.
@ -368,7 +368,7 @@ public final class SerialPort
private volatile int baudRate = 9600, dataBits = 8, stopBits = ONE_STOP_BIT, parity = NO_PARITY, eventFlags = 0; private volatile int baudRate = 9600, dataBits = 8, stopBits = ONE_STOP_BIT, parity = NO_PARITY, eventFlags = 0;
private volatile int timeoutMode = TIMEOUT_NONBLOCKING, readTimeout = 0, writeTimeout = 0, flowControl = 0; private volatile int timeoutMode = TIMEOUT_NONBLOCKING, readTimeout = 0, writeTimeout = 0, flowControl = 0;
private volatile int sendDeviceQueueSize = 4096, receiveDeviceQueueSize = 4096; private volatile int sendDeviceQueueSize = 4096, receiveDeviceQueueSize = 4096;
private volatile int rs485DelayBefore = 0, rs485DelayAfter = 0; private volatile int safetySleepTimeMS = 200, rs485DelayBefore = 0, rs485DelayAfter = 0;
private volatile SerialPortInputStream inputStream = null; private volatile SerialPortInputStream inputStream = null;
private volatile SerialPortOutputStream outputStream = null; private volatile SerialPortOutputStream outputStream = null;
private volatile SerialPortDataListener userDataListener = null; private volatile SerialPortDataListener userDataListener = null;
@ -392,14 +392,15 @@ public final class SerialPort
public final boolean openPort(int safetySleepTime, int deviceSendQueueSize, int deviceReceiveQueueSize) public final boolean openPort(int safetySleepTime, int deviceSendQueueSize, int deviceReceiveQueueSize)
{ {
// Set the send/receive internal buffer sizes, and return true if already opened // Set the send/receive internal buffer sizes, and return true if already opened
safetySleepTimeMS = safetySleepTime;
sendDeviceQueueSize = deviceSendQueueSize; sendDeviceQueueSize = deviceSendQueueSize;
receiveDeviceQueueSize = deviceReceiveQueueSize; receiveDeviceQueueSize = deviceReceiveQueueSize;
if (isOpened) if (isOpened)
return configPort(portHandle); return configPort(portHandle);
// Force a sleep to ensure that the port does not become unusable due to rapid closing/opening on the part of the user // Force a sleep to ensure that the port does not become unusable due to rapid closing/opening on the part of the user
if (safetySleepTime > 0) if (safetySleepTimeMS > 0)
try { Thread.sleep(safetySleepTime); } catch (Exception e) { Thread.currentThread().interrupt(); } try { Thread.sleep(safetySleepTimeMS); } catch (Exception e) { Thread.currentThread().interrupt(); }
// If this is an Android root application, we must explicitly allow serial port access to the library // If this is an Android root application, we must explicitly allow serial port access to the library
File portFile = isAndroid ? new File(comPort) : null; File portFile = isAndroid ? new File(comPort) : null;
@ -458,7 +459,7 @@ public final class SerialPort
/** /**
* Opens this serial port for reading and writing. * Opens this serial port for reading and writing.
* <p> * <p>
* This method is equivalent to calling {@link #openPort} with a value of 1000. * This method is equivalent to calling {@link #openPort} with a value of 200.
* <p> * <p>
* All serial port parameters or timeouts can be changed at any time before or after the port has been opened. * All serial port parameters or timeouts can be changed at any time before or after the port has been opened.
* <p> * <p>
@ -466,7 +467,7 @@ public final class SerialPort
* *
* @return Whether the port was successfully opened. * @return Whether the port was successfully opened.
*/ */
public final boolean openPort() { return openPort(1000); } public final boolean openPort() { return openPort(200); }
/** /**
* Closes this serial port. * Closes this serial port.
@ -859,7 +860,8 @@ public final class SerialPort
if (isOpened) if (isOpened)
{ {
try { Thread.sleep(200); } catch (Exception e) { Thread.currentThread().interrupt(); } if (safetySleepTimeMS > 0)
try { Thread.sleep(safetySleepTimeMS); } catch (Exception e) { Thread.currentThread().interrupt(); }
configPort(portHandle); configPort(portHandle);
} }
} }
@ -906,7 +908,8 @@ public final class SerialPort
if (isOpened) if (isOpened)
{ {
try { Thread.sleep(200); } catch (Exception e) { Thread.currentThread().interrupt(); } if (safetySleepTimeMS > 0)
try { Thread.sleep(safetySleepTimeMS); } catch (Exception e) { Thread.currentThread().interrupt(); }
configPort(portHandle); configPort(portHandle);
} }
} }
@ -971,7 +974,8 @@ public final class SerialPort
if (isOpened) if (isOpened)
{ {
try { Thread.sleep(200); } catch (Exception e) { Thread.currentThread().interrupt(); } if (safetySleepTimeMS > 0)
try { Thread.sleep(safetySleepTimeMS); } catch (Exception e) { Thread.currentThread().interrupt(); }
configTimeouts(portHandle); configTimeouts(portHandle);
} }
} }
@ -989,7 +993,8 @@ public final class SerialPort
if (isOpened) if (isOpened)
{ {
try { Thread.sleep(200); } catch (Exception e) { Thread.currentThread().interrupt(); } if (safetySleepTimeMS > 0)
try { Thread.sleep(safetySleepTimeMS); } catch (Exception e) { Thread.currentThread().interrupt(); }
configPort(portHandle); configPort(portHandle);
} }
} }
@ -1007,7 +1012,8 @@ public final class SerialPort
if (isOpened) if (isOpened)
{ {
try { Thread.sleep(200); } catch (Exception e) { Thread.currentThread().interrupt(); } if (safetySleepTimeMS > 0)
try { Thread.sleep(safetySleepTimeMS); } catch (Exception e) { Thread.currentThread().interrupt(); }
configPort(portHandle); configPort(portHandle);
} }
} }
@ -1031,7 +1037,8 @@ public final class SerialPort
if (isOpened) if (isOpened)
{ {
try { Thread.sleep(200); } catch (Exception e) { Thread.currentThread().interrupt(); } if (safetySleepTimeMS > 0)
try { Thread.sleep(safetySleepTimeMS); } catch (Exception e) { Thread.currentThread().interrupt(); }
configPort(portHandle); configPort(portHandle);
} }
} }
@ -1076,7 +1083,8 @@ public final class SerialPort
if (isOpened) if (isOpened)
{ {
try { Thread.sleep(200); } catch (Exception e) { Thread.currentThread().interrupt(); } if (safetySleepTimeMS > 0)
try { Thread.sleep(safetySleepTimeMS); } catch (Exception e) { Thread.currentThread().interrupt(); }
configPort(portHandle); configPort(portHandle);
} }
} }
@ -1100,7 +1108,8 @@ public final class SerialPort
if (isOpened) if (isOpened)
{ {
try { Thread.sleep(200); } catch (Exception e) { Thread.currentThread().interrupt(); } if (safetySleepTimeMS > 0)
try { Thread.sleep(safetySleepTimeMS); } catch (Exception e) { Thread.currentThread().interrupt(); }
configPort(portHandle); configPort(portHandle);
} }
} }
@ -1127,7 +1136,8 @@ public final class SerialPort
if (isOpened) if (isOpened)
{ {
try { Thread.sleep(200); } catch (Exception e) { Thread.currentThread().interrupt(); } if (safetySleepTimeMS > 0)
try { Thread.sleep(safetySleepTimeMS); } catch (Exception e) { Thread.currentThread().interrupt(); }
configPort(portHandle); configPort(portHandle);
} }
} }