X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=1386a3bf8d8b7a999e08bcf4fcb6b99faeae47e5;hb=aab4d593bdbffef8442282318778a9833cbc7a43;hp=eaafe8aeba7f4209719c2d079f4461067d4d1ef1;hpb=5f05173e793d49319c727240014b59a04bd4075c;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index eaafe8a..1386a3b 100644
--- a/dive.h
+++ b/dive.h
@@ -1,6 +1,9 @@
 #ifndef DIVE_H
 #define DIVE_H
 
+#include <stdlib.h>
+#include <time.h>
+
 /*
  * Some silly typedefs to make our units very explicit.
  *
@@ -11,7 +14,7 @@
  *
  * We also strive to make '0' a meaningless number saying "not
  * initialized", since many values are things that may not have
- * been reported (eg tank pressure or temperature from dive
+ * been reported (eg cylinder pressure or temperature from dive
  * computers that don't support them). But sometimes -1 is an even
  * more explicit way of saying "not there".
  *
@@ -19,7 +22,7 @@
  * temperatures. Doing temperatures in celsius or fahrenheit would
  * make for loss of precision when converting from one to the other,
  * and using millikelvin is SI-like but also means that a temperature
- * of '0' is clearly just a missing temperature or tank pressure.
+ * of '0' is clearly just a missing temperature or cylinder pressure.
  *
  * Also strive to use units that can not possibly be mistaken for a
  * valid value in a "normal" system without conversion. If the max
@@ -71,8 +74,14 @@ typedef struct {
 
 typedef struct {
 	volume_t size;
-	pressure_t pressure;
-} tank_type_t;
+	pressure_t workingpressure;
+	const char *description;	/* "LP85", "AL72", "AL80", "HP100+" or whatever */
+} cylinder_type_t;
+
+typedef struct {
+	cylinder_type_t type;
+	gasmix_t gasmix;
+} cylinder_t;
 
 static inline int to_feet(depth_t depth)
 {
@@ -95,14 +104,13 @@ struct sample {
 	duration_t time;
 	depth_t depth;
 	temperature_t temperature;
-	pressure_t tankpressure;
-	int tankindex;
+	pressure_t cylinderpressure;
+	int cylinderindex;
 };
 
-#define MAX_MIXES (4)
+#define MAX_CYLINDERS (4)
 
 struct dive {
-	const char *name;
 	time_t when;
 	char *location;
 	char *notes;
@@ -111,7 +119,7 @@ struct dive {
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
 	pressure_t beginning_pressure, end_pressure;
-	gasmix_t gasmix[MAX_MIXES];
+	cylinder_t cylinder[MAX_CYLINDERS];
 	int samples;
 	struct sample sample[];
 };
@@ -143,4 +151,7 @@ static inline unsigned int dive_size(int samples)
 	return sizeof(struct dive) + samples*sizeof(struct sample);
 }
 
+extern struct dive *fixup_dive(struct dive *dive);
+extern struct dive *try_to_merge(struct dive *a, struct dive *b);
+
 #endif /* DIVE_H */