Skip to content

DiveSystem: Handle APOS5 sample record shift on iX3M2. #121

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.

Sign up for GitHub

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

Open
mikeller wants to merge 1 commit into
base: Subsurface-DS9
Choose a base branch
from
Open

DiveSystem: Handle APOS5 sample record shift on iX3M2. #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 22 additions & 1 deletion src/divesystem_idive_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
*/

#include <stdlib.h>
#include <stdbool.h>

#include "divesystem_idive.h"
#include "context-private.h"
Expand Down Expand Up @@ -61,6 +62,7 @@
#define REC_SAMPLE 0
#define REC_INFO 1
#define REC_SAMPLE_APOS5_COMPAT 0x8006
#define REC_SAMPLE_APOS5_IX3M2 0x800E

typedef struct divesystem_idive_parser_t divesystem_idive_parser_t;

Expand Down Expand Up @@ -472,6 +474,22 @@ divesystem_idive_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callba
// narrow until the record type is confirmed by the vendor.
if (firmware_major >= 5 && type == REC_SAMPLE_APOS5_COMPAT)
type = REC_SAMPLE;
// AI-generated (Claude)
// APOS5 on iX3M2 (model range 0x60..0xFFF, observed 0x102) inserts one
// extra byte at record offset 0x0E, shifting the record-type marker
// from offset+52 to offset+53. Read both positions so that these
// records are correctly identified as profile samples.
// Time and depth fields are unaffected by the insertion; ancillary
// fields past offset 0x0E are not decoded yet, pending a full
// libdivecomputer-level log to confirm the new layout.
bool shifted_apos5 = false;
if (firmware_major >= 5 && ISIX3M2(parser->model) &&
type != REC_SAMPLE &&
offset + 53 + 1 <= size &&
array_uint16_le(data + offset + 53) == REC_SAMPLE_APOS5_IX3M2) {
Comment on lines +486 to +489
type = REC_SAMPLE;
shifted_apos5 = true;
}
if (type != REC_SAMPLE) {
if (type == REC_INFO) {
if (!have_location) {
Expand Down Expand Up @@ -604,7 +622,10 @@ divesystem_idive_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callba
if (callback) callback (DC_SAMPLE_CNS, &sample, userdata);

// Tank Pressure
if (samplesize == SZ_SAMPLE_IX3M_APOS4) {
// AI-generated (Claude)
// Ancillary fields (tank, bearing) use APOS4 offsets which are shifted
// for iX3M2 APOS5 records; skip them until the new layout is confirmed.
if (samplesize == SZ_SAMPLE_IX3M_APOS4 && !shifted_apos5) {
Comment on lines +625 to +628
unsigned int id = data[offset + 47] & 0x0F;
unsigned int flags = data[offset + 47] & 0xF0;
unsigned int pressure = data[offset + 49];
Expand Down
Loading