diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2247d5f --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/build +/dist diff --git a/build.xml b/build.xml index 68f6847..8eda88f 100644 --- a/build.xml +++ b/build.xml @@ -12,6 +12,7 @@ + diff --git a/lib/slf4j-api-1.7.2.jar b/lib/slf4j-api-1.7.2.jar new file mode 100644 index 0000000..73f38db Binary files /dev/null and b/lib/slf4j-api-1.7.2.jar differ diff --git a/src/de/fischl/usbtin/USBtin.java b/src/de/fischl/usbtin/USBtin.java index 6073f05..d23f905 100644 --- a/src/de/fischl/usbtin/USBtin.java +++ b/src/de/fischl/usbtin/USBtin.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.LinkedList; -import java.util.logging.Level; -import java.util.logging.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import jssc.SerialPort; import jssc.SerialPortException; import jssc.SerialPortTimeoutException; @@ -38,6 +38,8 @@ */ public class USBtin implements SerialPortEventListener { + private final Logger logger = LoggerFactory.getLogger(USBtin.class); + /** Serial port (virtual) to which USBtin is connected */ protected SerialPort serialPort; @@ -234,7 +236,7 @@ public void openCANChannel(int baudrate, OpenMode mode) throws USBtinException { this.transmit("s" + String.format("%02x", brpopt | 0xC0) + String.format("%04x", cnfvalues[xopt - 11])); - System.out.println("No preset for given baudrate " + baudrate + ". Set baudrate to " + (FOSC / ((brpopt + 1) * 2) / xopt)); + logger.info("No preset for given baudrate {}. Set baudrate to {}", baudrate, (FOSC / ((brpopt + 1) * 2) / xopt)); } @@ -242,7 +244,7 @@ public void openCANChannel(int baudrate, OpenMode mode) throws USBtinException { char modeCh; switch (mode) { default: - System.err.println("Mode " + mode + " not supported. Opening listen only."); + logger.warn("Mode {} not supported. Opening listen only.", mode); case LISTENONLY: modeCh = 'L'; break; case LOOPBACK: modeCh = 'l'; break; case ACTIVE: modeCh = 'O'; break; @@ -353,7 +355,7 @@ public void serialEvent(SerialPortEvent event) { try { sendFirstTXFifoMessage(); } catch (USBtinException ex) { - System.err.println(ex); + logger.warn("Error on CAN bus, {}", ex); } @@ -367,7 +369,7 @@ public void serialEvent(SerialPortEvent event) { try { sendFirstTXFifoMessage(); } catch (USBtinException ex) { - System.err.println(ex); + logger.warn("Error on CAN bus, {}", ex); } } else if (b != '\r') { @@ -376,7 +378,7 @@ public void serialEvent(SerialPortEvent event) { } } } catch (SerialPortException ex) { - System.err.println(ex); + logger.warn("Error on CAN bus, {}", ex); } } }