Mercurial > public > mk2
changeset 388:681bdc91114c 64kByte Logbook
BUGFIX Gas switch number.
| author | JeanDo |
|---|---|
| date | Sun, 19 Jun 2011 00:07:31 +0200 |
| parents | 106b95a33244 |
| children | a59532d2daf8 |
| files | code_part1/OSTC_code_c_part2/p2_deco.c code_part1/OSTC_code_c_part2/p2_deco.o |
| diffstat | 2 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_c_part2/p2_deco.c Sun Jun 19 00:06:55 2011 +0200 +++ b/code_part1/OSTC_code_c_part2/p2_deco.c Sun Jun 19 00:07:31 2011 +0200 @@ -989,14 +989,17 @@ { assert( 0 <= char_I_current_gas && char_I_current_gas <= (NUM_GAS+1) ); - if( (char_I_current_gas <= NUM_GAS) // Gas6 == manual set. - && char_I_deco_gas_change[char_I_current_gas-1] - ) + if( char_I_current_gas <= NUM_GAS ) // Gas1..Gas5 { - sim_gas_last_used = char_I_current_gas-1; - sim_gas_last_depth = char_I_deco_gas_change[sim_gas_last_used]; - // temp_depth_limit = ??? + sim_gas_last_used = char_I_current_gas; + + // Note: if current is first gas, we must find it, but not set + // last depth change to surface. + if( char_I_deco_gas_change[sim_gas_last_used-1] ) + sim_gas_last_depth = char_I_deco_gas_change[sim_gas_last_used-1]; } + else + sim_gas_last_used = 0; // Gas 6 = manual set } ////////////////////////////////////////////////////////////////////////////// @@ -1038,7 +1041,7 @@ if( switch_deco < deco_gas_change[j] ) { switch_deco = deco_gas_change[j]; - switch_last = j+1; + switch_last = j+1; // 1..5 } } } @@ -1083,7 +1086,7 @@ { assert( 0 <= sim_gas_last_used && sim_gas_last_used <= NUM_GAS ); - if( sim_gas_last_used == 0 ) + if( sim_gas_last_used == 0 ) // Gas6 = manualy set gas. { calc_N2_ratio = N2_ratio; calc_He_ratio = He_ratio;