# HG changeset patch
# User JeanDo
# Date 1312907419 -7200
# Node ID 4826dd98514b3bf1478f8074f7f2b304d781acf2
# Parent  a17b85b0fbccd5358dcd2e829cb1325b174d988f
NEW: Decoplanner OC volumes in liters (or bars), up to 65000.

diff -r a17b85b0fbcc -r 4826dd98514b code_part1/OSTC_code_asm_part1/changelog.txt
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Tue Aug 09 18:16:03 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Tue Aug 09 18:30:19 2011 +0200
@@ -1,7 +1,8 @@
 New in 1.96 beta:
 NEW: Logbook displays ceilings and temperature curve.
 BUGFIX: Decoplanner accumulates CNS during ascent.
-NEW: Decoplanner Warms in red if CNS is too high.
+NEW: Decoplanner warns in red if CNS is too high.
+NEW: Decoplanner OC volumes in liters (or bars), up to 65000.
 
 New in 1.95 beta:
 CHANGE: 0.98bar equal 10m depths with salinity set to 1.00kg/l
diff -r a17b85b0fbcc -r 4826dd98514b code_part1/OSTC_code_asm_part1/simulator.asm
--- a/code_part1/OSTC_code_asm_part1/simulator.asm	Tue Aug 09 18:16:03 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/simulator.asm	Tue Aug 09 18:30:19 2011 +0200
@@ -340,7 +340,7 @@
     STRCPY  "= "
 
     bsf     leftbind
-    output_16dp .4                      ; 1 decimal.
+    output_16                           ; No decimal anymore.
     bcf     leftbind
     call    word_processor              ; No unit: can be bars or litters.
     
diff -r a17b85b0fbcc -r 4826dd98514b code_part1/OSTC_code_c_part2/p2_deco.c
--- a/code_part1/OSTC_code_c_part2/p2_deco.c	Tue Aug 09 18:16:03 2011 +0200
+++ b/code_part1/OSTC_code_c_part2/p2_deco.c	Tue Aug 09 18:30:19 2011 +0200
@@ -2596,10 +2596,10 @@
 
     //---- convert results for the ASM interface -----------------------------
     for(i=0; i<NUM_GAS; ++i)
-        if( volumes[i] > 6553.4 )
+        if( volumes[i] > 65534.0 )
             int_O_gas_volumes[i] = 65535;
         else
-            int_O_gas_volumes[i] = (unsigned short)(volumes[i]*10.0 + 0.5);
+            int_O_gas_volumes[i] = (unsigned short)(volumes[i] + 0.5);
 }
 
 //////////////////////////////////////////////////////////////////////////////
diff -r a17b85b0fbcc -r 4826dd98514b code_part1/OSTC_code_c_part2/p2_deco.o
Binary file code_part1/OSTC_code_c_part2/p2_deco.o has changed