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

DLF import: use battery_end in preparation

Browse source 
Prepare for recording both start and end pressures.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
This commit is contained in:
Miika Turkia 2018-09-12 06:39:41 -04:00 • committed by Dirk Hohndel
parent 32eeb51305
commit 37e417c28a
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
core/parse-xml.c
View file

@ -1673,12 +1673,13 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size, struct dive_table *tabl
unsigned int time = 0;
int i;
char serial[6];
struct {
struct battery_status {
uint16_t volt1;
uint8_t percent1;
uint16_t volt2;
uint8_t percent2;
} battery = {0, 0, 0, 0};
};
struct battery_status battery_end = {0, 0, 0, 0};
target_table = table;
@ -1978,10 +1979,10 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size, struct dive_table *tabl
switch (ptr[2] >> 5) {
case 1:
/* Measure Battery, recording the last reading only */
battery.volt1 = (ptr[5] << 8) + ptr[4];
battery.percent1 = ptr[6];
battery.volt2 = (ptr[9] << 8) + ptr[8];
battery.percent2 = ptr[10];
battery_end.volt1 = (ptr[5] << 8) + ptr[4];
battery_end.percent1 = ptr[6];
battery_end.volt2 = (ptr[9] << 8) + ptr[8];
battery_end.percent2 = ptr[10];
break;
case 2:
/* Measure He */
@ -2014,21 +2015,21 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size, struct dive_table *tabl
}
/* Recording the ending battery status to extra data */
if (battery.volt1) {
size_t size = snprintf(NULL, 0, "%dmV (%d%%)", battery.volt1, battery.percent1) + 1;
if (battery_end.volt1) {
size_t size = snprintf(NULL, 0, "%dmV (%d%%)", battery_end.volt1, battery_end.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);
snprintf(ptr, size, "%dmV (%d%%)", battery_end.volt1, battery_end.percent1);
add_extra_data(cur_dc, "Battery 1 (end)", ptr);
free(ptr);
}
size = snprintf(NULL, 0, "%dmV (%d%%)", battery.volt2, battery.percent2) + 1;
size = snprintf(NULL, 0, "%dmV (%d%%)", battery_end.volt2, battery_end.percent2) + 1;
ptr = malloc(size);
if (ptr) {
snprintf(ptr, size, "%dmV (%d%%)", battery.volt2, battery.percent2);
add_extra_data(cur_dc, "Battery 2", ptr);
snprintf(ptr, size, "%dmV (%d%%)", battery_end.volt2, battery_end.percent2);
add_extra_data(cur_dc, "Battery 2 (end)", ptr);
free(ptr);
}
}