Skip to content
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

Jump to bottom

Fix incorrect call to RemoveFailedNode #1150

Merged
merged 1 commit into from Mar 3, 2019
Merged

Fix incorrect call to RemoveFailedNode #1150

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/main/java/org/openhab/binding/zwave/handler/ZWaveControllerHandler.java
View file
Open in desktop
Expand Up @@ -684,8 +684,7 @@ public Collection<ZWaveNode> getNodes() {
* Transmits the {@link ZWaveCommandClassTransactionPayload} to a Node.
* This will not wait for the transaction response.
*
* @param transaction
* the {@link ZWaveCommandClassTransactionPayload} message to send.
* @param transaction the {@link ZWaveCommandClassTransactionPayload} message to send.
*/
public void sendData(ZWaveCommandClassTransactionPayload transaction) {
if (controller == null) {
Expand Down Expand Up @@ -742,7 +741,7 @@ public void replaceFailedNode(int nodeId) {
if (controller == null) {
return;
}
controller.requestRemoveFailedNode(nodeId);
controller.requestSetFailedNode(nodeId);
}

public void reinitialiseNode(int nodeId) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openhab/binding/zwave/handler/ZWaveThingHandler.java
View file
Open in desktop
Expand Up @@ -1001,10 +1001,10 @@ public void handleConfigurationUpdate(Map<String, Object> configurationParameter
case "action":
if ("failed".equals(cfg[1]) && valueObject instanceof Boolean && ((Boolean) valueObject) == true) {
controllerHandler.replaceFailedNode(nodeId);
controllerHandler.checkNodeFailed(nodeId);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks right, but the terminology is a bit confusing...

The method name replaceFailedNode is confusing, because it sends the SetFailedNode request. I suspect this ties back to the zwave terminology, but it's confusing nonetheless.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do agree, but as you rightly assume, I tried to stick to the ZWave terminology (and is probably why I cocked it up in the first place).

}
if ("remove".equals(cfg[1]) && valueObject instanceof Boolean && ((Boolean) valueObject) == true) {
controllerHandler.removeFailedNode(nodeId);
controllerHandler.checkNodeFailed(nodeId);
}
if ("reinit".equals(cfg[1]) && valueObject instanceof Boolean && ((Boolean) valueObject) == true) {
logger.debug("NODE {}: Re-initialising node!", nodeId);
Expand Down