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

Import DC info properly from DM5 log

Browse source 
Using serial number as device ID here for simplicity. We also need the
DC info for the divecomputer tag per dive. And it seems that serial
number is in SerialNumber, SourceSerialNumber or both.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2015-02-21 20:55:06 +02:00 • committed by Dirk Hohndel
parent 5330a612c5
commit 27d0cd68fc
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
parse-xml.c
View file

@ -2267,12 +2267,13 @@ extern int dm5_dive(void *param, int columns, char **data, char **column)
*/ */
settings_start(); settings_start();
dc_settings_start(); dc_settings_start();
if (data[4]) if (data[4]) {
utf8_string(data[4], &cur_settings.dc.serial_nr); utf8_string(data[4], &cur_settings.dc.serial_nr);
cur_settings.dc.deviceid = atoi(data[4]);
}
if (data[5]) if (data[5])
utf8_string(data[5], &cur_settings.dc.model); utf8_string(data[5], &cur_settings.dc.model);
cur_settings.dc.deviceid = 0xffffffff;
dc_settings_end(); dc_settings_end();
settings_end(); settings_end();
@ -2283,9 +2284,11 @@ extern int dm5_dive(void *param, int columns, char **data, char **column)
if (data[9]) if (data[9])
cur_dive->dc.watertemp.mkelvin = C_to_mkelvin(atoi(data[9])); cur_dive->dc.watertemp.mkelvin = C_to_mkelvin(atoi(data[9]));
/* if (data[4]) {
* TODO: handle multiple cylinders cur_dive->dc.deviceid = atoi(data[4]);
*/ }
if (data[5])
utf8_string(data[5], &cur_dive->dc.model);
snprintf(get_events, sizeof(get_events) - 1, get_cylinders_template, cur_dive->number); snprintf(get_events, sizeof(get_events) - 1, get_cylinders_template, cur_dive->number);
retval = sqlite3_exec(handle, get_events, &dm5_cylinders, 0, &err); retval = sqlite3_exec(handle, get_events, &dm5_cylinders, 0, &err);
@ -2404,7 +2407,7 @@ int parse_dm5_buffer(sqlite3 *handle, const char *url, const char *buffer, int s
/* StartTime is converted from Suunto's nano seconds to standard /* StartTime is converted from Suunto's nano seconds to standard
* time. We also need epoch, not seconds since year 1. */ * time. We also need epoch, not seconds since year 1. */
char get_dives[] = "select D.DiveId,StartTime/10000000-62135596800,Note,Duration,SourceSerialNumber,Source,MaxDepth,SampleInterval,StartTemperature,BottomTemperature,D.StartPressure,D.EndPressure,Size,CylinderWorkPressure,SurfacePressure,DiveTime,SampleInterval,ProfileBlob,TemperatureBlob,PressureBlob,Oxygen,Helium,MIX.StartPressure,MIX.EndPressure,SampleBlob FROM Dive AS D JOIN DiveMixture AS MIX ON D.DiveId=MIX.DiveId"; char get_dives[] = "select D.DiveId,StartTime/10000000-62135596800,Note,Duration,coalesce(SourceSerialNumber,SerialNumber),Source,MaxDepth,SampleInterval,StartTemperature,BottomTemperature,D.StartPressure,D.EndPressure,Size,CylinderWorkPressure,SurfacePressure,DiveTime,SampleInterval,ProfileBlob,TemperatureBlob,PressureBlob,Oxygen,Helium,MIX.StartPressure,MIX.EndPressure,SampleBlob FROM Dive AS D JOIN DiveMixture AS MIX ON D.DiveId=MIX.DiveId";
retval = sqlite3_exec(handle, get_dives, &dm5_dive, handle, &err); retval = sqlite3_exec(handle, get_dives, &dm5_dive, handle, &err);