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

Use get_descriptor instead of hard-coded switch's

Browse source 
This starts using the newly lifted out get_descriptor in configure dive
computer, instead of previously hard-coded out of date
switch-statements.

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-12-28 20:55:54 +01:00 • committed by Dirk Hohndel
parent 00629c861c
commit 3b884c2e7c
1 changed files with 14 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

76
core/configuredivecomputerthreads.cpp
View file

@ -58,13 +58,6 @@
#define OSTC3_SAFETY_STOP_END_DEPTH 0x45 #define OSTC3_SAFETY_STOP_END_DEPTH 0x45
#define OSTC3_SAFETY_STOP_RESET_DEPTH 0x46 #define OSTC3_SAFETY_STOP_RESET_DEPTH 0x46
#define OSTC3_HW_OSTC_3 0x0A
#define OSTC3_HW_OSTC_3P 0x1A
#define OSTC3_HW_OSTC_CR 0x05
#define OSTC3_HW_OSTC_SPORT 0x12
#define OSTC3_HW_OSTC_2 0x11
#define SUUNTO_VYPER_MAXDEPTH 0x1e #define SUUNTO_VYPER_MAXDEPTH 0x1e
#define SUUNTO_VYPER_TOTAL_TIME 0x20 #define SUUNTO_VYPER_TOTAL_TIME 0x20
#define SUUNTO_VYPER_NUMBEROFDIVES 0x22 #define SUUNTO_VYPER_NUMBEROFDIVES 0x22
@ -163,45 +156,16 @@ static dc_status_t read_suunto_vyper_settings(dc_device_t *device, DeviceDetails
rc = dc_device_read(device, SUUNTO_VYPER_COMPUTER_TYPE, data, 1); rc = dc_device_read(device, SUUNTO_VYPER_COMPUTER_TYPE, data, 1);
if (rc == DC_STATUS_SUCCESS) { if (rc == DC_STATUS_SUCCESS) {
const char *model; dc_descriptor_t *desc = get_descriptor(DC_FAMILY_SUUNTO_VYPER, data[0]);
// FIXME: grab this info from libdivecomputer descriptor
// instead of hard coded here if (desc) {
switch (data[0]) { // We found a supported device
case 0x03: // we can safely proceed with reading/writing to this device.
model = "Stinger"; m_deviceDetails->model = dc_descriptor_get_product(desc);
break; dc_descriptor_free(desc);
case 0x04: } else {
model = "Mosquito";
break;
case 0x05:
model = "D3";
break;
case 0x0A:
model = "Vyper";
break;
case 0x0B:
model = "Vytec";
break;
case 0x0C:
model = "Cobra";
break;
case 0x0D:
model = "Gekko";
break;
case 0x16:
model = "Zoop";
break;
case 20:
case 30:
case 60:
// Suunto Spyder have there sample interval at this position
// Fallthrough
default:
return DC_STATUS_UNSUPPORTED; return DC_STATUS_UNSUPPORTED;
} }
// We found a supported device
// we can safely proceed with reading/writing to this device.
m_deviceDetails->model = model;
} }
EMIT_PROGRESS(); EMIT_PROGRESS();
@ -410,24 +374,12 @@ static dc_status_t read_ostc3_settings(dc_device_t *device, DeviceDetails *m_dev
return rc; return rc;
EMIT_PROGRESS(); EMIT_PROGRESS();
// FIXME: can we grab this info from libdivecomputer descriptor dc_descriptor_t *desc = get_descriptor(DC_FAMILY_HW_OSTC3, hardware[0]);
// instead of hard coded here? if (desc) {
switch(hardware[0]) { m_deviceDetails->model = dc_descriptor_get_product(desc);
case OSTC3_HW_OSTC_3: dc_descriptor_free(desc);
m_deviceDetails->model = "3"; } else {
break; return DC_STATUS_UNSUPPORTED;
case OSTC3_HW_OSTC_3P:
m_deviceDetails->model = "3+";
break;
case OSTC3_HW_OSTC_CR:
m_deviceDetails->model = "CR";
break;
case OSTC3_HW_OSTC_SPORT:
m_deviceDetails->model = "Sport";
break;
case OSTC3_HW_OSTC_2:
m_deviceDetails->model = "2";
break;
} }
//Read gas mixes //Read gas mixes