mk2: code_part1/OSTC_code_c_part2/p2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 569:ef667587b2b9

BUGFIX Don't forget missed stops MINOR cleanups for MacOSX compiler.

author	JeanDo
date	Wed, 04 Apr 2012 00:24:32 +0200
parents	a4586e115ded
children	fff1d38625f0

comparison

equal deleted inserted replaced

-:ebf6133207d4
+:ef667587b2b9
 // 2011/04/27: [jDG] Fixed char_O_gradient_factor calculation when model uses gradient-factor.
 // 2011/05/02: [jDG] Added "Future TTS" function (CF58).
 // 2011/05/17: [jDG] Various cleanups.
 // 2011/08/08: [jDG] Computes CNS during deco planning ascent.
 // 2011/11/24: [jDG] Slightly faster and better NDL computation.
-// 2011/12/17: [mH] Remove of the useless debug stuff
+// 2011/12/17: [mH]  Remove of the useless debug stuff
+// 2012/02/24: [jDG] Remove missed stop bug.
+// 2012/02/25: [jDG] Looking for a more stable LOW grad factor reference.
 //
 // TODO:
 //  + Allow to abort MD2 calculation (have to restart next time).
 //
 // Literature:
 static unsigned char calc_nextdecodepth(void);
 //---- Bank 4 parameters -----------------------------------------------------
 #pragma udata bank4=0x400
-static float			temp_limit;
 static float			GF_low;
 static float			GF_high;
 static float			GF_delta;
-static float            low_depth;                  // Depth of deepest stop
 static float			locked_GF_step;             // GF_delta / low_depth
 static unsigned char    temp_depth_limit;
