Skip to content

Add timestamp to duplicate command detection #783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dschall wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add timestamp to duplicate command detection #783

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions ...rc/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterTuyaButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
*/
package org.openhab.binding.zigbee.internal.converter;

import static java.lang.Integer.*;

import java.time.Duration;
import java.time.LocalDateTime;
import java.time.Month;
import java.time.temporal.TemporalUnit;
import java.util.Collections;
import java.util.HashMap;
import java.util.Set;
Expand Down Expand Up @@ -57,9 +59,12 @@ public class ZigBeeConverterTuyaButton extends ZigBeeBaseChannelConverter
private ZclCluster serverCluster = null;

// Tuya devices sometimes send duplicate commands with the same tx id.
// We keep track of the last received Tx id and ignore the duplicate.
// We keep track of the last received Tx id and time and ignore the duplicate.
// The time is needed because tx ids start over at 1 after some inactivity.
private Integer lastTxId = -1;

private LocalDateTime lastTxTime = LocalDateTime.of(2000, Month.JANUARY, 1, 0, 0, 0);
private final int IGNORE_DUPLICATE_TX_DURATION_IN_MINUTES = 5;

@Override
public Set<Integer> getImplementedClientClusters() {
return Collections.singleton(ZclOnOffCluster.CLUSTER_ID);
Expand Down Expand Up @@ -111,7 +116,7 @@ public boolean initializeDevice() {
CommandResult bindResponse = bind(clientCluster).get();
if (!bindResponse.isSuccess()) {
logger.error("{}: Error 0x{} setting client binding for cluster {}", endpoint.getIeeeAddress(),
toHexString(bindResponse.getStatusCode()), ZclOnOffCluster.CLUSTER_ID);
Integer.toHexString(bindResponse.getStatusCode()), ZclOnOffCluster.CLUSTER_ID);
}
} catch (InterruptedException | ExecutionException e) {
logger.error("{}: Exception setting client binding to cluster {}: {}", endpoint.getIeeeAddress(),
Expand Down Expand Up @@ -175,13 +180,14 @@ public Channel getChannel(ThingUID thingUID, ZigBeeEndpoint endpoint) {
@Override
public boolean commandReceived(ZclCommand command) {
logger.debug("{}: received command {}", endpoint.getIeeeAddress(), command);
LocalDateTime thisTxTime = LocalDateTime.now();
Integer thisTxId = command.getTransactionId();
if(lastTxId == thisTxId)
if(lastTxId == thisTxId && Duration.between(lastTxTime, thisTxTime).toMinutes() < IGNORE_DUPLICATE_TX_DURATION_IN_MINUTES)
{
logger.debug("{}: ignoring duplicate command {}", endpoint.getIeeeAddress(), thisTxId);
}
else if (command instanceof TuyaButtonPressCommand) {
TuyaButtonPressCommand tuyaButtonPressCommand = (TuyaButtonPressCommand) command;
TuyaButtonPressCommand tuyaButtonPressCommand = (TuyaButtonPressCommand) command;
thing.triggerChannel(channel.getUID(), getEventType(tuyaButtonPressCommand.getPressType()));
clientCluster.sendDefaultResponse(command, ZclStatus.SUCCESS);
}
Expand All @@ -190,6 +196,7 @@ else if (command instanceof TuyaButtonPressCommand) {
}

lastTxId = thisTxId;
lastTxTime = thisTxTime;
return true;
}

Expand Down