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

Cleanup OSTC settings debug code

Browse source 
The old OSTC settings debug code was a bit ugly.

This cleans that up and contains all the ugly-ness behind the
DEBUG_OSTC ifdef.

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-30 16:13:42 +01:00 • committed by Dirk Hohndel
parent 3416278da4
commit 04ac309725
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
configuredivecomputerthreads.cpp
View file

@ -71,6 +71,16 @@
#define hw_ostc_device_clock local_hw_ostc_device_clock #define hw_ostc_device_clock local_hw_ostc_device_clock
#define OSTC_FILE "../OSTC-data-dump.bin" #define OSTC_FILE "../OSTC-data-dump.bin"
// Fake the open function.
static dc_status_t local_dc_device_open(dc_device_t **out, dc_context_t *context, dc_descriptor_t *descriptor, const char *name)
{
if (strcmp(dc_descriptor_get_vendor(descriptor), "Heinrichs Weikamp") == 0 &&strcmp(dc_descriptor_get_product(descriptor), "OSTC 2N") == 0)
return DC_STATUS_SUCCESS;
else
return dc_device_open(out, context, descriptor, name);
}
#define dc_device_open local_dc_device_open
static dc_status_t local_hw_ostc_device_eeprom_read(void *ignored, unsigned char bank, unsigned char data[], unsigned int data_size) static dc_status_t local_hw_ostc_device_eeprom_read(void *ignored, unsigned char bank, unsigned char data[], unsigned int data_size)
{ {
FILE *f; FILE *f;
@ -1387,12 +1397,8 @@ void ReadSettingsThread::run()
{ {
bool supported = false; bool supported = false;
dc_status_t rc; dc_status_t rc;
#ifdef DEBUG_OSTC
if (strcmp(m_data->vendor, "Heinrichs Weikamp") == 0 && strcmp(m_data->product, "OSTC 2N") == 0) rc = dc_device_open(&m_data->device, m_data->context, m_data->descriptor, m_data->devname);
rc = DC_STATUS_SUCCESS;
else
#endif
rc = dc_device_open(&m_data->device, m_data->context, m_data->descriptor, m_data->devname);
if (rc == DC_STATUS_SUCCESS) { if (rc == DC_STATUS_SUCCESS) {
DeviceDetails *m_deviceDetails = new DeviceDetails(0); DeviceDetails *m_deviceDetails = new DeviceDetails(0);
switch (dc_device_get_type(m_data->device)) { switch (dc_device_get_type(m_data->device)) {
@ -1459,11 +1465,8 @@ void WriteSettingsThread::run()
{ {
bool supported = false; bool supported = false;
dc_status_t rc; dc_status_t rc;
#ifdef DEBUG_OSTC
rc = DC_STATUS_SUCCESS;
#else
rc = dc_device_open(&m_data->device, m_data->context, m_data->descriptor, m_data->devname); rc = dc_device_open(&m_data->device, m_data->context, m_data->descriptor, m_data->devname);
#endif
if (rc == DC_STATUS_SUCCESS) { if (rc == DC_STATUS_SUCCESS) {
switch (dc_device_get_type(m_data->device)) { switch (dc_device_get_type(m_data->device)) {
case DC_FAMILY_SUUNTO_VYPER: case DC_FAMILY_SUUNTO_VYPER: