mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

uemis: Fix mapping of object_ids to dive numbers

Browse source 
When performing a factory reset to an uemis, the object_ids within the divelog
will not be reset. Nevertheless, the dive numbers are reset to 1.
So, the first log will have a positive offset n to the first dive number.
The uemis-downloader used the object_id from the logs as a start point for
getDive, if dives were already synced before. This causes the sync to stall.
I prevent this by subtracting the lowest object_id from the requested before
using it as dive number.

Signed-off-by: Oliver Schwaneberg <oliver.schwaneberg@gmail.com>
This commit is contained in:
Oliver Schwaneberg 2018-01-28 20:20:02 +01:00 • committed by Jan Mulder
parent cd759a3b1e
commit 5a9faf2fea
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/uemis-downloader.c
View file

@ -73,6 +73,7 @@ static int mbuf_size = 0;
static int max_mem_used = -1; static int max_mem_used = -1;
static int next_table_index = 0; static int next_table_index = 0;
static int dive_to_read = 0; static int dive_to_read = 0;
static uint32_t mindiveid;
static int max_deleted_seen = -1; static int max_deleted_seen = -1;
@ -1034,6 +1035,7 @@ static char *uemis_get_divenr(char *deviceidstr, int force)
char divenr[10]; char divenr[10];
struct dive_table *table; struct dive_table *table;
deviceid = atoi(deviceidstr); deviceid = atoi(deviceidstr);
mindiveid = 0xFFFFFFFF;
/* /*
* If we are are retrying after a disconnect/reconnect, we * If we are are retrying after a disconnect/reconnect, we
@ -1055,9 +1057,12 @@ static char *uemis_get_divenr(char *deviceidstr, int force)
continue; continue;
for_each_dc (d, dc) { for_each_dc (d, dc) {
if (dc->model && !strcmp(dc->model, "Uemis Zurich") && if (dc->model && !strcmp(dc->model, "Uemis Zurich") &&
(dc->deviceid == 0 || dc->deviceid == 0x7fffffff || dc->deviceid == deviceid) && (dc->deviceid == 0 || dc->deviceid == 0x7fffffff || dc->deviceid == deviceid)) {
dc->diveid > maxdiveid) if (dc->diveid > maxdiveid)
maxdiveid = dc->diveid; maxdiveid = dc->diveid;
if (dc->diveid < mindiveid)
mindiveid = dc->diveid;
}
} }
} }
if (max_deleted_seen >= 0 && maxdiveid < (uint32_t)max_deleted_seen) { if (max_deleted_seen >= 0 && maxdiveid < (uint32_t)max_deleted_seen) {
@ -1216,6 +1221,7 @@ static bool get_matching_dive(int idx, char *newmax, int *uemis_mem_status, devi
bool found_below = false; bool found_below = false;
bool found_above = false; bool found_above = false;
int deleted_files = 0; int deleted_files = 0;
int fail_count = 0;
snprintf(log_file_no_to_find, sizeof(log_file_no_to_find), "logfilenr{int{%d", dive->dc.diveid); snprintf(log_file_no_to_find, sizeof(log_file_no_to_find), "logfilenr{int{%d", dive->dc.diveid);
#if UEMIS_DEBUG & 2 #if UEMIS_DEBUG & 2
@ -1283,6 +1289,10 @@ static bool get_matching_dive(int idx, char *newmax, int *uemis_mem_status, devi
} }
if (dive_to_read < -1) if (dive_to_read < -1)
dive_to_read = -1; dive_to_read = -1;
} else if (!strstr(mbuf, "act{") && ++fail_count == 10) {
if (verbose)
fprintf(stderr, "Uemis downloader: Cannot access dive details - searching from start\n");
dive_to_read = -1;
} }
} }
} }
@ -1347,10 +1357,10 @@ const char *do_uemis_import(device_data_t *data)
param_buff[1] = "notempty"; param_buff[1] = "notempty";
newmax = uemis_get_divenr(deviceid, force_download); newmax = uemis_get_divenr(deviceid, force_download);
if (verbose) if (verbose)
fprintf(stderr, "Uemis downloader: start looking at dive nr %s", newmax); fprintf(stderr, "Uemis downloader: start looking at dive nr %s\n", newmax);
first = start = atoi(newmax); first = start = atoi(newmax);
dive_to_read = first; dive_to_read = mindiveid < first ? first - mindiveid : first;
for (;;) { for (;;) {
#if UEMIS_DEBUG & 2 #if UEMIS_DEBUG & 2
debug_round++; debug_round++;