From 106f1fcdd6e0212f9ddbcfc674fd2a6198b4d6af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Sat, 14 Sep 2024 13:18:24 +0100 Subject: [PATCH] Amazfit Active / GTR 3 Pro: Add new device sources --- .../huami/amazfitactive/AmazfitActiveCoordinator.java | 5 ++++- .../amazfitactiveedge/AmazfitActiveEdgeCoordinator.java | 5 ++++- .../huami/amazfitbalance/AmazfitBalanceCoordinator.java | 6 +++++- .../huami/amazfitband7/AmazfitBand7Coordinator.java | 6 +++++- .../huami/amazfitbip5/AmazfitBip5Coordinator.java | 5 ++++- .../amazfitbip5unity/AmazfitBip5UnityCoordinator.java | 6 +++++- .../amazfitcheetahpro/AmazfitCheetahProCoordinator.java | 5 ++++- .../AmazfitCheetahRoundCoordinator.java | 5 ++++- .../AmazfitCheetahSquareCoordinator.java | 4 +++- .../huami/amazfitfalcon/AmazfitFalconCoordinator.java | 5 ++++- .../huami/amazfitgtr3/AmazfitGTR3Coordinator.java | 5 ++++- .../huami/amazfitgtr3pro/AmazfitGTR3ProCoordinator.java | 7 ++++++- .../huami/amazfitgtr4/AmazfitGTR4Coordinator.java | 9 +++++---- .../huami/amazfitgtrmini/AmazfitGTRMiniCoordinator.java | 5 ++++- .../huami/amazfitgts3/AmazfitGTS3Coordinator.java | 5 ++++- .../huami/amazfitgts4/AmazfitGTS4Coordinator.java | 5 ++++- .../amazfitgts4mini/AmazfitGTS4MiniCoordinator.java | 5 ++++- .../huami/amazfittrex2/AmazfitTRex2Coordinator.java | 5 ++++- .../amazfittrexultra/AmazfitTRexUltraCoordinator.java | 5 ++++- 19 files changed, 81 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveCoordinator.java index 7b175c86d..0b76f9883 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveCoordinator.java @@ -33,7 +33,10 @@ public class AmazfitActiveCoordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(8323328)); + return new HashSet<>(Arrays.asList( + 8323328, // chinese mainland version + 8323329 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeCoordinator.java index bc0a7cbc5..f82d93522 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeCoordinator.java @@ -38,7 +38,10 @@ public class AmazfitActiveEdgeCoordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(8388864, 8388865)); + return new HashSet<>(Arrays.asList( + 8388864, // chinese mainland version + 8388865 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceCoordinator.java index 34c0c1b19..676cac878 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceCoordinator.java @@ -33,7 +33,11 @@ public class AmazfitBalanceCoordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(8519936, 8519937, 8519939)); + return new HashSet<>(Arrays.asList( + 8519936, // chinese mainland version + 8519937, + 8519939 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7Coordinator.java index bbbdcce43..599c812b3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7Coordinator.java @@ -33,7 +33,11 @@ public class AmazfitBand7Coordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(252, 253, 254)); + return new HashSet<>(Arrays.asList( + 252, + 253, + 254 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5Coordinator.java index ef328eeea..c596258ab 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5Coordinator.java @@ -33,7 +33,10 @@ public class AmazfitBip5Coordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(8454400, 8454401)); + return new HashSet<>(Arrays.asList( + 8454400, // chinese mainland version + 8454401 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5unity/AmazfitBip5UnityCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5unity/AmazfitBip5UnityCoordinator.java index b64b04098..796eff0f6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5unity/AmazfitBip5UnityCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5unity/AmazfitBip5UnityCoordinator.java @@ -39,7 +39,11 @@ public class AmazfitBip5UnityCoordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(8782081, 8782088, 8782089)); + return new HashSet<>(Arrays.asList( + 8782081, + 8782088, + 8782089 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProCoordinator.java index 0e164de68..dc1e706ad 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProCoordinator.java @@ -33,7 +33,10 @@ public class AmazfitCheetahProCoordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(8126720, 8126721)); + return new HashSet<>(Arrays.asList( + 8126720, // chinese mainland version + 8126721 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundCoordinator.java index 75a93482d..a9cf910ff 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundCoordinator.java @@ -38,7 +38,10 @@ public class AmazfitCheetahRoundCoordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(8192256, 8192257)); + return new HashSet<>(Arrays.asList( + 8192256, // chinese mainland version + 8192257 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareCoordinator.java index 5a326c0fa..81e97a8bb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareCoordinator.java @@ -38,7 +38,9 @@ public class AmazfitCheetahSquareCoordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Collections.singletonList(8257793)); + return new HashSet<>(Collections.singletonList( + 8257793 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconCoordinator.java index 30b078f0e..09f2ec5a9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconCoordinator.java @@ -38,7 +38,10 @@ public class AmazfitFalconCoordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(414, 415)); + return new HashSet<>(Arrays.asList( + 414, // chinese mainland version + 415 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3Coordinator.java index b177036be..ae9a23c17 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3Coordinator.java @@ -33,7 +33,10 @@ public class AmazfitGTR3Coordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(226, 227)); + return new HashSet<>(Arrays.asList( + 226, // chinese mainland version + 227 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProCoordinator.java index c1ca86942..c49432bf3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProCoordinator.java @@ -33,7 +33,12 @@ public class AmazfitGTR3ProCoordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(229, 230, 6095106)); + return new HashSet<>(Arrays.asList( + 229, // chinese mainland version + 230, + 242, // chinese mainland version + 6095106 // chinese mainland version + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4Coordinator.java index ee9f879ee..09a13e784 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4Coordinator.java @@ -16,9 +16,6 @@ along with this program. If not, see . */ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr4; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -38,7 +35,11 @@ public class AmazfitGTR4Coordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(7930112, 7930113, 7864577)); + return new HashSet<>(Arrays.asList( + 7930112, // chinese mainland version + 7930113, + 7864577 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniCoordinator.java index bfe8472f3..fc439bf3a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniCoordinator.java @@ -33,7 +33,10 @@ public class AmazfitGTRMiniCoordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(250, 251)); + return new HashSet<>(Arrays.asList( + 250, + 251 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3Coordinator.java index 2bf8c0add..96196ea86 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3Coordinator.java @@ -33,7 +33,10 @@ public class AmazfitGTS3Coordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(224, 225)); + return new HashSet<>(Arrays.asList( + 224, // chinese mainland version + 225 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4Coordinator.java index 0ecf35ac0..b7ab4501b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4Coordinator.java @@ -33,7 +33,10 @@ public class AmazfitGTS4Coordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(7995648, 7995649)); + return new HashSet<>(Arrays.asList( + 7995648, // chinese mainland version + 7995649 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniCoordinator.java index f5101bd5c..7a821ecf3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniCoordinator.java @@ -33,7 +33,10 @@ public class AmazfitGTS4MiniCoordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(246, 247)); + return new HashSet<>(Arrays.asList( + 246, // chinese mainland version + 247 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2Coordinator.java index 0e0ff52e5..d4826c730 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2Coordinator.java @@ -33,7 +33,10 @@ public class AmazfitTRex2Coordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(418, 419)); + return new HashSet<>(Arrays.asList( + 418, // chinese mainland version + 419 + )); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraCoordinator.java index 16dad5bc3..8b61c4edd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraCoordinator.java @@ -33,7 +33,10 @@ public class AmazfitTRexUltraCoordinator extends ZeppOsCoordinator { @Override public Set getDeviceSources() { - return new HashSet<>(Arrays.asList(6553856, 6553857)); + return new HashSet<>(Arrays.asList( + 6553856, // chinese mainland version + 6553857 + )); } @Override