From 1169c416b1513919f6783b1b632ffb2347a7c004 Mon Sep 17 00:00:00 2001 From: Daniel Giritzer Date: Thu, 14 Aug 2025 11:37:21 +0200 Subject: [PATCH] feat: add support for broader range of Yawell R11 names --- .../gadgetbridge/devices/yawell/ring/YawellR11Coordinator.java | 2 +- .../gadgetbridge/devices/AbstractDeviceCoordinatorTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/yawell/ring/YawellR11Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/yawell/ring/YawellR11Coordinator.java index 6738e5cc2d..3fc12e3896 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/yawell/ring/YawellR11Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/yawell/ring/YawellR11Coordinator.java @@ -23,7 +23,7 @@ import nodomain.freeyourgadget.gadgetbridge.R; public class YawellR11Coordinator extends AbstractYawellRingCoordinator { @Override protected Pattern getSupportedDeviceName() { - return Pattern.compile("^R11_[0-9A-F]{4}$"); + return Pattern.compile("^R11C?_[0-9A-F]{4}$"); } @Override diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinatorTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinatorTest.java index 57351f173a..ec783256e4 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinatorTest.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinatorTest.java @@ -49,6 +49,8 @@ public class AbstractDeviceCoordinatorTest extends TestBase { put("P8", DeviceType.WASPOS); put("P8DFU", DeviceType.WASPOS); put("P80", DeviceType.COLMI_P80); + put("R11C_B200", DeviceType.YAWELL_R11); + put("R11_B200", DeviceType.YAWELL_R11); }}; for (Map.Entry e : bluetoothNameToExpectedType.entrySet()) {