diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2014-12-02 09:28:52 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-12-02 07:06:12 -0800 |
| commit | 60f09bbd4283b33f0aab8e0f600352ec78204cbb (patch) | |
| tree | 5ff0c1f2f562408abadb6f92513d9877167e4e75 /configuredivecomputerthreads.cpp | |
| parent | 194d4b4c00a783e5c4300e32d07ed963d493211d (diff) | |
| download | subsurface-60f09bbd4283b33f0aab8e0f600352ec78204cbb.tar.gz | |
Remove libdivecomputer ifdefs for configuring OSTC
The hw_ostc_device_eeprom_read / hw_ostc_device_eeprom_write functions
have bin in libdivecomputer since v0.1.0, so there was an error when the
read settings part ended up behind ifdef's.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'configuredivecomputerthreads.cpp')
| -rw-r--r-- | configuredivecomputerthreads.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/configuredivecomputerthreads.cpp b/configuredivecomputerthreads.cpp index e26935d6f..cfe8735b0 100644 --- a/configuredivecomputerthreads.cpp +++ b/configuredivecomputerthreads.cpp @@ -112,11 +112,9 @@ ReadSettingsThread::ReadSettingsThread(QObject *parent, device_data_t *data) } -#if DC_VERSION_CHECK(0, 5, 0) static int read_ostc_cf(unsigned char data[], unsigned char cf) { return data[128 + (cf % 32) * 4 + 3] << 8 ^ data[128 + (cf % 32) * 4 + 2]; } -#endif static void write_ostc_cf(unsigned char data[], unsigned char cf, unsigned char max_CF, unsigned int value) { // Only write settings supported by this firmware. @@ -490,6 +488,7 @@ void ReadSettingsThread::run() emit devicedetails(m_deviceDetails); break; } +#endif // divecomputer 0.5.0 #ifdef DEBUG_OSTC case DC_FAMILY_NULL: #endif @@ -796,7 +795,6 @@ void ReadSettingsThread::run() emit devicedetails(m_deviceDetails); break; } -#endif // divecomputer 0.5.0 default: supported = false; break; |