Strolch
/
strolch-plc
mirror of https://github.com/strolch-li/strolch-plc.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] Better I2C logging

This commit is contained in:
Robert von Burg 2022-05-05 13:05:06 +02:00
parent 9bacf5447e
commit 6c9a854ec8
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
strolch-plc-core/src/main/java/li/strolch/plc/core/hw/i2c/PCF8574InputConnection.java
View File

@ -211,7 +211,7 @@ public class PCF8574InputConnection extends SimplePlcConnection {
+ " and expected change state is " + this.interruptChangeState + ", forcing update..."); + " and expected change state is " + this.interruptChangeState + ", forcing update...");
try { try {
handleNewState(); handleNewState("interruptFix");
} catch (Exception e) { } catch (Exception e) {
handleBrokenConnection("Failed to read new state: " + getExceptionMessageWithCauses(e), e); handleBrokenConnection("Failed to read new state: " + getExceptionMessageWithCauses(e), e);
} }
@ -227,18 +227,18 @@ public class PCF8574InputConnection extends SimplePlcConnection {
try { try {
if (event.getState() == this.interruptChangeState) if (event.getState() == this.interruptChangeState)
handleNewState(); handleNewState("interrupt");
} catch (Exception e) { } catch (Exception e) {
handleBrokenConnection("Failed to read new state: " + getExceptionMessageWithCauses(e), e); handleBrokenConnection("Failed to read new state: " + getExceptionMessageWithCauses(e), e);
} }
} }
private void handleNewState() throws IOException { private void handleNewState(String ctx) throws IOException {
for (int i = 0; i < this.inputDevices.length; i++) { for (int i = 0; i < this.inputDevices.length; i++) {
I2CDevice i2CDevice = this.inputDevices[i]; I2CDevice i2CDevice = this.inputDevices[i];
if (i2CDevice == null) { if (i2CDevice == null) {
logger.warn("Ignoring invalid I2C Device 0x" + toHexString(this.addresses[i])); logger.warn("Ignoring invalid I2C Device 0x" + toHexString(this.addresses[i]) + " " + ctx);
continue; continue;
} }
@ -247,7 +247,7 @@ public class PCF8574InputConnection extends SimplePlcConnection {
if (this.verbose) if (this.verbose)
logger.info( logger.info(
this.id + " at 0x" + toHexString((byte) i2CDevice.getAddress()) + " has new state " + asBinary( this.id + " at 0x" + toHexString((byte) i2CDevice.getAddress()) + " has new state " + asBinary(
data)); data) + " " + ctx);
for (int j = 0; j < 8; j++) { for (int j = 0; j < 8; j++) {
boolean newState = isBitSet(data, j); boolean newState = isBitSet(data, j);
@ -257,8 +257,9 @@ public class PCF8574InputConnection extends SimplePlcConnection {
if (this.states[i][j] != newState) { if (this.states[i][j] != newState) {
this.states[i][j] = newState; this.states[i][j] = newState;
String address = this.id + "." + i + "." + j; String address = this.id + "." + i + "." + j;
logger.info( logger.info("Detected " + address + " = " + (newState ? 1 : 0) + (this.inverted ?
"Detected " + address + " = " + (newState ? 1 : 0) + (this.inverted ? " (inverted)" : "")); " (inverted) " :
" (normal) ") + asBinary(data) + " " + ctx);
this.plc.queueNotify(address, newState); this.plc.queueNotify(address, newState);
} }
} }