From b0f8d92ee07bbc07ba1bb8151dc78941b9205ff3 Mon Sep 17 00:00:00 2001 From: Moritz Vieli Date: Wed, 2 Oct 2024 13:58:27 +0200 Subject: [PATCH 01/11] Added plugin-related functions to the Java client - Add OlaClient.reloadPlugins() - Add OlaClient.getPluginState() - Add OlaClient.setPluginState() - Changed evaluation of PROTOBUF_VERSION, because pkg-config adds trailing ".0" to the version, which is not compatible with the available Java dependencies --- config/ola.m4 | 4 +- java/ChangeLog | 6 ++ java/pom.xml | 6 +- java/src/main/java/ola/OlaClient.java | 95 +++++++++++++++++++-------- 4 files changed, 80 insertions(+), 31 deletions(-) diff --git a/config/ola.m4 b/config/ola.m4 index f767788c87..e4df4427f7 100644 --- a/config/ola.m4 +++ b/config/ola.m4 @@ -25,10 +25,10 @@ AC_REQUIRE_CPP() PKG_CHECK_MODULES(libprotobuf, [protobuf >= $1]) AC_MSG_CHECKING([protobuf library version]) -PROTOBUF_VERSION=`pkg-config --modversion protobuf`; +PROTOBUF_VERSION=`protoc --version | awk '{print [$]2}'`; +AC_MSG_NOTICE([PROTOBUF VERSION $PROTOBUF_VERSION]) AC_MSG_RESULT([$PROTOBUF_VERSION]) AC_SUBST([PROTOBUF_VERSION]) - AC_SUBST([libprotobuf_CFLAGS]) AC_ARG_WITH([protoc], diff --git a/java/ChangeLog b/java/ChangeLog index 4a3da5b5ee..f628487204 100644 --- a/java/ChangeLog +++ b/java/ChangeLog @@ -1,3 +1,9 @@ +02/10/2024 Moritz Vieli + * v0.0.23 + - Add OlaClient.reloadPlugins() + - Add OlaClient.getPluginState() + - Add OlaClient.setPluginState() + 04/22/2017 Erez Makavy * v0.0.2 - Add OlaClient.getUniverseList() diff --git a/java/pom.xml b/java/pom.xml index 1ae5686e35..5e4680d6d6 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 ola ola-java-client - 0.1.0 + 0.0.3 Java implementation of OLA RPC UTF-8 @@ -36,8 +36,8 @@ maven-compiler-plugin 2.5.1 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/java/src/main/java/ola/OlaClient.java b/java/src/main/java/ola/OlaClient.java index 4f09a5af5e..24a6d2b42f 100644 --- a/java/src/main/java/ola/OlaClient.java +++ b/java/src/main/java/ola/OlaClient.java @@ -18,6 +18,8 @@ import java.util.logging.Logger; +import ola.proto.Ola; +import ola.proto.Ola.Ack; import ola.proto.Ola.DeviceConfigReply; import ola.proto.Ola.DeviceConfigRequest; import ola.proto.Ola.DeviceInfoReply; @@ -30,10 +32,14 @@ import ola.proto.Ola.OptionalUniverseRequest; import ola.proto.Ola.PatchAction; import ola.proto.Ola.PatchPortRequest; +import ola.proto.Ola.PluginReloadRequest; import ola.proto.Ola.PluginDescriptionReply; import ola.proto.Ola.PluginDescriptionRequest; import ola.proto.Ola.PluginListReply; import ola.proto.Ola.PluginListRequest; +import ola.proto.Ola.PluginStateRequest; +import ola.proto.Ola.PluginStateReply; +import ola.proto.Ola.PluginStateChangeRequest; import ola.proto.Ola.PortPriorityRequest; import ola.proto.Ola.RDMRequest; import ola.proto.Ola.RDMResponse; @@ -67,7 +73,6 @@ public class OlaClient { public OlaClient() throws Exception { - channel = new StreamRpcChannel(); controller = new SimpleRpcController(); serverService = OlaServerService.Stub.newStub(channel); @@ -77,12 +82,11 @@ public OlaClient() throws Exception { /** * Generic method for making Rpc Calls. * - * @param method Name of the Rpc Method to call + * @param method Name of the Rpc Method to call * @param inputMessage Input RpcMessage * @return Message result message or null if the call failed. */ private Message callRpcMethod(String method, Message inputMessage) { - final Message[] outputMessage = new Message[1]; controller.reset(); @@ -103,7 +107,6 @@ public void run(Message arg0) { } - /** * Get a list of plugins from olad. * @@ -114,6 +117,16 @@ public PluginListReply getPlugins() { } + /** + * Reload the plugins. + * + * @return The list of plugings. + */ + public Ack reloadPlugins() { + return (Ack) callRpcMethod("ReloadPlugins", PluginReloadRequest.newBuilder().build()); + } + + /** * Get a plugin description from olad. * @@ -121,7 +134,6 @@ public PluginListReply getPlugins() { * @return The list of plugings. */ public PluginDescriptionReply getPluginDescription(int pluginId) { - PluginDescriptionRequest request = PluginDescriptionRequest.newBuilder() .setPluginId(pluginId) .build(); @@ -130,6 +142,38 @@ public PluginDescriptionReply getPluginDescription(int pluginId) { } + /** + * Return the state for a plugin. + * + * @param pluginId number of the plugin for which to receive the state + * @return The list of plugings. + */ + public PluginStateReply getPluginState(int pluginId) { + PluginStateRequest request = Ola.PluginStateRequest.newBuilder() + .setPluginId(pluginId) + .build(); + + return (PluginStateReply) callRpcMethod("GetPluginState", request); + } + + + /** + * Change the state of plugins. + * + * @param pluginId number of the plugin for which to change the state + * @param enabled whether the plugin should be enabled or not + * @return The list of plugings. + */ + public Ack setPluginState(int pluginId, boolean enabled) { + PluginStateChangeRequest request = Ola.PluginStateChangeRequest.newBuilder() + .setPluginId(pluginId) + .setEnabled(enabled) + .build(); + + return (Ack) callRpcMethod("SetPluginState", request); + } + + /** * Get device info from olad. * @@ -155,7 +199,7 @@ public DeviceInfoReply getCandidatePorts(int universe) { * Configure device. * * @param device the id of the device to configure. - * @param data device configuration data. + * @param data device configuration data. * @return */ public DeviceConfigReply configureDevice(int device, short[] data) { @@ -221,6 +265,7 @@ public UIDListReply forceDiscovery(int universe, boolean full) { /** * Retrieve dmx data from universe. + * * @param universe the id of the universe * @return */ @@ -229,18 +274,16 @@ public DmxData getDmx(int universe) { } - /** * Patch a port. * - * @param device number - * @param port number - * @param action PachAction.PATCH or PatchAction.UNPATCH + * @param device number + * @param port number + * @param action PachAction.PATCH or PatchAction.UNPATCH * @param universe number * @return true when succeeded. */ public boolean patchPort(int device, int port, PatchAction action, int universe) { - PatchPortRequest patchRequest = PatchPortRequest.newBuilder() .setPortId(port) .setAction(action) @@ -257,11 +300,10 @@ public boolean patchPort(int device, int port, PatchAction action, int universe) * Send dmx data to olad. * * @param universe number - * @param values array of dmx data values + * @param values array of dmx data values * @return true when succeeded. */ public boolean sendDmx(int universe, short[] values) { - DmxData dmxData = DmxData.newBuilder() .setUniverse(universe) .setData(convertToUnsigned(values)) @@ -278,12 +320,12 @@ public boolean sendDmx(int universe, short[] values) { */ public boolean setPortPriority(int device, int port, int priority, int mode, boolean output) { PortPriorityRequest request = PortPriorityRequest.newBuilder() - .setDeviceAlias(device) - .setPortId(port) - .setPriority(priority) - .setPriorityMode(mode) - .setIsOutput(output) - .build(); + .setDeviceAlias(device) + .setPortId(port) + .setPriority(priority) + .setPriorityMode(mode) + .setIsOutput(output) + .build(); return callRpcMethod("SetPortPriority", request) != null; } @@ -293,7 +335,7 @@ public boolean setPortPriority(int device, int port, int priority, int mode, boo * Set universe name. * * @param universe id of universe for which to set the name. - * @param name The name to set. + * @param name The name to set. * @return true if the call succeeded. */ public boolean setUniverseName(int universe, String name) { @@ -309,7 +351,7 @@ public boolean setUniverseName(int universe, String name) { * Define merge mode for a universe. * * @param universe The id of the universe - * @param mode, merge mode to use + * @param mode, merge mode to use * @return true if call succeeded. */ public boolean setMergeMode(int universe, MergeMode mode) { @@ -323,8 +365,9 @@ public boolean setMergeMode(int universe, MergeMode mode) { /** * Register for dmx + * * @param universe - * @param action RegisterAction + * @param action RegisterAction * @return true if call succeeded. */ public boolean registerForDmx(int universe, RegisterAction action) { @@ -338,6 +381,7 @@ public boolean registerForDmx(int universe, RegisterAction action) { /** * Set source UID for device. + * * @param device The id of the device * @param estaId the UID to set. * @return true if call succeeded. @@ -354,8 +398,8 @@ public boolean setSourceUID(int device, int estaId) { /** * Send TimeCode. * - * @param type TimeCodeType - * @param frames number of frames + * @param type TimeCodeType + * @param frames number of frames * @param hours * @param minutes * @param seconds @@ -403,10 +447,9 @@ public RDMResponse sendRDMCommand(UID uid, int subDevice, int paramId, boolean i * Send dmx data, but don't wait for response. * * @param universe the id of the universe - * @param values dmx data + * @param values dmx data */ public void streamDmx(int universe, short[] values) { - DmxData dmxData = DmxData.newBuilder() .setUniverse(universe) .setData(convertToUnsigned(values)) From 6c3ca582b1cbe20970f82411a04d09c843368084 Mon Sep 17 00:00:00 2001 From: Moritz Vieli Date: Wed, 2 Oct 2024 14:01:09 +0200 Subject: [PATCH 02/11] fixed some comments --- java/src/main/java/ola/OlaClient.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/src/main/java/ola/OlaClient.java b/java/src/main/java/ola/OlaClient.java index 24a6d2b42f..d22179ae00 100644 --- a/java/src/main/java/ola/OlaClient.java +++ b/java/src/main/java/ola/OlaClient.java @@ -120,7 +120,7 @@ public PluginListReply getPlugins() { /** * Reload the plugins. * - * @return The list of plugings. + * @return Acknowledgement. */ public Ack reloadPlugins() { return (Ack) callRpcMethod("ReloadPlugins", PluginReloadRequest.newBuilder().build()); @@ -131,7 +131,7 @@ public Ack reloadPlugins() { * Get a plugin description from olad. * * @param pluginId number of the plugin for which to receive the description - * @return The list of plugings. + * @return The description of the plugin. */ public PluginDescriptionReply getPluginDescription(int pluginId) { PluginDescriptionRequest request = PluginDescriptionRequest.newBuilder() @@ -162,7 +162,7 @@ public PluginStateReply getPluginState(int pluginId) { * * @param pluginId number of the plugin for which to change the state * @param enabled whether the plugin should be enabled or not - * @return The list of plugings. + * @return Acknowledgement. */ public Ack setPluginState(int pluginId, boolean enabled) { PluginStateChangeRequest request = Ola.PluginStateChangeRequest.newBuilder() From 0c896e5d23fb1daf7765f675619219dcf6266b37 Mon Sep 17 00:00:00 2001 From: "Moritz A. Vieli" Date: Mon, 9 Dec 2024 06:57:27 +0100 Subject: [PATCH 03/11] Update java/src/main/java/ola/OlaClient.java Co-authored-by: Peter Newman --- java/src/main/java/ola/OlaClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/main/java/ola/OlaClient.java b/java/src/main/java/ola/OlaClient.java index d22179ae00..804ac21ae3 100644 --- a/java/src/main/java/ola/OlaClient.java +++ b/java/src/main/java/ola/OlaClient.java @@ -158,7 +158,7 @@ public PluginStateReply getPluginState(int pluginId) { /** - * Change the state of plugins. + * Set the state of a plugin. * * @param pluginId number of the plugin for which to change the state * @param enabled whether the plugin should be enabled or not From 9721b535111cc97328f85822f94b83e1f4f22ced Mon Sep 17 00:00:00 2001 From: "Moritz A. Vieli" Date: Mon, 9 Dec 2024 06:58:08 +0100 Subject: [PATCH 04/11] Update java/src/main/java/ola/OlaClient.java Co-authored-by: Peter Newman --- java/src/main/java/ola/OlaClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/main/java/ola/OlaClient.java b/java/src/main/java/ola/OlaClient.java index 804ac21ae3..6c5ee914b3 100644 --- a/java/src/main/java/ola/OlaClient.java +++ b/java/src/main/java/ola/OlaClient.java @@ -146,7 +146,7 @@ public PluginDescriptionReply getPluginDescription(int pluginId) { * Return the state for a plugin. * * @param pluginId number of the plugin for which to receive the state - * @return The list of plugings. + * @return The state of the plugin. */ public PluginStateReply getPluginState(int pluginId) { PluginStateRequest request = Ola.PluginStateRequest.newBuilder() From fd0e518d90895191352c231bc1c5b17082b26809 Mon Sep 17 00:00:00 2001 From: "Moritz A. Vieli" Date: Mon, 9 Dec 2024 06:58:27 +0100 Subject: [PATCH 05/11] Update java/src/main/java/ola/OlaClient.java Co-authored-by: Peter Newman --- java/src/main/java/ola/OlaClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/main/java/ola/OlaClient.java b/java/src/main/java/ola/OlaClient.java index 6c5ee914b3..dd0c6934cf 100644 --- a/java/src/main/java/ola/OlaClient.java +++ b/java/src/main/java/ola/OlaClient.java @@ -145,7 +145,7 @@ public PluginDescriptionReply getPluginDescription(int pluginId) { /** * Return the state for a plugin. * - * @param pluginId number of the plugin for which to receive the state + * @param pluginId number of the plugin to fetch the state of * @return The state of the plugin. */ public PluginStateReply getPluginState(int pluginId) { From ecdaf705e5a47df8f20ede403e37ae92754b1f4d Mon Sep 17 00:00:00 2001 From: "Moritz A. Vieli" Date: Mon, 9 Dec 2024 06:58:39 +0100 Subject: [PATCH 06/11] Update java/src/main/java/ola/OlaClient.java Co-authored-by: Peter Newman --- java/src/main/java/ola/OlaClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/main/java/ola/OlaClient.java b/java/src/main/java/ola/OlaClient.java index dd0c6934cf..ecd9a63bef 100644 --- a/java/src/main/java/ola/OlaClient.java +++ b/java/src/main/java/ola/OlaClient.java @@ -143,7 +143,7 @@ public PluginDescriptionReply getPluginDescription(int pluginId) { /** - * Return the state for a plugin. + * Return the state of a plugin. * * @param pluginId number of the plugin to fetch the state of * @return The state of the plugin. From 79630929f9cde69e0dbff67f7e1cbdfa4e3acbb6 Mon Sep 17 00:00:00 2001 From: Moritz Vieli Date: Mon, 9 Dec 2024 06:59:06 +0100 Subject: [PATCH 07/11] fix Java versioning --- java/ChangeLog | 2 +- java/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/ChangeLog b/java/ChangeLog index f628487204..ac94da5157 100644 --- a/java/ChangeLog +++ b/java/ChangeLog @@ -1,5 +1,5 @@ 02/10/2024 Moritz Vieli - * v0.0.23 + * v0.2.0 - Add OlaClient.reloadPlugins() - Add OlaClient.getPluginState() - Add OlaClient.setPluginState() diff --git a/java/pom.xml b/java/pom.xml index 5e4680d6d6..4a86bfc9e7 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 ola ola-java-client - 0.0.3 + 0.2.0 Java implementation of OLA RPC UTF-8 From e792f5255f4ddf1a35be0cef7e1cb1ab16f0c853 Mon Sep 17 00:00:00 2001 From: Moritz Vieli Date: Mon, 9 Dec 2024 07:05:30 +0100 Subject: [PATCH 08/11] Revert protobuf version detection for now, as suggested in the discussions of #1979 --- config/ola.m4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/ola.m4 b/config/ola.m4 index e4df4427f7..0ac3f7cc11 100644 --- a/config/ola.m4 +++ b/config/ola.m4 @@ -25,8 +25,7 @@ AC_REQUIRE_CPP() PKG_CHECK_MODULES(libprotobuf, [protobuf >= $1]) AC_MSG_CHECKING([protobuf library version]) -PROTOBUF_VERSION=`protoc --version | awk '{print [$]2}'`; -AC_MSG_NOTICE([PROTOBUF VERSION $PROTOBUF_VERSION]) +PROTOBUF_VERSION=`pkg-config --modversion protobuf`; AC_MSG_RESULT([$PROTOBUF_VERSION]) AC_SUBST([PROTOBUF_VERSION]) AC_SUBST([libprotobuf_CFLAGS]) From b5be0b94de51153921ab8c051f000487f9d3db9f Mon Sep 17 00:00:00 2001 From: Moritz Vieli Date: Mon, 9 Dec 2024 07:19:16 +0100 Subject: [PATCH 09/11] Return boolean instead of ack for reloadPlugins and setPluginState --- java/src/main/java/ola/OlaClient.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/java/src/main/java/ola/OlaClient.java b/java/src/main/java/ola/OlaClient.java index ecd9a63bef..67decf1c85 100644 --- a/java/src/main/java/ola/OlaClient.java +++ b/java/src/main/java/ola/OlaClient.java @@ -120,10 +120,10 @@ public PluginListReply getPlugins() { /** * Reload the plugins. * - * @return Acknowledgement. + * @return true when succeeded. */ - public Ack reloadPlugins() { - return (Ack) callRpcMethod("ReloadPlugins", PluginReloadRequest.newBuilder().build()); + public boolean reloadPlugins() { + return callRpcMethod("ReloadPlugins", PluginReloadRequest.newBuilder().build()) != null; } @@ -162,15 +162,15 @@ public PluginStateReply getPluginState(int pluginId) { * * @param pluginId number of the plugin for which to change the state * @param enabled whether the plugin should be enabled or not - * @return Acknowledgement. + * @return true when succeeded. */ - public Ack setPluginState(int pluginId, boolean enabled) { + public boolean setPluginState(int pluginId, boolean enabled) { PluginStateChangeRequest request = Ola.PluginStateChangeRequest.newBuilder() .setPluginId(pluginId) .setEnabled(enabled) .build(); - return (Ack) callRpcMethod("SetPluginState", request); + return callRpcMethod("SetPluginState", request) != null; } From 3401e90f5a1e3dc6933fc0bacb8b44d5c32963e1 Mon Sep 17 00:00:00 2001 From: Moritz Vieli Date: Mon, 9 Dec 2024 07:26:34 +0100 Subject: [PATCH 10/11] revert whitespace changes --- config/ola.m4 | 1 + java/src/main/java/ola/OlaClient.java | 44 +++++++++++++++------------ 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/config/ola.m4 b/config/ola.m4 index 0ac3f7cc11..f767788c87 100644 --- a/config/ola.m4 +++ b/config/ola.m4 @@ -28,6 +28,7 @@ AC_MSG_CHECKING([protobuf library version]) PROTOBUF_VERSION=`pkg-config --modversion protobuf`; AC_MSG_RESULT([$PROTOBUF_VERSION]) AC_SUBST([PROTOBUF_VERSION]) + AC_SUBST([libprotobuf_CFLAGS]) AC_ARG_WITH([protoc], diff --git a/java/src/main/java/ola/OlaClient.java b/java/src/main/java/ola/OlaClient.java index 67decf1c85..707bdccbfb 100644 --- a/java/src/main/java/ola/OlaClient.java +++ b/java/src/main/java/ola/OlaClient.java @@ -73,6 +73,7 @@ public class OlaClient { public OlaClient() throws Exception { + channel = new StreamRpcChannel(); controller = new SimpleRpcController(); serverService = OlaServerService.Stub.newStub(channel); @@ -82,11 +83,12 @@ public OlaClient() throws Exception { /** * Generic method for making Rpc Calls. * - * @param method Name of the Rpc Method to call + * @param method Name of the Rpc Method to call * @param inputMessage Input RpcMessage * @return Message result message or null if the call failed. */ private Message callRpcMethod(String method, Message inputMessage) { + final Message[] outputMessage = new Message[1]; controller.reset(); @@ -107,6 +109,7 @@ public void run(Message arg0) { } + /** * Get a list of plugins from olad. * @@ -199,7 +202,7 @@ public DeviceInfoReply getCandidatePorts(int universe) { * Configure device. * * @param device the id of the device to configure. - * @param data device configuration data. + * @param data device configuration data. * @return */ public DeviceConfigReply configureDevice(int device, short[] data) { @@ -265,7 +268,6 @@ public UIDListReply forceDiscovery(int universe, boolean full) { /** * Retrieve dmx data from universe. - * * @param universe the id of the universe * @return */ @@ -277,13 +279,14 @@ public DmxData getDmx(int universe) { /** * Patch a port. * - * @param device number - * @param port number - * @param action PachAction.PATCH or PatchAction.UNPATCH + * @param device number + * @param port number + * @param action PachAction.PATCH or PatchAction.UNPATCH * @param universe number * @return true when succeeded. */ public boolean patchPort(int device, int port, PatchAction action, int universe) { + PatchPortRequest patchRequest = PatchPortRequest.newBuilder() .setPortId(port) .setAction(action) @@ -300,10 +303,11 @@ public boolean patchPort(int device, int port, PatchAction action, int universe) * Send dmx data to olad. * * @param universe number - * @param values array of dmx data values + * @param values array of dmx data values * @return true when succeeded. */ public boolean sendDmx(int universe, short[] values) { + DmxData dmxData = DmxData.newBuilder() .setUniverse(universe) .setData(convertToUnsigned(values)) @@ -320,12 +324,12 @@ public boolean sendDmx(int universe, short[] values) { */ public boolean setPortPriority(int device, int port, int priority, int mode, boolean output) { PortPriorityRequest request = PortPriorityRequest.newBuilder() - .setDeviceAlias(device) - .setPortId(port) - .setPriority(priority) - .setPriorityMode(mode) - .setIsOutput(output) - .build(); + .setDeviceAlias(device) + .setPortId(port) + .setPriority(priority) + .setPriorityMode(mode) + .setIsOutput(output) + .build(); return callRpcMethod("SetPortPriority", request) != null; } @@ -335,7 +339,7 @@ public boolean setPortPriority(int device, int port, int priority, int mode, boo * Set universe name. * * @param universe id of universe for which to set the name. - * @param name The name to set. + * @param name The name to set. * @return true if the call succeeded. */ public boolean setUniverseName(int universe, String name) { @@ -351,7 +355,7 @@ public boolean setUniverseName(int universe, String name) { * Define merge mode for a universe. * * @param universe The id of the universe - * @param mode, merge mode to use + * @param mode, merge mode to use * @return true if call succeeded. */ public boolean setMergeMode(int universe, MergeMode mode) { @@ -367,7 +371,7 @@ public boolean setMergeMode(int universe, MergeMode mode) { * Register for dmx * * @param universe - * @param action RegisterAction + * @param action RegisterAction * @return true if call succeeded. */ public boolean registerForDmx(int universe, RegisterAction action) { @@ -381,7 +385,6 @@ public boolean registerForDmx(int universe, RegisterAction action) { /** * Set source UID for device. - * * @param device The id of the device * @param estaId the UID to set. * @return true if call succeeded. @@ -398,8 +401,8 @@ public boolean setSourceUID(int device, int estaId) { /** * Send TimeCode. * - * @param type TimeCodeType - * @param frames number of frames + * @param type TimeCodeType + * @param frames number of frames * @param hours * @param minutes * @param seconds @@ -447,9 +450,10 @@ public RDMResponse sendRDMCommand(UID uid, int subDevice, int paramId, boolean i * Send dmx data, but don't wait for response. * * @param universe the id of the universe - * @param values dmx data + * @param values dmx data */ public void streamDmx(int universe, short[] values) { + DmxData dmxData = DmxData.newBuilder() .setUniverse(universe) .setData(convertToUnsigned(values)) From c7d2874eccc7a432fc8bef0c53fb98e4ae3f5920 Mon Sep 17 00:00:00 2001 From: Moritz Vieli Date: Mon, 9 Dec 2024 07:46:09 +0100 Subject: [PATCH 11/11] remove further whitespaces --- java/src/main/java/ola/OlaClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/main/java/ola/OlaClient.java b/java/src/main/java/ola/OlaClient.java index 707bdccbfb..e4a583cc50 100644 --- a/java/src/main/java/ola/OlaClient.java +++ b/java/src/main/java/ola/OlaClient.java @@ -276,6 +276,7 @@ public DmxData getDmx(int universe) { } + /** * Patch a port. * @@ -369,7 +370,6 @@ public boolean setMergeMode(int universe, MergeMode mode) { /** * Register for dmx - * * @param universe * @param action RegisterAction * @return true if call succeeded.