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

Support for changed DM5 sample blob

Browse source 
Block size for sample is now variable, so detect the version and parse
proper blocks.

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-06-02 06:33:51 +03:00 • committed by Dirk Hohndel
parent 0ae40b4069
commit 16ac0bc45d
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
parse-xml.c
View file

@ -2268,7 +2268,7 @@ extern int dm4_dive(void *param, int columns, char **data, char **column)
extern int dm5_dive(void *param, int columns, char **data, char **column) extern int dm5_dive(void *param, int columns, char **data, char **column)
{ {
int i, interval, retval = 0; int i, interval, retval = 0, block_size;
sqlite3 *handle = (sqlite3 *)param; sqlite3 *handle = (sqlite3 *)param;
unsigned const char *sampleBlob; unsigned const char *sampleBlob;
char *err = NULL; char *err = NULL;
@ -2330,10 +2330,25 @@ extern int dm5_dive(void *param, int columns, char **data, char **column)
interval = data[16] ? atoi(data[16]) : 0; interval = data[16] ? atoi(data[16]) : 0;
sampleBlob = (unsigned const char *)data[24]; sampleBlob = (unsigned const char *)data[24];
if (sampleBlob) {
switch (sampleBlob[0]) {
case 2:
block_size = 19;
break;
case 3:
block_size = 23;
break;
default:
block_size = 16;
break;
}
}
for (i = 0; interval && sampleBlob && i * interval < cur_dive->duration.seconds; i++) { for (i = 0; interval && sampleBlob && i * interval < cur_dive->duration.seconds; i++) {
float *depth = (float *)&sampleBlob[i * 16 + 3]; float *depth = (float *)&sampleBlob[i * block_size + 3];
int32_t temp = (sampleBlob[i * 16 + 10] << 8) + sampleBlob[i * 16 + 11]; int32_t temp = (sampleBlob[i * block_size + 10] << 8) + sampleBlob[i * block_size + 11];
int32_t pressure = (sampleBlob[i * 16 + 9] << 16) + (sampleBlob[i * 16 + 8] << 8) + sampleBlob[i * 16 + 7]; int32_t pressure = (sampleBlob[i * block_size + 9] << block_size) + (sampleBlob[i * block_size + 8] << 8) + sampleBlob[i * block_size + 7];
sample_start(); sample_start();
cur_sample->time.seconds = i * interval; cur_sample->time.seconds = i * interval;