Wisdom 3

[Dirk Hohndel]

On Tue, Oct 28, 2014 at 07:24:40AM -0700, Dirk Hohndel wrote:
> On Tue, Oct 28, 2014 at 10:11:59AM +0100, Jef Driesen wrote:
> > On 27-10-14 19:41, Dirk Hohndel wrote:
> > >I see that both MacDive and DivingLog claim Wisdom 3 support...
> > >Looking at the dump from a Wisdom 3 its reply to the version command is
> > >"WISDOM R3B  512K" and the model at address 0x0008 is 0x4458 which we don't
> > >appear to have covered in src/oceanic_atom2_parser.c
> > 
> > That means it's using the default. I'm sure you won't be surprised if I say
> > that's not necessary correct :-)
> 
> I was actually surprised how well it did.
> 
> In the mean time I got a bin file plus the dump of a decoded dive from the
> Sherwood website and it decoded almost everything correctly.
> 
> Only the sign of the temperature delta appears to be inverted. I asked the
> person who submitted the bug to verify my analysis, but I'm guessing
> you'll have a patch from me to fully enable the Wisdom 3 later today.

And here we go. This appears to be all that's needed to fix the bug
reported by the Subsurface user. I have not looked into any other possible
differences to the Wisdom 2.

>From the specs I can find those two seem pretty identical with the
exception of the deco algorithm. "modified Haldanean" on the Wisdom 2 and
DSAT (Oceanics rather ill specified proprietary algorithm) on the Wisdom 3.


/D

-------------- next part --------------
>From c49d0226081170478c0f29d99f58fe91e5454e3c Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk at hohndel.org>
Date: Tue, 28 Oct 2014 20:55:21 -0700
Subject: [PATCH] Fix temperature parsing for Sherwood Wisdom 3

Adds the new model and treats it like a Wisdom 2 (and many other, similar
versions of the Oceanic Atom2 style dive computers).

Signed-off-by: Dirk Hohndel <dirk at hohndel.org>
---
 src/oceanic_atom2_parser.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/oceanic_atom2_parser.c b/src/oceanic_atom2_parser.c
index f38afef6f235..2e30612b9484 100644
--- a/src/oceanic_atom2_parser.c
+++ b/src/oceanic_atom2_parser.c
@@ -64,6 +64,7 @@
 #define T3B         0x4455
 #define ATOM31      0x4456
 #define A300AI      0x4457
+#define WISDOM3     0x4458
 #define A300        0x445A
 #define TX1         0x4542
 #define AMPHOS      0x4545
@@ -618,7 +619,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
 					else if (parser->model == ATOM2 || parser->model == PROPLUS21 ||
 						parser->model == EPICA || parser->model == EPICB ||
 						parser->model == ATMOSAI2 || parser->model == AMPHOS ||
-						parser->model == WISDOM2)
+						parser->model == WISDOM2 || parser->model == WISDOM3)
 						sign = (data[offset + 0] & 0x80) >> 7;
 					else
 						sign = (~data[offset + 0] & 0x80) >> 7;
-- 
1.8.0.rc0.18.gf84667d