subsurface.git/core, branch v4.6.2

Handle negative dates (before the epoch) better

2017-02-17T23:08:38Z

The Qt model sorting for the dive date was using a unsigned number, which doesn't work for dates before 1970. Also, the dive date parsing got the year 1900 wrong. Not that we really care, because other parts of date handling will screw up with any date before the year 1904. So if you claim to be diving before 1904, you get basically random behavior. Signed-off-by: Linus Torvalds

Fix crash when merging dives with a missing dive computer model

2017-02-16T05:46:15Z

The test for the dive being a planned dive was completely bogus: - it should use "same_string()" which correctly checks for NULL - the string it checks for is obviously spelled wrong anyway. Reported-by: Alessandro Volpi Fixes: a031dbbbd ("When merging planned dives keep all cylinders") Signed-off-by: Linus Torvalds

Set up gaslist only in the beginning of diveplan

2017-02-11T16:31:42Z

In the beginning of the diveplan, divedatapoints of zero duration indicate available gases with the depth giving the suggested switch depth. Zero-duration datapoints in the middle of the dive do not have this meaning and should thus be ignored when composing the gaslist. The tests should have these gas defining segments in the beginning. This fixes a problem when replanning a dive that would change to random gases during deco. Signed-off-by: Robert C. Helling

Always show manually added gaschanges in notes

2017-02-11T16:31:42Z

In the manually entered part, we dont wait until the next stop. Signed-off-by: Robert C. Helling

Reset VPM-B state between repetitive dives

2017-02-10T14:41:24Z

This resets the maximum crushing pressures and the maximal ambient pressure between repetitive dives to prevent anomalies that a dive produces a shorter deco when following another one than without. Reported-by: sfuchs@gmx.de Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel

Make cylinder merging a bit more careful

2017-02-10T05:30:49Z

This makes some further updates to the new cylinder merging code: - avoid re-using the cylinder if the usage type (OC/diluent/O2) is different between the two dives, even if the gasmix might be the same. - avoid re-using a cylinder if the user has manually added pressure data for it (and the pressures don't match) - when deciding to reuse a cylinder, make sure that we merge as much of the type information as makes sense. This will potentially result in more cylinders that might need manual cleanup, but at least we won't be throwing out user data. And in most cases where merging happens, none of this is an issue (because the data comes fresh from a dive computer, and won't have been manually edited to trigger the new rules). Signed-off-by: Linus Torvalds

Rewrite cylinder merging code from scratch

2017-02-10T05:30:49Z

The old cylinder merging code depended on the preferred dive having all the cylinders, and the newly merged dive was just forced to pick from that existing set of cylinders. That worked ok if you have a "main" dive computer that you have all the gases programmed for, and you download that first, and then you download any secondary data later. But it completely messed up if the second dive computer had gases that the first one didn't know about, and just basically ended up doing random things. This rewrites the whole thing to actually try to create a union of the two sets of cylinders when merging, with sane matching so that if the cylinders match you won't get duplicates. Miika Turkia hit this when he only used one gas, but had several gases defined in his OSTC that he downloaded after his Vyper (with had just the single gas defined). This should fix that case (at least it does for my xml merging test-case that showed the same problem after some munging). Reported-by: Miika Turkia Signed-off-by: Linus Torvalds

Finish removal of informational_prefs

2017-02-05T20:44:11Z

And make export-html build again. Signed-off-by: Dirk Hohndel

Merge informational_prefs into git_prefs

2017-02-05T20:29:51Z

There is no need to have two variables for the same purpose. [Dirk Hohndel: changed to keep the two separate functions as otherwise we no longer parse existing repos successfully] Signed-off-by: Joakim Bygdell Signed-off-by: Dirk Hohndel

MOBILE: Read profile settings from git

2017-02-05T19:59:47Z

Signed-off-by: Joakim Bygdell