diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2015-01-21 08:52:28 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-01-22 06:02:34 +1200 |
| commit | e0c0ba4836a9cac104f1a8c40bb3e9c1da9d8747 (patch) | |
| tree | 92ed275368497bc67fe250ff82afa419334665dc | |
| parent | e8b02d3b2a9bd620e40d6444852c9d86fde41e66 (diff) | |
| download | subsurface-e0c0ba4836a9cac104f1a8c40bb3e9c1da9d8747.tar.gz | |
Set divemode to FREEDIVE now when we support that
Previous code mapped all our free dive inputs to OC, but now when we
actually have a FREEDIVE divemode, we can do better.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | libdivecomputer.c | 2 | ||||
| -rw-r--r-- | parse-xml.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libdivecomputer.c b/libdivecomputer.c index 41ec876a7..6a16eb12d 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -552,6 +552,8 @@ static int dive_cb(const unsigned char *data, unsigned int size, if (rc == DC_STATUS_SUCCESS) switch(divemode) { case DC_DIVEMODE_FREEDIVE: + dive->dc.divemode = FREEDIVE; + break; case DC_DIVEMODE_GAUGE: case DC_DIVEMODE_OC: /* Open circuit */ dive->dc.divemode = OC; diff --git a/parse-xml.c b/parse-xml.c index 92e470c7e..47b4fcc24 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -2577,7 +2577,7 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size) else if (0xd8 <= ptr[15] && ptr[15] <= 0xdf) cur_dc->divemode = CCR; // mCCR else if (0xe0 <= ptr[15] && ptr[15] <= 0xe7) - cur_dc->divemode = OC; // Free diving + cur_dc->divemode = FREEDIVE; else if (0xe8 <= ptr[15] && ptr[15] <= 0xef) cur_dc->divemode = OC; // Gauge else if (0xf0 <= ptr[15] && ptr[15] <= 0xf7) |