From 8c7374e0d9a8ea54e8f1f70c2b0bce62943c1e5e Mon Sep 17 00:00:00 2001 From: Joe Folen Date: Wed, 31 Jan 2024 16:40:15 -0600 Subject: [PATCH 1/6] LED controller and helper updates --- .../components/controllers/LEDController.java | 19 +++++------------ .../outputdevices/LEDHelper.java | 21 +++++++------------ 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/components/src/main/java/com/opensourcewithslu/components/controllers/LEDController.java b/components/src/main/java/com/opensourcewithslu/components/controllers/LEDController.java index 793b4b21..eda4a6bd 100644 --- a/components/src/main/java/com/opensourcewithslu/components/controllers/LEDController.java +++ b/components/src/main/java/com/opensourcewithslu/components/controllers/LEDController.java @@ -6,35 +6,26 @@ import io.micronaut.http.annotation.Get; import jakarta.inject.Named; - @Controller("/led") public class LEDController { private final LEDHelper ledHelper; - - public LEDController(@Named("Led")DigitalOutput led){ + public LEDController(@Named("led")DigitalOutput led){ this.ledHelper = new LEDHelper(led); } - @Get("/LedOn") + @Get("/ledOn") public void ledOn(){ - /*deviceOff method turns on the LED after checking the output. This - will turn on the LED - */ - - ledHelper.deviceOff(); + ledHelper.ledOn(); } - @Get("/LedOff") + @Get("/ledOff") public void ledOff(){ - - ledHelper.deviceOn(); + ledHelper.ledOff(); } @Get("/switchState") public void switchState(){ - - ledHelper.switchState(); } } diff --git a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/LEDHelper.java b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/LEDHelper.java index 604cd596..722293cd 100644 --- a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/LEDHelper.java +++ b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/LEDHelper.java @@ -1,18 +1,13 @@ package com.opensourcewithslu.outputdevices; + import com.pi4j.io.gpio.digital.DigitalOutput; -import io.micronaut.context.ApplicationContext; -import io.micronaut.context.annotation.Prototype; -import io.micronaut.inject.qualifiers.Qualifiers; -import jakarta.inject.Inject; -import jakarta.inject.Named; -import jakarta.inject.Singleton; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class LEDHelper { private static final Logger log = LoggerFactory.getLogger(LEDHelper.class); - private DigitalOutput ledOutput; + private final DigitalOutput ledOutput; //tag::const[] public LEDHelper(DigitalOutput ledOutput) @@ -22,21 +17,21 @@ public LEDHelper(DigitalOutput ledOutput) } //tag::method[] - public void deviceOn() + public void ledOn() //end::method[] { if (ledOutput.isLow()) { - log.trace("Turning off LED"); + log.info("Turning on LED"); ledOutput.high(); } } //tag::method[] - public void deviceOff() + public void ledOff() //end::method[] { if (ledOutput.isHigh()) { - log.trace("Turning on LED"); + log.info("Turning off LED"); ledOutput.low(); } } @@ -46,10 +41,10 @@ public void switchState() //end::method[] { if(ledOutput.isHigh()){ - deviceOff(); + ledOff(); } else{ - deviceOn(); + ledOn(); } } } From 75accedb9516f840451681a39d97704529f5d5eb Mon Sep 17 00:00:00 2001 From: Joe Folen Date: Thu, 1 Feb 2024 14:31:49 -0600 Subject: [PATCH 2/6] input devices controller and helper updates --- .../controllers/PushButtonController.java | 10 ++++--- .../controllers/RfidController.java | 1 - .../controllers/RotaryEncoderController.java | 5 ++-- .../controllers/SlideSwitchController.java | 3 --- .../inputdevices/PushButtonHelper.java | 10 +++---- .../inputdevices/RFidHelper.java | 7 +++-- .../inputdevices/RotaryEncoderHelper.java | 27 +++++++++---------- .../inputdevices/SlideSwitchHelper.java | 11 +++----- 8 files changed, 31 insertions(+), 43 deletions(-) diff --git a/components/src/main/java/com/opensourcewithslu/components/controllers/PushButtonController.java b/components/src/main/java/com/opensourcewithslu/components/controllers/PushButtonController.java index 94a05493..4c735a70 100644 --- a/components/src/main/java/com/opensourcewithslu/components/controllers/PushButtonController.java +++ b/components/src/main/java/com/opensourcewithslu/components/controllers/PushButtonController.java @@ -11,13 +11,15 @@ //tag::ex[] @Controller("/pushButton") public class PushButtonController { + private final PushButtonHelper pushButtonHelper; + private final LEDHelper ledHelper; - public PushButtonController(@Named("button-input-3") DigitalInput pushButton1, - @Named("led") DigitalOutput led1) { - this.pushButtonHelper = new PushButtonHelper(pushButton1); - this.ledHelper = new LEDHelper(led1); + public PushButtonController(@Named("button-input-3") DigitalInput pushButton, + @Named("led") DigitalOutput led) { + this.pushButtonHelper = new PushButtonHelper(pushButton); + this.ledHelper = new LEDHelper(led); } @Get("/init") diff --git a/components/src/main/java/com/opensourcewithslu/components/controllers/RfidController.java b/components/src/main/java/com/opensourcewithslu/components/controllers/RfidController.java index 5f366902..6984da07 100644 --- a/components/src/main/java/com/opensourcewithslu/components/controllers/RfidController.java +++ b/components/src/main/java/com/opensourcewithslu/components/controllers/RfidController.java @@ -11,7 +11,6 @@ //tag::ex[] @Controller("/rfid") public class RfidController { - private final RFidHelper rfidHelper; public RfidController(@Named("rfid") SpiConfig spi, Context pi4jContext){ diff --git a/components/src/main/java/com/opensourcewithslu/components/controllers/RotaryEncoderController.java b/components/src/main/java/com/opensourcewithslu/components/controllers/RotaryEncoderController.java index d68954ff..e83aabd7 100644 --- a/components/src/main/java/com/opensourcewithslu/components/controllers/RotaryEncoderController.java +++ b/components/src/main/java/com/opensourcewithslu/components/controllers/RotaryEncoderController.java @@ -9,11 +9,12 @@ //tag::ex[] @Controller("/rotaryEncoder") public class RotaryEncoderController { - private final RotaryEncoderHelper encoderHelper; + private final RotaryEncoderHelper encoderHelper2; - public RotaryEncoderController(@Named("rotary-encoder")MultipinConfiguration rotaryEncoder, @Named("rotary-encoder-2")MultipinConfiguration rotaryEncoder2){ + public RotaryEncoderController(@Named("rotary-encoder")MultipinConfiguration rotaryEncoder, + @Named("rotary-encoder-2")MultipinConfiguration rotaryEncoder2){ this.encoderHelper = new RotaryEncoderHelper(rotaryEncoder); this.encoderHelper2 = new RotaryEncoderHelper(rotaryEncoder2); } diff --git a/components/src/main/java/com/opensourcewithslu/components/controllers/SlideSwitchController.java b/components/src/main/java/com/opensourcewithslu/components/controllers/SlideSwitchController.java index 51b16cfc..b4bf3cf0 100644 --- a/components/src/main/java/com/opensourcewithslu/components/controllers/SlideSwitchController.java +++ b/components/src/main/java/com/opensourcewithslu/components/controllers/SlideSwitchController.java @@ -1,8 +1,6 @@ package com.opensourcewithslu.components.controllers; -import com.opensourcewithslu.inputdevices.PushButtonHelper; import com.opensourcewithslu.inputdevices.SlideSwitchHelper; -import com.opensourcewithslu.outputdevices.LEDHelper; import com.pi4j.io.gpio.digital.DigitalInput; import io.micronaut.http.annotation.Controller; import io.micronaut.http.annotation.Get; @@ -30,6 +28,5 @@ public boolean checkSwitch1(){ public boolean checkSwitch2(){ return slideSwitchHelper2.isOn; } - } //end::ex[] diff --git a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/PushButtonHelper.java b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/PushButtonHelper.java index 08ab9d26..29f62f96 100644 --- a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/PushButtonHelper.java +++ b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/PushButtonHelper.java @@ -1,17 +1,15 @@ package com.opensourcewithslu.inputdevices; + import com.pi4j.io.gpio.digital.DigitalInput; import com.pi4j.io.gpio.digital.DigitalStateChangeListener; -import io.micronaut.context.annotation.Prototype; -import jakarta.annotation.PostConstruct; -import jakarta.inject.Named; -import jakarta.inject.Singleton; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class PushButtonHelper { private static final Logger log = LoggerFactory.getLogger(PushButtonHelper.class); - private DigitalInput buttonInput; + private final DigitalInput buttonInput; + public Boolean isPressed; //tag::const[] @@ -28,7 +26,7 @@ public PushButtonHelper(DigitalInput buttonInput) public void initialize() //end::method[] { - log.trace("Initializing " + buttonInput.getName()); + log.info("Initializing " + buttonInput.getName()); buttonInput.addListener(e->{ isPressed = buttonInput.isHigh(); diff --git a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/RFidHelper.java b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/RFidHelper.java index b6ddf646..1a93c279 100644 --- a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/RFidHelper.java +++ b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/RFidHelper.java @@ -1,18 +1,17 @@ package com.opensourcewithslu.inputdevices; + import com.pi4j.crowpi.components.exceptions.RfidException; import com.pi4j.context.Context; import com.pi4j.io.spi.SpiConfig; -import io.micronaut.context.annotation.Prototype; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.pi4j.crowpi.components.RfidComponent; - import java.util.concurrent.atomic.AtomicReference; - public class RFidHelper { private static final Logger log = LoggerFactory.getLogger(RFidHelper.class); - private RfidComponent scanner; + + private final RfidComponent scanner; //tag::const[] public RFidHelper(SpiConfig config, int reset, Context pi4jContext) diff --git a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/RotaryEncoderHelper.java b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/RotaryEncoderHelper.java index dbd1fdb4..31d1c640 100644 --- a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/RotaryEncoderHelper.java +++ b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/RotaryEncoderHelper.java @@ -1,24 +1,21 @@ package com.opensourcewithslu.inputdevices; -import com.opensourcewithslu.utilities.MultiPinConfigs.DigitalInputMultiPinConfiguration; + import com.opensourcewithslu.utilities.MultipinConfiguration; -import com.opensourcewithslu.utilities.Pi4JMultipinFactory; import com.pi4j.io.gpio.digital.DigitalInput; -import com.pi4j.io.gpio.digital.DigitalListener; -import com.pi4j.io.gpio.digital.DigitalStateChangeListener; -import io.micronaut.context.annotation.Context; -import io.micronaut.context.annotation.Prototype; -import jakarta.annotation.PostConstruct; -import jakarta.inject.Named; -import jakarta.inject.Singleton; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class RotaryEncoderHelper { private static final Logger log = LoggerFactory.getLogger(RotaryEncoderHelper.class); - private DigitalInput clk; - private DigitalInput dt; - private DigitalInput sw; - private String helperName; + + private final DigitalInput clk; + + private final DigitalInput dt; + + private final DigitalInput sw; + + private final String helperName; + private int globalCounter; //tag::const[] @@ -38,7 +35,7 @@ public RotaryEncoderHelper(MultipinConfiguration multiPin) public void initialize() //end::method[] { - log.trace("Initializing " + helperName); + log.info("Initializing " + helperName); String logInfo = helperName + " counter is {}"; @@ -59,7 +56,7 @@ else if (!clk.equals(dt.state())){ globalCounter--; } } - log.trace(logInfo, globalCounter); + log.info(logInfo, globalCounter); }); sw.addListener(e -> { diff --git a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/SlideSwitchHelper.java b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/SlideSwitchHelper.java index cc2d12a7..3cad2bfc 100644 --- a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/SlideSwitchHelper.java +++ b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/SlideSwitchHelper.java @@ -1,19 +1,14 @@ package com.opensourcewithslu.inputdevices; + import com.pi4j.io.gpio.digital.DigitalInput; import com.pi4j.io.gpio.digital.DigitalStateChangeListener; -import io.micronaut.context.annotation.Prototype; -import jakarta.annotation.PostConstruct; -import jakarta.inject.Named; -import jakarta.inject.Singleton; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class SlideSwitchHelper { - private static final Logger log = LoggerFactory.getLogger(SlideSwitchHelper.class); - private DigitalInput slideSwitchInput; + private final DigitalInput slideSwitchInput; public boolean isOn; @@ -31,7 +26,7 @@ public SlideSwitchHelper(DigitalInput slideSwitchInput) public void initialize() //end::method[] { - log.trace("Initializing Slide Switch"); + log.info("Initializing Slide Switch"); slideSwitchInput.addListener(e->{ isOn = slideSwitchInput.isHigh(); From 008bc42ed2b1bf0adb47746c28ebf1fcf1fe173e Mon Sep 17 00:00:00 2001 From: Joe Folen Date: Thu, 1 Feb 2024 14:48:26 -0600 Subject: [PATCH 3/6] output devices controller and helper and MultiCompController updates --- .../controllers/MultiCompController.java | 16 +++++----- .../components/controllers/lcdController.java | 1 - .../components/controllers/rgbController.java | 2 +- .../outputdevices/LCD1602Helper.java | 15 ++++------ .../outputdevices/RGBLEDHelper.java | 29 ++++++++++--------- 5 files changed, 31 insertions(+), 32 deletions(-) diff --git a/components/src/main/java/com/opensourcewithslu/components/controllers/MultiCompController.java b/components/src/main/java/com/opensourcewithslu/components/controllers/MultiCompController.java index 92d53f09..9291ae42 100644 --- a/components/src/main/java/com/opensourcewithslu/components/controllers/MultiCompController.java +++ b/components/src/main/java/com/opensourcewithslu/components/controllers/MultiCompController.java @@ -1,7 +1,6 @@ package com.opensourcewithslu.components.controllers; import com.opensourcewithslu.inputdevices.PushButtonHelper; -import com.opensourcewithslu.inputdevices.RotaryEncoderHelper; import com.opensourcewithslu.outputdevices.LEDHelper; import com.pi4j.io.gpio.digital.DigitalInput; import com.pi4j.io.gpio.digital.DigitalOutput; @@ -15,11 +14,14 @@ @Controller("/multi") public class MultiCompController { private static final Logger log = LoggerFactory.getLogger(MultiCompController.class); - private LEDHelper ledHelper; - private LEDHelper ledHelper2; - private PushButtonHelper button1; - private PushButtonHelper button2; + private final LEDHelper ledHelper; + + private final LEDHelper ledHelper2; + + private final PushButtonHelper button1; + + private final PushButtonHelper button2; public MultiCompController(@Named("led") DigitalOutput led1, @Named("led2") DigitalOutput led2, @@ -41,7 +43,7 @@ public void switch2(){ ledHelper2.switchState(); } - @Get("/but1") + @Get("/button1") public void button1(){ button1.addEventListener(e ->{ log.info(String.valueOf(button1.isPressed)); @@ -51,7 +53,7 @@ public void button1(){ }); } - @Get("/but2") + @Get("/button2") public void button2(){ button2.addEventListener(e ->{ if(button2.isPressed){ diff --git a/components/src/main/java/com/opensourcewithslu/components/controllers/lcdController.java b/components/src/main/java/com/opensourcewithslu/components/controllers/lcdController.java index 13891f1b..a53b62e5 100644 --- a/components/src/main/java/com/opensourcewithslu/components/controllers/lcdController.java +++ b/components/src/main/java/com/opensourcewithslu/components/controllers/lcdController.java @@ -5,7 +5,6 @@ import com.pi4j.io.i2c.I2CConfig; import io.micronaut.http.annotation.Controller; import io.micronaut.http.annotation.Get; -import io.micronaut.http.annotation.Post; import jakarta.inject.Named; //tag::ex[] diff --git a/components/src/main/java/com/opensourcewithslu/components/controllers/rgbController.java b/components/src/main/java/com/opensourcewithslu/components/controllers/rgbController.java index 11b635e7..234de2ef 100644 --- a/components/src/main/java/com/opensourcewithslu/components/controllers/rgbController.java +++ b/components/src/main/java/com/opensourcewithslu/components/controllers/rgbController.java @@ -2,7 +2,6 @@ import com.opensourcewithslu.outputdevices.RGBLEDHelper; import com.opensourcewithslu.utilities.MultipinConfiguration; -import com.pi4j.io.pwm.Pwm; import io.micronaut.http.annotation.Controller; import io.micronaut.http.annotation.Get; import jakarta.inject.Named; @@ -13,6 +12,7 @@ @Controller("/rgb") public class rgbController { private final RGBLEDHelper rgbledHelper; + private static final Logger log = LoggerFactory.getLogger(rgbController.class); public rgbController(@Named("rgb-led") MultipinConfiguration rgbLed){ diff --git a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/LCD1602Helper.java b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/LCD1602Helper.java index 4807eeab..5befb038 100644 --- a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/LCD1602Helper.java +++ b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/LCD1602Helper.java @@ -1,13 +1,10 @@ package com.opensourcewithslu.outputdevices; -import com.pi4j.Pi4J; import com.pi4j.catalog.components.LcdDisplay; import com.pi4j.context.Context; import com.pi4j.io.i2c.I2CConfig; -import io.micronaut.context.annotation.Prototype; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.pi4j.crowpi.components.LcdDisplayComponent; public class LCD1602Helper { private static final Logger log = LoggerFactory.getLogger(LEDHelper.class); @@ -20,14 +17,14 @@ public LCD1602Helper(I2CConfig i2CConfig, Context pi4jContext) { this.lcdDisplay = new LcdDisplay(pi4jContext, 4, 16); lcdDisplay.setDisplayBacklight(true); - log.trace("LCD is set up with 4 rows and 16 columns. Backlight is on by default"); + log.info("LCD is set up with 4 rows and 16 columns. Backlight is on by default"); } //tag::method[] public void writeText(String text) //end::method[] { - log.trace("writing"); + log.info("writing"); lcdDisplay.displayText(text); } @@ -35,7 +32,7 @@ public void writeText(String text) public void writeTextAtLine(String text, int line) //end::method[] { - log.trace("writing on " + line + "line"); + log.info("writing on " + line + "line"); lcdDisplay.displayText(text, line); } @@ -46,10 +43,10 @@ public void setBackLight(boolean state) log.info("changing backlight"); if (state){ - log.trace("backlight on"); + log.info("backlight on"); lcdDisplay.setDisplayBacklight(true); } else{ - log.trace("backlight off"); + log.info("backlight off"); lcdDisplay.setDisplayBacklight(false); } } @@ -58,7 +55,7 @@ public void setBackLight(boolean state) public void clearDisplay() //end::method[] { - log.trace("Clear display"); + log.info("Clear display"); lcdDisplay.clearDisplay(); } diff --git a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/RGBLEDHelper.java b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/RGBLEDHelper.java index 89679478..07b19b0b 100644 --- a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/RGBLEDHelper.java +++ b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/RGBLEDHelper.java @@ -1,10 +1,7 @@ package com.opensourcewithslu.outputdevices; -import com.opensourcewithslu.inputdevices.PushButtonHelper; import com.opensourcewithslu.utilities.MultipinConfiguration; import com.pi4j.io.pwm.Pwm; -import com.pi4j.io.pwm.PwmConfig; -import io.micronaut.context.annotation.Prototype; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,14 +9,16 @@ public class RGBLEDHelper { private static final Logger log = LoggerFactory.getLogger(RGBLEDHelper.class); private final Pwm red; + private final Pwm green; + private final Pwm blue; //tag::const[] public RGBLEDHelper(MultipinConfiguration pwm) //end::const[] { - log.trace("Init rgb"); + log.info("Init rgb"); Pwm[] pwms = (Pwm[]) pwm.getComponents(); this.red = pwms[0]; this.green = pwms[1]; @@ -39,7 +38,7 @@ public void setColor(int[] colors) public void setColor(int[] colors, int[] frequency) //end::method[] { - log.trace("setting the colors and frequency via a list"); + log.info("setting the colors and frequency via a list"); red.on(colors[0], frequency[0]); green.on(colors[1], frequency[1]); blue.on(colors[2], frequency[2]); @@ -49,7 +48,7 @@ public void setColor(int[] colors, int[] frequency) public void setColorHex(String hex) //end::method[] { - log.trace("setting the color via hex"); + log.info("setting the color via hex"); // hex splitting into rbg int values int r = (Integer.decode(hex) & 0xFF0000) >> 16; int g = (Integer.decode(hex) & 0xFF00) >> 8; @@ -60,11 +59,12 @@ public void setColorHex(String hex) green.on(g, 200); blue.on(b, 200); } + //tag::method[] public void setColorHex(String hex, int[] frequency) //end::method[] { - log.trace("setting the color and frequency via hex and int"); + log.info("setting the color and frequency via hex and int"); // hex splitting into rbg int values int r = (Integer.decode(hex) & 0xFF0000) >> 16; int g = (Integer.decode(hex) & 0xFF00) >> 8; @@ -79,7 +79,7 @@ public void setColorHex(String hex, int[] frequency) public void setRed(int red) //end::method[] { - log.trace("Set red"); + log.info("Set red"); this.red.on(red, 200); } @@ -87,7 +87,7 @@ public void setRed(int red) public void setRed(int red, int frequency) //end::method[] { - log.trace("set red and set frequency"); + log.info("set red and set frequency"); this.red.on(red, frequency); } @@ -95,7 +95,7 @@ public void setRed(int red, int frequency) public void setBlue(int blue) //end::method[] { - log.trace("set blue"); + log.info("set blue"); this.blue.on(blue, 200); } @@ -103,7 +103,7 @@ public void setBlue(int blue) public void setBlue(int blue, int frequency) //end::method[] { - log.trace("set blue and set frequency"); + log.info("set blue and set frequency"); this.blue.on(blue, frequency); } @@ -111,7 +111,7 @@ public void setBlue(int blue, int frequency) public void setGreen(int green) //end::method[] { - log.trace("set green"); + log.info("set green"); this.green.on(green, 200); } @@ -119,7 +119,7 @@ public void setGreen(int green) public void setGreen(int green, int frequency) //end::method[] { - log.trace("set green and set frequency"); + log.info("set green and set frequency"); this.green.on(green, frequency); } @@ -127,6 +127,7 @@ public void setGreen(int green, int frequency) public void ledOff() //end::method[] { + log.info("turning off each LED pin"); this.red.off(); this.green.off(); this.blue.off(); @@ -136,7 +137,7 @@ public void ledOff() public void ledOn() //end::method[] { - log.trace("turning on each LED pin and setting to 100"); + log.info("turning on each LED pin and setting to 100"); this.red.on(100, 200); this.green.on(100, 200); this.blue.on(100, 200); From 8b9c1ac0375d730f8e0bcad1bbb34eb7bf912704 Mon Sep 17 00:00:00 2001 From: Joe Folen Date: Fri, 2 Feb 2024 11:12:00 -0600 Subject: [PATCH 4/6] addresses lambda changes --- .../opensourcewithslu/inputdevices/PushButtonHelper.java | 6 +++--- .../opensourcewithslu/inputdevices/SlideSwitchHelper.java | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/PushButtonHelper.java b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/PushButtonHelper.java index 29f62f96..9eef9437 100644 --- a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/PushButtonHelper.java +++ b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/PushButtonHelper.java @@ -28,9 +28,9 @@ public void initialize() { log.info("Initializing " + buttonInput.getName()); - buttonInput.addListener(e->{ - isPressed = buttonInput.isHigh(); - }); + buttonInput.addListener(e-> + isPressed = buttonInput.isHigh() + ); } //tag::method[] diff --git a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/SlideSwitchHelper.java b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/SlideSwitchHelper.java index 3cad2bfc..9527342b 100644 --- a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/SlideSwitchHelper.java +++ b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/inputdevices/SlideSwitchHelper.java @@ -28,10 +28,9 @@ public void initialize() { log.info("Initializing Slide Switch"); - slideSwitchInput.addListener(e->{ - isOn = slideSwitchInput.isHigh(); - }); - + slideSwitchInput.addListener(e-> + isOn = slideSwitchInput.isHigh() + ); } //tag::method[] From dfe171719be7a6e6f12146e03b350b5a74827a63 Mon Sep 17 00:00:00 2001 From: Joe Folen Date: Sun, 4 Feb 2024 12:16:54 -0600 Subject: [PATCH 5/6] addresses RGBLED controller and helper comments --- .../components/controllers/rgbController.java | 4 ---- .../com/opensourcewithslu/outputdevices/RGBLEDHelper.java | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/components/src/main/java/com/opensourcewithslu/components/controllers/rgbController.java b/components/src/main/java/com/opensourcewithslu/components/controllers/rgbController.java index 234de2ef..0e9e5e68 100644 --- a/components/src/main/java/com/opensourcewithslu/components/controllers/rgbController.java +++ b/components/src/main/java/com/opensourcewithslu/components/controllers/rgbController.java @@ -5,16 +5,12 @@ import io.micronaut.http.annotation.Controller; import io.micronaut.http.annotation.Get; import jakarta.inject.Named; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; //tag::ex[] @Controller("/rgb") public class rgbController { private final RGBLEDHelper rgbledHelper; - private static final Logger log = LoggerFactory.getLogger(rgbController.class); - public rgbController(@Named("rgb-led") MultipinConfiguration rgbLed){ this.rgbledHelper = new RGBLEDHelper(rgbLed); } diff --git a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/RGBLEDHelper.java b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/RGBLEDHelper.java index 07b19b0b..bd95165d 100644 --- a/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/RGBLEDHelper.java +++ b/micronautpi4j-utils/src/main/java/com/opensourcewithslu/outputdevices/RGBLEDHelper.java @@ -64,7 +64,7 @@ public void setColorHex(String hex) public void setColorHex(String hex, int[] frequency) //end::method[] { - log.info("setting the color and frequency via hex and int"); + log.info("Setting the color via Hex and a list of frequencies(RGB)"); // hex splitting into rbg int values int r = (Integer.decode(hex) & 0xFF0000) >> 16; int g = (Integer.decode(hex) & 0xFF00) >> 8; @@ -119,7 +119,7 @@ public void setGreen(int green) public void setGreen(int green, int frequency) //end::method[] { - log.info("set green and set frequency"); + log.info("Setting green color and its frequency"); this.green.on(green, frequency); } @@ -127,7 +127,7 @@ public void setGreen(int green, int frequency) public void ledOff() //end::method[] { - log.info("turning off each LED pin"); + log.info("Turning off RGB LED"); this.red.off(); this.green.off(); this.blue.off(); From 73f09635d1908ee11ac10b1738ebdbac394a1f71 Mon Sep 17 00:00:00 2001 From: Joe Folen Date: Sun, 4 Feb 2024 16:56:36 -0600 Subject: [PATCH 6/6] addresses rotary encoder changes --- .../components/controllers/RotaryEncoderController.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/components/src/main/java/com/opensourcewithslu/components/controllers/RotaryEncoderController.java b/components/src/main/java/com/opensourcewithslu/components/controllers/RotaryEncoderController.java index e83aabd7..e083d769 100644 --- a/components/src/main/java/com/opensourcewithslu/components/controllers/RotaryEncoderController.java +++ b/components/src/main/java/com/opensourcewithslu/components/controllers/RotaryEncoderController.java @@ -11,12 +11,8 @@ public class RotaryEncoderController { private final RotaryEncoderHelper encoderHelper; - private final RotaryEncoderHelper encoderHelper2; - - public RotaryEncoderController(@Named("rotary-encoder")MultipinConfiguration rotaryEncoder, - @Named("rotary-encoder-2")MultipinConfiguration rotaryEncoder2){ + public RotaryEncoderController(@Named("rotary-encoder")MultipinConfiguration rotaryEncoder){ this.encoderHelper = new RotaryEncoderHelper(rotaryEncoder); - this.encoderHelper2 = new RotaryEncoderHelper(rotaryEncoder2); } @Get("/value")