mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

DLF import: Record battery status

Browse source 
This will record the ending battery status to extra data. Would need
info from CCR divers whether this suffices or if we should record also
the starting volatage or even every single reading.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
This commit is contained in:
Miika Turkia 2018-09-09 21:11:34 +03:00 committed by Dirk Hohndel
parent a93ecf3912
commit aae2403ddd
1 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
core/parse-xml.c
View file

@ -1682,6 +1682,12 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size, struct dive_table *tabl
unsigned int time = 0; unsigned int time = 0;
int i; int i;
char serial[6]; char serial[6];
struct {
uint16_t volt1;
uint8_t percent1;
uint16_t volt2;
uint8_t percent2;
} battery = {0, 0, 0, 0};
target_table = table; target_table = table;
@ -1980,8 +1986,12 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size, struct dive_table *tabl
/* measure record */ /* measure record */
switch (ptr[2] >> 5) { switch (ptr[2] >> 5) {
case 1: case 1:
/* Measure Battery */ /* Measure Battery, recording the last reading only */
//printf("B1: %dmV %d% B2: %dmV %d%\n", (ptr[5] << 8) + ptr[4], (ptr[7] << 8) + ptr[6], (ptr[9] << 8) + ptr[8], (ptr[11] << 8) + ptr[10]); battery.volt1 = (ptr[5] << 8) + ptr[4];
battery.percent1 = ptr[6];
battery.volt2 = (ptr[9] << 8) + ptr[8];
battery.percent2 = ptr[10];
break;
case 3: case 3:
/* Measure Oxygen */ /* Measure Oxygen */
//printf("o2 cells(0.01 mV): %d %d %d %d\n", (ptr[5] << 8) + ptr[4], (ptr[7] << 8) + ptr[6], (ptr[9] << 8) + ptr[8], (ptr[11] << 8) + ptr[10]); //printf("o2 cells(0.01 mV): %d %d %d %d\n", (ptr[5] << 8) + ptr[4], (ptr[7] << 8) + ptr[6], (ptr[9] << 8) + ptr[8], (ptr[11] << 8) + ptr[10]);
@ -2004,6 +2014,27 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size, struct dive_table *tabl
break; break;
} }
} }
/* Recording the ending battery status to extra data */
if (battery.volt1) {
size_t size = snprintf(NULL, 0, "%dmV (%d%%)", battery.volt1, battery.percent1) + 1;
char *ptr = malloc(size);
if (ptr) {
snprintf(ptr, size, "%dmV (%d%%)", battery.volt1, battery.percent1);
add_extra_data(cur_dc, "Battery 1", ptr);
free(ptr);
}
size = snprintf(NULL, 0, "%dmV (%d%%)", battery.volt2, battery.percent2) + 1;
ptr = malloc(size);
if (ptr) {
snprintf(ptr, size, "%dmV (%d%%)", battery.volt2, battery.percent2);
add_extra_data(cur_dc, "Battery 2", ptr);
free(ptr);
}
}
divecomputer_end(); divecomputer_end();
dive_end(); dive_end();
return 0; return 0;