Add support for the Commander TM
The Cochran Commander TM appears to be a first generation Commander with limited storage and function compared to later models. The main differences are: - The TM doesn't support high-speed transfer so use the 0x05 read command and don't change to a higher baud rate. Still reset to 9600 to wait for the heartbeat. - The TM has a different config command (one byte). - The TM has only one config page.
This commit is contained in:
John Van Ostrand
Jef Driesen
parent
1d8f25ba9b
commit
fb65726a55
@ -35,11 +35,12 @@
|
||||
|
||||
#define MAXRETRIES 2
|
||||
|
||||
#define COCHRAN_MODEL_COMMANDER_PRE21000 0
|
||||
#define COCHRAN_MODEL_COMMANDER_AIR_NITROX 1
|
||||
#define COCHRAN_MODEL_EMC_14 2
|
||||
#define COCHRAN_MODEL_EMC_16 3
|
||||
#define COCHRAN_MODEL_EMC_20 4
|
||||
#define COCHRAN_MODEL_COMMANDER_TM 0
|
||||
#define COCHRAN_MODEL_COMMANDER_PRE21000 1
|
||||
#define COCHRAN_MODEL_COMMANDER_AIR_NITROX 2
|
||||
#define COCHRAN_MODEL_EMC_14 3
|
||||
#define COCHRAN_MODEL_EMC_16 4
|
||||
#define COCHRAN_MODEL_EMC_20 5
|
||||
|
||||
typedef enum cochran_endian_t {
|
||||
ENDIAN_LE,
|
||||
@ -88,6 +89,7 @@ typedef struct cochran_device_layout_t {
|
||||
unsigned int pt_profile_pre;
|
||||
unsigned int pt_profile_begin;
|
||||
unsigned int pt_profile_end;
|
||||
unsigned int pt_dive_number;
|
||||
} cochran_device_layout_t;
|
||||
|
||||
typedef struct cochran_commander_device_t {
|
||||
@ -115,6 +117,31 @@ static const dc_device_vtable_t cochran_commander_device_vtable = {
|
||||
cochran_commander_device_close /* close */
|
||||
};
|
||||
|
||||
// Cochran Commander TM, pre-dates pre-21000 s/n
|
||||
static const cochran_device_layout_t cochran_cmdr_tm_device_layout = {
|
||||
COCHRAN_MODEL_COMMANDER_TM, // model
|
||||
24, // address_bits
|
||||
ENDIAN_WORD_BE, // endian
|
||||
9600, // baudrate
|
||||
4096, // rbstream_size
|
||||
0x146, // cf_dive_count
|
||||
0x158, // cf_last_log
|
||||
0xffffff, // cf_last_interdive
|
||||
0x15c, // cf_serial_number
|
||||
0x010000, // rb_logbook_begin
|
||||
0x012328, // rb_logbook_end
|
||||
90, // rb_logbook_entry_size
|
||||
100, // rb_logbook_entry_count
|
||||
0x012328, // rb_profile_begin
|
||||
0x020000, // rb_profile_end
|
||||
15, // pt_fingerprint
|
||||
4, // fingerprint_size
|
||||
0, // pt_profile_pre
|
||||
0, // pt_profile_begin
|
||||
90, // pt_profile_end (Next begin pointer is the end)
|
||||
20, // pt_dive_number
|
||||
};
|
||||
|
||||
// Cochran Commander pre-21000 s/n
|
||||
static const cochran_device_layout_t cochran_cmdr_1_device_layout = {
|
||||
COCHRAN_MODEL_COMMANDER_PRE21000, // model
|
||||
@ -137,6 +164,7 @@ static const cochran_device_layout_t cochran_cmdr_1_device_layout = {
|
||||
28, // pt_profile_pre
|
||||
0, // pt_profile_begin
|
||||
128, // pt_profile_end
|
||||
68, // pt_dive_number
|
||||
};
|
||||
|
||||
|
||||
@ -162,6 +190,7 @@ static const cochran_device_layout_t cochran_cmdr_device_layout = {
|
||||
30, // pt_profile_pre
|
||||
6, // pt_profile_begin
|
||||
128, // pt_profile_end
|
||||
70, // pt_dive_number
|
||||
};
|
||||
|
||||
// Cochran EMC-14
|
||||
@ -186,6 +215,7 @@ static const cochran_device_layout_t cochran_emc14_device_layout = {
|
||||
30, // pt_profile_pre
|
||||
6, // pt_profile_begin
|
||||
256, // pt_profile_end
|
||||
86, // pt_dive_number
|
||||
};
|
||||
|
||||
// Cochran EMC-16
|
||||
@ -210,6 +240,7 @@ static const cochran_device_layout_t cochran_emc16_device_layout = {
|
||||
30, // pt_profile_pre
|
||||
6, // pt_profile_begin
|
||||
256, // pt_profile_end
|
||||
86, // pt_dive_number
|
||||
};
|
||||
|
||||
// Cochran EMC-20
|
||||
@ -234,6 +265,7 @@ static const cochran_device_layout_t cochran_emc20_device_layout = {
|
||||
30, // pt_profile_pre
|
||||
6, // pt_profile_begin
|
||||
256, // pt_profile_end
|
||||
86, // pt_dive_number
|
||||
};
|
||||
|
||||
|
||||
@ -242,6 +274,7 @@ static unsigned int
|
||||
cochran_commander_get_model (cochran_commander_device_t *device)
|
||||
{
|
||||
const cochran_commander_model_t models[] = {
|
||||
{"\x0a""12", COCHRAN_MODEL_COMMANDER_TM},
|
||||
{"\x11""21", COCHRAN_MODEL_COMMANDER_PRE21000},
|
||||
{"\x11""22", COCHRAN_MODEL_COMMANDER_AIR_NITROX},
|
||||
{"730", COCHRAN_MODEL_EMC_14},
|
||||
@ -334,7 +367,7 @@ cochran_commander_packet (cochran_commander_device_t *device, dc_event_progress_
|
||||
}
|
||||
}
|
||||
|
||||
if (high_speed) {
|
||||
if (high_speed && device->layout->baudrate != 9600) {
|
||||
// Give the DC time to process the command.
|
||||
dc_serial_sleep(device->port, 45);
|
||||
|
||||
@ -403,18 +436,24 @@ cochran_commander_read_config (cochran_commander_device_t *device, dc_event_prog
|
||||
dc_device_t *abstract = (dc_device_t *) device;
|
||||
dc_status_t rc = DC_STATUS_SUCCESS;
|
||||
|
||||
// Read two 512 byte blocks into one 1024 byte buffer
|
||||
for (unsigned int i = 0; i < 2; i++) {
|
||||
const unsigned int len = size / 2;
|
||||
if ((size % 512) != 0)
|
||||
return DC_STATUS_INVALIDARGS;
|
||||
|
||||
// Read two 512 byte blocks into one 1024 byte buffer
|
||||
unsigned int pages = size / 512;
|
||||
for (unsigned int i = 0; i < pages; i++) {
|
||||
unsigned char command[2] = {0x96, i};
|
||||
rc = cochran_commander_packet(device, progress, command, sizeof(command), data + i * len, len, 0);
|
||||
unsigned int command_size = sizeof(command);
|
||||
if (device->layout->model == COCHRAN_MODEL_COMMANDER_TM)
|
||||
command_size = 1;
|
||||
|
||||
rc = cochran_commander_packet(device, progress, command, command_size, data + i * 512, 512, 0);
|
||||
if (rc != DC_STATUS_SUCCESS)
|
||||
return rc;
|
||||
|
||||
dc_event_vendor_t vendor;
|
||||
vendor.data = data + i * len;
|
||||
vendor.size = len;
|
||||
vendor.data = data + i * 512;
|
||||
vendor.size = 512;
|
||||
device_event_emit (abstract, DC_EVENT_VENDOR, &vendor);
|
||||
}
|
||||
|
||||
@ -448,15 +487,36 @@ cochran_commander_read (cochran_commander_device_t *device, dc_event_progress_t
|
||||
break;
|
||||
case 24:
|
||||
// Commander uses 24 byte addressing
|
||||
command[0] = 0x15;
|
||||
command[1] = (address ) & 0xff;
|
||||
command[2] = (address >> 8) & 0xff;
|
||||
command[3] = (address >> 16) & 0xff;
|
||||
command[4] = (size ) & 0xff;
|
||||
command[5] = (size >> 8 ) & 0xff;
|
||||
command[6] = (size >> 16 ) & 0xff;
|
||||
command[7] = 0x04;
|
||||
command_size = 8;
|
||||
if (device->layout->baudrate == 9600) {
|
||||
// This read command will return 32K bytes if asked to read
|
||||
// 0 bytes. So we can allow a size of up to 0x10000 but if
|
||||
// the user asks for 0 bytes we should just return success
|
||||
// otherwise we'll end end up running past the buffer.
|
||||
if (size > 0x10000)
|
||||
return DC_STATUS_INVALIDARGS;
|
||||
if (size == 0)
|
||||
return DC_STATUS_SUCCESS;
|
||||
|
||||
// Older commander, use low-speed read command
|
||||
command[0] = 0x05;
|
||||
command[1] = (address ) & 0xff;
|
||||
command[2] = (address >> 8) & 0xff;
|
||||
command[3] = (address >> 16) & 0xff;
|
||||
command[4] = (size ) & 0xff;
|
||||
command[5] = (size >> 8 ) & 0xff;
|
||||
command_size = 6;
|
||||
} else {
|
||||
// Newer commander with high-speed read command
|
||||
command[0] = 0x15;
|
||||
command[1] = (address ) & 0xff;
|
||||
command[2] = (address >> 8) & 0xff;
|
||||
command[3] = (address >> 16) & 0xff;
|
||||
command[4] = (size ) & 0xff;
|
||||
command[5] = (size >> 8 ) & 0xff;
|
||||
command[6] = (size >> 16 ) & 0xff;
|
||||
command[7] = 0x04;
|
||||
command_size = 8;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return DC_STATUS_UNSUPPORTED;
|
||||
@ -526,6 +586,8 @@ cochran_commander_profile_size(cochran_commander_device_t *device, cochran_data_
|
||||
static unsigned int
|
||||
cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_data_t *data)
|
||||
{
|
||||
unsigned int base = device->layout->rb_logbook_begin;
|
||||
|
||||
// We track profile ringbuffer usage to determine which dives have profile data
|
||||
int profile_capacity_remaining = device->layout->rb_profile_end - device->layout->rb_profile_begin;
|
||||
|
||||
@ -544,10 +606,13 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d
|
||||
|
||||
// Remove the pre-dive events that occur after the last dive
|
||||
unsigned int rb_head_ptr = 0;
|
||||
if (device->layout->endian == ENDIAN_WORD_BE)
|
||||
rb_head_ptr = (array_uint32_word_be(data->config + device->layout->cf_last_log) & 0xfffff000) + 0x2000;
|
||||
if (device->layout->model == COCHRAN_MODEL_COMMANDER_TM)
|
||||
// TM uses SRAM and does not need to erase pages
|
||||
rb_head_ptr = base + array_uint32_word_be(data->config + device->layout->cf_last_log);
|
||||
else if (device->layout->endian == ENDIAN_WORD_BE)
|
||||
rb_head_ptr = base + (array_uint32_word_be(data->config + device->layout->cf_last_log) & 0xfffff000) + 0x2000;
|
||||
else
|
||||
rb_head_ptr = (array_uint32_le(data->config + device->layout->cf_last_log) & 0xfffff000) + 0x2000;
|
||||
rb_head_ptr = base + (array_uint32_le(data->config + device->layout->cf_last_log) & 0xfffff000) + 0x2000;
|
||||
|
||||
unsigned int head_dive = 0, tail_dive = 0;
|
||||
|
||||
@ -561,13 +626,13 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d
|
||||
}
|
||||
|
||||
unsigned int last_profile_idx = (device->layout->rb_logbook_entry_count + head_dive - 1) % device->layout->rb_logbook_entry_count;
|
||||
unsigned int last_profile_end = array_uint32_le(data->logbook + last_profile_idx * device->layout->rb_logbook_entry_size + device->layout->pt_profile_end);
|
||||
unsigned int last_profile_end = base + array_uint32_le(data->logbook + last_profile_idx * device->layout->rb_logbook_entry_size + device->layout->pt_profile_end);
|
||||
unsigned int last_profile_pre = 0xFFFFFFFF;
|
||||
|
||||
if (device->layout->endian == ENDIAN_WORD_BE)
|
||||
last_profile_pre = array_uint32_word_be(data->config + device->layout->cf_last_log);
|
||||
last_profile_pre = base + array_uint32_word_be(data->config + device->layout->cf_last_log);
|
||||
else
|
||||
last_profile_pre = array_uint32_le(data->config + device->layout->cf_last_log);
|
||||
last_profile_pre = base + array_uint32_le(data->config + device->layout->cf_last_log);
|
||||
|
||||
if (rb_head_ptr > last_profile_end)
|
||||
profile_capacity_remaining -= rb_head_ptr - last_profile_end;
|
||||
@ -585,7 +650,7 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d
|
||||
break;
|
||||
}
|
||||
|
||||
unsigned int profile_pre = array_uint32_le(log_entry + device->layout->pt_profile_pre);
|
||||
unsigned int profile_pre = base + array_uint32_le(log_entry + device->layout->pt_profile_pre);
|
||||
|
||||
unsigned int sample_size = cochran_commander_profile_size(device, data, idx, profile_pre, last_profile_pre);
|
||||
last_profile_pre = profile_pre;
|
||||
@ -648,6 +713,9 @@ cochran_commander_device_open (dc_device_t **out, dc_context_t *context, const c
|
||||
|
||||
unsigned int model = cochran_commander_get_model(device);
|
||||
switch (model) {
|
||||
case COCHRAN_MODEL_COMMANDER_TM:
|
||||
device->layout = &cochran_cmdr_tm_device_layout;
|
||||
break;
|
||||
case COCHRAN_MODEL_COMMANDER_PRE21000:
|
||||
device->layout = &cochran_cmdr_1_device_layout;
|
||||
break;
|
||||
@ -728,6 +796,7 @@ cochran_commander_device_dump (dc_device_t *abstract, dc_buffer_t *buffer)
|
||||
cochran_commander_device_t *device = (cochran_commander_device_t *) abstract;
|
||||
dc_status_t rc = DC_STATUS_SUCCESS;
|
||||
unsigned char config[1024];
|
||||
unsigned int config_size = sizeof(config);
|
||||
unsigned int size = device->layout->rb_profile_end - device->layout->rb_logbook_begin;
|
||||
|
||||
// Make sure buffer is good.
|
||||
@ -742,9 +811,12 @@ cochran_commander_device_dump (dc_device_t *abstract, dc_buffer_t *buffer)
|
||||
return DC_STATUS_NOMEMORY;
|
||||
}
|
||||
|
||||
if (device->layout->model == COCHRAN_MODEL_COMMANDER_TM)
|
||||
config_size = 512;
|
||||
|
||||
// Determine size for progress
|
||||
dc_event_progress_t progress = EVENT_PROGRESS_INITIALIZER;
|
||||
progress.maximum = sizeof(config) + size;
|
||||
progress.maximum = config_size + size;
|
||||
device_event_emit (abstract, DC_EVENT_PROGRESS, &progress);
|
||||
|
||||
// Emit ID block
|
||||
@ -753,12 +825,12 @@ cochran_commander_device_dump (dc_device_t *abstract, dc_buffer_t *buffer)
|
||||
vendor.size = sizeof (device->id);
|
||||
device_event_emit (abstract, DC_EVENT_VENDOR, &vendor);
|
||||
|
||||
rc = cochran_commander_read_config (device, &progress, config, sizeof(config));
|
||||
rc = cochran_commander_read_config (device, &progress, config, config_size);
|
||||
if (rc != DC_STATUS_SUCCESS)
|
||||
return rc;
|
||||
|
||||
// Read the sample data, from 0 to sample end will include logbook
|
||||
rc = cochran_commander_read (device, &progress, device->layout->rb_logbook_begin, dc_buffer_get_data(buffer), device->layout->rb_profile_end);
|
||||
// Read the sample data, logbook and sample data are contiguous
|
||||
rc = cochran_commander_read (device, &progress, device->layout->rb_logbook_begin, dc_buffer_get_data(buffer), size);
|
||||
if (rc != DC_STATUS_SUCCESS) {
|
||||
ERROR (abstract->context, "Failed to read the sample data.");
|
||||
return rc;
|
||||
@ -783,6 +855,10 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
|
||||
unsigned int max_config = sizeof(data.config);
|
||||
unsigned int max_logbook = layout->rb_logbook_end - layout->rb_logbook_begin;
|
||||
unsigned int max_sample = layout->rb_profile_end - layout->rb_profile_begin;
|
||||
unsigned int base = device->layout->rb_logbook_begin;
|
||||
|
||||
if (device->layout->model == COCHRAN_MODEL_COMMANDER_TM)
|
||||
max_config = 512;
|
||||
|
||||
// setup progress indication
|
||||
dc_event_progress_t progress = EVENT_PROGRESS_INITIALIZER;
|
||||
@ -797,7 +873,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
|
||||
|
||||
// Read config
|
||||
dc_status_t rc = DC_STATUS_SUCCESS;
|
||||
rc = cochran_commander_read_config(device, &progress, data.config, sizeof(data.config));
|
||||
rc = cochran_commander_read_config(device, &progress, data.config, max_config);
|
||||
if (rc != DC_STATUS_SUCCESS)
|
||||
return rc;
|
||||
|
||||
@ -807,9 +883,11 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
|
||||
else
|
||||
data.dive_count = array_uint16_be (data.config + layout->cf_dive_count);
|
||||
|
||||
if (data.dive_count == 0)
|
||||
if (data.dive_count == 0) {
|
||||
// No dives to read
|
||||
WARNING(abstract->context, "This dive computer has no recorded dives.");
|
||||
return DC_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
if (data.dive_count > layout->rb_logbook_entry_count) {
|
||||
data.logbook_size = layout->rb_logbook_entry_count * layout->rb_logbook_entry_size;
|
||||
@ -829,7 +907,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
|
||||
}
|
||||
|
||||
// Request log book
|
||||
rc = cochran_commander_read(device, &progress, 0, data.logbook, data.logbook_size);
|
||||
rc = cochran_commander_read(device, &progress, layout->rb_logbook_begin, data.logbook, data.logbook_size);
|
||||
if (rc != DC_STATUS_SUCCESS) {
|
||||
status = rc;
|
||||
goto error;
|
||||
@ -837,6 +915,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
|
||||
|
||||
// Locate fingerprint, recent dive with invalid profile and calc read size
|
||||
unsigned int profile_read_size = cochran_commander_find_fingerprint(device, &data);
|
||||
|
||||
// Update progress indicator with new maximum
|
||||
progress.maximum -= (max_sample - profile_read_size);
|
||||
device_event_emit (abstract, DC_EVENT_PROGRESS, &progress);
|
||||
@ -870,8 +949,13 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
|
||||
// Number of dives to read
|
||||
dive_count = (layout->rb_logbook_entry_count + head_dive - tail_dive) % layout->rb_logbook_entry_count;
|
||||
|
||||
unsigned int last_start_address = 0;
|
||||
if (layout->endian == ENDIAN_WORD_BE)
|
||||
last_start_address = base + array_uint32_word_be(data.config + layout->cf_last_log );
|
||||
else
|
||||
last_start_address = base + array_uint32_le(data.config + layout->cf_last_log );
|
||||
|
||||
// Create the ringbuffer stream.
|
||||
unsigned int last_start_address = array_uint32_le (data.logbook + ((head_dive - 1) * layout->rb_logbook_entry_size) + layout->pt_profile_end);
|
||||
status = dc_rbstream_new (&rbstream, abstract, 1, layout->rbstream_size, layout->rb_profile_begin, layout->rb_profile_end, last_start_address);
|
||||
if (status != DC_STATUS_SUCCESS) {
|
||||
ERROR (abstract->context, "Failed to create the ringbuffer stream.");
|
||||
@ -886,8 +970,23 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
|
||||
|
||||
unsigned char *log_entry = data.logbook + idx * layout->rb_logbook_entry_size;
|
||||
|
||||
unsigned int sample_start_address = array_uint32_le (log_entry + layout->pt_profile_begin);
|
||||
unsigned int sample_end_address = array_uint32_le (log_entry + layout->pt_profile_end);
|
||||
unsigned int sample_start_address = 0;
|
||||
unsigned int sample_end_address = 0;
|
||||
if (layout->model == COCHRAN_MODEL_COMMANDER_TM) {
|
||||
sample_start_address = base + array_uint24_le (log_entry + layout->pt_profile_begin);
|
||||
sample_end_address = last_start_address;
|
||||
// Commander TM has SRAM which seems to randomize when they lose power for too long
|
||||
// Check for bad entries.
|
||||
if (sample_start_address < layout->rb_profile_begin || sample_start_address > layout->rb_profile_end ||
|
||||
sample_end_address < layout->rb_profile_begin || sample_end_address > layout->rb_profile_end ||
|
||||
array_uint16_le(log_entry + layout->pt_dive_number) % layout->rb_logbook_entry_count != idx) {
|
||||
ERROR(abstract->context, "Corrupt dive (%d).", idx);
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
sample_start_address = base + array_uint32_le (log_entry + layout->pt_profile_begin);
|
||||
sample_end_address = base + array_uint32_le (log_entry + layout->pt_profile_end);
|
||||
}
|
||||
|
||||
int sample_size = 0, pre_size = 0;
|
||||
|
||||
|
||||
@ -31,11 +31,12 @@
|
||||
|
||||
#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
|
||||
|
||||
#define COCHRAN_MODEL_COMMANDER_PRE21000 0
|
||||
#define COCHRAN_MODEL_COMMANDER_AIR_NITROX 1
|
||||
#define COCHRAN_MODEL_EMC_14 2
|
||||
#define COCHRAN_MODEL_EMC_16 3
|
||||
#define COCHRAN_MODEL_EMC_20 4
|
||||
#define COCHRAN_MODEL_COMMANDER_TM 0
|
||||
#define COCHRAN_MODEL_COMMANDER_PRE21000 1
|
||||
#define COCHRAN_MODEL_COMMANDER_AIR_NITROX 2
|
||||
#define COCHRAN_MODEL_EMC_14 3
|
||||
#define COCHRAN_MODEL_EMC_16 4
|
||||
#define COCHRAN_MODEL_EMC_20 5
|
||||
|
||||
// Cochran time stamps start at Jan 1, 1992
|
||||
#define COCHRAN_EPOCH 694242000
|
||||
@ -43,6 +44,7 @@
|
||||
#define UNSUPPORTED 0xFFFFFFFF
|
||||
|
||||
typedef enum cochran_sample_format_t {
|
||||
SAMPLE_TM,
|
||||
SAMPLE_CMDR,
|
||||
SAMPLE_EMC,
|
||||
} cochran_sample_format_t;
|
||||
@ -58,6 +60,7 @@ typedef struct cochran_parser_layout_t {
|
||||
cochran_sample_format_t format;
|
||||
unsigned int headersize;
|
||||
unsigned int samplesize;
|
||||
unsigned int pt_sample_interval;
|
||||
cochran_date_encoding_t date_encoding;
|
||||
unsigned int datetime;
|
||||
unsigned int pt_profile_begin;
|
||||
@ -113,10 +116,36 @@ static const dc_parser_vtable_t cochran_commander_parser_vtable = {
|
||||
NULL /* destroy */
|
||||
};
|
||||
|
||||
static const cochran_parser_layout_t cochran_cmdr_tm_parser_layout = {
|
||||
SAMPLE_TM, // format
|
||||
90, // headersize
|
||||
1, // samplesize
|
||||
72, // pt_sample_interval
|
||||
DATE_ENCODING_TICKS, // date_encoding
|
||||
15, // datetime, 4 bytes
|
||||
0, // pt_profile_begin, 4 bytes
|
||||
UNSUPPORTED, // water_conductivity, 1 byte, 0=low(fresh), 2=high(sea)
|
||||
0, // pt_profile_pre, 4 bytes
|
||||
83, // start_temp, 1 byte, F
|
||||
UNSUPPORTED, // start_depth, 2 bytes, /4=ft
|
||||
20, // dive_number, 2 bytes
|
||||
UNSUPPORTED, // altitude, 1 byte, /4=kilofeet
|
||||
UNSUPPORTED, // pt_profile_end, 4 bytes
|
||||
UNSUPPORTED, // end_temp, 1 byte F
|
||||
57, // divetime, 2 bytes, minutes
|
||||
49, // max_depth, 2 bytes, /4=ft
|
||||
51, // avg_depth, 2 bytes, /4=ft
|
||||
74, // oxygen, 4 bytes (2 of) 2 bytes, /256=%
|
||||
UNSUPPORTED, // helium, 4 bytes (2 of) 2 bytes, /256=%
|
||||
82, // min_temp, 1 byte, /2+20=F
|
||||
UNSUPPORTED, // max_temp, 1 byte, /2+20=F
|
||||
};
|
||||
|
||||
static const cochran_parser_layout_t cochran_cmdr_1_parser_layout = {
|
||||
SAMPLE_CMDR, // type
|
||||
SAMPLE_CMDR, // format
|
||||
256, // headersize
|
||||
2, // samplesize
|
||||
UNSUPPORTED, // pt_sample_interval
|
||||
DATE_ENCODING_TICKS, // date_encoding
|
||||
8, // datetime, 4 bytes
|
||||
0, // pt_profile_begin, 4 bytes
|
||||
@ -138,9 +167,10 @@ static const cochran_parser_layout_t cochran_cmdr_1_parser_layout = {
|
||||
};
|
||||
|
||||
static const cochran_parser_layout_t cochran_cmdr_parser_layout = {
|
||||
SAMPLE_CMDR, // type
|
||||
SAMPLE_CMDR, // format
|
||||
256, // headersize
|
||||
2, // samplesize
|
||||
UNSUPPORTED, // pt_sample_interval
|
||||
DATE_ENCODING_MSDHYM, // date_encoding
|
||||
0, // datetime, 6 bytes
|
||||
6, // pt_profile_begin, 4 bytes
|
||||
@ -162,9 +192,10 @@ static const cochran_parser_layout_t cochran_cmdr_parser_layout = {
|
||||
};
|
||||
|
||||
static const cochran_parser_layout_t cochran_emc_parser_layout = {
|
||||
SAMPLE_EMC, // type
|
||||
SAMPLE_EMC, // format
|
||||
512, // headersize
|
||||
3, // samplesize
|
||||
UNSUPPORTED, // pt_sample_interval
|
||||
DATE_ENCODING_SMHDMY, // date_encoding
|
||||
0, // datetime, 6 bytes
|
||||
6, // pt_profile_begin, 4 bytes
|
||||
@ -197,6 +228,7 @@ static const cochran_events_t cochran_events[] = {
|
||||
{0xC3, 1, SAMPLE_EVENT_OLF, SAMPLE_FLAGS_NONE}, // CNS Oxygen toxicity warning
|
||||
{0xC4, 1, SAMPLE_EVENT_MAXDEPTH, SAMPLE_FLAGS_NONE}, // Depth exceeds user set point
|
||||
{0xC5, 1, SAMPLE_EVENT_NONE, SAMPLE_FLAGS_BEGIN}, // Entered decompression mode
|
||||
{0xC7, 1, SAMPLE_EVENT_VIOLATION,SAMPLE_FLAGS_BEGIN}, // Entered Gauge mode (e.g. locked out)
|
||||
{0xC8, 1, SAMPLE_EVENT_PO2, SAMPLE_FLAGS_BEGIN}, // PO2 too high
|
||||
{0xCC, 1, SAMPLE_EVENT_NONE, SAMPLE_FLAGS_BEGIN}, // Low Cylinder 1 pressure
|
||||
{0xCE, 1, SAMPLE_EVENT_NONE, SAMPLE_FLAGS_BEGIN}, // Non-decompression warning
|
||||
@ -334,6 +366,11 @@ cochran_commander_parser_create (dc_parser_t **out, dc_context_t *context, unsig
|
||||
parser->model = model;
|
||||
|
||||
switch (model) {
|
||||
case COCHRAN_MODEL_COMMANDER_TM:
|
||||
parser->layout = &cochran_cmdr_tm_parser_layout;
|
||||
parser->events = NULL; // No inter-dive events on this model
|
||||
parser->nevents = 0;
|
||||
break;
|
||||
case COCHRAN_MODEL_COMMANDER_PRE21000:
|
||||
parser->layout = &cochran_cmdr_1_parser_layout;
|
||||
parser->events = cochran_cmdr_event_bytes;
|
||||
@ -440,6 +477,8 @@ cochran_commander_parser_get_field (dc_parser_t *abstract, dc_field_type_t type,
|
||||
*((unsigned int*) value) = (data[layout->min_temp] / 2.0 + 20 - 32) / 1.8;
|
||||
break;
|
||||
case DC_FIELD_TEMPERATURE_MAXIMUM:
|
||||
if (layout->max_temp == UNSUPPORTED)
|
||||
return DC_STATUS_UNSUPPORTED;
|
||||
if (data[layout->max_temp] == 0xFF)
|
||||
return DC_STATUS_UNSUPPORTED;
|
||||
*((unsigned int*) value) = (data[layout->max_temp] / 2.0 + 20 - 32) / 1.8;
|
||||
@ -484,6 +523,8 @@ cochran_commander_parser_get_field (dc_parser_t *abstract, dc_field_type_t type,
|
||||
// for density assume
|
||||
// 0 = 1000kg/m³, 2 = 1025kg/m³
|
||||
// and other values are linear
|
||||
if (layout->water_conductivity == UNSUPPORTED)
|
||||
return DC_STATUS_UNSUPPORTED;
|
||||
if ((data[layout->water_conductivity] & 0x3) == 0)
|
||||
water->type = DC_WATER_FRESH;
|
||||
else
|
||||
@ -493,6 +534,8 @@ cochran_commander_parser_get_field (dc_parser_t *abstract, dc_field_type_t type,
|
||||
case DC_FIELD_ATMOSPHERIC:
|
||||
// Cochran measures air pressure and stores it as altitude.
|
||||
// Convert altitude (measured in 1/4 kilofeet) back to pressure.
|
||||
if (layout->altitude == UNSUPPORTED)
|
||||
return DC_STATUS_UNSUPPORTED;
|
||||
*(double *) value = ATM / BAR * pow(1 - 0.0000225577 * data[layout->altitude] * 250.0 * FEET, 5.25588);
|
||||
break;
|
||||
default:
|
||||
@ -504,8 +547,114 @@ cochran_commander_parser_get_field (dc_parser_t *abstract, dc_field_type_t type,
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Parse early Commander computers
|
||||
*/
|
||||
static dc_status_t
|
||||
cochran_commander_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t callback, void *userdata)
|
||||
cochran_commander_parser_samples_foreach_tm (dc_parser_t *abstract, dc_sample_callback_t callback, void *userdata)
|
||||
{
|
||||
cochran_commander_parser_t *parser = (cochran_commander_parser_t *) abstract;
|
||||
const cochran_parser_layout_t *layout = parser->layout;
|
||||
const unsigned char *data = abstract->data;
|
||||
const unsigned char *samples = data + layout->headersize;
|
||||
|
||||
if (abstract->size < layout->headersize)
|
||||
return DC_STATUS_DATAFORMAT;
|
||||
|
||||
unsigned int size = abstract->size - layout->headersize;
|
||||
unsigned int sample_interval = data[layout->pt_sample_interval];
|
||||
|
||||
dc_sample_value_t sample = {0};
|
||||
unsigned int time = 0, last_sample_time = 0;
|
||||
unsigned int offset = 2;
|
||||
unsigned int deco_ceiling = 0;
|
||||
|
||||
unsigned int temp = samples[0]; // Half degrees F
|
||||
unsigned int depth = samples[1]; // Half feet
|
||||
|
||||
last_sample_time = sample.time = time;
|
||||
if (callback) callback (DC_SAMPLE_TIME, sample, userdata);
|
||||
|
||||
sample.depth = (depth / 2.0) * FEET;
|
||||
if (callback) callback (DC_SAMPLE_DEPTH, sample, userdata);
|
||||
|
||||
sample.temperature = (temp / 2.0 - 32.0) / 1.8;
|
||||
if (callback) callback (DC_SAMPLE_TEMPERATURE, sample, userdata);
|
||||
|
||||
sample.gasmix = 0;
|
||||
if (callback) callback(DC_SAMPLE_GASMIX, sample, userdata);
|
||||
|
||||
while (offset < size) {
|
||||
const unsigned char *s = samples + offset;
|
||||
|
||||
sample.time = time;
|
||||
if (last_sample_time != sample.time) {
|
||||
// We haven't issued this time yet.
|
||||
last_sample_time = sample.time;
|
||||
if (callback) callback (DC_SAMPLE_TIME, sample, userdata);
|
||||
}
|
||||
|
||||
if (*s & 0x80) {
|
||||
// Event or temperate change byte
|
||||
if (*s & 0x60) {
|
||||
// Event byte
|
||||
switch (*s) {
|
||||
case 0xC5: // Deco obligation begins
|
||||
break;
|
||||
case 0xD8: // Deco obligation ends
|
||||
break;
|
||||
case 0xAB: // Decrement ceiling (deeper)
|
||||
deco_ceiling += 10; // feet
|
||||
|
||||
sample.deco.type = DC_DECO_DECOSTOP;
|
||||
sample.deco.time = 60; // We don't know the duration
|
||||
sample.deco.depth = deco_ceiling * FEET;
|
||||
if (callback) callback(DC_SAMPLE_DECO, sample, userdata);
|
||||
break;
|
||||
case 0xAD: // Increment ceiling (shallower)
|
||||
deco_ceiling -= 10; // feet
|
||||
|
||||
sample.deco.type = DC_DECO_DECOSTOP;
|
||||
sample.deco.depth = deco_ceiling * FEET;
|
||||
sample.deco.time = 60; // We don't know the duration
|
||||
if (callback) callback(DC_SAMPLE_DECO, sample, userdata);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
// Temp change
|
||||
if (*s & 0x10)
|
||||
temp -= (*s & 0x0f);
|
||||
else
|
||||
temp += (*s & 0x0f);
|
||||
sample.temperature = (temp / 2.0 - 32.0) / 1.8;
|
||||
if (callback) callback (DC_SAMPLE_TEMPERATURE, sample, userdata);
|
||||
}
|
||||
|
||||
offset++;
|
||||
continue;
|
||||
}
|
||||
|
||||
// Depth sample
|
||||
if (s[0] & 0x40)
|
||||
depth -= s[0] & 0x3f;
|
||||
else
|
||||
depth += s[0] & 0x3f;
|
||||
|
||||
sample.depth = (depth / 2.0) * FEET;
|
||||
if (callback) callback (DC_SAMPLE_DEPTH, sample, userdata);
|
||||
|
||||
offset++;
|
||||
time += sample_interval;
|
||||
}
|
||||
return DC_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Parse Commander I (Pre-21000 s/n), II and EMC computers
|
||||
*/
|
||||
static dc_status_t
|
||||
cochran_commander_parser_samples_foreach_emc (dc_parser_t *abstract, dc_sample_callback_t callback, void *userdata)
|
||||
{
|
||||
cochran_commander_parser_t *parser = (cochran_commander_parser_t *) abstract;
|
||||
const cochran_parser_layout_t *layout = parser->layout;
|
||||
@ -720,3 +869,15 @@ cochran_commander_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callb
|
||||
|
||||
return DC_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
static dc_status_t
|
||||
cochran_commander_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t callback, void *userdata)
|
||||
{
|
||||
cochran_commander_parser_t *parser = (cochran_commander_parser_t *) abstract;
|
||||
|
||||
if (parser->model == COCHRAN_MODEL_COMMANDER_TM)
|
||||
return cochran_commander_parser_samples_foreach_tm (abstract, callback, userdata);
|
||||
else
|
||||
return cochran_commander_parser_samples_foreach_emc (abstract, callback, userdata);
|
||||
}
|
||||
|
||||
@ -314,11 +314,12 @@ static const dc_descriptor_t g_descriptors[] = {
|
||||
{"DiveSystem", "iDive2 Deep", DC_FAMILY_DIVESYSTEM_IDIVE, 0x44},
|
||||
{"DiveSystem", "iDive2 Tech+", DC_FAMILY_DIVESYSTEM_IDIVE, 0x45},
|
||||
/* Cochran Commander */
|
||||
{"Cochran", "Commander I", DC_FAMILY_COCHRAN_COMMANDER, 0},
|
||||
{"Cochran", "Commander II", DC_FAMILY_COCHRAN_COMMANDER, 1},
|
||||
{"Cochran", "EMC-14", DC_FAMILY_COCHRAN_COMMANDER, 2},
|
||||
{"Cochran", "EMC-16", DC_FAMILY_COCHRAN_COMMANDER, 3},
|
||||
{"Cochran", "EMC-20H", DC_FAMILY_COCHRAN_COMMANDER, 4},
|
||||
{"Cochran", "Commander TM", DC_FAMILY_COCHRAN_COMMANDER, 0},
|
||||
{"Cochran", "Commander I", DC_FAMILY_COCHRAN_COMMANDER, 1},
|
||||
{"Cochran", "Commander II", DC_FAMILY_COCHRAN_COMMANDER, 2},
|
||||
{"Cochran", "EMC-14", DC_FAMILY_COCHRAN_COMMANDER, 3},
|
||||
{"Cochran", "EMC-16", DC_FAMILY_COCHRAN_COMMANDER, 4},
|
||||
{"Cochran", "EMC-20H", DC_FAMILY_COCHRAN_COMMANDER, 5},
|
||||
};
|
||||
|
||||
typedef struct dc_descriptor_iterator_t {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user