Parcourir la source

Merge mfkey from https://github.com/noproto/FlipperMfkey

# Conflicts:
#	mfkey/application.fam
Willy-JL il y a 1 an
Parent
commit
dfb255664e
2 fichiers modifiés avec 12 ajouts et 3 suppressions
  1. 1 1
      mfkey/application.fam
  2. 11 2
      mfkey/mfkey.c

+ 1 - 1
mfkey/application.fam

@@ -15,7 +15,7 @@ App(
     fap_icon_assets="images",
     fap_weburl="https://github.com/noproto/FlipperMfkey",
     fap_description="MIFARE Classic key recovery tool",
-    fap_version="2.1",
+    fap_version="2.2",
 )
 
 App(

+ 11 - 2
mfkey/mfkey.c

@@ -257,8 +257,17 @@ int old_recover(
 
 static inline int sync_state(ProgramState* program_state) {
     int ts = furi_hal_rtc_get_timestamp();
-    program_state->eta_round = program_state->eta_round - (ts - program_state->eta_timestamp);
-    program_state->eta_total = program_state->eta_total - (ts - program_state->eta_timestamp);
+    int elapsed_time = ts - program_state->eta_timestamp;
+    if(elapsed_time < program_state->eta_round) {
+        program_state->eta_round -= elapsed_time;
+    } else {
+        program_state->eta_round = 0;
+    }
+    if(elapsed_time < program_state->eta_total) {
+        program_state->eta_total -= elapsed_time;
+    } else {
+        program_state->eta_total = 0;
+    }
     program_state->eta_timestamp = ts;
     if(program_state->close_thread_please) {
         return 1;