[lifx] Set tagged flag accordingly for unicast and broadcast messages (#13744)

* Set tagged flag accordingly
* Update packets

Also-by: Wouter Born <github@maindrain.net>
Signed-off-by: Pauli Anttila <pauli.anttila@gmail.com>
pull/13846/head
pali 2022-12-05 11:00:10 +02:00 committed by GitHub
parent 8f972362c3
commit 590b2cb4f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 2 additions and 61 deletions

View File

@ -33,7 +33,6 @@ public class GetColorZonesRequest extends Packet {
private int endIndex = MAX_ZONE_INDEX; private int endIndex = MAX_ZONE_INDEX;
public GetColorZonesRequest() { public GetColorZonesRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -30,7 +30,6 @@ public class GetEchoRequest extends Packet {
private ByteBuffer payload; private ByteBuffer payload;
public GetEchoRequest() { public GetEchoRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -23,7 +23,6 @@ public class GetGroupRequest extends Packet {
public static final int TYPE = 0x33; public static final int TYPE = 0x33;
public GetGroupRequest() { public GetGroupRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -22,7 +22,6 @@ public class GetHevCycleConfigurationRequest extends Packet {
public static final int TYPE = 0x91; public static final int TYPE = 0x91;
public GetHevCycleConfigurationRequest() { public GetHevCycleConfigurationRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -22,7 +22,6 @@ public class GetHevCycleRequest extends Packet {
public static final int TYPE = 0x8E; public static final int TYPE = 0x8E;
public GetHevCycleRequest() { public GetHevCycleRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -23,7 +23,6 @@ public class GetHostFirmwareRequest extends Packet {
public static final int TYPE = 0x0E; public static final int TYPE = 0x0E;
public GetHostFirmwareRequest() { public GetHostFirmwareRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -23,7 +23,6 @@ public class GetHostInfoRequest extends Packet {
public static final int TYPE = 0x0C; public static final int TYPE = 0x0C;
public GetHostInfoRequest() { public GetHostInfoRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -23,7 +23,6 @@ public class GetInfoRequest extends Packet {
public static final int TYPE = 0x22; public static final int TYPE = 0x22;
public GetInfoRequest() { public GetInfoRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -23,7 +23,6 @@ public class GetLabelRequest extends Packet {
public static final int TYPE = 0x17; public static final int TYPE = 0x17;
public GetLabelRequest() { public GetLabelRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -22,7 +22,6 @@ public class GetLastHevCycleResultRequest extends Packet {
public static final int TYPE = 0x94; public static final int TYPE = 0x94;
public GetLastHevCycleResultRequest() { public GetLastHevCycleResultRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -22,7 +22,6 @@ public class GetLightInfraredRequest extends Packet {
public static final int TYPE = 0x78; public static final int TYPE = 0x78;
public GetLightInfraredRequest() { public GetLightInfraredRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -23,7 +23,6 @@ public class GetLightPowerRequest extends Packet {
public static final int TYPE = 0x74; public static final int TYPE = 0x74;
public GetLightPowerRequest() { public GetLightPowerRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -23,7 +23,6 @@ public class GetLocationRequest extends Packet {
public static final int TYPE = 0x30; public static final int TYPE = 0x30;
public GetLocationRequest() { public GetLocationRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -23,7 +23,6 @@ public class GetPowerRequest extends Packet {
public static final int TYPE = 0x14; public static final int TYPE = 0x14;
public GetPowerRequest() { public GetPowerRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -23,7 +23,6 @@ public class GetRequest extends Packet {
public static final int TYPE = 0x65; public static final int TYPE = 0x65;
public GetRequest() { public GetRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -23,7 +23,6 @@ public class GetServiceRequest extends Packet {
public static final int TYPE = 0x02; public static final int TYPE = 0x02;
public GetServiceRequest() { public GetServiceRequest() {
setTagged(true);
setAddressable(true); setAddressable(true);
} }

View File

@ -24,7 +24,6 @@ public class GetTileEffectRequest extends Packet {
public static final int TYPE = 0x2CE; public static final int TYPE = 0x2CE;
public GetTileEffectRequest() { public GetTileEffectRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -23,7 +23,6 @@ public class GetVersionRequest extends Packet {
public static final int TYPE = 0x20; public static final int TYPE = 0x20;
public GetVersionRequest() { public GetVersionRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -23,7 +23,6 @@ public class GetWifiFirmwareRequest extends Packet {
public static final int TYPE = 0x12; public static final int TYPE = 0x12;
public GetWifiFirmwareRequest() { public GetWifiFirmwareRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -23,7 +23,6 @@ public class GetWifiInfoRequest extends Packet {
public static final int TYPE = 0x10; public static final int TYPE = 0x10;
public GetWifiInfoRequest() { public GetWifiInfoRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -51,7 +51,6 @@ public class SetColorRequest extends Packet {
public SetColorRequest() { public SetColorRequest() {
stream = ByteBuffer.allocate(1); stream = ByteBuffer.allocate(1);
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -70,7 +70,6 @@ public class SetColorZonesRequest extends Packet {
} }
public SetColorZonesRequest() { public SetColorZonesRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -41,7 +41,6 @@ public class SetHevCycleConfigurationRequest extends Packet {
} }
public SetHevCycleConfigurationRequest() { public SetHevCycleConfigurationRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -41,7 +41,6 @@ public class SetHevCycleRequest extends Packet {
} }
public SetHevCycleRequest() { public SetHevCycleRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -30,7 +30,6 @@ public class SetLabelRequest extends Packet {
private String label; private String label;
public SetLabelRequest() { public SetLabelRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setAckRequired(true); setAckRequired(true);
} }

View File

@ -33,7 +33,6 @@ public class SetLightInfraredRequest extends Packet {
} }
public SetLightInfraredRequest() { public SetLightInfraredRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -47,7 +47,6 @@ public class SetLightPowerRequest extends Packet {
public SetLightPowerRequest() { public SetLightPowerRequest() {
state = PowerState.OFF; state = PowerState.OFF;
this.duration = 0; this.duration = 0;
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }
@ -55,7 +54,6 @@ public class SetLightPowerRequest extends Packet {
public SetLightPowerRequest(PowerState state) { public SetLightPowerRequest(PowerState state) {
this.state = state; this.state = state;
this.duration = 0; this.duration = 0;
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -35,14 +35,12 @@ public class SetPowerRequest extends Packet {
public SetPowerRequest() { public SetPowerRequest() {
state = PowerState.OFF; state = PowerState.OFF;
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }
public SetPowerRequest(PowerState state) { public SetPowerRequest(PowerState state) {
this.state = state; this.state = state;
setTagged(false);
setAddressable(true); setAddressable(true);
setResponseRequired(true); setResponseRequired(true);
} }

View File

@ -66,7 +66,6 @@ public class SetTileEffectRequest extends Packet {
private Effect effect; private Effect effect;
public SetTileEffectRequest() { public SetTileEffectRequest() {
setTagged(false);
setAddressable(true); setAddressable(true);
setAckRequired(true); setAckRequired(true);
} }

View File

@ -51,12 +51,6 @@ public class StateHostFirmwareResponse extends Packet {
this.version = version; this.version = version;
} }
public StateHostFirmwareResponse() {
setTagged(false);
setAddressable(true);
setResponseRequired(true);
}
@Override @Override
public int packetType() { public int packetType() {
return TYPE; return TYPE;

View File

@ -48,12 +48,6 @@ public class StateHostInfoResponse extends Packet {
return rx; return rx;
} }
public StateHostInfoResponse() {
setTagged(false);
setAddressable(true);
setResponseRequired(true);
}
@Override @Override
public int packetType() { public int packetType() {
return TYPE; return TYPE;

View File

@ -57,12 +57,6 @@ public class StateInfoResponse extends Packet {
this.downtime = downtime; this.downtime = downtime;
} }
public StateInfoResponse() {
setTagged(false);
setAddressable(true);
setResponseRequired(true);
}
@Override @Override
public int packetType() { public int packetType() {
return TYPE; return TYPE;

View File

@ -57,12 +57,6 @@ public class StateVersionResponse extends Packet {
this.version = version; this.version = version;
} }
public StateVersionResponse() {
setTagged(false);
setAddressable(true);
setResponseRequired(true);
}
@Override @Override
public int packetType() { public int packetType() {
return TYPE; return TYPE;

View File

@ -51,12 +51,6 @@ public class StateWifiFirmwareResponse extends Packet {
this.version = version; this.version = version;
} }
public StateWifiFirmwareResponse() {
setTagged(false);
setAddressable(true);
setResponseRequired(true);
}
@Override @Override
public int packetType() { public int packetType() {
return TYPE; return TYPE;

View File

@ -276,8 +276,10 @@ public class LifxSelectorUtil {
try { try {
if (castType == UNICAST) { if (castType == UNICAST) {
packet.setTagged(false);
LifxThrottlingUtil.lock(packet.getTarget()); LifxThrottlingUtil.lock(packet.getTarget());
} else { } else {
packet.setTagged(true);
LifxThrottlingUtil.lock(); LifxThrottlingUtil.lock();
} }