# HG changeset patch
# User JeanDo
# Date 1335304263 -7200
# Node ID 32448d5ca734531df469a5386c7653afed8625d3
# Parent  fff1d38625f00dcc027db3f25d0a5c9b3e7136d4
BUGFIX: GasVolume should not count bottom time/depth in CCR mode.

diff -r fff1d38625f0 -r 32448d5ca734 code_part1/OSTC_code_asm_part1/changelog.txt
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Tue Apr 24 23:47:13 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Tue Apr 24 23:51:03 2012 +0200
@@ -3,6 +3,7 @@
 NEW: Custom Functions III menu (CF64-CF95)
 BUGFIX: Missed deco stops issue
 BUGFIX: Timeout for 2nd page of Gas Setup
+BUGFIX: GasVolume checks for a gas-switch before the first stop
 
 New in 2.21:
 BUGFIX: GF warning in logbook memory
diff -r fff1d38625f0 -r 32448d5ca734 code_part1/OSTC_code_c_part2/p2_deco.c
--- a/code_part1/OSTC_code_c_part2/p2_deco.c	Tue Apr 24 23:47:13 2012 +0200
+++ b/code_part1/OSTC_code_c_part2/p2_deco.c	Tue Apr 24 23:51:03 2012 +0200
@@ -2340,7 +2340,7 @@
     gas = char_I_first_gas - 1;
 
     bottom_usage = (float) read_custom_function(56);
-    if( bottom_usage > 0.0 )
+    if( char_I_const_ppO2 == 0 && bottom_usage > 0.0 )
         volumes[gas]
             = (char_I_bottom_depth*0.1 + 1.0)           // Use Psurface = 1.0 bar.
             * char_I_bottom_time                        // in minutes.
diff -r fff1d38625f0 -r 32448d5ca734 code_part1/OSTC_code_c_part2/p2_deco.o
Binary file code_part1/OSTC_code_c_part2/p2_deco.o has changed