() {
- @Override
- protected void updateItem(Profile item, boolean btl) {
- super.updateItem(item, btl);
- setGraphic(null);
- if (item != null)
- setText(item.getName());
- }
- };
- textfield.setOnAction(c -> {
- var p = buttonCell.getItem();
- var oldName = p.getName();
- var newName = textfield.getText();
- buttonCell.setGraphic(null);
- if (save.getProfile(newName).isPresent()) {
- buttonCell.setText(oldName);
- return;
- }
- p.setName(newName);
- buttonCell.setText(newName);
- profiles.getItems().set(profiles.getItems().indexOf(p), p);
- saveService.save();
- });
- textfield.focusedProperty().addListener((arg, oldVal, newVal) -> {
- if (!newVal) {
- buttonCell.setGraphic(null);
- buttonCell.setText(buttonCell.getItem().getName());
- }
- });
- textfield.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
- if (event.getCode() == KeyCode.ESCAPE) {
- buttonCell.setGraphic(null);
- buttonCell.setText(buttonCell.getItem().getName());
- }
- });
- profiles.setButtonCell(buttonCell);
- profiles.addEventFilter(MouseEvent.MOUSE_RELEASED, event -> {
- if (event.getButton() == MouseButton.SECONDARY) {
- event.consume();
- var rename = new MenuItem("Rename");
- var delete = new MenuItem("Delete");
- rename.setOnAction(c -> {
- buttonCell.setGraphic(textfield);
- textfield.requestFocus();
- textfield.setText(buttonCell.getText());
- textfield.selectAll();
- buttonCell.setText("");
- });
- delete.setOnAction(c -> {
- save.getProfiles().remove(buttonCell.getItem());
- profiles.getItems().remove(buttonCell.getItem());
- if (profiles.getValue() == null)
- profiles.getSelectionModel().select(0);
- });
- if (profiles.getItems().size() <= 1)
- delete.setDisable(true);
- var cm = new ContextMenu(rename, delete);
- profiles.setContextMenu(cm);
- } else if (event.getButton() == MouseButton.PRIMARY) {
- buttonCell.getGraphic();
- }
- });
-
- profileMenu.getChildren().add(buildAddButton());
- profileMenu.getChildren().add(buildSettingsButton());
- profileMenu.getChildren().addAll(profiles);
- }
-
- private void updateCurrentProfileName(String name) {
- var profile = save.setCurrentProfile(name);
- if (profile.isEmpty())
- return;
- setLighting(profile.get().getLightingConfig(), true);
- saveService.save();
- eventPublisher.publishEvent(LightingChangedToDefaultEvent.INSTANCE);
}
public void focusChanged(String from, String to) {
- if (!StringUtils.equals(from, to) && switchForApplication(to))
- return;
-
- switchAwayFromApplication(from);
- }
-
- private boolean switchForApplication(String to) {
- var result = new boolean[] { false };
- save.getProfiles()
- .stream()
- .filter(p -> StreamEx.of(p.getActivateApplications()).anyMatch(i -> StringUtils.equalsIgnoreCase(i, to)))
- .findFirst()
- .ifPresent(p -> {
- Platform.runLater(() -> profiles.getSelectionModel().select(p));
- result[0] = true;
- });
- return result[0];
- }
-
- private void switchAwayFromApplication(String from) {
- var mainProfile = StreamEx.of(save.getProfiles()).findFirst(Profile::isMainProfile);
- var item = profiles.getSelectionModel().getSelectedItem();
- if (item == null || !item.isFocusBackOnLost() || mainProfile.isEmpty()) {
- return;
- }
- if (StreamEx.of(item.getActivateApplications()).anyMatch(a -> StringUtils.equalsIgnoreCase(a, from))) {
- Platform.runLater(() -> profiles.getSelectionModel().select(mainProfile.get()));
- }
- }
-
- private Button buildAddButton() {
- var addButton = new Button();
- var svgCode = "M28,14H18V4c0-1.104-0.896-2-2-2s-2,0.896-2,2v10H4c-1.104,0-2,0.896-2,2s0.896,2,2,2h10v10c0,1.104,0.896,2,2,2 s2-0.896,2-2V18h10c1.104,0,2-0.896,2-2S29.104,14,28,14z";
- var path = new SVGPath();
- path.setStyle("-fx-fill:white;");
- path.setContent(svgCode);
- path.setScaleX(0.7D);
- path.setScaleY(0.7D);
- addButton.setGraphic(path);
- addButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
- addButton.setOnAction(c -> {
- String newName;
- //noinspection ForLoopWithMissingComponent
- for (var i = 1; ; i++) {
- newName = "profile " + i;
- if (save.getProfile(newName).isEmpty())
- break;
- }
- var newProfile = new Profile(newName, getDeviceType());
- save.getProfiles().add(newProfile);
- profiles.getItems().add(newProfile);
- profiles.getSelectionModel().select(newProfile);
- });
- addButton.setPrefSize(44.0D, 44.0D);
- return addButton;
- }
-
- private Button buildSettingsButton() {
- var settingSvg = "M24.38,10.175l-2.231-0.268c-0.228-0.851-0.562-1.655-0.992-2.401l1.387-1.763c0.212-0.271,0.188-0.69-0.057-0.934" +
- "l-2.299-2.3c-0.242-0.243-0.662-0.269-0.934-0.057l-1.766,1.389c-0.743-0.43-1.547-0.764-2.396-0.99L14.825,0.62" +
- "C14.784,0.279,14.469,0,14.125,0h-3.252c-0.344,0-0.659,0.279-0.699,0.62L9.906,2.851c-0.85,0.227-1.655,0.562-2.398,0.991" +
- "L5.743,2.455c-0.27-0.212-0.69-0.187-0.933,0.056L2.51,4.812C2.268,5.054,2.243,5.474,2.456,5.746L3.842,7.51" +
- "c-0.43,0.744-0.764,1.549-0.991,2.4l-2.23,0.267C0.28,10.217,0,10.532,0,10.877v3.252c0,0.344,0.279,0.657,0.621,0.699l2.231,0.268" +
- "c0.228,0.848,0.561,1.652,0.991,2.396l-1.386,1.766c-0.211,0.271-0.187,0.69,0.057,0.934l2.296,2.301" +
- "c0.243,0.242,0.663,0.269,0.933,0.057l1.766-1.39c0.744,0.43,1.548,0.765,2.398,0.991l0.268,2.23" +
- "c0.041,0.342,0.355,0.62,0.699,0.62h3.252c0.345,0,0.659-0.278,0.699-0.62l0.268-2.23c0.851-0.228,1.655-0.562,2.398-0.991" +
- "l1.766,1.387c0.271,0.212,0.69,0.187,0.933-0.056l2.299-2.301c0.244-0.242,0.269-0.662,0.056-0.935l-1.388-1.764" +
- "c0.431-0.744,0.764-1.548,0.992-2.397l2.23-0.268C24.721,14.785,25,14.473,25,14.127v-3.252" +
- "C25.001,10.529,24.723,10.216,24.38,10.175z M12.501,18.75c-3.452,0-6.25-2.798-6.25-6.25s2.798-6.25,6.25-6.25" +
- "s6.25,2.798,6.25,6.25S15.954,18.75,12.501,18.75z";
- var setPath = new SVGPath();
- setPath.setStyle("-fx-fill:white;");
- setPath.setContent(settingSvg);
- setPath.setScaleX(.9);
- setPath.setScaleY(.9);
-
- var settingsButton = new Button();
- settingsButton.setGraphic(setPath);
- settingsButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
- settingsButton.setOnAction(c -> {
- try {
- var stage = new Stage();
- var selection = profiles.getSelectionModel().getSelectedItem();
- fxHelper.buildProfileSettingsDialog(save, selection).start(stage);
- stage.setOnHidden(e -> Platform.runLater(() -> {
- profiles.getButtonCell().setText(selection.getName());
- if (profiles.getSelectionModel().getSelectedItem().equals(selection)) {
- updateCurrentProfileName(selection.getName());
- }
- }));
- } catch (Exception e) {
- log.error("Unable to load profile settings dialog", e);
- }
- });
- settingsButton.setPrefSize(44.0D, 44.0D);
- return settingsButton;
- }
-
- public void setProfile(@Nullable String name) {
- save.getProfile(name).ifPresent(profiles::setValue);
}
public String getDisplayName() {
@@ -273,21 +41,15 @@ public void setDisplayName(String name) {
save.setDisplayName(name);
}
- /**
- * This will have muted colors for mute-override-controls
- */
- public LightingConfig getLightingConfig() {
+ public LightingConfig lightingConfig() {
if (lightingConfig == null) {
- lightingConfig = currentProfile().getLightingConfig();
+ lightingConfig = currentProfile().lightingConfig();
}
return lightingConfig;
}
- /**
- * Will have the original colors, even when mute-override is active.
- */
public LightingConfig getSavedLightingConfig() {
- return currentProfile().getLightingConfig();
+ return currentProfile().lightingConfig();
}
public void setLighting(LightingConfig config, boolean priority) {
@@ -301,87 +63,25 @@ public void setSavedLighting(LightingConfig config) {
private void doSetLighting(LightingConfig config, boolean priority) {
lightingConfig = config;
-
if (config == null) {
- config = LightingConfig.defaultLightingConfig(getDeviceType());
+ config = LightingConfig.defaultLightingConfig(deviceType());
saveService.save();
}
try {
- var finalConfig = config;
- Platform.runLater(() -> showLightingConfigToUI(finalConfig));
- //noinspection NestedTryStatement
- try {
- outputInterpreter.sendLightingConfig(getSerialNumber(), getDeviceType(), config, priority);
- } catch (Exception e) {
- log.error("Unable to send lighting config", e);
- }
+ outputInterpreter.sendLightingConfig(serialNumber, deviceType(), config, priority);
} catch (Exception e) {
- log.error("Unable to set lighting", e);
- setLighting(LightingConfig.defaultLightingConfig(getDeviceType()), priority);
+ log.error("Unable to send lighting config", e);
+ setLighting(LightingConfig.defaultLightingConfig(deviceType()), priority);
}
}
- protected SVGPath getLightingImage() {
- return Images.light();
- }
-
public void focusApplicationChanged() {
- var images = getKnobImages();
- for (var i = 0; i < images.length; i++) {
- var idx = i;
- var dialData = currentProfile().getDialData(i);
- if (dialData != null) {
- dialData.getCommand(CommandVolumeFocus.class).ifPresent(c -> determineAndSetImage(idx));
- }
- }
}
public void saveChanged() {
- updateAllImages();
- }
-
- protected void updateAllImages() {
- for (var i = 0; i < getKnobImages().length; i++) {
- determineAndSetImage(i);
- }
- }
-
- private void determineAndSetImage(int dial) {
- var images = getKnobImages();
- if (!isShowIcons()) {
- images[dial].setImage(null);
- return;
- }
-
- var cmd = currentProfile().getDialData(dial);
- var settings = currentProfile().getKnobSettings(dial);
-
- var image = iconService.getImageFrom(cmd, settings);
- images[dial].setImage(iconService.isDefault(image) ? null : image);
}
- protected ImageView buildKnobImageView() {
- var result = new ImageView();
- result.setOpacity(.4);
- result.setMouseTransparent(true);
- return result;
- }
-
- private boolean isShowIcons() {
- return saveService.get().isMainUIIcons();
- }
-
- protected abstract ImageView[] getKnobImages();
-
- public abstract Pane getDevicePane();
-
- public abstract Node getLabel();
-
- public abstract Button getLightingButton();
-
- public abstract Image getPreviewImage();
-
- public abstract DeviceType getDeviceType();
+ public abstract DeviceType deviceType();
public abstract void setKnobRotation(int paramInt1, int paramInt2);
@@ -389,15 +89,14 @@ private boolean isShowIcons() {
public abstract void setButtonPressed(int paramInt, boolean paramBoolean);
- public abstract void closeDialogs();
-
- public abstract void showLightingConfigToUI(LightingConfig paramLightingConfig);
-
public void disconnected() {
- closeDialogs();
+ }
+
+ public void setProfile(String profileName) {
+ save.setCurrentProfileName(profileName);
}
public Profile currentProfile() {
- return save.ensureCurrentProfile(getDeviceType());
+ return save.ensureCurrentProfile(deviceType());
}
}
diff --git a/src/main/java/com/getpcpanel/device/DeviceFactory.java b/src/main/java/com/getpcpanel/device/DeviceFactory.java
index a28097e7..381277ff 100644
--- a/src/main/java/com/getpcpanel/device/DeviceFactory.java
+++ b/src/main/java/com/getpcpanel/device/DeviceFactory.java
@@ -1,40 +1,34 @@
package com.getpcpanel.device;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Service;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import com.getpcpanel.commands.IconService;
import com.getpcpanel.hid.InputInterpreter;
import com.getpcpanel.hid.OutputInterpreter;
import com.getpcpanel.profile.DeviceSave;
import com.getpcpanel.profile.SaveService;
-import com.getpcpanel.ui.FxHelper;
import com.getpcpanel.util.coloroverride.OverrideColorService;
import lombok.RequiredArgsConstructor;
-@Service
-@Configuration
-@RequiredArgsConstructor
+@ApplicationScoped
public class DeviceFactory {
- private final FxHelper fxHelper;
- private final InputInterpreter inputInterpreter;
- private final SaveService saveService;
- private final OutputInterpreter outputInterpreter;
- private final IconService iconService;
- private final ApplicationEventPublisher eventPublisher;
- private final OverrideColorService overrideColorService;
+ @Inject InputInterpreter inputInterpreter;
+ @Inject SaveService saveService;
+ @Inject OutputInterpreter outputInterpreter;
+ @Inject IconService iconService;
+ @Inject OverrideColorService overrideColorService;
- public PCPanelRGBUI buildRgb(String serialNum, DeviceSave deviceSave) {
- return new PCPanelRGBUI(fxHelper, inputInterpreter, saveService, outputInterpreter, iconService, eventPublisher, overrideColorService, deviceSave, serialNum);
+ public Device buildRgb(String serialNum, DeviceSave deviceSave) {
+ return new PCPanelRGBDevice(inputInterpreter, saveService, outputInterpreter, iconService, overrideColorService, deviceSave, serialNum);
}
- public PCPanelMiniUI buildMini(String serialNum, DeviceSave deviceSave) {
- return new PCPanelMiniUI(fxHelper, inputInterpreter, saveService, outputInterpreter, iconService, eventPublisher, overrideColorService, serialNum, deviceSave);
+ public Device buildMini(String serialNum, DeviceSave deviceSave) {
+ return new PCPanelMiniDevice(inputInterpreter, saveService, outputInterpreter, iconService, overrideColorService, serialNum, deviceSave);
}
- public PCPanelProUI buildPro(String serialNum, DeviceSave deviceSave) {
- return new PCPanelProUI(fxHelper, inputInterpreter, saveService, outputInterpreter, iconService, eventPublisher, overrideColorService, serialNum, deviceSave);
+ public Device buildPro(String serialNum, DeviceSave deviceSave) {
+ return new PCPanelProDevice(inputInterpreter, saveService, outputInterpreter, iconService, overrideColorService, serialNum, deviceSave);
}
}
diff --git a/src/main/java/com/getpcpanel/device/GlobalBrightnessChangedEvent.java b/src/main/java/com/getpcpanel/device/GlobalBrightnessChangedEvent.java
new file mode 100644
index 00000000..bcbe3def
--- /dev/null
+++ b/src/main/java/com/getpcpanel/device/GlobalBrightnessChangedEvent.java
@@ -0,0 +1,7 @@
+package com.getpcpanel.device;
+
+/**
+ * Fired when the global brightness setting changes.
+ */
+public record GlobalBrightnessChangedEvent(String serialNum, int brightness) {
+}
diff --git a/src/main/java/com/getpcpanel/device/PCPanelMiniDevice.java b/src/main/java/com/getpcpanel/device/PCPanelMiniDevice.java
new file mode 100644
index 00000000..205abd9d
--- /dev/null
+++ b/src/main/java/com/getpcpanel/device/PCPanelMiniDevice.java
@@ -0,0 +1,22 @@
+package com.getpcpanel.device;
+
+import com.getpcpanel.commands.IconService;
+import com.getpcpanel.hid.InputInterpreter;
+import com.getpcpanel.hid.OutputInterpreter;
+import com.getpcpanel.profile.DeviceSave;
+import com.getpcpanel.profile.SaveService;
+import com.getpcpanel.util.coloroverride.OverrideColorService;
+
+public class PCPanelMiniDevice extends Device {
+ private final int[] knobRotations = new int[DeviceType.PCPANEL_MINI.getAnalogCount()];
+
+ public PCPanelMiniDevice(InputInterpreter inputInterpreter, SaveService saveService, OutputInterpreter outputInterpreter,
+ IconService iconService, OverrideColorService overrideColorService, String serialNum, DeviceSave deviceSave) {
+ super(saveService, outputInterpreter, iconService, serialNum, deviceSave);
+ }
+
+ @Override public DeviceType deviceType() { return DeviceType.PCPANEL_MINI; }
+ @Override public void setKnobRotation(int knob, int rotation) { knobRotations[knob] = rotation; }
+ @Override public int getKnobRotation(int knob) { return knobRotations[knob]; }
+ @Override public void setButtonPressed(int button, boolean pressed) {}
+}
diff --git a/src/main/java/com/getpcpanel/device/PCPanelMiniUI.java b/src/main/java/com/getpcpanel/device/PCPanelMiniUI.java
deleted file mode 100644
index 73e06ea8..00000000
--- a/src/main/java/com/getpcpanel/device/PCPanelMiniUI.java
+++ /dev/null
@@ -1,274 +0,0 @@
-package com.getpcpanel.device;
-
-import java.io.IOException;
-import java.util.Objects;
-
-import org.springframework.context.ApplicationEventPublisher;
-
-import com.getpcpanel.commands.IconService;
-import com.getpcpanel.hid.DeviceCommunicationHandler;
-import com.getpcpanel.hid.InputInterpreter;
-import com.getpcpanel.hid.OutputInterpreter;
-import com.getpcpanel.profile.DeviceSave;
-import com.getpcpanel.profile.LightingConfig;
-import com.getpcpanel.profile.LightingConfig.LightingMode;
-import com.getpcpanel.profile.SaveService;
-import com.getpcpanel.profile.SingleKnobLightingConfig;
-import com.getpcpanel.profile.SingleKnobLightingConfig.SINGLE_KNOB_MODE;
-import com.getpcpanel.ui.FxHelper;
-import com.getpcpanel.ui.HomePage;
-import com.getpcpanel.util.Util;
-import com.getpcpanel.util.coloroverride.OverrideColorService;
-
-import javafx.application.Platform;
-import javafx.fxml.FXML;
-import javafx.scene.Node;
-import javafx.scene.control.Button;
-import javafx.scene.control.ContentDisplay;
-import javafx.scene.control.Label;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseButton;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.Region;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.shape.Shape;
-import javafx.scene.text.Font;
-import javafx.stage.Stage;
-import lombok.extern.log4j.Log4j2;
-
-@Log4j2
-public class PCPanelMiniUI extends Device {
- private final InputInterpreter inputInterpreter;
- private final OverrideColorService overrideColorService;
-
- public static final int KNOB_COUNT = 4;
- private static final double MAX_ANALOG_VALUE = 100;
- @FXML private Pane lightPanes;
- @FXML private Pane panelPane;
- private Label label;
- private Button lightingButton;
- private final Button[] knobs = new Button[KNOB_COUNT];
- private final int[] analogValue = new int[KNOB_COUNT];
- private final ImageView[] images = new ImageView[KNOB_COUNT];
- private static final Image previewImage = new Image(Objects.requireNonNull(PCPanelMiniUI.class.getResource("/assets/PCPanelMini/preview.png")).toExternalForm());
- private Stage childDialogStage;
-
- public PCPanelMiniUI(FxHelper fxHelper, InputInterpreter inputInterpreter, SaveService saveService, OutputInterpreter outputInterpreter, IconService iconService, ApplicationEventPublisher eventPublisher, OverrideColorService overrideColorService,
- String serialNum, DeviceSave deviceSave) {
- super(fxHelper, saveService, outputInterpreter, iconService, eventPublisher, serialNum, deviceSave);
- this.inputInterpreter = inputInterpreter;
- this.overrideColorService = overrideColorService;
- var loader = getFxHelper().getLoader(getClass().getResource("/assets/PCPanelMini/PCPanelMini.fxml"));
- loader.setController(this);
- try {
- Pane pane = loader.load();
- initButtons();
- initLabel();
- initLightingButton();
- pane.getStylesheets().addAll(Objects.requireNonNull(getClass().getResource("/assets/PCPanelMini/PCPanelMini.css")).toExternalForm());
- } catch (IOException e) {
- log.error("Unable to initialize ui", e);
- }
- postInit();
- }
-
- @Override
- public Node getLabel() {
- return label;
- }
-
- @Override
- public Pane getDevicePane() {
- return panelPane;
- }
-
- private void rotateKnob(int knob, int val) {
- if (knob >= analogValue.length) {
- log.error("Getting knob {} value ({}), but the amount of knobs is less: {}", knob, val, analogValue.length);
- return;
- }
- analogValue[knob] = val;
- if (getLightingConfig().getLightingMode() == LightingMode.CUSTOM)
- showLightingConfigToUI(getLightingConfig());
- ((Region) knobs[knob].getGraphic()).getChildrenUnmodifiable().get(3).setRotate(Util.analogValueToRotation(val));
- }
-
- @Override
- public int getKnobRotation(int knob) {
- return analogValue[knob];
- }
-
- private void initLabel() {
- label = new Label("PCPANEL MINI");
- var f = Font.loadFont(getClass().getResourceAsStream("/assets/apex-mk2.regular.otf"), 50.0D);
- label.setFont(f);
- label.setUnderline(true);
- label.setTextFill(Paint.valueOf("white"));
- }
-
- private void initLightingButton() {
- lightingButton = new Button("Lighting", getLightingImage());
- lightingButton.setStyle("-fx-background-color: transparent;");
- lightingButton.setContentDisplay(ContentDisplay.TOP);
- lightingButton.setMinHeight(100.0D);
- lightingButton.setOnAction(e -> {
- childDialogStage = new Stage();
- getFxHelper().buildMiniLightingDialog(this).start(childDialogStage);
- });
- }
-
- private void initButtons() throws IOException {
- var xPos = 56.3D;
- var yPos = 133.4D;
- var xDelta = 115.0D;
- var buttonSize = 80;
- for (var i = 0; i < KNOB_COUNT; i++) {
- var loader = getFxHelper().getLoader(getClass().getResource("/assets/PCPanelMini/knob.fxml"));
- Node nx = loader.load();
- images[i] = buildKnobImageView();
- knobs[i] = new Button("", nx);
- knobs[i].setId("dial_button");
- knobs[i].setContentDisplay(ContentDisplay.CENTER);
- knobs[i].setMinSize(buttonSize, buttonSize);
- knobs[i].setMaxSize(buttonSize, buttonSize);
- knobs[i].setLayoutX(xPos);
- knobs[i].setLayoutY(yPos);
- knobs[i].setScaleX(1.2D);
- knobs[i].setScaleY(1.2D);
-
- images[i].setLayoutX(xPos + 5);
- images[i].setLayoutY(yPos + 5);
- images[i].setFitWidth(70);
- images[i].setFitHeight(70);
-
- var knob = i;
- knobs[i].setOnAction(e -> {
- HomePage.showHint(false);
- var bm = getFxHelper().buildBasicMacro(this, knob);
- try {
- childDialogStage = new Stage();
- bm.start(childDialogStage);
- } catch (Exception ex) {
- log.error("Unable to init button", ex);
- }
- });
- var idx = i;
- knobs[i].setOnMouseClicked(c -> {
- if (c.getButton() == MouseButton.MIDDLE) {
- try {
- inputInterpreter.onButtonPress(new DeviceCommunicationHandler.ButtonPressEvent(getSerialNumber(), knob, true));
- } catch (IOException e1) {
- log.error("Unable to handle button press", e1);
- }
- try {
- inputInterpreter.onButtonPress(new DeviceCommunicationHandler.ButtonPressEvent(getSerialNumber(), knob, false));
- } catch (IOException e1) {
- log.error("Unable to handle button up", e1);
- }
- } else if (c.getButton() == MouseButton.SECONDARY) {
- getFxHelper().buildMiniLightingDialog(this).select(idx).start(new Stage());
- }
- });
- panelPane.getChildren().add(knobs[i]);
- panelPane.getChildren().add(images[i]);
- xPos += xDelta;
- }
- }
-
- public String toString() {
- return getDisplayName();
- }
-
- @Override
- public Image getPreviewImage() {
- return previewImage;
- }
-
- private int getKnobCount() {
- return KNOB_COUNT;
- }
-
- @Override
- public void setKnobRotation(int knob, int value) {
- Platform.runLater(() -> rotateKnob(knob, value));
- }
-
- @Override
- public void setButtonPressed(int knob, boolean pressed) {
- Platform.runLater(() -> knobs[knob].setOpacity(pressed ? 0.5D : 1.0D));
- }
-
- private void setKnobUIColorHex(int knob, String color) {
- var lightPane = (Shape) lightPanes.getChildren().get(knob);
- lightPane.setFill(Paint.valueOf(color));
- }
-
- private void setKnobUIColor(int knob, Paint color) {
- var lightPane = (Shape) lightPanes.getChildren().get(knob);
- lightPane.setFill(color);
- }
-
- private void setAllKnobUIColor(Paint color) {
- for (var i = 0; i < getKnobCount(); i++) {
- setKnobUIColor(i, color);
- }
- }
-
- @Override
- public void closeDialogs() {
- if (childDialogStage != null && childDialogStage.isShowing())
- childDialogStage.close();
- }
-
- @Override
- public Button getLightingButton() {
- return lightingButton;
- }
-
- @Override
- public DeviceType getDeviceType() {
- return DeviceType.PCPANEL_MINI;
- }
-
- @Override
- public void showLightingConfigToUI(LightingConfig config) {
- var mode = config.getLightingMode();
- if (mode == LightingMode.ALL_COLOR) {
- setAllKnobUIColor(Color.valueOf(config.getAllColor()));
- } else if (mode == LightingMode.SINGLE_COLOR) {
- for (var i = 0; i < getKnobCount(); i++) {
- var color = overrideColorService.getDialOverride(serialNumber, i).map(SingleKnobLightingConfig::getColor1).orElse(config.getIndividualColors()[i]);
- setKnobUIColorHex(i, color);
- }
- } else if (mode == LightingMode.ALL_RAINBOW) {
- for (var i = 0; i < getKnobCount(); i++)
- setKnobUIColor(i,
- Color.hsb((360 * (getKnobCount() - i - 1) * (0xFF & config.getRainbowPhaseShift())) / 255.0D * getKnobCount(), 1.0D, (0xFF & config.getRainbowBrightness()) / 255.0D));
- } else if (mode == LightingMode.ALL_WAVE) {
- for (var i = 0; i < getKnobCount(); i++)
- setKnobUIColor(i, Color.hsb(360.0D * (0xFF & config.getWaveHue()) / 255.0D, 1.0D, (0xFF & config.getWaveBrightness()) / 255.0D));
- } else if (mode == LightingMode.ALL_BREATH) {
- for (var i = 0; i < getKnobCount(); i++)
- setKnobUIColor(i, Color.hsb(360.0D * (0xFF & config.getBreathHue()) / 255.0D, 1.0D, (0xFF & config.getBreathBrightness()) / 255.0D));
- } else {
- var knobConfigs = config.getKnobConfigs();
- for (var i = 0; i < KNOB_COUNT; i++) {
- var knobConfig = overrideColorService.getDialOverride(serialNumber, i).orElse(knobConfigs[i]);
- if (knobConfig.getMode() == SINGLE_KNOB_MODE.STATIC) {
- setKnobUIColorHex(i, knobConfig.getColor1());
- } else if (knobConfig.getMode() == SINGLE_KNOB_MODE.VOLUME_GRADIENT) {
- var c1 = Color.web(knobConfig.getColor1());
- var c2 = Color.web(knobConfig.getColor2());
- setKnobUIColor(i, c1.interpolate(c2, analogValue[i] / MAX_ANALOG_VALUE));
- }
- }
- }
- }
-
- @Override
- protected ImageView[] getKnobImages() {
- return images;
- }
-}
diff --git a/src/main/java/com/getpcpanel/device/PCPanelProDevice.java b/src/main/java/com/getpcpanel/device/PCPanelProDevice.java
new file mode 100644
index 00000000..f3f9a2b8
--- /dev/null
+++ b/src/main/java/com/getpcpanel/device/PCPanelProDevice.java
@@ -0,0 +1,22 @@
+package com.getpcpanel.device;
+
+import com.getpcpanel.commands.IconService;
+import com.getpcpanel.hid.InputInterpreter;
+import com.getpcpanel.hid.OutputInterpreter;
+import com.getpcpanel.profile.DeviceSave;
+import com.getpcpanel.profile.SaveService;
+import com.getpcpanel.util.coloroverride.OverrideColorService;
+
+public class PCPanelProDevice extends Device {
+ private final int[] knobRotations = new int[DeviceType.PCPANEL_PRO.getAnalogCount()];
+
+ public PCPanelProDevice(InputInterpreter inputInterpreter, SaveService saveService, OutputInterpreter outputInterpreter,
+ IconService iconService, OverrideColorService overrideColorService, String serialNum, DeviceSave deviceSave) {
+ super(saveService, outputInterpreter, iconService, serialNum, deviceSave);
+ }
+
+ @Override public DeviceType deviceType() { return DeviceType.PCPANEL_PRO; }
+ @Override public void setKnobRotation(int knob, int rotation) { knobRotations[knob] = rotation; }
+ @Override public int getKnobRotation(int knob) { return knobRotations[knob]; }
+ @Override public void setButtonPressed(int button, boolean pressed) {}
+}
diff --git a/src/main/java/com/getpcpanel/device/PCPanelProUI.java b/src/main/java/com/getpcpanel/device/PCPanelProUI.java
deleted file mode 100644
index c4e520a2..00000000
--- a/src/main/java/com/getpcpanel/device/PCPanelProUI.java
+++ /dev/null
@@ -1,387 +0,0 @@
-package com.getpcpanel.device;
-
-import java.io.IOException;
-import java.util.Objects;
-
-import org.springframework.context.ApplicationEventPublisher;
-
-import com.getpcpanel.commands.IconService;
-import com.getpcpanel.hid.DeviceCommunicationHandler;
-import com.getpcpanel.hid.InputInterpreter;
-import com.getpcpanel.hid.OutputInterpreter;
-import com.getpcpanel.profile.DeviceSave;
-import com.getpcpanel.profile.LightingConfig;
-import com.getpcpanel.profile.LightingConfig.LightingMode;
-import com.getpcpanel.profile.SaveService;
-import com.getpcpanel.profile.SingleKnobLightingConfig.SINGLE_KNOB_MODE;
-import com.getpcpanel.profile.SingleLogoLightingConfig.SINGLE_LOGO_MODE;
-import com.getpcpanel.profile.SingleSliderLabelLightingConfig.SINGLE_SLIDER_LABEL_MODE;
-import com.getpcpanel.profile.SingleSliderLightingConfig.SINGLE_SLIDER_MODE;
-import com.getpcpanel.ui.FxHelper;
-import com.getpcpanel.ui.HomePage;
-import com.getpcpanel.util.Util;
-import com.getpcpanel.util.coloroverride.OverrideColorService;
-
-import javafx.application.Platform;
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Node;
-import javafx.scene.control.Button;
-import javafx.scene.control.ContentDisplay;
-import javafx.scene.control.Label;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseButton;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.Region;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.shape.SVGPath;
-import javafx.scene.text.Font;
-import javafx.stage.Stage;
-import lombok.extern.log4j.Log4j2;
-
-@Log4j2
-public class PCPanelProUI extends Device {
- private final InputInterpreter inputInterpreter;
- private final OverrideColorService overrideColorService;
-
- public static final int KNOB_COUNT = 5;
- public static final int SLIDER_COUNT = 4;
- private static final int LEDS_PER_SLIDER = 5;
- private static final int MAX_ANALOG_VALUE = 100;
- @FXML private Pane lightPanes;
- @FXML private Pane panelPane;
- private Label label;
- private Button lightingButton;
- private final Button[] knobs = new Button[9];
- private final ImageView[] images = new ImageView[9];
- private static final Image previewImage = new Image(Objects.requireNonNull(PCPanelProUI.class.getResource("/assets/PCPanelPro/Pro_Cutout.png")).toExternalForm());
- private Stage childDialogStage;
- @FXML private Pane sliderHolder1;
- @FXML private Pane sliderHolder2;
- @FXML private Pane sliderHolder3;
- @FXML private Pane sliderHolder4;
- @FXML private SVGPath sliderLabel1;
- @FXML private SVGPath sliderLabel2;
- @FXML private SVGPath sliderLabel3;
- @FXML private SVGPath sliderLabel4;
- @FXML private SVGPath logoLight;
- @FXML private SVGPath knobColor1;
- @FXML private SVGPath knobColor2;
- @FXML private SVGPath knobColor3;
- @FXML private SVGPath knobColor4;
- @FXML private SVGPath knobColor5;
- @FXML private Pane sliderLightPane1;
- @FXML private Pane sliderLightPane2;
- @FXML private Pane sliderLightPane3;
- @FXML private Pane sliderLightPane4;
- private final Pane[] sliderLightPanes = new Pane[4];
- private final SVGPath[] knobColors = new SVGPath[5];
- private final SVGPath[] sliderLabels = new SVGPath[4];
- private final int[] analogValue = new int[9];
- private final Pane[] sliderHolders = new Pane[4];
-
- public PCPanelProUI(FxHelper fxHelper, InputInterpreter inputInterpreter, SaveService saveService, OutputInterpreter outputInterpreter, IconService iconService, ApplicationEventPublisher eventPublisher, OverrideColorService overrideColorService,
- String serialNum, DeviceSave deviceSave) {
- super(fxHelper, saveService, outputInterpreter, iconService, eventPublisher, serialNum, deviceSave);
- this.inputInterpreter = inputInterpreter;
- this.overrideColorService = overrideColorService;
- var loader = getFxHelper().getLoader(getClass().getResource("/assets/PCPanelPro/PCPanelPro.fxml"));
- loader.setController(this);
- try {
- Pane pane = loader.load();
- Util.fill(sliderLightPanes, (Object[]) new Pane[] { sliderLightPane1, sliderLightPane2, sliderLightPane3, sliderLightPane4 });
- Util.fill(knobColors, (Object[]) new SVGPath[] { knobColor1, knobColor2, knobColor3, knobColor4, knobColor5 });
- Util.fill(sliderLabels, (Object[]) new SVGPath[] { sliderLabel1, sliderLabel2, sliderLabel3, sliderLabel4 });
- Util.fill(sliderHolders, (Object[]) new Pane[] { sliderHolder1, sliderHolder2, sliderHolder3, sliderHolder4 });
- initButtons();
- initLabel();
- initLightingButton();
- pane.getStylesheets().addAll(Objects.requireNonNull(getClass().getResource("/assets/PCPanelPro/PCPanelPro.css")).toExternalForm());
- } catch (IOException e) {
- log.error("Unable to init ui", e);
- }
- postInit();
- }
-
- @Override
- public Node getLabel() {
- return label;
- }
-
- @Override
- public Pane getDevicePane() {
- return panelPane;
- }
-
- private void rotateKnob(int knob, int val) {
- analogValue[knob] = val;
- if (getLightingConfig().getLightingMode() == LightingMode.CUSTOM)
- showLightingConfigToUI(getLightingConfig());
- if (knob < 5) {
- ((Region) knobs[knob].getGraphic()).getChildrenUnmodifiable().get(3).setRotate(Util.analogValueToRotation(val));
- } else {
- var x = Util.map(val, 0.0D, 255.0D, sliderHolders[knob - 5].getPrefHeight(), 0.0D) - 40.0D;
- knobs[knob].setLayoutY(x);
- images[knob].setLayoutY(x);
- }
- }
-
- @Override
- public int getKnobRotation(int knob) {
- return analogValue[knob];
- }
-
- private void initLabel() {
- label = new Label("PCPANEL PRO");
- var f = Font.loadFont(getClass().getResourceAsStream("/assets/apex-mk2.regular.otf"), 50.0D);
- label.setFont(f);
- label.setUnderline(true);
- label.setTextFill(Paint.valueOf("white"));
- }
-
- private void initLightingButton() {
- lightingButton = new Button("Lighting", getLightingImage());
- lightingButton.setStyle("-fx-background-color: transparent;");
- lightingButton.setContentDisplay(ContentDisplay.TOP);
- lightingButton.setMinHeight(100.0D);
- lightingButton.setOnAction(e -> {
- childDialogStage = new Stage();
- getFxHelper().buildProLightingDialog(this).start(childDialogStage);
- });
- }
-
- private void initButtons() throws IOException {
- var xPos = 121.3D;
- var yPos = 66.3D;
- var xDelta = 133.0D;
- var yDelta = 97.5D;
- var buttonSize = 80;
- for (var i = 0; i < 9; i++) {
- FXMLLoader loader;
- if (i < 5) {
- loader = getFxHelper().getLoader(getClass().getResource("/assets/PCPanelPro/knob.fxml"));
- } else {
- loader = getFxHelper().getLoader(getClass().getResource("/assets/PCPanelPro/slider.fxml"));
- }
- Node nx = loader.load();
- images[i] = buildKnobImageView();
- knobs[i] = new Button("", nx);
- knobs[i].setId("dial_button");
- knobs[i].setContentDisplay(ContentDisplay.CENTER);
- if (i < 5) {
- knobs[i].setMinSize(buttonSize, buttonSize);
- knobs[i].setMaxSize(buttonSize, buttonSize);
- knobs[i].setLayoutX(xPos);
- knobs[i].setLayoutY(yPos);
- knobs[i].setScaleX(1.2D);
- knobs[i].setScaleY(1.2D);
-
- images[i].setLayoutX(xPos + 5);
- images[i].setLayoutY(yPos + 5);
- images[i].setFitWidth(71);
- images[i].setFitHeight(71);
- } else {
- knobs[i].setMinSize(buttonSize, buttonSize);
- knobs[i].setMaxSize(buttonSize, buttonSize);
- knobs[i].setLayoutX(-26.0D);
- knobs[i].setScaleX(0.4D);
- knobs[i].setScaleY(0.4D);
-
- images[i].setLayoutX(-11.0D);
- images[i].setFitWidth(50);
- images[i].setFitHeight(50);
- }
- var knob = i;
- knobs[i].setOnAction(e -> {
- HomePage.showHint(false);
- var name = (knob < 5) ? ("Knob " + (knob + 1)) : ("Slider " + (knob - 5 + 1));
- var analogType = (knob < 5) ? "Knob" : "Slider";
- var bm = getFxHelper().buildBasicMacro(this, knob, knob < 5, name, analogType);
- try {
- childDialogStage = new Stage();
- bm.start(childDialogStage);
- } catch (Exception ex) {
- log.error("Unable to start dialog", ex);
- }
- });
- var idx = i;
- knobs[i].setOnMouseClicked(c -> {
- if (c.getButton() == MouseButton.MIDDLE) {
- try {
- inputInterpreter.onButtonPress(new DeviceCommunicationHandler.ButtonPressEvent(getSerialNumber(), knob, true));
- } catch (IOException e1) {
- log.error("Unable to handle button press", e1);
- }
- try {
- inputInterpreter.onButtonPress(new DeviceCommunicationHandler.ButtonPressEvent(getSerialNumber(), knob, false));
- } catch (IOException e1) {
- log.error("Unable to handle button release", e1);
- }
- } else if (c.getButton() == MouseButton.SECONDARY) {
- getFxHelper().buildProLightingDialog(this).select(idx).start(new Stage());
- }
- });
- if (i < 5) {
- panelPane.getChildren().add(knobs[i]);
- panelPane.getChildren().add(images[i]);
- } else {
- sliderHolders[i - 5].getChildren().add(knobs[i]);
- sliderHolders[i - 5].getChildren().add(images[i]);
- }
- xPos += xDelta;
- if (i == 1) {
- yPos += yDelta;
- xPos -= 332.5D;
- }
- }
- }
-
- public String toString() {
- return getDisplayName();
- }
-
- @Override
- public Image getPreviewImage() {
- return previewImage;
- }
-
- @Override
- public void setKnobRotation(int knob, int value) {
- Platform.runLater(() -> rotateKnob(knob, value));
- }
-
- @Override
- public void setButtonPressed(int knob, boolean pressed) {
- Platform.runLater(() -> knobs[knob].setOpacity(pressed ? 0.5D : 1.0D));
- }
-
- @Override
- public void closeDialogs() {
- if (childDialogStage != null && childDialogStage.isShowing())
- childDialogStage.close();
- }
-
- @Override
- public Button getLightingButton() {
- return lightingButton;
- }
-
- @Override
- public DeviceType getDeviceType() {
- return DeviceType.PCPANEL_PRO;
- }
-
- private void setAllColor(Paint color) {
- for (var p : knobColors) {
- p.setFill(color);
- }
- for (var p : sliderLabels) {
- p.setFill(color);
- }
- for (var pane : sliderLightPanes) {
- for (var n : pane.getChildren())
- ((SVGPath) n).setFill(color);
- }
- logoLight.setFill(color);
- }
-
- @Override
- public void showLightingConfigToUI(LightingConfig config) {
- var mode = config.getLightingMode();
- if (mode == LightingMode.ALL_COLOR) {
- setAllColor(Paint.valueOf(config.getAllColor()));
- } else if (mode == LightingMode.ALL_RAINBOW) {
- var totalRows = 9;
- var row = 0;
- knobColor1.setFill(createFill(config, totalRows, row));
- knobColor2.setFill(createFill(config, totalRows, row));
- row++;
- knobColor3.setFill(createFill(config, totalRows, row));
- knobColor4.setFill(createFill(config, totalRows, row));
- knobColor5.setFill(createFill(config, totalRows, row));
- row++;
- for (var p : sliderLabels) {
- p.setFill(createFill(config, totalRows, row));
- }
- row++;
- for (var i = 4; i >= 0; i--) {
- for (var a = 0; a < 4; a++)
- ((SVGPath) sliderLightPanes[a].getChildren().get(i)).setFill(createFill(config, totalRows, row));
- row++;
- }
- logoLight.setFill(createFill(config, totalRows, row));
- } else if (mode == LightingMode.ALL_WAVE) {
- setAllColor(Color.hsb(360.0D * (0xFF & config.getWaveHue()) / 255.0D, 1.0D, (0xFF & config.getWaveBrightness()) / 255.0D));
- } else if (mode == LightingMode.ALL_BREATH) {
- setAllColor(Color.hsb(360.0D * (0xFF & config.getBreathHue()) / 255.0D, 1.0D, (0xFF & config.getBreathBrightness()) / 255.0D));
- } else if (mode == LightingMode.CUSTOM) {
- var knobConfigs = config.getKnobConfigs();
- var sliderLabelConfigs = config.getSliderLabelConfigs();
- var sliderConfigs = config.getSliderConfigs();
- for (var i = 0; i < KNOB_COUNT; i++) {
- var knobConfig = overrideColorService.getDialOverride(serialNumber, i).orElse(knobConfigs[i]);
- if (knobConfig.getMode() == SINGLE_KNOB_MODE.STATIC) {
- knobColors[i].setFill(Paint.valueOf(knobConfig.getColor1()));
- } else if (knobConfig.getMode() == SINGLE_KNOB_MODE.VOLUME_GRADIENT) {
- var c1 = Color.web(knobConfig.getColor1());
- var c2 = Color.web(knobConfig.getColor2());
- knobColors[i].setFill(c1.interpolate(c2, analogValue[i] / 100.0D));
- }
- }
- for (var i = 0; i < SLIDER_COUNT; i++) {
- var sliderLabelConfig = overrideColorService.getSliderLabelOverride(serialNumber, i).orElse(sliderLabelConfigs[i]);
- if (sliderLabelConfig.getMode() == SINGLE_SLIDER_LABEL_MODE.STATIC)
- sliderLabels[i].setFill(Paint.valueOf(sliderLabelConfig.getColor()));
- }
- for (var i = 0; i < SLIDER_COUNT; i++) {
- var sliderConfig = overrideColorService.getSliderOverride(serialNumber, i).orElse(sliderConfigs[i]);
- if (sliderConfig.getMode() == SINGLE_SLIDER_MODE.STATIC) {
- for (var n : sliderLightPanes[i].getChildren())
- ((SVGPath) n).setFill(Paint.valueOf(sliderConfig.getColor1()));
- } else if (sliderConfig.getMode() == SINGLE_SLIDER_MODE.STATIC_GRADIENT) {
- var c1 = Color.web(sliderConfig.getColor1());
- var c2 = Color.web(sliderConfig.getColor2());
- var f = 0.0D;
- var delta = 0.25D;
- for (var a = 0; a < LEDS_PER_SLIDER; a++) {
- ((SVGPath) sliderLightPanes[i].getChildren().get(a)).setFill(c1.interpolate(c2, f));
- f += delta;
- }
- } else if (sliderConfig.getMode() == SINGLE_SLIDER_MODE.VOLUME_GRADIENT) {
- var c1 = Color.web(sliderConfig.getColor1());
- var c2 = Color.web(sliderConfig.getColor2());
- var f = 0.0D;
- var delta = 0.25D;
- for (var a = 0; a < 5; a++) {
- if (a < (analogValue[i + 5] + 10) * 5 / MAX_ANALOG_VALUE) {
- ((SVGPath) sliderLightPanes[i].getChildren().get(a)).setFill(c1.interpolate(c2, f));
- } else {
- ((SVGPath) sliderLightPanes[i].getChildren().get(a)).setFill(Paint.valueOf("black"));
- }
- f += delta;
- }
- }
- }
-
- var logoConfig = overrideColorService.getLogoOverride(serialNumber).orElse(config.getLogoConfig());
- if (logoConfig.getMode() == SINGLE_LOGO_MODE.STATIC) {
- logoLight.setFill(Paint.valueOf(logoConfig.getColor()));
- } else if (logoConfig.getMode() == SINGLE_LOGO_MODE.RAINBOW) {
- logoLight.setFill(Color.RED);
- } else if (logoConfig.getMode() == SINGLE_LOGO_MODE.BREATH) {
- logoLight.setFill(Color.hsb(360.0D * (0xFF & logoConfig.getHue()) / 255.0D, 1.0D, (0xFF & logoConfig.getBrightness()) / 255.0D));
- }
- }
- }
-
- private static Color createFill(LightingConfig config, int totalRows, int row) {
- return Color.hsb((360 * (totalRows - row - 1) * (0xFF & config.getRainbowPhaseShift())) / 255.0D * totalRows, 1.0D, (0xFF & config.getRainbowBrightness()) / 255.0D);
- }
-
- @Override
- protected ImageView[] getKnobImages() {
- return images;
- }
-}
diff --git a/src/main/java/com/getpcpanel/device/PCPanelRGBDevice.java b/src/main/java/com/getpcpanel/device/PCPanelRGBDevice.java
new file mode 100644
index 00000000..3e831558
--- /dev/null
+++ b/src/main/java/com/getpcpanel/device/PCPanelRGBDevice.java
@@ -0,0 +1,22 @@
+package com.getpcpanel.device;
+
+import com.getpcpanel.commands.IconService;
+import com.getpcpanel.hid.InputInterpreter;
+import com.getpcpanel.hid.OutputInterpreter;
+import com.getpcpanel.profile.DeviceSave;
+import com.getpcpanel.profile.SaveService;
+import com.getpcpanel.util.coloroverride.OverrideColorService;
+
+public class PCPanelRGBDevice extends Device {
+ private final int[] knobRotations = new int[DeviceType.PCPANEL_RGB.getAnalogCount()];
+
+ public PCPanelRGBDevice(InputInterpreter inputInterpreter, SaveService saveService, OutputInterpreter outputInterpreter,
+ IconService iconService, OverrideColorService overrideColorService, DeviceSave deviceSave, String serialNum) {
+ super(saveService, outputInterpreter, iconService, serialNum, deviceSave);
+ }
+
+ @Override public DeviceType deviceType() { return DeviceType.PCPANEL_RGB; }
+ @Override public void setKnobRotation(int knob, int rotation) { knobRotations[knob] = rotation; }
+ @Override public int getKnobRotation(int knob) { return knobRotations[knob]; }
+ @Override public void setButtonPressed(int button, boolean pressed) {}
+}
diff --git a/src/main/java/com/getpcpanel/device/PCPanelRGBUI.java b/src/main/java/com/getpcpanel/device/PCPanelRGBUI.java
deleted file mode 100644
index 873fd394..00000000
--- a/src/main/java/com/getpcpanel/device/PCPanelRGBUI.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package com.getpcpanel.device;
-
-import java.io.IOException;
-import java.util.Objects;
-
-import org.springframework.context.ApplicationEventPublisher;
-
-import com.getpcpanel.commands.IconService;
-import com.getpcpanel.hid.DeviceCommunicationHandler;
-import com.getpcpanel.hid.InputInterpreter;
-import com.getpcpanel.hid.OutputInterpreter;
-import com.getpcpanel.profile.DeviceSave;
-import com.getpcpanel.profile.LightingConfig;
-import com.getpcpanel.profile.LightingConfig.LightingMode;
-import com.getpcpanel.profile.SaveService;
-import com.getpcpanel.profile.SingleKnobLightingConfig;
-import com.getpcpanel.ui.FxHelper;
-import com.getpcpanel.ui.HomePage;
-import com.getpcpanel.util.Util;
-import com.getpcpanel.util.coloroverride.OverrideColorService;
-
-import javafx.application.Platform;
-import javafx.fxml.FXML;
-import javafx.scene.Node;
-import javafx.scene.control.Button;
-import javafx.scene.control.ContentDisplay;
-import javafx.scene.control.Label;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseButton;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.Region;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.shape.Shape;
-import javafx.scene.text.Font;
-import javafx.stage.Stage;
-import lombok.extern.log4j.Log4j2;
-
-@Log4j2
-public class PCPanelRGBUI extends Device {
- private final InputInterpreter inputInterpreter;
- private final OverrideColorService overrideColorService;
-
- private static final int KNOB_COUNT = 4;
- @FXML private Pane lightPanes;
- @FXML private Pane panelPane;
- private Label label;
- private Button lightingButton;
- private final Button[] knobs = new Button[KNOB_COUNT];
- private final ImageView[] images = new ImageView[KNOB_COUNT];
- private static final Image previewImage = new Image(Objects.requireNonNull(PCPanelRGBUI.class.getResource("/assets/PCPanelRGB/preview.png")).toExternalForm());
- private Stage childDialogStage;
-
- public PCPanelRGBUI(FxHelper fxHelper, InputInterpreter inputInterpreter, SaveService saveService, OutputInterpreter outputInterpreter, IconService iconService, ApplicationEventPublisher eventPublisher, OverrideColorService overrideColorService,
- DeviceSave deviceSave, String serialNum) {
- super(fxHelper, saveService, outputInterpreter, iconService, eventPublisher, serialNum, deviceSave);
- this.inputInterpreter = inputInterpreter;
- this.overrideColorService = overrideColorService;
- var loader = getFxHelper().getLoader(getClass().getResource("/assets/PCPanelRGB/PCPanelRGB.fxml"));
- loader.setController(this);
- try {
- Pane pane = loader.load();
- initButtons();
- initLabel();
- initLightingButton();
- pane.getStylesheets().addAll(Objects.requireNonNull(getClass().getResource("/assets/PCPanelRGB/PCPanelRGB.css")).toExternalForm());
- } catch (IOException e) {
- log.error("Unable to init ui", e);
- }
- postInit();
- }
-
- @Override
- public Node getLabel() {
- return label;
- }
-
- @Override
- public Pane getDevicePane() {
- return panelPane;
- }
-
- private void rotateKnob(int knob, int val) {
- ((Region) knobs[knob].getGraphic()).getChildrenUnmodifiable().get(3).setRotate(Util.analogValueToRotation(val));
- }
-
- @Override
- public int getKnobRotation(int knob) {
- return Util.rotationToAnalogValue(((Region) knobs[knob].getGraphic()).getChildrenUnmodifiable().get(3).getRotate());
- }
-
- private void initLabel() {
- label = new Label("PCPANEL RGB");
- var f = Font.loadFont(getClass().getResourceAsStream("/assets/apex-mk2.regular.otf"), 50.0D);
- label.setFont(f);
- label.setUnderline(true);
- label.setTextFill(Paint.valueOf("white"));
- }
-
- private void initLightingButton() {
- lightingButton = new Button("Lighting", getLightingImage());
- lightingButton.setStyle("-fx-background-color: transparent;");
- lightingButton.setContentDisplay(ContentDisplay.TOP);
- lightingButton.setMinHeight(100.0D);
- lightingButton.setOnAction(e -> {
- childDialogStage = new Stage();
- getFxHelper().buildRGBLightingDialog(this).start(childDialogStage);
- });
- }
-
- private void initButtons() throws IOException {
- var xPos = 52.0D;
- var yPos = 64.0D;
- var xDelta = 107.3D;
- var buttonSize = 80;
- for (var i = 0; i < KNOB_COUNT; i++) {
- var loader = getFxHelper().getLoader(getClass().getResource("/assets/PCPanelRGB/knob.fxml"));
- Node nx = loader.load();
- images[i] = buildKnobImageView();
- knobs[i] = new Button("", nx);
- knobs[i].setId("dial_button");
- knobs[i].setContentDisplay(ContentDisplay.CENTER);
- knobs[i].setMinSize(buttonSize, buttonSize);
- knobs[i].setMaxSize(buttonSize, buttonSize);
- knobs[i].setLayoutX(xPos);
- knobs[i].setLayoutY(yPos);
-
- images[i].setLayoutX(xPos + 10);
- images[i].setLayoutY(yPos + 10);
- images[i].setFitWidth(buttonSize - 20);
- images[i].setFitHeight(buttonSize - 20);
-
- var knob = i;
- knobs[i].setOnAction(e -> {
- HomePage.showHint(false);
- var bm = getFxHelper().buildBasicMacro(this, knob);
- try {
- childDialogStage = new Stage();
- bm.start(childDialogStage);
- } catch (Exception ex) {
- log.error("Unable to init button", ex);
- }
- });
- var idx = i;
- knobs[i].setOnMouseClicked(c -> {
- if (c.getButton() == MouseButton.MIDDLE) {
- try {
- inputInterpreter.onButtonPress(new DeviceCommunicationHandler.ButtonPressEvent(getSerialNumber(), knob, true));
- } catch (IOException e1) {
- log.error("Unable to handle button press", e1);
- }
- try {
- inputInterpreter.onButtonPress(new DeviceCommunicationHandler.ButtonPressEvent(getSerialNumber(), knob, false));
- } catch (IOException e1) {
- log.error("Unable to handle button release", e1);
- }
- } else if (c.getButton() == MouseButton.SECONDARY) {
- getFxHelper().buildRGBLightingDialog(this).select(idx).start(new Stage());
- }
- });
- panelPane.getChildren().add(knobs[i]);
- panelPane.getChildren().add(images[i]);
- xPos += xDelta;
- }
- }
-
- public String toString() {
- return getDisplayName();
- }
-
- @Override
- public Image getPreviewImage() {
- return previewImage;
- }
-
- public int getKnobCount() {
- return KNOB_COUNT;
- }
-
- @Override
- public void setKnobRotation(int knob, int value) {
- Platform.runLater(() -> rotateKnob(knob, value));
- }
-
- @Override
- public void setButtonPressed(int knob, boolean pressed) {
- Platform.runLater(() -> knobs[knob].setOpacity(pressed ? 0.5D : 1.0D));
- }
-
- private void setAllKnobUIColor(Color color) {
- for (var i = 0; i < getKnobCount(); i++) {
- setKnobUIColor(i, color);
- }
- }
-
- private void setKnobUIColorHex(int knob, String color) {
- var lightPane = (Shape) lightPanes.getChildren().get(knob);
- lightPane.setFill(Paint.valueOf(color));
- }
-
- private void setKnobUIColor(int knob, Color color) {
- var lightPane = (Shape) lightPanes.getChildren().get(knob);
- lightPane.setFill(color);
- }
-
- @Override
- public void closeDialogs() {
- if (childDialogStage != null && childDialogStage.isShowing())
- childDialogStage.close();
- }
-
- @Override
- public Button getLightingButton() {
- return lightingButton;
- }
-
- @Override
- public DeviceType getDeviceType() {
- return DeviceType.PCPANEL_RGB;
- }
-
- @Override
- public void showLightingConfigToUI(LightingConfig config) {
- var mode = config.getLightingMode();
- if (mode == LightingMode.ALL_COLOR) {
- setAllKnobUIColor(Color.valueOf(config.getAllColor()));
- } else if (mode == LightingMode.SINGLE_COLOR) {
- for (var i = 0; i < getKnobCount(); i++) {
- var color = overrideColorService.getDialOverride(serialNumber, i).map(SingleKnobLightingConfig::getColor1).orElse(config.getIndividualColors()[i]);
- setKnobUIColorHex(i, color);
- }
- } else if (mode == LightingMode.ALL_RAINBOW) {
- for (var i = 0; i < getKnobCount(); i++)
- setKnobUIColor(i,
- Color.hsb((360 * (getKnobCount() - i - 1) * (0xFF & config.getRainbowPhaseShift())) / 255.0D * getKnobCount(), 1.0D, (0xFF & config.getRainbowBrightness()) / 255.0D));
- } else if (mode == LightingMode.ALL_WAVE) {
- for (var i = 0; i < getKnobCount(); i++)
- setKnobUIColor(i, Color.hsb(360.0D * (0xFF & config.getWaveHue()) / 255.0D, 1.0D, (0xFF & config.getWaveBrightness()) / 255.0D));
- } else if (mode == LightingMode.ALL_BREATH) {
- for (var i = 0; i < getKnobCount(); i++)
- setKnobUIColor(i, Color.hsb(360.0D * (0xFF & config.getBreathHue()) / 255.0D, 1.0D, (0xFF & config.getBreathBrightness()) / 255.0D));
- }
- }
-
- @Override
- protected ImageView[] getKnobImages() {
- return images;
- }
-}
diff --git a/src/main/java/com/getpcpanel/graalvm/NativeImageConfig.java b/src/main/java/com/getpcpanel/graalvm/NativeImageConfig.java
new file mode 100644
index 00000000..f3b623a3
--- /dev/null
+++ b/src/main/java/com/getpcpanel/graalvm/NativeImageConfig.java
@@ -0,0 +1,250 @@
+package com.getpcpanel.graalvm;
+
+import org.hid4java.jna.HidApi;
+import org.hid4java.jna.HidApiLibrary;
+import org.hid4java.jna.HidDeviceInfoStructure;
+import org.hid4java.jna.HidDeviceStructure;
+import org.hid4java.jna.HidrawHidApiLibrary;
+import org.hid4java.jna.LibusbHidApiLibrary;
+import org.hid4java.jna.WideStringBuffer;
+
+import com.getpcpanel.commands.Commands;
+import com.getpcpanel.commands.CommandsType;
+import com.getpcpanel.commands.DeviceSet;
+import com.getpcpanel.commands.command.Command;
+import com.getpcpanel.commands.command.CommandBrightness;
+import com.getpcpanel.commands.command.CommandEndProgram;
+import com.getpcpanel.commands.command.CommandKeystroke;
+import com.getpcpanel.commands.command.CommandMedia;
+import com.getpcpanel.commands.command.CommandMedia.VolumeButton;
+import com.getpcpanel.commands.command.CommandNoOp;
+import com.getpcpanel.commands.command.CommandObs;
+import com.getpcpanel.commands.command.CommandObsMuteSource;
+import com.getpcpanel.commands.command.CommandObsSetScene;
+import com.getpcpanel.commands.command.CommandObsSetSourceVolume;
+import com.getpcpanel.commands.command.CommandProfile;
+import com.getpcpanel.commands.command.CommandRun;
+import com.getpcpanel.commands.command.CommandShortcut;
+import com.getpcpanel.commands.command.CommandVoiceMeeter;
+import com.getpcpanel.commands.command.CommandVoiceMeeterAdvanced;
+import com.getpcpanel.commands.command.CommandVoiceMeeterAdvancedButton;
+import com.getpcpanel.commands.command.CommandVoiceMeeterBasic;
+import com.getpcpanel.commands.command.CommandVoiceMeeterBasicButton;
+import com.getpcpanel.commands.command.CommandVolume;
+import com.getpcpanel.commands.command.CommandVolumeApplicationDeviceToggle;
+import com.getpcpanel.commands.command.CommandVolumeDefaultDevice;
+import com.getpcpanel.commands.command.CommandVolumeDefaultDeviceAdvanced;
+import com.getpcpanel.commands.command.CommandVolumeDefaultDeviceToggle;
+import com.getpcpanel.commands.command.CommandVolumeDefaultDeviceToggleAdvanced;
+import com.getpcpanel.commands.command.CommandVolumeDevice;
+import com.getpcpanel.commands.command.CommandVolumeDeviceMute;
+import com.getpcpanel.commands.command.CommandVolumeFocus;
+import com.getpcpanel.commands.command.CommandVolumeFocusMute;
+import com.getpcpanel.commands.command.CommandVolumeProcess;
+import com.getpcpanel.commands.command.CommandVolumeProcessMute;
+import com.getpcpanel.commands.command.DialAction.DialCommandParams;
+import com.getpcpanel.profile.DeviceSave;
+import com.getpcpanel.profile.Profile;
+import com.getpcpanel.profile.Save;
+import com.getpcpanel.profile.dto.KnobSetting;
+import com.getpcpanel.profile.dto.LightingConfig;
+import com.getpcpanel.profile.dto.LightingConfig.LightingMode;
+import com.getpcpanel.profile.dto.MqttSettings;
+import com.getpcpanel.profile.dto.MqttSettings.HomeAssistantSettings;
+import com.getpcpanel.profile.dto.OSCBinding;
+import com.getpcpanel.profile.dto.OSCConnectionInfo;
+import com.getpcpanel.profile.dto.OverlayPosition;
+import com.getpcpanel.profile.dto.SingleKnobLightingConfig;
+import com.getpcpanel.profile.dto.SingleKnobLightingConfig.SINGLE_KNOB_MODE;
+import com.getpcpanel.profile.dto.SingleLogoLightingConfig;
+import com.getpcpanel.profile.dto.SingleLogoLightingConfig.SINGLE_LOGO_MODE;
+import com.getpcpanel.profile.dto.SingleSliderLabelLightingConfig;
+import com.getpcpanel.profile.dto.SingleSliderLabelLightingConfig.SINGLE_SLIDER_LABEL_MODE;
+import com.getpcpanel.profile.dto.SingleSliderLightingConfig;
+import com.getpcpanel.profile.dto.SingleSliderLightingConfig.SINGLE_SLIDER_MODE;
+import com.getpcpanel.profile.dto.WaveLinkSettings;
+import com.getpcpanel.wavelink.command.CommandWaveLink;
+import com.getpcpanel.wavelink.command.CommandWaveLinkAddFocusToChannel;
+import com.getpcpanel.wavelink.command.CommandWaveLinkChange;
+import com.getpcpanel.wavelink.command.CommandWaveLinkChangeLevel;
+import com.getpcpanel.wavelink.command.CommandWaveLinkChangeMute;
+import com.getpcpanel.wavelink.command.CommandWaveLinkChannelEffect;
+import com.getpcpanel.wavelink.command.CommandWaveLinkMainOutput;
+import com.getpcpanel.wavelink.command.WaveLinkCommandTarget;
+
+import dev.niels.wavelink.impl.model.WaveLinkApp;
+import dev.niels.wavelink.impl.model.WaveLinkChannel;
+import dev.niels.wavelink.impl.model.WaveLinkControlAction;
+import dev.niels.wavelink.impl.model.WaveLinkEffect;
+import dev.niels.wavelink.impl.model.WaveLinkGain;
+import dev.niels.wavelink.impl.model.WaveLinkImage;
+import dev.niels.wavelink.impl.model.WaveLinkInput;
+import dev.niels.wavelink.impl.model.WaveLinkInputDevice;
+import dev.niels.wavelink.impl.model.WaveLinkMainOutput;
+import dev.niels.wavelink.impl.model.WaveLinkMix;
+import dev.niels.wavelink.impl.model.WaveLinkOutput;
+import dev.niels.wavelink.impl.model.WaveLinkOutputDevice;
+import dev.niels.wavelink.impl.rpc.JsonRpcMessage;
+import dev.niels.wavelink.impl.rpc.JsonRpcResponse;
+import dev.niels.wavelink.impl.rpc.JsonRpcResponse.ErrorDetail;
+import dev.niels.wavelink.impl.rpc.WaveLinkAddToChannelCommand;
+import dev.niels.wavelink.impl.rpc.WaveLinkChannelChangedCommand;
+import dev.niels.wavelink.impl.rpc.WaveLinkChannelsChangedCommand;
+import dev.niels.wavelink.impl.rpc.WaveLinkFocusedAppChangedCommand;
+import dev.niels.wavelink.impl.rpc.WaveLinkGetApplicationInfo;
+import dev.niels.wavelink.impl.rpc.WaveLinkGetChannels;
+import dev.niels.wavelink.impl.rpc.WaveLinkGetInputDevices;
+import dev.niels.wavelink.impl.rpc.WaveLinkGetMixes;
+import dev.niels.wavelink.impl.rpc.WaveLinkGetOutputDevices;
+import dev.niels.wavelink.impl.rpc.WaveLinkJsonRpcCommand;
+import dev.niels.wavelink.impl.rpc.WaveLinkMixChangedCommand;
+import dev.niels.wavelink.impl.rpc.WaveLinkOutputDeviceChangedCommand;
+import dev.niels.wavelink.impl.rpc.WaveLinkSetChannelCommand;
+import dev.niels.wavelink.impl.rpc.WaveLinkSetMixCommand;
+import dev.niels.wavelink.impl.rpc.WaveLinkSetOutputDeviceCommand;
+import dev.niels.wavelink.impl.rpc.WaveLinkSetSubscription;
+import dev.niels.wavelink.impl.rpc.WaveLinkUnknownCommand;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+/**
+ * GraalVM native image reflection hints.
+ *
+ * Jackson deserialises {@link Command} subtypes via {@code @JsonTypeInfo(use = ID.CLASS)}, so
+ * every concrete subtype must be registered for reflection. All profile/command model classes that
+ * are serialised/deserialised by Jackson are collected here.
+ *
+ *
hid4java JNA structures and library interfaces are also registered here for JNA reflective
+ * instantiation and field access.
+ */
+@RegisterForReflection(targets = {
+ // hid4java JNA library + structure classes (JNA needs reflection to instantiate structures)
+ HidApi.class,
+ HidApiLibrary.class,
+ HidDeviceInfoStructure.class,
+ HidDeviceStructure.class,
+ HidrawHidApiLibrary.class,
+ LibusbHidApiLibrary.class,
+ WideStringBuffer.class,
+
+ // MQTT Home Assistant discovery payload classes (serialised to JSON by Jackson)
+ // Note: these records are package-private so referenced by classNames below
+
+ // Command type hierarchy
+ Command.class,
+ CommandBrightness.class,
+ CommandEndProgram.class,
+ CommandKeystroke.class,
+ CommandMedia.class,
+ VolumeButton.class,
+ CommandNoOp.class,
+ CommandObs.class,
+ CommandObsMuteSource.class,
+ CommandObsSetScene.class,
+ CommandObsSetSourceVolume.class,
+ CommandProfile.class,
+ CommandRun.class,
+ CommandShortcut.class,
+ CommandVoiceMeeter.class,
+ CommandVoiceMeeterAdvanced.class,
+ CommandVoiceMeeterAdvancedButton.class,
+ CommandVoiceMeeterBasic.class,
+ CommandVoiceMeeterBasicButton.class,
+ CommandVolume.class,
+ CommandVolumeApplicationDeviceToggle.class,
+ CommandVolumeDefaultDevice.class,
+ CommandVolumeDefaultDeviceAdvanced.class,
+ CommandVolumeDefaultDeviceToggle.class,
+ CommandVolumeDefaultDeviceToggleAdvanced.class,
+ CommandVolumeDevice.class,
+ CommandVolumeDeviceMute.class,
+ CommandVolumeFocus.class,
+ CommandVolumeFocusMute.class,
+ CommandVolumeProcess.class,
+ CommandVolumeProcessMute.class,
+
+ // WaveLink command hierarchy (also extends Command → ID.CLASS polymorphism)
+ CommandWaveLink.class,
+ CommandWaveLinkAddFocusToChannel.class,
+ CommandWaveLinkChange.class,
+ CommandWaveLinkChangeLevel.class,
+ CommandWaveLinkChangeMute.class,
+ CommandWaveLinkChannelEffect.class,
+ CommandWaveLinkMainOutput.class,
+ WaveLinkCommandTarget.class,
+
+ // WaveLink RPC protocol classes (Jackson @JsonSubTypes / @JsonTypeInfo)
+ JsonRpcMessage.class,
+ JsonRpcResponse.class,
+ ErrorDetail.class,
+ WaveLinkJsonRpcCommand.class,
+ WaveLinkChannelChangedCommand.class,
+ WaveLinkChannelsChangedCommand.class,
+ WaveLinkFocusedAppChangedCommand.class,
+ WaveLinkMixChangedCommand.class,
+ WaveLinkOutputDeviceChangedCommand.class,
+ WaveLinkGetApplicationInfo.class,
+ WaveLinkGetChannels.class,
+ WaveLinkGetInputDevices.class,
+ WaveLinkGetMixes.class,
+ WaveLinkGetOutputDevices.class,
+ WaveLinkSetChannelCommand.class,
+ WaveLinkSetMixCommand.class,
+ WaveLinkSetOutputDeviceCommand.class,
+ WaveLinkSetSubscription.class,
+ WaveLinkAddToChannelCommand.class,
+ WaveLinkUnknownCommand.class,
+
+ // WaveLink model classes (deserialised from WaveLink JSON API)
+ WaveLinkApp.class,
+ WaveLinkChannel.class,
+ WaveLinkControlAction.class,
+ WaveLinkEffect.class,
+ WaveLinkGain.class,
+ WaveLinkImage.class,
+ WaveLinkInput.class,
+ WaveLinkInputDevice.class,
+ WaveLinkMainOutput.class,
+ WaveLinkMix.class,
+ WaveLinkOutput.class,
+ WaveLinkOutputDevice.class,
+
+ // Command support types serialised by Jackson
+ Commands.class,
+ CommandsType.class,
+ DeviceSet.class,
+ DialCommandParams.class,
+
+ // Profile / save model classes (Jackson deserialization of user save file)
+ Save.class,
+ DeviceSave.class,
+ Profile.class,
+ LightingConfig.class,
+ LightingMode.class,
+ SingleKnobLightingConfig.class,
+ SINGLE_KNOB_MODE.class,
+ SingleSliderLightingConfig.class,
+ SINGLE_SLIDER_MODE.class,
+ SingleSliderLabelLightingConfig.class,
+ SINGLE_SLIDER_LABEL_MODE.class,
+ SingleLogoLightingConfig.class,
+ SINGLE_LOGO_MODE.class,
+ KnobSetting.class,
+ MqttSettings.class,
+ HomeAssistantSettings.class,
+ WaveLinkSettings.class,
+ OSCConnectionInfo.class,
+ OSCBinding.class,
+ OverlayPosition.class,
+}, classNames = {
+ // MQTT Home Assistant discovery records (package-private inner classes – referenced by name)
+ "com.getpcpanel.mqtt.MqttHomeAssistantHelper$HomeAssistantAvailability",
+ "com.getpcpanel.mqtt.MqttHomeAssistantHelper$HomeAssistantButtonConfig",
+ "com.getpcpanel.mqtt.MqttHomeAssistantHelper$HomeAssistantButtonEventConfig",
+ "com.getpcpanel.mqtt.MqttHomeAssistantHelper$HomeAssistantDevice",
+ "com.getpcpanel.mqtt.MqttHomeAssistantHelper$HomeAssistantLightConfig",
+ "com.getpcpanel.mqtt.MqttHomeAssistantHelper$HomeAssistantNumberConfig",
+})
+public class NativeImageConfig {
+ private NativeImageConfig() {
+ }
+}
diff --git a/src/main/java/com/getpcpanel/hid/ByteWriter.java b/src/main/java/com/getpcpanel/hid/ByteWriter.java
index 3979d3eb..43399350 100644
--- a/src/main/java/com/getpcpanel/hid/ByteWriter.java
+++ b/src/main/java/com/getpcpanel/hid/ByteWriter.java
@@ -2,8 +2,10 @@
import java.util.stream.Stream;
-import javafx.scene.paint.Color;
-
+/**
+ * Builds byte arrays for HID lighting commands.
+ * Colors are passed as hex strings (e.g. "#rrggbb") or as separate R/G/B int components.
+ */
class ByteWriter {
private final byte[] buff;
private final int brightnessMultiplier;
@@ -34,9 +36,32 @@ public ByteWriter appendBrightness(byte nr) {
return append(applyBrightness(nr));
}
- @SuppressWarnings("NumericCastThatLosesPrecision")
- public ByteWriter append(Color c) {
- return append(applyBrightness((byte) (c.getRed() * 255)), applyBrightness((byte) (c.getGreen() * 255)), applyBrightness((byte) (c.getBlue() * 255)));
+ /**
+ * Append RGB from a CSS hex color string ("#rrggbb"). If null/invalid, appends black.
+ */
+ public ByteWriter appendHex(String hexColor) {
+ int r = 0, g = 0, b = 0;
+ if (hexColor != null) {
+ try {
+ String hex = hexColor.startsWith("#") ? hexColor.substring(1) : hexColor;
+ r = Integer.parseInt(hex.substring(0, 2), 16) & 0xFF;
+ g = Integer.parseInt(hex.substring(2, 4), 16) & 0xFF;
+ b = Integer.parseInt(hex.substring(4, 6), 16) & 0xFF;
+ } catch (Exception ignored) {
+ }
+ }
+ return append(applyBrightness((byte) r), applyBrightness((byte) g), applyBrightness((byte) b));
+ }
+
+ /**
+ * Append RGB from int components (0-255). Values are clamped to [0, 255].
+ */
+ public ByteWriter appendRGB(int r, int g, int b) {
+ return append(
+ applyBrightness((byte) (Math.min(255, Math.max(0, r)) & 0xFF)),
+ applyBrightness((byte) (Math.min(255, Math.max(0, g)) & 0xFF)),
+ applyBrightness((byte) (Math.min(255, Math.max(0, b)) & 0xFF))
+ );
}
private byte applyBrightness(byte nr) {
diff --git a/src/main/java/com/getpcpanel/hid/DeviceCommunicationHandler.java b/src/main/java/com/getpcpanel/hid/DeviceCommunicationHandler.java
index dc6d47e0..b8767802 100644
--- a/src/main/java/com/getpcpanel/hid/DeviceCommunicationHandler.java
+++ b/src/main/java/com/getpcpanel/hid/DeviceCommunicationHandler.java
@@ -14,14 +14,17 @@
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.commons.lang3.tuple.Pair;
import org.hid4java.HidDevice;
-import org.springframework.context.ApplicationEventPublisher;
+
+import javax.annotation.Nullable;
import com.getpcpanel.device.DeviceType;
import com.getpcpanel.profile.SaveService;
+import jakarta.enterprise.event.Event;
import lombok.Setter;
import lombok.extern.log4j.Log4j2;
@@ -30,7 +33,7 @@ public class DeviceCommunicationHandler {
private static final byte INPUT_CODE_KNOB_CHANGE = 1;
private static final byte INPUT_CODE_BUTTON_CHANGE = 2;
- private final ApplicationEventPublisher eventPublisher;
+ private final Event