From 6f96566f4adc49f7a2535049d72aee66b8fadf88 Mon Sep 17 00:00:00 2001 From: Navid Date: Wed, 13 Dec 2023 10:58:51 -0500 Subject: [PATCH 1/3] No G7 hard reset --- .../com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java index 9962db5d79..afb87ee6a6 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java @@ -36,9 +36,9 @@ public static void updateAge(final String transmitterId, final int dexTimeStamp, if (dexTimeStamp < 1) { UserError.Log.e(TAG, "Invalid dex timestamp in updateAge: " + dexTimeStamp); if (dexTimeStamp == 0 && absolute) { - if (FirmwareCapability.isTransmitterStandardFirefly(getTransmitterID())) { // Firefly, which cannot be hard reset - UserError.Log.e(TAG, "Your transmitter clock has stopped or never started."); - } else { + if (FirmwareCapability.isTransmitterG5(getTransmitterID()) || FirmwareCapability.isTransmitterTimeTravelCapable(getTransmitterID()) || FirmwareCapability.isTransmitterModified(getTransmitterID())) { // Devices that can be hard reset only + DexResetHelper.offer("Your transmitter clock has stopped or never started. Do you want to hard reset it?"); + } else { // Everything else - future devices will be gere. If a future device can be hard reset, they should be added to the true (other) side DexResetHelper.offer("Your transmitter clock has stopped or never started. Do you want to hard reset it?"); } } From 0097eb9147511dc36eef8821f30fb131f6a2f492 Mon Sep 17 00:00:00 2001 From: Navid Date: Wed, 13 Dec 2023 11:06:19 -0500 Subject: [PATCH 2/3] Typo --- .../java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java index afb87ee6a6..d048ad1a01 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java @@ -38,7 +38,7 @@ public static void updateAge(final String transmitterId, final int dexTimeStamp, if (dexTimeStamp == 0 && absolute) { if (FirmwareCapability.isTransmitterG5(getTransmitterID()) || FirmwareCapability.isTransmitterTimeTravelCapable(getTransmitterID()) || FirmwareCapability.isTransmitterModified(getTransmitterID())) { // Devices that can be hard reset only DexResetHelper.offer("Your transmitter clock has stopped or never started. Do you want to hard reset it?"); - } else { // Everything else - future devices will be gere. If a future device can be hard reset, they should be added to the true (other) side + } else { // Everything else - future devices will be here. If a future device can be hard reset, they should be added to the true (other) side. DexResetHelper.offer("Your transmitter clock has stopped or never started. Do you want to hard reset it?"); } } From 17455a6922463e03d6ffb13038862c4610b112dc Mon Sep 17 00:00:00 2001 From: Navid Date: Wed, 13 Dec 2023 17:25:53 -0500 Subject: [PATCH 3/3] Correction --- .../java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java index d048ad1a01..87278121ac 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java @@ -39,7 +39,7 @@ public static void updateAge(final String transmitterId, final int dexTimeStamp, if (FirmwareCapability.isTransmitterG5(getTransmitterID()) || FirmwareCapability.isTransmitterTimeTravelCapable(getTransmitterID()) || FirmwareCapability.isTransmitterModified(getTransmitterID())) { // Devices that can be hard reset only DexResetHelper.offer("Your transmitter clock has stopped or never started. Do you want to hard reset it?"); } else { // Everything else - future devices will be here. If a future device can be hard reset, they should be added to the true (other) side. - DexResetHelper.offer("Your transmitter clock has stopped or never started. Do you want to hard reset it?"); + UserError.Log.e(TAG, "Your transmitter clock has stopped or never started."); } } return;