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

configure OSTC3: Add temperature sensor offset

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2016-01-22 14:17:49 +01:00 • committed by Dirk Hohndel
parent 128fc39274
commit 91a72f45d4
5 changed files with 48 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
subsurface-core/configuredivecomputerthreads.cpp
View file

@ -52,6 +52,7 @@
#define OSTC3_DYNAMIC_ASCEND_RATE 0x3F
#define OSTC3_GRAPHICAL_SPEED_INDICATOR 0x40
#define OSTC3_ALWAYS_SHOW_PPO2 0x41
#define OSTC3_TEMP_SENSOR_OFFSET 0x42
#define OSTC3_HW_OSTC_3 0x0A
#define OSTC3_HW_OSTC_3P 0x1A
@ -406,7 +407,7 @@ static dc_status_t read_ostc3_settings(dc_device_t *device, DeviceDetails *m_dev
dc_status_t rc;
dc_event_progress_t progress;
progress.current = 0;
progress.maximum = 52;
progress.maximum = 53;
unsigned char hardware[1];
//Read hardware type
@ -659,6 +660,13 @@ static dc_status_t read_ostc3_settings(dc_device_t *device, DeviceDetails *m_dev
m_deviceDetails->pressureSensorOffset = (signed char)uData[0];
EMIT_PROGRESS();
rc = hw_ostc3_device_config_read(device, OSTC3_TEMP_SENSOR_OFFSET, uData, sizeof(uData));
if (rc != DC_STATUS_SUCCESS)
return rc;
// OSTC3 stores the tempSensorOffset in two-complement
m_deviceDetails->tempSensorOffset = (signed char)uData[0];
EMIT_PROGRESS();
//read firmware settings
unsigned char fData[64] = { 0 };
rc = hw_ostc3_device_version(device, fData, sizeof(fData));
@ -679,7 +687,7 @@ static dc_status_t write_ostc3_settings(dc_device_t *device, DeviceDetails *m_de
dc_status_t rc;
dc_event_progress_t progress;
progress.current = 0;
progress.maximum = 51;
progress.maximum = 56;
//write gas values
unsigned char gas1Data[4] = {
@ -915,6 +923,13 @@ static dc_status_t write_ostc3_settings(dc_device_t *device, DeviceDetails *m_de
return rc;
EMIT_PROGRESS();
// OSTC3 stores the tempSensorOffset in two-complement
data[0] = (unsigned char)m_deviceDetails->pressureSensorOffset;
rc = hw_ostc3_device_config_write(device, OSTC3_TEMP_SENSOR_OFFSET, data, sizeof(data));
if (rc != DC_STATUS_SUCCESS)
return rc;
EMIT_PROGRESS();
//sync date and time
if (m_deviceDetails->syncTime) {
dc_datetime_t now;