From 500bfe50a19761d905eaf254d103098bd435278a Mon Sep 17 00:00:00 2001 From: Navid Date: Fri, 30 Aug 2024 21:36:27 -0400 Subject: [PATCH] New Device --- .../eveningoutpost/dexdrip/g5model/FirmwareCapability.java | 3 ++- .../dexdrip/services/Ob1G5CollectionService.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java index ad1c5efe2..f64099554 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java @@ -19,7 +19,8 @@ public class FirmwareCapability { private static final ImmutableSet KNOWN_G6_REV2_RAW_FIRMWARES = ImmutableSet.of("2.18.2.67"); private static final ImmutableSet KNOWN_G6_PLUS_FIRMWARES = ImmutableSet.of("2.4.2.88"); private static final ImmutableSet KNOWN_ONE_FIRMWARES = ImmutableSet.of("30.192.103.34"); - private static final ImmutableSet KNOWN_ALT_FIRMWARES = ImmutableSet.of("29.192.104.59", "32.192.104.82", "32.192.104.109", "32.192.105.64", "32.192.106.0", "44.192.105.72"); + private static final ImmutableSet KNOWN_ALT_FIRMWARES = ImmutableSet.of("29.192.104.59", "32.192.104.82", "32.192.104.109", "32.192.105.64", "32.192.106.0", "44.192.105.72", + "37.192.105.94"); private static final ImmutableSet KNOWN_TIME_TRAVEL_TESTED = ImmutableSet.of("1.6.5.25"); // new G6 firmware versions will need to be added here / above diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/services/Ob1G5CollectionService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/Ob1G5CollectionService.java index ccfa545f5..037b9e1df 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/services/Ob1G5CollectionService.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/services/Ob1G5CollectionService.java @@ -1230,7 +1230,10 @@ private synchronized void stopDiscover() { } private boolean isScanMatch(final String this_address, final String historical_address, final String this_name, final String search_name) { - if (search_name == null && (this_address.equalsIgnoreCase(historical_address) || this_name == null || (emptyString(historical_address) && this_name.startsWith("DXCM")) || (emptyString(historical_address) && this_name.startsWith("DX02")))) { + if (search_name == null && (this_address.equalsIgnoreCase(historical_address) || this_name == null || + (emptyString(historical_address) && this_name.startsWith("DXCM")) || + (emptyString(historical_address) && this_name.startsWith("DX02")) || + (emptyString(historical_address) && this_name.startsWith("DX01")))) { return !inFailureTally(this_address); }