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

Connect up all the OSTC4 common settings

Browse source 
Connect up all the settings that are the same, and remove those who are
not, and correct those who only are minor differences.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
This commit is contained in:
Anton Lundin 2017-04-27 21:21:00 +02:00 • committed by Dirk Hohndel
parent 527763f306
commit 5a4e1a5586
3 changed files with 59 additions and 400 deletions
Download patch file Download diff file Expand all files Collapse all files

50
core/configuredivecomputerthreads.cpp
View file

@ -554,6 +554,31 @@ static dc_status_t read_ostc4_settings(dc_device_t *device, DeviceDetails *m_dev
EMIT_PROGRESS(); \
} while (0)
READ_SETTING(OSTC3_DIVE_MODE, diveMode);
READ_SETTING(OSTC3_LAST_DECO, lastDeco);
READ_SETTING(OSTC3_BRIGHTNESS, brightness);
READ_SETTING(OSTC3_UNITS, units);
READ_SETTING(OSTC3_SALINITY, salinity);
READ_SETTING(OSTC3_DIVEMODE_COLOR, diveModeColor);
READ_SETTING(OSTC3_LANGUAGE, language);
READ_SETTING(OSTC3_DATE_FORMAT, dateFormat);
READ_SETTING(OSTC3_SAFETY_STOP, safetyStop);
READ_SETTING(OSTC3_GF_HIGH, gfHigh);
READ_SETTING(OSTC3_GF_LOW, gfLow);
READ_SETTING(OSTC3_PPO2_MIN, ppO2Min);
READ_SETTING(OSTC3_PPO2_MAX, ppO2Max);
READ_SETTING(OSTC3_FUTURE_TTS, futureTTS);
READ_SETTING(OSTC3_CCR_MODE, ccrMode);
READ_SETTING(OSTC3_DECO_TYPE, decoType);
READ_SETTING(OSTC3_AGF_HIGH, aGFHigh);
READ_SETTING(OSTC3_AGF_LOW, aGFLow);
READ_SETTING(OSTC3_SETPOINT_FALLBACK, setPointFallback);
READ_SETTING(OSTC3_BOTTOM_GAS_CONSUMPTION, bottomGasConsumption);
READ_SETTING(OSTC3_DECO_GAS_CONSUMPTION, decoGasConsumption);
READ_SETTING(OSTC3_ALWAYS_SHOW_PPO2, alwaysShowppO2);
READ_SETTING(OSTC3_SAFETY_STOP_LENGTH, safetyStopLength);
READ_SETTING(OSTC3_SAFETY_STOP_START_DEPTH, safetyStopStartDepth);
#undef READ_SETTING
rc = hw_ostc3_device_config_read(device, OSTC3_PRESSURE_SENSOR_OFFSET, uData, sizeof(uData));
@ -792,6 +817,31 @@ static dc_status_t write_ostc4_settings(dc_device_t *device, DeviceDetails *m_de
EMIT_PROGRESS(); \
} while (0)
WRITE_SETTING(OSTC3_DIVE_MODE, diveMode);
WRITE_SETTING(OSTC3_LAST_DECO, lastDeco);
WRITE_SETTING(OSTC3_BRIGHTNESS, brightness);
WRITE_SETTING(OSTC3_UNITS, units);
WRITE_SETTING(OSTC3_SALINITY, salinity);
WRITE_SETTING(OSTC3_DIVEMODE_COLOR, diveModeColor);
WRITE_SETTING(OSTC3_LANGUAGE, language);
WRITE_SETTING(OSTC3_DATE_FORMAT, dateFormat);
WRITE_SETTING(OSTC3_SAFETY_STOP, safetyStop);
WRITE_SETTING(OSTC3_GF_HIGH, gfHigh);
WRITE_SETTING(OSTC3_GF_LOW, gfLow);
WRITE_SETTING(OSTC3_PPO2_MIN, ppO2Min);
WRITE_SETTING(OSTC3_PPO2_MAX, ppO2Max);
WRITE_SETTING(OSTC3_FUTURE_TTS, futureTTS);
WRITE_SETTING(OSTC3_CCR_MODE, ccrMode);
WRITE_SETTING(OSTC3_DECO_TYPE, decoType);
WRITE_SETTING(OSTC3_AGF_HIGH, aGFHigh);
WRITE_SETTING(OSTC3_AGF_LOW, aGFLow);
WRITE_SETTING(OSTC3_SETPOINT_FALLBACK, setPointFallback);
WRITE_SETTING(OSTC3_BOTTOM_GAS_CONSUMPTION, bottomGasConsumption);
WRITE_SETTING(OSTC3_DECO_GAS_CONSUMPTION, decoGasConsumption);
WRITE_SETTING(OSTC3_ALWAYS_SHOW_PPO2, alwaysShowppO2);
WRITE_SETTING(OSTC3_SAFETY_STOP_LENGTH, safetyStopLength);
WRITE_SETTING(OSTC3_SAFETY_STOP_START_DEPTH, safetyStopStartDepth);
#undef WRITE_SETTING
// OSTC3 stores the pressureSensorOffset in two-complement