]> git.basschouten.com Git - openhab-addons.git/commitdiff
[lifx] Set tagged flag accordingly for unicast and broadcast messages (#13744)
authorpali <pauli.anttila@gmail.com>
Mon, 5 Dec 2022 09:00:10 +0000 (11:00 +0200)
committerGitHub <noreply@github.com>
Mon, 5 Dec 2022 09:00:10 +0000 (10:00 +0100)
* Set tagged flag accordingly
* Update packets

Also-by: Wouter Born <github@maindrain.net>
Signed-off-by: Pauli Anttila <pauli.anttila@gmail.com>
35 files changed:
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetColorZonesRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetEchoRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetGroupRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetHevCycleConfigurationRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetHevCycleRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetHostFirmwareRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetHostInfoRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetInfoRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetLabelRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetLastHevCycleResultRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetLightInfraredRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetLightPowerRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetLocationRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetPowerRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetServiceRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetTileEffectRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetVersionRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetWifiFirmwareRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/GetWifiInfoRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/SetColorRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/SetColorZonesRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/SetHevCycleConfigurationRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/SetHevCycleRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/SetLabelRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/SetLightInfraredRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/SetLightPowerRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/SetPowerRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/SetTileEffectRequest.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/StateHostFirmwareResponse.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/StateHostInfoResponse.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/StateInfoResponse.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/StateVersionResponse.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/dto/StateWifiFirmwareResponse.java
bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxSelectorUtil.java

index 8e75e74289b16bded9b4915e02663a190e25725f..461fcea43074d1c964fda5935b6c60a1fc96eaa3 100644 (file)
@@ -33,7 +33,6 @@ public class GetColorZonesRequest extends Packet {
     private int endIndex = MAX_ZONE_INDEX;
 
     public GetColorZonesRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 8403c4dbf7c7f37f5bf6f0b01190909f379ed9ff..74f96cda2d8236352d18a681ed6c610e1d5b6742 100644 (file)
@@ -30,7 +30,6 @@ public class GetEchoRequest extends Packet {
     private ByteBuffer payload;
 
     public GetEchoRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 3ab967f23f491fee0380d8b5d188f159ab65e1ff..44b4c285b84bcf1990b08ebc311675bd76f2a401 100644 (file)
@@ -23,7 +23,6 @@ public class GetGroupRequest extends Packet {
     public static final int TYPE = 0x33;
 
     public GetGroupRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 437707a95d7a1184b4f0b606169600531964e032..f238000ce9dde361cd529d4047420913cb77485e 100644 (file)
@@ -22,7 +22,6 @@ public class GetHevCycleConfigurationRequest extends Packet {
     public static final int TYPE = 0x91;
 
     public GetHevCycleConfigurationRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 61765c9bde397a1ebc62d2943a99390c09003c7e..a09b6e538a5b9317816fa3d6586eada429afe8d3 100644 (file)
@@ -22,7 +22,6 @@ public class GetHevCycleRequest extends Packet {
     public static final int TYPE = 0x8E;
 
     public GetHevCycleRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index ad0f57b652958e4b37362bc03ad0973754fe1c63..dbc4e41f05405d0a971ce303426b93b75939462d 100644 (file)
@@ -23,7 +23,6 @@ public class GetHostFirmwareRequest extends Packet {
     public static final int TYPE = 0x0E;
 
     public GetHostFirmwareRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 04519a53098fa6d7ab8ba2b493d583ad6e4c48bc..0638ca8179afeffad0972ccc0308be0cc3693d40 100644 (file)
@@ -23,7 +23,6 @@ public class GetHostInfoRequest extends Packet {
     public static final int TYPE = 0x0C;
 
     public GetHostInfoRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 2963170fad451477b8863862f6f9ac03a81e982d..c6500edfd807dfc2880c513f42ffe028b62cefeb 100644 (file)
@@ -23,7 +23,6 @@ public class GetInfoRequest extends Packet {
     public static final int TYPE = 0x22;
 
     public GetInfoRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 285bcc0c96d0735266f95e967dd1286bfbf69f0e..c44227cb31681719225082aeb77b21d0a91cd971 100644 (file)
@@ -23,7 +23,6 @@ public class GetLabelRequest extends Packet {
     public static final int TYPE = 0x17;
 
     public GetLabelRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 0ca40fa6d045e2cff51a527ed984da665e6e127d..3ef9411cc77a99487a19c9581311d1965d3ecdcb 100644 (file)
@@ -22,7 +22,6 @@ public class GetLastHevCycleResultRequest extends Packet {
     public static final int TYPE = 0x94;
 
     public GetLastHevCycleResultRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 31426601efd99867a43a14ae43cd1d2664b83445..38925dcac6691445f05633691852c95241a26d7f 100644 (file)
@@ -22,7 +22,6 @@ public class GetLightInfraredRequest extends Packet {
     public static final int TYPE = 0x78;
 
     public GetLightInfraredRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index d04952d30aac9766c9d7c05ddc3a3fd8179e8f05..94924208286576fd75bc14a23930e5c2f52603d8 100644 (file)
@@ -23,7 +23,6 @@ public class GetLightPowerRequest extends Packet {
     public static final int TYPE = 0x74;
 
     public GetLightPowerRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 50e90d31f9aad15e54c88ed65c0e09b53bbc6081..e7ee01cc6b4236b0bce99f180f4056094fdbbaeb 100644 (file)
@@ -23,7 +23,6 @@ public class GetLocationRequest extends Packet {
     public static final int TYPE = 0x30;
 
     public GetLocationRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index d69163b659d5836a044a5a41eda3d2430b078386..6db8c3119cffe5043badf11a9e5cac50ca9628d8 100644 (file)
@@ -23,7 +23,6 @@ public class GetPowerRequest extends Packet {
     public static final int TYPE = 0x14;
 
     public GetPowerRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 6d812417adab7c3fe2cff5184ebd4917e7efa02b..913cf01b61b3b4590e7a9450cf54c9e603060509 100644 (file)
@@ -23,7 +23,6 @@ public class GetRequest extends Packet {
     public static final int TYPE = 0x65;
 
     public GetRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 318be38e2739d645200f88c714a475ab59a4ce68..a6f7e9387100934ecfd9b93db7891058c1df65be 100644 (file)
@@ -23,7 +23,6 @@ public class GetServiceRequest extends Packet {
     public static final int TYPE = 0x02;
 
     public GetServiceRequest() {
-        setTagged(true);
         setAddressable(true);
     }
 
index a4ad91adbe122dac4efc78aaa0937f5e434a0ac6..8a1e480fe71b207f79f406051b7806c2533776a1 100644 (file)
@@ -24,7 +24,6 @@ public class GetTileEffectRequest extends Packet {
     public static final int TYPE = 0x2CE;
 
     public GetTileEffectRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 98da874a19c9a127ffa0d089d2ac72a3b542364f..90337838da1c2b0e82339b5ac1661494dbed18e5 100644 (file)
@@ -23,7 +23,6 @@ public class GetVersionRequest extends Packet {
     public static final int TYPE = 0x20;
 
     public GetVersionRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 868c4d59ef23704f206a83babbdf73c2fa9019ee..ecfe32551f2559abcd1b38015cbddfaf2d9b77b4 100644 (file)
@@ -23,7 +23,6 @@ public class GetWifiFirmwareRequest extends Packet {
     public static final int TYPE = 0x12;
 
     public GetWifiFirmwareRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 33d4c62d7632476a37008ca839696bc449a76dae..b12d5dffa3b4df1a2e05f332b6ec7a8d3eb9d657 100644 (file)
@@ -23,7 +23,6 @@ public class GetWifiInfoRequest extends Packet {
     public static final int TYPE = 0x10;
 
     public GetWifiInfoRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 684aa55fdce200617d0c7706d78afc639c3093da..e7d2e2701b87bb51d5c3cebfe3b06b03192a8109 100644 (file)
@@ -51,7 +51,6 @@ public class SetColorRequest extends Packet {
 
     public SetColorRequest() {
         stream = ByteBuffer.allocate(1);
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index d92a61aed29c76b35f74d3b86ede798364d551b8..0b7408fc7ab26d8ac445ed2a8e0bf39a0dea4307 100644 (file)
@@ -70,7 +70,6 @@ public class SetColorZonesRequest extends Packet {
     }
 
     public SetColorZonesRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index ac29ac56b92be5b389eebfd7529108421136e1b4..28aaed23c5f51962a8e7a6c3811a9dad7a2c76bc 100644 (file)
@@ -41,7 +41,6 @@ public class SetHevCycleConfigurationRequest extends Packet {
     }
 
     public SetHevCycleConfigurationRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 3bedbfca03f69d4887cf6908eb48a542097f5dd5..ab4c60c12b547ec091c4aef4545e03c584a412eb 100644 (file)
@@ -41,7 +41,6 @@ public class SetHevCycleRequest extends Packet {
     }
 
     public SetHevCycleRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 3185136d00acdde04b97faee4cbba0d8d5db5feb..5b6ccfdf4831d6433579e17c7d9b609a8cf09e58 100644 (file)
@@ -30,7 +30,6 @@ public class SetLabelRequest extends Packet {
     private String label;
 
     public SetLabelRequest() {
-        setTagged(false);
         setAddressable(true);
         setAckRequired(true);
     }
index 714496f289bc0fe79ab3dbf1a4631611a008507c..d13edaefa2a9e9540764df9e61ce159009933958 100644 (file)
@@ -33,7 +33,6 @@ public class SetLightInfraredRequest extends Packet {
     }
 
     public SetLightInfraredRequest() {
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 12723dad540e2957dd14b8dc0c502bd53a66b4cd..cf2859c753850e2daffed5398c728d542685a669 100644 (file)
@@ -47,7 +47,6 @@ public class SetLightPowerRequest extends Packet {
     public SetLightPowerRequest() {
         state = PowerState.OFF;
         this.duration = 0;
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
@@ -55,7 +54,6 @@ public class SetLightPowerRequest extends Packet {
     public SetLightPowerRequest(PowerState state) {
         this.state = state;
         this.duration = 0;
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 76bd10e168f958244f718a94cb81c62692ac0145..b575831a6202267d0040faedd56f614871810f2f 100644 (file)
@@ -35,14 +35,12 @@ public class SetPowerRequest extends Packet {
 
     public SetPowerRequest() {
         state = PowerState.OFF;
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
 
     public SetPowerRequest(PowerState state) {
         this.state = state;
-        setTagged(false);
         setAddressable(true);
         setResponseRequired(true);
     }
index 9807a58b62465f97fb223fff764557b1de72d464..64bdec63bf427a2d75c6acb12e504ad056e47404 100644 (file)
@@ -66,7 +66,6 @@ public class SetTileEffectRequest extends Packet {
     private Effect effect;
 
     public SetTileEffectRequest() {
-        setTagged(false);
         setAddressable(true);
         setAckRequired(true);
     }
index 0658e2b3a3b49e8f28925792e52f63eda52273a1..163a2dca235a0b2a1aecbad66db48c904174a029 100644 (file)
@@ -51,12 +51,6 @@ public class StateHostFirmwareResponse extends Packet {
         this.version = version;
     }
 
-    public StateHostFirmwareResponse() {
-        setTagged(false);
-        setAddressable(true);
-        setResponseRequired(true);
-    }
-
     @Override
     public int packetType() {
         return TYPE;
index 5faea20996c37b3af211719c959aaf3578ce9e00..f24955ff39232577a2a734157714591d7c7bf42a 100644 (file)
@@ -48,12 +48,6 @@ public class StateHostInfoResponse extends Packet {
         return rx;
     }
 
-    public StateHostInfoResponse() {
-        setTagged(false);
-        setAddressable(true);
-        setResponseRequired(true);
-    }
-
     @Override
     public int packetType() {
         return TYPE;
index f58e701d74e726dcf18dca5d8fab364db0995c72..d8f73fe547c85cbcf9bf0090fe15fb9bb380aed8 100644 (file)
@@ -57,12 +57,6 @@ public class StateInfoResponse extends Packet {
         this.downtime = downtime;
     }
 
-    public StateInfoResponse() {
-        setTagged(false);
-        setAddressable(true);
-        setResponseRequired(true);
-    }
-
     @Override
     public int packetType() {
         return TYPE;
index 2fac8568d4555f1b33b1562056d25dfe4d14dc0d..e9236e44daffdbf2d6d9965ee03e62cff65a7f9b 100644 (file)
@@ -57,12 +57,6 @@ public class StateVersionResponse extends Packet {
         this.version = version;
     }
 
-    public StateVersionResponse() {
-        setTagged(false);
-        setAddressable(true);
-        setResponseRequired(true);
-    }
-
     @Override
     public int packetType() {
         return TYPE;
index abbbd21c343f09b5f0409c11b35f33701300d443..cf6606ced93799a421e6e67f69705631323ef11c 100644 (file)
@@ -51,12 +51,6 @@ public class StateWifiFirmwareResponse extends Packet {
         this.version = version;
     }
 
-    public StateWifiFirmwareResponse() {
-        setTagged(false);
-        setAddressable(true);
-        setResponseRequired(true);
-    }
-
     @Override
     public int packetType() {
         return TYPE;
index 7073104a0e0799290926ab51b8effe2c905d6961..7e7864e54ed3238473ee3649061420e8b58a742e 100644 (file)
@@ -276,8 +276,10 @@ public class LifxSelectorUtil {
 
         try {
             if (castType == UNICAST) {
+                packet.setTagged(false);
                 LifxThrottlingUtil.lock(packet.getTarget());
             } else {
+                packet.setTagged(true);
                 LifxThrottlingUtil.lock();
             }