mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'otu-tracking-v2' of git://github.com/dirkhh/subsurface

Browse source 
* 'otu-tracking-v2' of git://github.com/dirkhh/subsurface:
  Make OTU column invisible by default
  Add OTU to divelist
  Calculate OTUs for every dive

Fix up trivial conflicts in dive.h (due to dive event handling also
adding a field to the dive structure)
This commit is contained in:
Linus Torvalds 2011-09-27 10:46:42 -07:00
commit 2a8f7ab78f
3 changed files with 65 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dive.h
View file

@ -134,6 +134,11 @@ static inline int to_PSI(pressure_t pressure)
return pressure.mbar * 0.0145037738 + 0.5;
}
static inline double to_ATM(pressure_t pressure)
{
return pressure.mbar / 1013.25;
}
struct sample {
duration_t time;
depth_t depth;
@ -171,6 +176,7 @@ struct dive {
depth_t visibility;
temperature_t airtemp, watertemp;
cylinder_t cylinder[MAX_CYLINDERS];
int otu;
struct event *events;
int samples, alloc_samples;
struct sample sample[];