public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[velbus] Fix multiple channel status in one packet (#15272)

Browse Source 
Fix bug : Manage more than one channel status in the packet.

Signed-off-by: Daniel Rosengarten <github@praetorians.be>
This commit is contained in:
Daniel Rosengarten 2023-07-18 19:54:20 +02:00 committed by GitHub
parent 2f5f37e136
commit b650454d94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bundles/org.openhab.binding.velbus/src/main/java/org/openhab/binding/velbus/internal/handler/VelbusSensorHandler.java
View File

@ -141,7 +141,11 @@ public class VelbusSensorHandler extends VelbusThingHandler {
byte command = packet[4]; byte command = packet[4];
if (command == COMMAND_PUSH_BUTTON_STATUS && packet.length >= 6) { if (command == COMMAND_PUSH_BUTTON_STATUS && packet.length >= 6) {
byte channelJustPressed = packet[5];
for (int channel = 0; channel < 8; channel++) {
byte channelMask = (byte) Math.pow(2, channel);
byte channelJustPressed = (byte) (packet[5] & channelMask);
if (channelJustPressed != 0) { if (channelJustPressed != 0) {
VelbusChannelIdentifier velbusChannelIdentifier = new VelbusChannelIdentifier(address, VelbusChannelIdentifier velbusChannelIdentifier = new VelbusChannelIdentifier(address,
channelJustPressed); channelJustPressed);
@ -149,7 +153,7 @@ public class VelbusSensorHandler extends VelbusThingHandler {
CommonTriggerEvents.PRESSED); CommonTriggerEvents.PRESSED);
} }
byte channelJustReleased = packet[6]; byte channelJustReleased = (byte) (packet[6] & channelMask);
if (channelJustReleased != 0) { if (channelJustReleased != 0) {
VelbusChannelIdentifier velbusChannelIdentifier = new VelbusChannelIdentifier(address, VelbusChannelIdentifier velbusChannelIdentifier = new VelbusChannelIdentifier(address,
channelJustReleased); channelJustReleased);
@ -157,7 +161,7 @@ public class VelbusSensorHandler extends VelbusThingHandler {
CommonTriggerEvents.RELEASED); CommonTriggerEvents.RELEASED);
} }
byte channelLongPressed = packet[7]; byte channelLongPressed = (byte) (packet[7] & channelMask);
if (channelLongPressed != 0) { if (channelLongPressed != 0) {
VelbusChannelIdentifier velbusChannelIdentifier = new VelbusChannelIdentifier(address, VelbusChannelIdentifier velbusChannelIdentifier = new VelbusChannelIdentifier(address,
channelLongPressed); channelLongPressed);
@ -168,3 +172,4 @@ public class VelbusSensorHandler extends VelbusThingHandler {
} }
} }
} }
}