diff --git a/backend/pom.xml b/backend/pom.xml index fd1912ae..e2174611 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -81,7 +81,7 @@ com.pi4j - pi4j-plugin-pigpio + pi4j-plugin-gpiod ${pi4j.version} diff --git a/backend/src/main/java/net/alex9849/cocktailpi/config/Config.java b/backend/src/main/java/net/alex9849/cocktailpi/config/Config.java index 098f2966..7af928a4 100644 --- a/backend/src/main/java/net/alex9849/cocktailpi/config/Config.java +++ b/backend/src/main/java/net/alex9849/cocktailpi/config/Config.java @@ -3,8 +3,9 @@ import com.pi4j.Pi4J; import com.pi4j.context.Context; import com.pi4j.context.ContextBuilder; -import com.pi4j.library.pigpio.PiGpio; -import com.pi4j.library.pigpio.impl.PiGpioNativeImpl; +import com.pi4j.plugin.gpiod.provider.gpio.digital.GpioDDigitalInputProvider; +import com.pi4j.plugin.gpiod.provider.gpio.digital.GpioDDigitalOutputProvider; +import com.pi4j.plugin.linuxfs.provider.i2c.LinuxFsI2CProvider; import com.pi4j.plugin.mock.provider.gpio.digital.MockDigitalInputProvider; import com.pi4j.plugin.mock.provider.gpio.digital.MockDigitalOutputProvider; import com.pi4j.plugin.mock.provider.i2c.MockI2CProvider; @@ -35,14 +36,9 @@ public Context getGpioController() { if(gpioController == null) { ContextBuilder ctxBuilder = Pi4J.newContextBuilder(); if(isRaspberryPi) { - //ctxBuilder.add(LinuxFsI2CProvider.newInstance()); - PiGpio piGpio = PiGpioNativeImpl.newInstance(); - ctxBuilder.add(PiGpioDigitalInputProvider.newInstance(piGpio)); - ctxBuilder.add(PiGpioDigitalOutputProvider.newInstance(piGpio)); - ctxBuilder.add(PiGpioSpiProvider.newInstance(piGpio)); - ctxBuilder.add(PiGpioSerialProvider.newInstance(piGpio)); - ctxBuilder.add(PiGpioI2CProvider.newInstance(piGpio)); - ctxBuilder.add(PiGpioPwmProvider.newInstance(piGpio)); + ctxBuilder.add(LinuxFsI2CProvider.newInstance()); + ctxBuilder.add(GpioDDigitalInputProvider.newInstance()); + ctxBuilder.add(GpioDDigitalOutputProvider.newInstance()); } else { ctxBuilder.add(MockDigitalInputProvider.newInstance()); ctxBuilder.add(MockDigitalOutputProvider.newInstance()); diff --git a/pom.xml b/pom.xml index eb01f61d..fec4d63b 100644 --- a/pom.xml +++ b/pom.xml @@ -20,10 +20,21 @@ 17 - 2.4.0 + 2.5.0-SNAPSHOT + + oss-snapshots-repo + Sonatype OSS Maven Repository + https://oss.sonatype.org/content/groups/public + + false + + + true + + alex9849 https://nexus.liggesmeyer.net/repository/maven-releases/