mk2: code_part1/OSTC_code_c_part2/p2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 755:6724df41d4f1

CHANGE: Remove CF55 from decolist TODO: show gas change stops different from decostops

author	heinrichsweikamp
date	Tue, 22 Oct 2013 10:16:54 +0200
parents	7e7e98247a8a
children	50ed645c251d

comparison

equal deleted inserted replaced

-:780f182ae2b8
+:6724df41d4f1
 // 2012/09/10: [mH]  Fill char_O_deco_time_for_log for logbook write
 // 2012/10/05: [jDG] Better deco_gas_volumes accuracy (average depth, switch between stop).
 // 2013/03/05: [jDG] Should vault low_depth too.
 // 2013/03/05: [jDG] Wrobell remark: ascent_to_first_stop works better with finer steps (2sec).
 // 2013/05/08: [jDG] A. Salm remark: NOAA tables for CNS are in ATA, not bar.
+// 2013/10/22: [mH] Remove CF55 stuff
 //
 // TODO:
 //  + Allow to abort MD2 calculation (have to restart next time).
 //
 // Literature:
 static float            pres_diluent;                   // new in v.101
 static float            const_ppO2;                     // new in v.101
 static unsigned char    sim_gas_last_depth;             // Depth of last used gas, to detected a gas switch.
 static unsigned char    sim_gas_last_used;              // Number of last used gas, to detected a gas switch.
-static unsigned short   sim_gas_delay;                  // Time of gas-switch-stop ends [min on dive].
 static unsigned short   sim_dive_mins;                  // Simulated dive time.
 static float			calc_N2_ratio;                  // Simulated (switched) nitrogen ratio.
 static float			calc_He_ratio;                  // Simulated (switched) helium ratio.
 static float			CNS_fraction;			        // new in v.101
 static float			float_saturation_multiplier;    // new in v.101
 }
 // If there is a better gas available
 if( switch_deco )
 {
-unsigned char delay;
-delay = read_custom_function(55);
 assert( !sim_gas_last_depth || sim_gas_last_depth > switch_deco );
-// Should restart gas-switch delay only when gas do changes...
-assert( sim_gas_delay <= sim_dive_mins );
 sim_gas_last_depth = switch_deco;
 sim_gas_last_used  = switch_last;
-sim_gas_delay      = delay
+return 0;
-+ sim_dive_mins;
+}
-if( delay )
-{
-temp_depth_limit = switch_deco;
-return 1;
-}
-else
-return 0;
-}
-sim_gas_delay = 0;
 return 0;
 }
 //////////////////////////////////////////////////////////////////////////////
 // Calculate gas switches
 //
 static void calc_hauptroutine(void)
 {
 static unsigned char backup_gas_used  = 0;
 static unsigned char backup_gas_depth = 0;
-static unsigned char backup_gas_delay = 0;
 calc_hauptroutine_data_input();
 calc_hauptroutine_update_tissues();
 calc_gradient_factor();
 locked_GF_step = 0.0;
 // Reset gas switch history.
 backup_gas_used  = sim_gas_last_used  = 0;
 backup_gas_depth = sim_gas_last_depth = 0;
-backup_gas_delay = sim_gas_delay = 0;
 sim_dive_mins = 0;
 break;
 case 0: //---- bottom time -----------------------------------------------
 default:
 gas_switch_find_current();              // Lookup for current gas & time.
 gas_switch_set();                       // setup calc_ratio's
 backup_gas_used  = sim_gas_last_used;   // And save for later simu steps.
 backup_gas_depth = sim_gas_last_depth;  // And save for later simu steps.
-backup_gas_delay = sim_gas_delay;
 sim_ascent_to_first_stop();
 // Calc stops next time (deco or gas switch).
 char_O_deco_status = 1 | ( char_O_deco_status & 4 );
 // next ascent simulation is done from the current depth:
 if( (char_O_deco_status & 3) == 0 )
 {
 sim_gas_last_used  = backup_gas_used;
 sim_gas_last_depth = backup_gas_depth;
-sim_gas_delay      = backup_gas_delay;
 }
 break;
 }
 }
 {
 // Limit loops to 512ms, using the RTC timer 3:
 if( tmr3() & (512*32) )
 break;
-// Do not ascent while doing a gas switch ?
+if( calc_nextdecodepth() )
-if( sim_gas_delay <= sim_dive_mins )
-{
-if( calc_nextdecodepth() )
 {
 if( temp_depth_limit == 0 )
 goto Surface;
 //---- We hit a stop at temp_depth_limit ---------------------
 temp_deco = temp_depth_limit * METER_TO_BAR // Convert to relative bar,
 + pres_surface;                   // To absolute.
 if( !update_deco_table() )                  // Adds a one minute stops.
 goto Surface;                           // Deco table full: abort...
 }
 else
 {
 copy_deco_table();
 calc_ascenttime();
 char_O_deco_status = 0;         // calc nullzeit next time.
 char_O_deco_last_stop = 0;      // Surface reached (to animate menu)
 return;
 }
 }
-}
-else
-{
-// Note: if loop==0, temp_depth_limit might not be already set here.
-temp_depth_limit = (int)(0.5 + (temp_deco - pres_surface) * BAR_TO_METER);
-if( !update_deco_table() )  // Just pass one minute.
-goto Surface;           // Deco table full: abort...
-}
 //---- Then update tissue --------------------------------------------
 sim_dive_mins++;            // Advance simulated time by 1 minute.
 gas_switch_set();           // Apply any simulated gas change, once validated.
 sim_alveolar_presures();    // Updates ppN2 and ppHe.
 sim_tissue(1);              // Simulate compartiments for 1 minute.
 temp_deco = pres_respiration;       // Starts from current real depth.
 // Are we doing the special @+5min variation ?
 if(char_O_deco_status & 4)
 sim_extra_time();
-// Do we have a gas switch going on ?
-if( sim_gas_delay > sim_dive_mins )
-return;
 //---- Loop until first stop, gas switch, or surface is reached ----------
 for(;;)
 {
 overlay float old_deco = temp_deco;     // Pamb backup (bars)
 }
 if( internal_deco_depth[x] == 0 )
 {
 internal_deco_depth[x] = temp_depth_limit;
-if( sim_gas_delay >= sim_dive_mins )
-internal_deco_depth[x] |= 0x80;
 internal_deco_time[x]  = 1;
 return 1;
 }
 }
 RESET_C_STACK
 // Backup state machine
 backup_gas_last_depth = sim_gas_last_depth;
 backup_gas_last_used  = sim_gas_last_used;
-backup_gas_delay      = sim_gas_delay;
 backup_dive_mins      = sim_dive_mins;
 backup_actual_ppO2    = char_I_actual_ppO2;
 // Uses 1min CNS period:
 char_I_step_is_1min = 1;
 //---- Back to normal mode... --------------------------------------------
 char_I_step_is_1min = 0;
 sim_gas_last_depth  = backup_gas_last_depth;
 sim_gas_last_used   = backup_gas_last_used;
-sim_gas_delay       = backup_gas_delay;
 sim_dive_mins       = backup_dive_mins;
 char_I_actual_ppO2  = backup_actual_ppO2;
 }
 //////////////////////////////////////////////////////////////////////////////

Mercurial > public > mk2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 755:6724df41d4f1