From 89b234ccddf8d13cc421121e3321560a39d072e7 Mon Sep 17 00:00:00 2001 From: Gerrit Beine Date: Mon, 11 Sep 2017 18:19:31 +0200 Subject: [PATCH] Replace System.out and System.err with slf4j; used version 1.7.2 due to compatibility to openHAB 2.1.0 --- .gitignore | 2 ++ build.xml | 1 + lib/slf4j-api-1.7.2.jar | Bin 0 -> 26083 bytes src/de/fischl/usbtin/USBtin.java | 16 +++++++++------- 4 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 .gitignore create mode 100644 lib/slf4j-api-1.7.2.jar 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 0000000000000000000000000000000000000000..73f38db9ce6973b8247c2cf267a5fd4a1464c7b3 GIT binary patch literal 26083 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 literal 0 HcmV?d00001 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); } } }