adds support for different SPI-Buses in the MCP23S17 class.

fhnw-sgi-ip12-22vt · Nov 30, 2022 · 75a7ac6 · 75a7ac6
1 parent 5ddbb47
commit 75a7ac6
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/src/main/java/com/example/MCP23S17.java b/src/main/java/com/example/MCP23S17.java
@@ -2,9 +2,8 @@
 
 import com.pi4j.context.Context;
 import com.pi4j.io.gpio.digital.*;
-import com.pi4j.io.spi.Spi;
-import com.pi4j.io.spi.SpiConfig;
-import com.pi4j.io.spi.SpiMode;
+import com.pi4j.io.spi.*;
+
 import java.io.IOException;
 import java.util.*;
 
@@ -764,13 +763,13 @@ public interface InterruptListener {
      * @throws NullPointerException if the given chip select output is {@code null}.
      */
     private MCP23S17(Context pi4j,
-                     int spiChannel,
+                     SpiBus bus,
                      DigitalOutput chipSelect,
                      DigitalInput portAInterrupt,
                      DigitalInput portBInterrupt)
             throws IOException {
         this.chipSelect = Objects.requireNonNull(chipSelect, "chipSelect must be non-null");
-        this.spi = pi4j.create(buildSpiConfig(pi4j, spiChannel, SPI_SPEED_HZ));
+        this.spi = pi4j.create(buildSpiConfig(pi4j, bus, SPI_SPEED_HZ));
         this.portAInterrupt = portAInterrupt;
         this.portBInterrupt = portBInterrupt;
 
@@ -783,11 +782,12 @@ private MCP23S17(Context pi4j,
      * @param pi4j Pi4J context
      * @return SPI instance
      */
-    private SpiConfig buildSpiConfig(Context pi4j, int channel, int frequency) {
+    private SpiConfig buildSpiConfig(Context pi4j, SpiBus bus,int frequency) {
         return Spi.newConfigBuilder(pi4j)
                 .id("SPI" + 1)
                 .name("LED Matrix")
-                .address(channel)
+                .bus(bus)
+                .chipSelect(SpiChipSelect.CS_0)
                 .mode(SpiMode.MODE_0)
                 .baud(frequency)
                 .build();

diff --git a/src/main/java/com/example/Main.java b/src/main/java/com/example/Main.java
@@ -141,7 +141,7 @@ private void run(Context pi4j) throws Exception {
 
 
         int pixels = 12;
-        ledStrip = new LEDStrip(pi4j, pixels, 1.0, SpiBus.BUS_1, SpiChipSelect.CS_1);
+        ledStrip = new LEDStrip(pi4j, pixels, 1.0, SpiBus.BUS_1);
         ledStrip.allOff();
         int h=0;
         while(h++ < 10000) {

diff --git a/target/antrun/build-main.xml b/target/antrun/build-main.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="maven-antrun-" default="main">
   <target name="main">
-    <condition else="C:\Users\MNG\OneDrive\Dokumente\Studium\IP12\IP12-Ladestation\remoteDebugTest\target" property="finalJarDir" value="C:\Users\MNG\OneDrive\Dokumente\Studium\IP12\IP12-Ladestation\remoteDebugTest\target/lib">
-      <equals arg2="true" arg1="true" casesensitive="" />
-    </condition>
+    <property name="remote.run.jvmargs" value="" />
+    <property name="target.run.as.module" value="true" />
+    <property name="local.dist.dir" value="C:\Users\MNG\OneDrive\Dokumente\Studium\IP12\IP12-Ladestation\remoteDebugTest\target" />
+    <property name="remote.runtime.encoding" value="UTF-8" />
+    <property name="dist.jar.name" value="remoteDebugTest" />
+    <ant antfile="antrun/build.xml" target="run-remote" />
   </target>
 </project>
diff --git a/target/classes/com/example/Main.class b/target/classes/com/example/Main.class
diff --git a/target/classes/module-info.class b/target/classes/module-info.class
diff --git a/target/lib/remoteDebugTest.jar b/target/lib/remoteDebugTest.jar