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 17dad25b35..9962db5d79 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java @@ -36,7 +36,7 @@ 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.isTransmitterRawIncapable(getTransmitterID())) { // Firefly, which cannot be hard reset + if (FirmwareCapability.isTransmitterStandardFirefly(getTransmitterID())) { // Firefly, which cannot be hard reset UserError.Log.e(TAG, "Your transmitter clock has stopped or never started."); } else { DexResetHelper.offer("Your transmitter clock has stopped or never started. Do you want to hard reset it?"); 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 d9000f9f84..7c69f874e0 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java @@ -91,6 +91,13 @@ public static boolean isTransmitterModified(final String tx_id) { return false; } + public static boolean isTransmitterStandardFirefly(final String tx_id) { // Firefly that has not been modified + if (!isTransmitterModified(tx_id) && isTransmitterRawIncapable(tx_id)) { + return true; + } + return false; + } + public static boolean isTransmitterG5(final String tx_id) { return isG5Firmware(getRawFirmwareVersionString(tx_id)); } diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java index a5d0e87be7..7d76e2ee35 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java @@ -770,7 +770,7 @@ public static boolean doGetData(Ob1G5CollectionService parent, RxBleConnection c if (session_start.isFubar()) { final long tk = DexTimeKeeper.getDexTime(getTransmitterID(), tsl()); if (tk > 0) { - if (FirmwareCapability.isTransmitterRawIncapable(getTransmitterID())) {// Firefly, which cannot be hard reset + if (FirmwareCapability.isTransmitterStandardFirefly(getTransmitterID())) {// Firefly, which cannot be hard reset UserError.Log.e(TAG, "Unusual session start failure"); } else { DexResetHelper.offer("Unusual session start failure, is transmitter crashed? Try Hard Reset?");