changeset 441:4826dd98514b

NEW: Decoplanner OC volumes in liters (or bars), up to 65000.
author JeanDo
date Tue, 09 Aug 2011 18:30:19 +0200
parents a17b85b0fbcc
children 9cec10e64077
files code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/simulator.asm code_part1/OSTC_code_c_part2/p2_deco.c code_part1/OSTC_code_c_part2/p2_deco.o
diffstat 4 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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.
     
--- 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);
 }
 
 //////////////////////////////////////////////////////////////////////////////
Binary file code_part1/OSTC_code_c_part2/p2_deco.o has changed