diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-11-09 17:58:36 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-11-09 17:58:36 -0800 |
| commit | fc1b8db17f24e4d014997505c1d59e63fc135339 (patch) | |
| tree | 5f3c189d75901b1062e56fe3edfdb017caaebecf /subsurface-core | |
| parent | 779a70629bc883f62321dc195a6c931f6d52f1c9 (diff) | |
| download | subsurface-fc1b8db17f24e4d014997505c1d59e63fc135339.tar.gz | |
Uemis downloader: recover if dive info is completely missing
I user had a Uemis that had a dive log entry for a certain internal id but
no dive info for it. This appeared to be one of those dreaded dives when
the Uemis decides to start a dive at the end of a flight and then stays in
dive mode until it runs out of battery.
Anyway, if we see a number above and a number below, just give up and move
on.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-core')
| -rw-r--r-- | subsurface-core/uemis-downloader.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/subsurface-core/uemis-downloader.c b/subsurface-core/uemis-downloader.c index 2d837f0cb..24c879cb6 100644 --- a/subsurface-core/uemis-downloader.c +++ b/subsurface-core/uemis-downloader.c @@ -1119,6 +1119,8 @@ static bool get_matching_dive(int idx, char *newmax, int *uemis_mem_status, stru char log_file_no_to_find[20]; char dive_to_read_buf[10]; bool found = false; + bool found_below = false; + bool found_above = false; int deleted_files = 0; snprintf(log_file_no_to_find, sizeof(log_file_no_to_find), "logfilenr{int{%d", dive->dc.diveid); @@ -1176,13 +1178,19 @@ static bool get_matching_dive(int idx, char *newmax, int *uemis_mem_status, stru char *logfilenr = strstr(mbuf, "logfilenr"); if (logfilenr) { sscanf(logfilenr, "logfilenr{int{%u", &nr_found); - if (nr_found >= dive->dc.diveid) + if (nr_found >= dive->dc.diveid) { + found_above = true; dive_to_read = dive_to_read - 2; + } else { + found_below = true; + } if (dive_to_read < -1) dive_to_read = -1; } } } + if (found_above && found_below) + break; dive_to_read++; } else { /* At this point the memory of the UEMIS is full, let's cleanup all divelog files were |