[PATCH 0/3] Misc smaller patches

Linus Torvalds torvalds at linux-foundation.org
Sat Jul 22 08:50:33 PDT 2017



This is a set of three small patches that fix some particular issue that 
came up while looking at the gas pressure handling for multiple cylinders.

The first one is really entirely independent of the others, and fixes the 
gas use reporting issue that Davide has had.

The second one is a trivial fix to XML parsing that will not affect any 
normal use, but came up because I was using "dctool" to generate some dive 
data from Dirk's logs, and subsurface crashed on the XML due to the lack 
of a <divecomputer> XML sub-section.

The third one is the patch that actually enables the profile for multiple 
gases at the same time - we already had the code, but it was conditional 
on the dive being CCR, and now that the cylinder pressure handling has 
been generalized it just enables it more widely.

This does *not* get the sidemount case all working, although depending on 
the exact libdivecomputer behavior for your dive computer, and *if* your 
dive computer generates pressure events for multiple cylinders, it can now 
work almost by mistake.

There's a bit more work required to make it actually work fairly reliably, 
but on the whole this gets us _mostly_ there. And it still works fine for 
CCR from my limited tests with Willem's XML files.

Linus Torvalds (3):
  Gas usage statistics: don't require gas switch events
  parse-xml: use "get_dc()" rather than "cur_dc" for filling in extra data
  Show multiple gas pressures in the profile even if the dive isn't CCR

 core/parse-xml.c                   |  2 +-
 core/statistics.c                  | 12 ------------
 profile-widget/diveprofileitem.cpp | 29 ++++++++++++-----------------
 3 files changed, 13 insertions(+), 30 deletions(-)

-- 
2.13.1.518.g0d864c4df



More information about the subsurface mailing list