diff options
| -rw-r--r-- | core/configuredivecomputerthreads.cpp | 10 | ||||
| -rw-r--r-- | core/subsurface-qt/SettingsObjectWrapper.cpp | 2 | ||||
| -rw-r--r-- | core/units.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/core/configuredivecomputerthreads.cpp b/core/configuredivecomputerthreads.cpp index 994c7c411..ac4752c5a 100644 --- a/core/configuredivecomputerthreads.cpp +++ b/core/configuredivecomputerthreads.cpp @@ -79,7 +79,7 @@ #define SUUNTO_VYPER_ALARM_DEPTH_TIME 0x65 #define SUUNTO_VYPER_ALARM_TIME 0x66 #define SUUNTO_VYPER_ALARM_DEPTH 0x68 -#define SUUNTO_VYPER_CUSTOM_TEXT_LENGHT 30 +#define SUUNTO_VYPER_CUSTOM_TEXT_LENGTH 30 #ifdef DEBUG_OSTC // Fake io to ostc memory banks @@ -148,7 +148,7 @@ static void write_ostc_cf(unsigned char data[], unsigned char cf, unsigned char static dc_status_t read_suunto_vyper_settings(dc_device_t *device, DeviceDetails *m_deviceDetails, dc_event_callback_t progress_cb, void *userdata) { - unsigned char data[SUUNTO_VYPER_CUSTOM_TEXT_LENGHT + 1]; + unsigned char data[SUUNTO_VYPER_CUSTOM_TEXT_LENGTH + 1]; dc_status_t rc; dc_event_progress_t progress; progress.current = 0; @@ -204,10 +204,10 @@ static dc_status_t read_suunto_vyper_settings(dc_device_t *device, DeviceDetails m_deviceDetails->serialNo = QString::number(serial_number); EMIT_PROGRESS(); - rc = dc_device_read(device, SUUNTO_VYPER_CUSTOM_TEXT, data, SUUNTO_VYPER_CUSTOM_TEXT_LENGHT); + rc = dc_device_read(device, SUUNTO_VYPER_CUSTOM_TEXT, data, SUUNTO_VYPER_CUSTOM_TEXT_LENGTH); if (rc != DC_STATUS_SUCCESS) return rc; - data[SUUNTO_VYPER_CUSTOM_TEXT_LENGHT] = 0; + data[SUUNTO_VYPER_CUSTOM_TEXT_LENGTH] = 0; m_deviceDetails->customText = (const char *)data; EMIT_PROGRESS(); @@ -294,7 +294,7 @@ static dc_status_t write_suunto_vyper_settings(dc_device_t *device, DeviceDetail rc = dc_device_write(device, SUUNTO_VYPER_CUSTOM_TEXT, // Convert the customText to a 30 char wide padded with " " (const unsigned char *)QString("%1").arg(m_deviceDetails->customText, -30, QChar(' ')).toUtf8().data(), - SUUNTO_VYPER_CUSTOM_TEXT_LENGHT); + SUUNTO_VYPER_CUSTOM_TEXT_LENGTH); if (rc != DC_STATUS_SUCCESS) return rc; EMIT_PROGRESS(); diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index d1146b7b6..16987d6ae 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -1625,7 +1625,7 @@ void UnitsSettings::setLength(int value) QSettings s; s.beginGroup(group); s.setValue("length", value); - prefs.units.length = (units::LENGHT) value; + prefs.units.length = (units::LENGTH) value; emit lengthChanged(value); } diff --git a/core/units.h b/core/units.h index 5e92a00ba..ff1ae3430 100644 --- a/core/units.h +++ b/core/units.h @@ -232,7 +232,7 @@ static inline int mbar_to_PSI(int mbar) #undef PASCAL #endif struct units { - enum LENGHT { + enum LENGTH { METERS, FEET } length; |