Shearwater Petrel import has wrong timestamp

[Dirk Hohndel]

On Sun, 2013-05-12 at 00:26 +0200, Henrik Brautaset Aronsen wrote:
> Henrik Brautaset Aronsen wrote:
> > I tried importing a couple of dives from the Petrel today.  Observations:
> >
> > - The imported dives are two hours wrong.  E.g. a dive is at 14:23 on 
> > the Petrel, but is imported as 16:23 in Subsurface.  Norway is in CEST 
> > (GMT+2) right now, that might have something to do with it.  There are 
> > no time zone settings on the Petrel.
> >
> > - I get a bluetooth timeout error on the Petrel when it tries to 
> > import the two test dives that came with the computer.
> >
> > - Otherwise, it works great.  It's *so* nice that Jef implemented the 
> > native support.  I tried and old libdc version first, and it was sloooow.
> 
> Oh, and:
> 
> - When I switch from Suunto HelO2 to Shearwater Petrel in the download 
> dialogue, it doesn't auto-fetch the device name for the Petrel.  The 
> Suunto device name stays.

Correct - that's something I was about to implement (it's somewhat
tricky to get right) and stopped because of the fast progress of the Qt
port. I'd rather do this for Qt :-)

> - The Petrel doesn't show up in the device name editor.

Once the cu device is created it /should/ show up. Can you try that one
again, please?

> - If I merge the dives from the HelO2 and the Petrel (after correcting 
> the Petrel's timestamp), it doesn't show up as a dive with two 
> divecomputers.  Only the Suunto profile is kept.

That is totally bogus. This has worked for a very long time (and I have
lots of dives with three or four divecomputers in my log).

Could you start from an empty file, download from the HelO2 and then
from the Petrel and verify this? And once you verified it, could you set
a breakpoint in merge_dives() and figure out what's going wrong?

Thanks

/D