这是indexloc提供的服务，不要输入任何密码
Skip to content

[LCN] Fixes problems with fingerprint codes which were received in decimal #15488

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

Merged
merged 5 commits into from
Sep 4, 2023
Merged

[LCN] Fixes problems with fingerprint codes which were received in decimal #15488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3456d8f
fixed problems with fingerprint codes which were received in decimal …
Aug 23, 2023
30eb6d0
Merge branch 'openhab:main' into main
andrexp Aug 23, 2023
136d29e
correct format issues
Aug 23, 2023
dcc3071
add test file for fingerprint codes
Aug 29, 2023
7ff7aca
Delete openhab-addons.code-workspace
andrexp Aug 29, 2023
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
13 changes: 8 additions & 5 deletions ...cn/src/main/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleCodeSubHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@
public class LcnModuleCodeSubHandler extends AbstractLcnModuleSubHandler {
private static final Pattern TRANSPONDER_PATTERN = Pattern
.compile(LcnBindingConstants.ADDRESS_REGEX + "\\.ZT(?<byte0>\\d{3})(?<byte1>\\d{3})(?<byte2>\\d{3})");
private static final Pattern FINGERPRINT_PATTERN = Pattern.compile(LcnBindingConstants.ADDRESS_REGEX
+ "\\.ZF(?<byte0>[0-9A-Fa-f]{2})(?<byte1>[0-9A-Fa-f]{2})(?<byte2>[0-9A-Fa-f]{2})");
private static final Pattern FINGERPRINT_PATTERN_HEX = Pattern.compile(LcnBindingConstants.ADDRESS_REGEX
+ "\\.ZF(?<byte0>[0-9A-Fa-f]{2})(?<byte1>[0-9A-Fa-f]{2})(?<byte2>[0-9A-Fa-f]{2})$");
private static final Pattern FINGERPRINT_PATTERN_DEC = Pattern
.compile(LcnBindingConstants.ADDRESS_REGEX + "\\.ZF(?<byte0>\\d{3})(?<byte1>\\d{3})(?<byte2>\\d{3})");
private static final Pattern REMOTE_CONTROL_PATTERN = Pattern.compile(LcnBindingConstants.ADDRESS_REGEX
+ "\\.ZI(?<byte0>\\d{3})(?<byte1>\\d{3})(?<byte2>\\d{3})(?<key>\\d{3})(?<action>\\d{3})");

Expand All @@ -51,7 +53,7 @@ public void handleRefresh(LcnChannelGroup channelGroup, int number) {
public void handleStatusMessage(Matcher matcher) {
String code;

if (matcher.pattern() == FINGERPRINT_PATTERN) {
if (matcher.pattern() == FINGERPRINT_PATTERN_HEX) {
code = String.format("%02X%02X%02X", Integer.parseInt(matcher.group("byte0"), 16),
Integer.parseInt(matcher.group("byte1"), 16), Integer.parseInt(matcher.group("byte2"), 16));
} else {
Expand All @@ -61,7 +63,7 @@ public void handleStatusMessage(Matcher matcher) {

if (matcher.pattern() == TRANSPONDER_PATTERN) {
handler.triggerChannel(LcnChannelGroup.CODE, "transponder", code);
} else if (matcher.pattern() == FINGERPRINT_PATTERN) {
} else if (matcher.pattern() == FINGERPRINT_PATTERN_HEX || matcher.pattern() == FINGERPRINT_PATTERN_DEC) {
handler.triggerChannel(LcnChannelGroup.CODE, "fingerprint", code);
} else if (matcher.pattern() == REMOTE_CONTROL_PATTERN) {
int keyNumber = Integer.parseInt(matcher.group("key"));
Expand Down Expand Up @@ -114,6 +116,7 @@ public void handleStatusMessage(Matcher matcher) {

@Override
public Collection<Pattern> getPckStatusMessagePatterns() {
return Arrays.asList(TRANSPONDER_PATTERN, FINGERPRINT_PATTERN, REMOTE_CONTROL_PATTERN);
return Arrays.asList(TRANSPONDER_PATTERN, FINGERPRINT_PATTERN_HEX, FINGERPRINT_PATTERN_DEC,
REMOTE_CONTROL_PATTERN);
}
}
49 changes: 49 additions & 0 deletions ...rc/test/java/org/openhab/binding/lcn/internal/subhandler/LcnModuleCodeSubHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/**
* Copyright (c) 2010-2023 Contributors to the openHAB project
*
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.lcn.internal.subhandler;

import static org.mockito.Mockito.*;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.lcn.internal.common.LcnChannelGroup;

/**
* Test class.
*
* @author Andre Jendrysseck - Initial contribution
*/
@NonNullByDefault
public class LcnModuleCodeSubHandlerTest extends AbstractTestLcnModuleSubHandler {

@Override
@BeforeEach
public void setUp() {
super.setUp();
}

@Test
public void testHexFingerprint() {
tryParseAllHandlers("=M000005.ZFABCDEF");
verify(handler).triggerChannel(LcnChannelGroup.CODE, "fingerprint", "ABCDEF");
verify(handler).triggerChannel(any(), any(), any());
}

@Test
public void testDecFingerprint() {
tryParseAllHandlers("=M000005.ZF255255255");
verify(handler).triggerChannel(LcnChannelGroup.CODE, "fingerprint", "FFFFFF");
verify(handler).triggerChannel(any(), any(), any());
}
}