summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2011-10-03 09:55:17 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2011-10-03 10:03:29 -0700
commita32d28d5e388ab3e31eadcd329814488fa5e8b1b (patch)
tree2219ece3634e15e75428c57d9f0631fdcc082efe
parent776355cf10cf109ac50e8027381201b7b6d9f5ac (diff)
downloadsubsurface-a32d28d5e388ab3e31eadcd329814488fa5e8b1b.tar.gz
Add working pressure to uemis tank data
Turns out they use 202.6bar as default working pressure. WTF? Also I had misunderstood the way I should record the pressure internally (which happened to work since I didn't set the working pressure). This is now fixed as well. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--uemis.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/uemis.c b/uemis.c
index 25d1b8ab7..76bd1669b 100644
--- a/uemis.c
+++ b/uemis.c
@@ -203,10 +203,15 @@ static void parse_divelog_binary(char *base64, struct dive **divep) {
gasoffset = 4;
for (i = 0; i < template; i++) {
float volume = *(float *)(data+116+25*(gasoffset + i)) * 1000.0;
- /* uemis always assumes a working pressure of 3000psi / 206bar - even though that's wrong */
- /* I also think that the unit that it stores (cuft for me) might change with SDA settings */
- // dive->cylinder[i].type.size.mliter = volume * 206.84 / 28.317;
- dive->cylinder[i].type.size.mliter = volume * 200 / 28.317;
+ /* uemis always assumes a working pressure of 202.6bar (!?!?) - I first thought
+ * it was 3000psi, but testing against all my dives gets me that strange number.
+ * Still, that's of course completely bogus and shows they don't get how
+ * cylinders are named in non-metric parts of the world...
+ * we store the incorrect working pressure to get the SAC calculations "close"
+ * but the user will have to correct this manually
+ */
+ dive->cylinder[i].type.size.mliter = volume;
+ dive->cylinder[i].type.workingpressure.mbar = 202600;
dive->cylinder[i].gasmix.o2.permille = *(uint8_t *)(data+120+25*(gasoffset + i)) * 10 + 0.5;
dive->cylinder[i].gasmix.he.permille = 0;
}