mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 23:53:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Read and write alarm time correctly for Stinger

Browse source 
The Stinger stores the alarm time in seconds, instead of minutes as the
Vyper does it. This corrects for that.

Reported-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2014-12-07 23:44:44 +01:00 • committed by Dirk Hohndel
parent ac207ee5ff
commit d6f417b5bf
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
configuredivecomputerthreads.cpp
View file

@ -247,7 +247,11 @@ void ReadSettingsThread::run()
} }
rc = dc_device_read(m_data->device, SUUNTO_VYPER_ALARM_TIME, data, 2); rc = dc_device_read(m_data->device, SUUNTO_VYPER_ALARM_TIME, data, 2);
if (rc == DC_STATUS_SUCCESS) { if (rc == DC_STATUS_SUCCESS) {
m_deviceDetails->setAlarmTime(data[0] << 8 ^ data[1]); int time = data[0] << 8 ^ data[1];
// The stinger stores alarm time in seconds instead of minutes.
if (m_deviceDetails->model() == "Stinger")
time /= 60;
m_deviceDetails->setAlarmTime(time);
} }
rc = dc_device_read(m_data->device, SUUNTO_VYPER_ALARM_DEPTH, data, 2); rc = dc_device_read(m_data->device, SUUNTO_VYPER_ALARM_DEPTH, data, 2);
if (rc == DC_STATUS_SUCCESS) { if (rc == DC_STATUS_SUCCESS) {
@ -838,6 +842,7 @@ void WriteSettingsThread::run()
case DC_FAMILY_SUUNTO_VYPER: case DC_FAMILY_SUUNTO_VYPER:
unsigned char data; unsigned char data;
unsigned char data2[2]; unsigned char data2[2];
int time;
// Maybee we should read the model from the device to sanity check it here too.. // Maybee we should read the model from the device to sanity check it here too..
// For now we just check that we actually read a device before writing to one. // For now we just check that we actually read a device before writing to one.
if (m_deviceDetails->model() == "") if (m_deviceDetails->model() == "")
@ -863,8 +868,12 @@ void WriteSettingsThread::run()
dc_device_write(m_data->device, SUUNTO_VYPER_LIGHT, &data, 1); dc_device_write(m_data->device, SUUNTO_VYPER_LIGHT, &data, 1);
data = m_deviceDetails->alarmDepthEnabled() << 1 ^ m_deviceDetails->alarmTimeEnabled(); data = m_deviceDetails->alarmDepthEnabled() << 1 ^ m_deviceDetails->alarmTimeEnabled();
dc_device_write(m_data->device, SUUNTO_VYPER_ALARM_DEPTH_TIME, &data, 1); dc_device_write(m_data->device, SUUNTO_VYPER_ALARM_DEPTH_TIME, &data, 1);
data2[0] = m_deviceDetails->alarmTime() >> 8; // The stinger stores alarm time in seconds instead of minutes.
data2[1] = m_deviceDetails->alarmTime() & 0xFF; time = m_deviceDetails->alarmTime();
if (m_deviceDetails->model() == "Stinger")
time *= 60;
data2[0] = time >> 8;
data2[1] = time & 0xFF;
dc_device_write(m_data->device, SUUNTO_VYPER_ALARM_TIME, data2, 2); dc_device_write(m_data->device, SUUNTO_VYPER_ALARM_TIME, data2, 2);
data2[0] = (int)(mm_to_feet(m_deviceDetails->alarmDepth()) * 128) >> 8; data2[0] = (int)(mm_to_feet(m_deviceDetails->alarmDepth()) * 128) >> 8;
data2[1] = (int)(mm_to_feet(m_deviceDetails->alarmDepth()) * 128) & 0x0FF; data2[1] = (int)(mm_to_feet(m_deviceDetails->alarmDepth()) * 128) & 0x0FF;