Skip to content

Commit

Permalink
Merge pull request #3238 from Navid200/Navid_2023_12_13
Browse files Browse the repository at this point in the history
No G7 hard reset
  • Loading branch information
jamorham authored Dec 23, 2023
2 parents 0339da7 + 17455a6 commit 38ecc6c
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ 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 here. If a future device can be hard reset, they should be added to the true (other) side.
UserError.Log.e(TAG, "Your transmitter clock has stopped or never started.");
}
}
return;
Expand Down

0 comments on commit 38ecc6c

Please sign in to comment.