Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shearwater: Add Stack Timer Information. #61

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/shearwater_predator_parser.c
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,8 @@ shearwater_predator_parser_cache (shearwater_predator_parser_t *parser)

unsigned int offset = headersize;
unsigned int length = size - footersize;
unsigned int stack_time_total_s = 0;
unsigned int stack_time_remaining_s;
while (offset + parser->samplesize <= length) {
// Ignore empty samples.
if (array_isequal (data + offset, parser->samplesize, 0x00)) {
Expand Down Expand Up @@ -680,6 +682,14 @@ shearwater_predator_parser_cache (shearwater_predator_parser_t *parser)
tank[1].pressure_reserve = array_uint16_be(data + offset + 17);
}
} else if (type == LOG_RECORD_OPENING_6) {
if (logversion >= 11) {
stack_time_total_s = array_uint16_be(data + offset + 1);
if (stack_time_total_s > 0) {
dc_field_add_string_fmt(&parser->cache, "Configured stack time [hh:mm:ss]", "%d:%02d:%02d", stack_time_total_s / 3600, (stack_time_total_s / 60) % 60, stack_time_total_s % 60);
stack_time_remaining_s = array_uint16_be(data + offset + 3);
dc_field_add_string_fmt(&parser->cache, "Remaining stack time at start [hh:mm:ss]", "%d:%02d:%02d", stack_time_remaining_s / 3600, (stack_time_remaining_s / 60) % 60, stack_time_remaining_s % 60);
}
}
if (logversion >= 13) {
tank[0].enabled = data[offset + 19];
memcpy (tank[0].name, data + offset + 20, sizeof (tank[0].name));
Expand All @@ -704,6 +714,14 @@ shearwater_predator_parser_cache (shearwater_predator_parser_t *parser)
}
}
} else if (type >= LOG_RECORD_CLOSING_0 && type <= LOG_RECORD_CLOSING_7) {
if (type == LOG_RECORD_CLOSING_6) {
if (logversion >= 11) {
if (stack_time_total_s > 0) {
stack_time_remaining_s = array_uint16_be(data + offset + 3);
dc_field_add_string_fmt(&parser->cache, "Remaining stack time at end [hh:mm:ss]", "%d:%02d:%02d", stack_time_remaining_s / 3600, (stack_time_remaining_s / 60) % 60, stack_time_remaining_s % 60);
}
}
}
// Closing record
parser->closing[type - LOG_RECORD_CLOSING_0] = offset;
} else if (type == LOG_RECORD_FINAL) {
Expand Down
Loading