mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 21:13:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Uemis downloader: fix and move helper function

Browse source 
This function is only used in the Uemis downloader, and it got broken when
we switched to using a separate table for the downloaded dives.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Guido Lerch 2015-09-05 11:00:54 -07:00 • committed by Dirk Hohndel
parent a547ee0ff2
commit 8647f95953
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dive.h
View file

@ -582,21 +582,6 @@ extern void delete_current_divecomputer(void);
#define for_each_gps_location(_i, _x) \
for ((_i) = 0; ((_x) = get_gps_location(_i, &gps_location_table)) != NULL; (_i)++)
static inline struct dive *get_dive_by_uemis_diveid(uint32_t diveid, uint32_t deviceid)
{
int i;
struct dive *dive;
for_each_dive (i, dive) {
struct divecomputer *dc = &dive->dc;
do {
if (dc->diveid == diveid && dc->deviceid == deviceid)
return dive;
} while ((dc = dc->next) != NULL);
}
return NULL;
}
static inline struct dive *get_dive_by_uniq_id(int id)
{
int i;

11
uemis-downloader.c
View file

@ -126,6 +126,15 @@ static struct dive *uemis_start_dive(uint32_t deviceid)
return dive;
}
static struct dive *get_dive_by_uemis_diveid(device_data_t *devdata, u_int32_t object_id)
{
for (int i = 0; i < devdata->download_table->nr; i++) {
if (object_id == devdata->download_table->dives[i]->dc.diveid)
return devdata->download_table->dives[i];
}
return NULL;
}
static void record_uemis_dive(device_data_t *devdata, struct dive *dive)
{
if (devdata->create_new_trip) {
@ -817,7 +826,7 @@ static bool process_raw_buffer(device_data_t *devdata, uint32_t deviceid, char *
dive->number = atoi(val);
} else if (!log && !strcmp(tag, "logfilenr")) {
/* this one tells us which dive we are adding data to */
dive = get_dive_by_uemis_diveid(atoi(val), deviceid);
dive = get_dive_by_uemis_diveid(devdata, atoi(val));
if (for_dive)
*for_dive = atoi(val);
} else if (!log && dive && !strcmp(tag, "divespot_id")) {