Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No G7 hard reset #3238

Merged
merged 3 commits into from
Dec 23, 2023
Merged

No G7 hard reset #3238

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f96566
No G7 hard reset
Navid200 Dec 13, 2023
0097eb9
Typo
Navid200 Dec 13, 2023
17455a6
Correction
Navid200 Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 here. If a future device can be hard reset, they should be added to the true (other) side.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The if and else clauses both seem to be the same, is this correct?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sorry about that and thanks.

Corrected now

DexResetHelper.offer("Your transmitter clock has stopped or never started. Do you want to hard reset it?");
}
}
Expand Down
Loading