Merge pull request #336 from taartspi/linuxi2c_ioexception

Temporary fix for linuxfs-i2c IOException. Also fix return code for …
Pi4J · Mar 15, 2024 · 8119be5 · 8119be5
2 parents 61fb5cb + 34d854e
commit 8119be5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ns/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/i2c/LinuxFsI2C.java b/...ns/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/i2c/LinuxFsI2C.java
@@ -316,7 +316,7 @@ public int readRegister(byte[] register, byte[] buffer, int offset, int length)
             buffer[i] = ioctlData.get(readBuffPosition +i );
 ;        }
 
-        return (ioctlData.limit());
+        return (readLength);
     }
 
 
@@ -330,8 +330,6 @@ public int writeReadRegisterWord(int register, int word) {
         reg[1] = (byte) (word & 0xff);
         reg[2] = (byte) ((word >> 8) & 0xff);
         byte buff[] = new byte[2];
-
-        int rCode = this.readRegister(reg, buff, 0, buff.length);
         word = (buff[1] << 8)  | buff[0];
         return word;
 

diff --git a/...in-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/i2c/LinuxFsI2CProviderImpl.java b/...in-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/i2c/LinuxFsI2CProviderImpl.java
@@ -56,6 +56,8 @@ public synchronized I2C create(I2CConfig config) {
         LinuxFsI2CBus i2CBus = this.i2CBusMap.computeIfAbsent(config.getBus(), busNr -> new LinuxFsI2CBus(config));
         // create new I/O instance based on I/O config
         LinuxFsI2C i2C = new LinuxFsI2C(i2CBus, this, config);
+        // Workaround, needed if first LinuxFsI2C usage is ioctl (readRegister or writeRegister)
+        i2C.read();
         this.context.registry().add(i2C);
         return i2C;
     }