+static unsigned char    low_depth;                  // Depth of deepest stop
 // Simulation context: used to predict ascent.
 static unsigned char	sim_lead_tissue_no;         // Leading compatiment number.
 static float			sim_lead_tissue_limit;      // Buhlmann tolerated pressure.
 #endif
 static short read_custom_function(PARAMETER unsigned char cf)
 {
 #ifdef CROSS_COMPILE
-return (cf & 32) ? eeprom.bank1_CF[cf-32].value
+return (cf & 32) ? eeprom.bank1_CF[cf-32].value.lo
-: eeprom.bank0_CF[cf   ].value;
+: eeprom.bank0_CF[cf   ].value.lo;
 #else
 extern unsigned char hi, lo;
 extern void getcustom15();
 _asm
 movff   cf,WREG
 movlw 1
 movwf TBLPTRU,0
 _endasm
 #endif
-assert( 0 <= ci && ci < NUM_COMP );
+assert( ci < NUM_COMP );
 // Use an interleaved array (AoS) to access coefficients with a
 // single addressing.
 {
 overlay rom const float* ptr = &buhlmann_ab[4*ci];
 movlw 1
 movwf TBLPTRU,0
 _endasm
 #endif
-assert( 0 <= ci && ci < NUM_COMP );
+assert( ci < NUM_COMP );
 // Integration intervals.
 switch(period)
 {
 case 0: //---- 2 sec -----------------------------------------------------
 movlw 1
 movwf TBLPTRU,0
 _endasm
 #endif
-assert( 0 <= ci && ci < NUM_COMP );
+assert( ci < NUM_COMP );
 {
 overlay rom const float* ptr = &buhlmann_ht[2*ci];
 var_N2_ht = *ptr++;
 var_He_ht = *ptr++;
 }
 assert( depth >= -0.2 );        // Allow for 200mbar of weather change.
 //---- ZH-L16 + GRADIENT FACTOR model ------------------------------------
 	if( char_I_deco_model != 0 )
 	{
-if( depth >= low_depth )
+overlay unsigned char first_stop = 0;
-sim_limit( GF_low );
+overlay float p;
-else
-sim_limit( GF_high - depth * locked_GF_step );
+sim_limit( GF_low );
+p = sim_lead_tissue_limit - pres_surface;
-// Stops are needed ?
+if( p <= 0.0f )
-if( sim_lead_tissue_limit > pres_surface )
+goto no_deco_stop;          // We can surface directly...
-{
-// Compute tolerated depth, for the leading tissue [metre]:
+p *= BAR_TO_METER;
-overlay float depth_tol = (sim_lead_tissue_limit - pres_surface) * BAR_TO_METER;
+if( p < min_depth )
-overlay unsigned char first_stop;
+goto no_deco_stop;          // First stop is higher than 1' ascent.
-// If ascent is VERY fast, this can be lower than the actual depth... Because
+first_stop = 3 * (short)(0.99999 + p*0.333333);
-// this happends only in simulation, just forget about it:
+assert( first_stop < 128 );
-if( depth_tol > depth )
-depth_tol = depth;
+// Apply correction for the shallowest stop.
+if( first_stop == 3 )                           // new in v104
-// Deepest stop, in multiples of 3 metres.
+first_stop = char_I_depth_last_deco;        // Use last 3m..6m instead.
-first_stop = 3 * (short)(0.99999 + depth_tol * 0.33333 );
-assert( first_stop < 128 );
+// Store the deepest point needing a deco stop as the LOW reference for GF.
+// NOTE: following stops will be validated using this LOW-HIGH gf scale,
-// Is it a new deepest needed stop ? If yes this is the reference for
+//       so if we want to keep coherency, we should not validate this stop
-// the varying gradient factor. So reset that:
+//       yet, but apply the search to it, as for all the following stops afterward.
-if( depth_tol > min_depth && depth_tol > low_depth )
+if( first_stop > low_depth )
 {
-// Store the deepest stop depth, as reference for GF_low.
+low_depth = first_stop;
-low_depth = depth_tol;
+locked_GF_step = GF_delta / first_stop;
-locked_GF_step = GF_delta / low_depth;
+}
-}
+// We have a stop candidate.
-#if defined(__DEBUG) || defined(CROSS_COMPILE)
+// But maybe ascending to the next stop will diminish the constraint,
-{
+// because the GF might decrease more than the preassure gradient...
-// Extra testing code to make sure the first_stop formula
+while(first_stop > 0)
-// and rounding provides correct depth:
+{
-overlay float pres_stop =  first_stop * METER_TO_BAR
+overlay unsigned char next_stop;            // Next depth (0..90m)
-	                  + pres_surface;
+overlay float pres_stop;                    // Next pressure (bar)
-// Keep GF_low until a first stop depth is found:
+// Check max speed, or reaching surface.
-if( first_stop >= low_depth )
+if( first_stop <= min_depth )
-sim_limit( GF_low );
+goto no_deco_stop;
-else
-// current GF is GF_high - alpha (GF_high - GF_low)
+if( first_stop <= char_I_depth_last_deco )  // new in v104
-// With alpha = currentDepth / maxDepth, hence in [0..1]
+next_stop = 0;
-sim_limit( GF_high - first_stop * locked_GF_step );
+else if( first_stop == 6 )
+next_stop = char_I_depth_last_deco;
-// upper limit (lowest pressure tolerated), + 1mbar for rounding...:
+else
-assert( sim_lead_tissue_limit < (pres_stop + 0.001) );
+next_stop = first_stop - 3;             // Index of next (upper) stop.
-}
-#endif
+// Just a check we are indeed above LOW ref.
+assert( next_stop < low_depth );
-// Apply correction for the shallowest stop.
-if( first_stop == 3 )                           // new in v104
+// Total preassure at the new stop candidate:
-first_stop = char_I_depth_last_deco;        // Use last 3m..6m instead.
+pres_stop =  next_stop * METER_TO_BAR
+	              + pres_surface;
-// Because gradient factor at first_stop might be bigger than at
-// current depth, we might ascent a bit more.
+// Keep GF_low until a first stop depth is found:
-// Hence, check all stops until one is indeed higher than tolerated presure:
+sim_limit( GF_high - next_stop * locked_GF_step );
-while(first_stop > 0)
-{
+// Check upper limit (lowest pressure tolerated):
-overlay unsigned char next_stop;            // Next index (0..30)
+if( sim_lead_tissue_limit >= pres_stop )    // check if ascent to next deco stop is ok
-overlay float pres_stop;                    // Next depth (0m..90m)
+goto deco_stop_found;
-// Check max speed, or reaching surface.
+// Else, validate that stop and loop...
-if( first_stop <= min_depth )
+first_stop = next_stop;
-break;
+}
+assert( first_stop == 0 );
-// So, there is indeed a stop needed:
-need_stop = 1;
+no_deco_stop:
+		temp_depth_limit = 0;
-if( first_stop <= char_I_depth_last_deco )  // new in v104
+goto done;
-next_stop = 0;
-else if( first_stop == 6 )
+// next stop is the last validated depth found, aka first_stop
-next_stop = char_I_depth_last_deco;
+deco_stop_found:
-else
+need_stop = 1;                  // Hit.
-next_stop = first_stop - 3;             // Index of next (upper) stop.
+temp_depth_limit = first_stop;  // Stop depth, in meter.
-	    pres_stop =  next_stop * METER_TO_BAR
+done:
-	              + pres_surface;
+;
-// Keep GF_low until a first stop depth is found:
-if( next_stop >= low_depth )
-sim_limit( GF_low );
-else
-// current GF is GF_high - alpha (GF_high - GF_low)
-// With alpha = currentDepth / maxDepth, hence in [0..1]
-sim_limit( GF_high - next_stop * locked_GF_step );
-// upper limit (lowest pressure tolerated):
-if( sim_lead_tissue_limit >= pres_stop )    // check if ascent to next deco stop is ok
-break;
-// Else, validate that stop and loop...
-first_stop = next_stop;
-}
-// next stop is the last validated depth found, aka first_stop
-temp_depth_limit = first_stop;                  // Stop depth, in metre.
-}
-else
-			temp_depth_limit = 0;                           // stop depth, in metre.
 	}
 	else //---- ZH-L16 model -------------------------------------------------
 	{
 overlay float pres_gradient;
 {
 RESET_C_STACK
 calc_dive_interval();
 }
 //////////////////////////////////////////////////////////////////////////////
 // Find current gas in the list (if any).
 //
 // Input:  char_I_current_gas = 1..6
 //
 //
 // Output: calc_N2_ratio, calc_He_ratio
 //
 static void gas_switch_set(void)
 {
-assert( 0 <= sim_gas_last_used && sim_gas_last_used <= NUM_GAS );
+assert( sim_gas_last_used <= NUM_GAS );
 if( sim_gas_last_used == 0 )    // Gas6 = manualy set gas.
 {
 calc_N2_ratio = N2_ratio;
 	    calc_He_ratio = He_ratio;
 char_O_deco_status = 0;     // Calc bottom-time/nullzeit next iteration.
 // Values that should be reset just once for the full real dive.
 // This is used to record the lowest stop for the whole dive,
 // Including ACCROSS all simulated ascent.
-low_depth = 0.0;
+low_depth = 0;
+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;
 	if( char_I_deco_model != 0 )        // calculate relative gradient factor
 	{
 overlay float rgf;
-		if( low_depth < 1.5 )
+		if( low_depth < 3 )
 			rgf = GF_high;
 else
 {
 overlay float temp1 = low_depth * METER_TO_BAR;
 overlay float temp2 = pres_respiration - pres_surface;
 ppN2 = N2_ratio * (pres_respiration - ppWater);
 ppHe = 0.0;
 float_desaturation_multiplier = char_I_desaturation_multiplier * (0.01 * SURFACE_DESAT_FACTOR);
 float_saturation_multiplier   = char_I_saturation_multiplier   * 0.01;
-// Make sure SURFACE_DESAT_FACTOR is applyed:
+// Make sure SURFACE_DESAT_FACTOR is applied:
 backup_model = char_I_deco_model;
 char_I_deco_model = 0;
 //---- Perform simulation ------------------------------------------------
 for(t=0; t<char_I_dive_interval; ++t)
 else //---- OC mode : have to follow all gas switches... -----------------
 {
 overlay unsigned char i = 0;    // Decostop loop counter
 overlay float actual_ppO2;
 overlay unsigned char time, t;
+overlay unsigned char deepest_first = (read_custom_function(54) == 0);
 //---- Ascent to surface delay
 // NOTE: count as if time is spent with bottom pressure,
 //       AND the bottom gas
 actual_ppO2 = (pres_surface + char_I_bottom_depth * METER_TO_BAR)
 {
 deco_calc_CNS_fraction();
 sim_dive_mins++;
 }
-//---- Do all further stops
+//---- Do all further stops ------------------------------------------
 for(i=0; i<NUM_STOPS; ++i)
 {
-//---- Get next stop
+overlay unsigned char switch_gas;
-time             = char_O_deco_time[i];
-temp_depth_limit = char_O_deco_depth[i] & 0x7F;
+//---- Get next stop, possibly in reverse order ------------------
-if( time == 0 ) break;      // End of table: done.
+if( deepest_first )
+{
+time             = char_O_deco_time[i];
+temp_depth_limit = char_O_deco_depth[i];
+}
+else
+{
+time             = char_O_deco_time[(NUM_STOPS-1)-i];
+temp_depth_limit = char_O_deco_depth[(NUM_STOPS-1)-i];
+}
+if( time == 0 ) continue;
-//---- Gas Switch ?
+//---- Gas Switch ? ----------------------------------------------
-if( char_O_deco_depth[i] & 0x80 )
+switch_gas = temp_depth_limit & 0x80;   // Switch flag.
-if( gas_switch_deepest() )
+temp_depth_limit &= 0x7F;               // True stop depth.
-gas_switch_set();
+if( switch_gas )
-//---- Convert Depth and N2_ratio to ppO2
+{
+gas_switch_deepest();
+gas_switch_set();
+}
+//---- Convert Depth and N2_ratio to ppO2 ------------------------
 actual_ppO2 = (pres_surface + temp_depth_limit * METER_TO_BAR)
 * (1.0 - calc_N2_ratio - calc_He_ratio);
 if( actual_ppO2 < 0.0  ) actual_ppO2 = 0.0;
 if( actual_ppO2 > 2.50 ) actual_ppO2 = 2.55;
 char_I_actual_ppO2 = (unsigned char)(100.0 * actual_ppO2 + 0.5);
 sim_dive_mins++;
 }
 }
 }
-// Back to normal mode...
+//---- 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;
 void deco_calc_percentage(void)
 {
 RESET_C_STACK
 assert( 60 <= char_I_temp && char_I_temp <= 100 );
-assert(  0 <= int_I_temp  && int_I_temp  < 5760 );      // Less than 4 days = 96h...
+assert( int_I_temp  < 5760 );      // Less than 4 days = 96h...
 int_I_temp = (unsigned short)(((float)int_I_temp * (float)char_I_temp) * 0.01 );
 assert( int_I_temp < 5760 );                            // Less than 96h too...
 }

Mercurial > public > mk2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 569:ef667587b2b9