mk2: code_part1/OSTC_code_c_part2/p2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 203:2d9af08ed0ac

BUGFIX Gas switch + To implement gas switch, the ascent engine have to know about dive duration.

author	JeanDo
date	Fri, 18 Feb 2011 00:23:51 +0100
parents	e5c484d59a91
children	275befc5f39d

comparison

equal deleted inserted replaced

-:667700d09fff
+:2d9af08ed0ac
 // 05/23/10 v109: 5 gas changes & 1 min timer
 // 07/13/10 v110: cns vault added
 // 12/25/10 v110: split in three files (deco.c, main.c, definitions.h)
 // 2011/01/20: [jDG] Create a common file included in ASM and C code.
 // 2011/01/23: [jDG] Added read_custom_function().
-// 2011/01/24: [jDG] Make ascenttime an int. No more overflow!
+// 2011/01/24: [jDG] Make ascenttime an short. No more overflow!
 // 2011/01/25: [jDG] Fusion deco array for both models.
 // 2011/01/25: [jDG] Use CF(54) to reverse deco order.
 // 2011/02/11: [jDG] Reworked gradient-factor implementation.
 // 2011/02/13: [jDG] CF55 for additional gas switch delay in decoplan.
 //
 static void calc_nextdecodepth(void);
 //---- Bank 4 parameters -----------------------------------------------------
 #pragma udata bank4=0x400
-static unsigned char 	low_depth;
 static float			temp_limit;
 static float			GF_low;
 static float			GF_high;
 static float			GF_delta;
 static unsigned char    low_depth;                  // Depth of deepest stop
 static float            const_ppO2;                 // new in v.101
 static float            deco_ppO2_change;           // new in v.101
 static float            deco_ppO2;                  // new in v.101
 static unsigned char    sim_gas_last_used;              // Last used gas, to detected a gas switch.
-static unsigned char    sim_gas_delay;                  // Delay added for gas switch (count down) [min].
+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
 static float			float_desaturation_multiplier;  // new in v.101
 #include "p2_tables.romdata" 		        // new table for deco_main_v.101 (var_N2_a modified)
 // Magic table to compute the MD2 HASH
 //
 #pragma romdata hash_tables = 0x017E00  // Address fixed by ASM access...
-rom const rom unsigned int md_pi[] =
+rom const rom unsigned short md_pi[] =
 {
 0x292E, 0x43C9, 0xA2D8, 0x7C01, 0x3D36, 0x54A1, 0xECF0, 0x0613
 , 0x62A7, 0x05F3, 0xC0C7, 0x738C, 0x9893, 0x2BD9, 0xBC4C, 0x82CA
 , 0x1E9B, 0x573C, 0xFDD4, 0xE016, 0x6742, 0x6F18, 0x8A17, 0xE512
 , 0xBE4E, 0xC4D6, 0xDA9E, 0xDE49, 0xA0FB, 0xF58E, 0xBB2F, 0xEE7A
 //////////////////////////////////////////////////////////////////////////////
 // DBG - multi main during dive
 //
 static void check_dbg(PARAMETER char is_post_check)
 {
-	overlay unsigned int temp_DBS = 0;
+	overlay unsigned short temp_DBS = 0;
 overlay unsigned char i;            // Local loop index.
 	if( (DBG_N2_ratio != N2_ratio) || (DBG_He_ratio != He_ratio) )
 		temp_DBS |= DBG_c_gas;
 	if(DBG_const_ppO2 != const_ppO2)
 //////////////////////////////////////////////////////////////////////////////
 ///////////////////////  U T I L I T I E S   /////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
-static int read_custom_function(PARAMETER unsigned char cf)
+static short read_custom_function(PARAMETER unsigned char cf)
 {
 #ifdef CROSS_COMPILE
 extern unsigned short custom_functions[];
 return custom_functions[cf];
 #else
 	if (char_I_deco_model == 1)
 	{
 // Recompute leading gas limit, at current depth:
 overlay float depth = (temp_deco - pres_surface) / 0.09995;
 assert( depth >= 0.0 );
+assert( low_depth < 255 );
 if( depth > low_depth )
 sim_limit( GF_low );
 else
 sim_limit( GF_high - depth * locked_GF_step );
 // Stops are needed ?
 if( sim_lead_tissue_limit > pres_surface )
 {
 // Deepest stop, in meter.
-overlay unsigned char first_stop = 3 * (int)(0.99 + (sim_lead_tissue_limit - pres_surface) / 0.29985);
+overlay unsigned char first_stop = 3 * (short)(0.99 + (sim_lead_tissue_limit - pres_surface) / 0.29985);
 assert( first_stop < 128 );
 // Apply correction for the first stop.
 if( first_stop == 3 )                           // new in v104
 first_stop = char_I_depth_last_deco;        // Use last 3m..6m instead.
 		pres_gradient = sim_lead_tissue_limit - pres_surface;
 		if (pres_gradient >= 0)
 		{
 			pres_gradient /= 0.29985; 	                            // Bar --> stop number;
-			temp_depth_limit = 3 * (int) (pres_gradient + 0.99);    // --> meter : depth for deco
+			temp_depth_limit = 3 * (short) (pres_gradient + 0.99);  // --> meter : depth for deco
 			if (temp_depth_limit == 0)                              // At surface ?
 				temp_deco = pres_surface;
 			else
 			{
 				if (temp_depth_limit < char_I_depth_last_deco)      // Implement last stop at 4m/5m/6m...
 // Calculate gas switches
 //
 //
 void check_gas_switch(void)
 {
-overlay unsigned char temp_gas_switch = sim_gas_last_used;
+overlay unsigned char temp_gas_switch = 0;
 overlay float         switch_deco;
 calc_N2_ratio = N2_ratio;
 calc_He_ratio = He_ratio;
 temp_gas_switch = 5;
 switch_deco = deco_gas_change5;
 	}
 }
-// Should detect gas switch only when gas do changes...
+// If there is a better gas available
-// sim_gas_last_used: used to detect just once in each ascent simu.
+if( temp_gas_switch )
-// N2_ratio         : used to detect when already breathing that gas.
+{
-if( sim_gas_last_used < temp_gas_switch
+// Should detect gas switch only when gas do changes...
-&& (calc_N2_ratio != N2_ratio || calc_He_ratio != He_ratio))
+// sim_gas_last_used: used to detect just once in each ascent simu.
-{
+// N2_ratio         : used to detect when already breathing that gas.
-sim_gas_last_used = temp_gas_switch;
+if( sim_gas_last_used < temp_gas_switch
-sim_gas_delay = read_custom_function(55);
+&& sim_gas_delay <= sim_dive_mins
+&& (calc_N2_ratio != N2_ratio || calc_He_ratio != He_ratio))
-// Apply depth correction ONLY if there delay is not null:
-if( sim_gas_delay > 0 )
 {
-temp_deco = switch_deco - float_deco_distance;
+sim_gas_last_used = temp_gas_switch;
-temp_depth_limit = (temp_deco - pres_surface) / 0.09985;
+sim_gas_delay = read_custom_function(55);
+// Apply depth correction ONLY if CF#55 is not null:
+if( sim_gas_delay > 0 )
+{
+sim_gas_delay += sim_dive_mins;
+temp_deco = switch_deco - float_deco_distance;
+temp_depth_limit = (temp_deco - pres_surface) / 0.09985;
+}
 }
 }
+else
+sim_gas_delay = 0;
 assert( 0.0 <= calc_N2_ratio && calc_N2_ratio <= 0.95 );
 assert( 0.0 <= calc_He_ratio && calc_He_ratio <= 0.95 );
 assert( (calc_N2_ratio + calc_He_ratio) <= 1.00 );
 }
 static void calc_hauptroutine(void)
 {
 	static float backup_GF_step;
 	static unsigned char backup_low_depth;
 	static unsigned char backup_gas_used;
+	static unsigned char backup_gas_delay;
 	calc_hauptroutine_data_input();
 	if(!flag_in_divemode)
 	{
 // Values that should be reset just once for the full real dive
 // (not every time we simulate an ascent):
 low_depth = 0;              // Reset GF history.
 	backup_low_depth = 255;     // backup is empty...
+sim_gas_last_used = 0;      // Reset gas switch history.
-// No gas change (yet) for this ascent simulation.
+sim_gas_delay = 0;
-sim_gas_last_used = 0;
+sim_dive_mins = 0;
-	break;
+break;
 case 0: //---- bottom time -----------------------------------------------
 	calc_nullzeit();
 	check_ndl();
 	    char_O_deco_status = 2; // calc ascent next time.
 case 2: //---- Simulate ascent to first stop -----------------------------
 // Backup ascention state, so the simulation won't polute the real
 // dive data.
 	backup_GF_step = locked_GF_step;
 	backup_low_depth = low_depth;
-backup_gas_used = sim_gas_last_used;
+// Check proposed gas at begin of ascent simulation
+	    temp_deco = pres_respiration;       // Starts from current real depth.
+sim_dive_mins = int_I_divemins;     // and time.
+check_gas_switch();
+backup_gas_used = sim_gas_last_used;// And save for later simu steps.
+backup_gas_delay = sim_gas_delay;
 	sim_ascent_to_first_stop();
 char_O_deco_status = 1;     // Calc stops next time (deco or gas switch).
 	break;
 	if( char_O_deco_status == 0 && backup_low_depth != 255)
 	{
 	locked_GF_step = backup_GF_step;
 	low_depth = backup_low_depth;
 sim_gas_last_used = backup_gas_used;
-	backup_low_depth = 255;
+sim_gas_delay = backup_gas_delay;
+backup_low_depth = 255;
 }
 	break;
 	}
 	check_post_dbg();
 // Reset all C-code dive parameters from their ASM-code values.
 // Detect gas change condition.
 //
 void calc_hauptroutine_data_input(void)
 {
-overlay int int_temp;
+overlay short int_temp;
 pres_respiration    = int_I_pres_respiration * 0.001;
 pres_surface        = int_I_pres_surface     * 0.001;
 N2_ratio            = char_I_N2_ratio        * 0.01;
 He_ratio            = char_I_He_ratio        * 0.01;
 // ____________________________________________________
 //
 // _____________ G A S _ C H A N G E S ________________
 // ____________________________________________________
+// Keep a marhin of 150mbar = 1.50m
 int_temp = (int_I_pres_respiration - int_I_pres_surface) + MBAR_REACH_GASCHANGE_AUTO_CHANGE_OFF;
 deco_gas_change1 = 0.0;
 deco_gas_change2 = 0.0;
 deco_gas_change3 = 0.0;
 deco_gas_change4 = 0.0;
 deco_gas_change5 = 0.0;
+// Gas are selectable if we did not pass the change depth by more than 1.50m:
 if(char_I_deco_gas_change1)
 {
-overlay int int_temp2 = ((int)char_I_deco_gas_change1) * 100;
+if( int_temp > 100 *(short)char_I_deco_gas_change1 )
-if(int_temp > int_temp2)
+	deco_gas_change1 = char_I_deco_gas_change1 / 9.995
-{
++ pres_surface
-	deco_gas_change1 = (float)char_I_deco_gas_change1 / 9.995 + pres_surface;
++ float_deco_distance;
-	deco_gas_change1 += float_deco_distance;
-	}
 }
 if(char_I_deco_gas_change2)
 {
-overlay int int_temp2 = ((int)char_I_deco_gas_change2) * 100;
+if( int_temp > 100 *(short)char_I_deco_gas_change2 )
-if(int_temp > int_temp2)
+	deco_gas_change2 = char_I_deco_gas_change2 / 9.995
-{
++ pres_surface
-	deco_gas_change2 = (float)char_I_deco_gas_change2 / 9.995 + pres_surface;
++ float_deco_distance;
-	deco_gas_change2 += float_deco_distance;
-	}
 }
 if(char_I_deco_gas_change3)
 {
-overlay int int_temp2 = ((int)char_I_deco_gas_change3) * 100;
+if( int_temp > 100 *(short)char_I_deco_gas_change3 )
-if(int_temp > int_temp2)
+	deco_gas_change3 = char_I_deco_gas_change3 / 9.995
-{
++ pres_surface
-	deco_gas_change3 = (float)char_I_deco_gas_change3 / 9.995 + pres_surface;
++ float_deco_distance;
-	deco_gas_change3 += float_deco_distance;
-	}
 }
 if(char_I_deco_gas_change4)
 {
-overlay int int_temp2 = ((int)char_I_deco_gas_change4) * 100;
+if( int_temp > 100 *(short)char_I_deco_gas_change4 )
-if(int_temp > int_temp2)
+	deco_gas_change4 = char_I_deco_gas_change4 / 9.995
-{
++ pres_surface
-	deco_gas_change4 = (float)char_I_deco_gas_change4 / 9.995 + pres_surface;
++ float_deco_distance;
-	deco_gas_change4 += float_deco_distance;
-	}
 }
 if(char_I_deco_gas_change5)
 {
-overlay int int_temp2 = ((int)char_I_deco_gas_change5) * 100;
+if( int_temp > 100 *(short)char_I_deco_gas_change5 )
-if(int_temp > int_temp2)
+	deco_gas_change5 = char_I_deco_gas_change5 / 9.995
-{
++ pres_surface
-	deco_gas_change5 = (float)char_I_deco_gas_change5 / 9.995 + pres_surface;
++ float_deco_distance;
-	deco_gas_change5 += float_deco_distance;
-	}
 }
 const_ppO2 = char_I_const_ppO2 * 0.01;
 deco_ppO2_change = char_I_deco_ppO2_change / 99.95
 + pres_surface
 		calc_tissue(1);
 // Calc limit for surface, ie. GF_high.
 calc_limit(GF_high);
-	int_O_gtissue_limit = (int)(calc_lead_tissue_limit * 1000);
+	int_O_gtissue_limit = (short)(calc_lead_tissue_limit * 1000);
-	int_O_gtissue_press = (int)((pres_tissue[char_O_gtissue_no] + (pres_tissue+16)[char_O_gtissue_no]) * 1000);
+	int_O_gtissue_press = (short)((pres_tissue[char_O_gtissue_no] + (pres_tissue+16)[char_O_gtissue_no]) * 1000);
 // if guiding tissue can not be exposed to surface pressure immediately
 if( calc_lead_tissue_limit > pres_surface && char_O_deco_status == 0)
 	{
 		char_O_nullzeit = 0;    // deco necessary
 overlay unsigned char loop;
 	for(loop = 0; loop < 16; ++loop)
 	{
 // Do not ascent while doing a gas switch.
-if( sim_gas_delay == 0 )
+if( sim_gas_delay <= sim_dive_mins )
+{
 calc_nextdecodepth();
-//---- Finish computations once surface is reached -------------------
+//---- Finish computations once surface is reached ---------------
 if( temp_depth_limit == 0 )
-	{
+	    {
-		copy_deco_table();
+		    copy_deco_table();
-	calc_ascenttime();
+	    calc_ascenttime();
-		char_O_deco_status = 0; // calc nullzeit next time.
+		    char_O_deco_status = 0; // calc nullzeit next time.
-		return;
+		    return;
-	}
+	    }
-//---- Else, continue simulating the stops ---------------------------
+//---- Else, continue simulating the stops -----------------------
-if( sim_gas_delay == 0 )
 check_gas_switch();     // Calculate N2_ratio and He_ratio.
-if( sim_gas_delay > 0 )
+}
-sim_gas_delay--;
+//---- Then update tissue and decoplan -------------------------------
-alveolar_presures();        // Updates ppN2 and ppHe.
+sim_dive_mins++;            // Advance simulated time by 1 minute.
+alveolar_presures();        // Updates ppN2 and ppHe.
 sim_tissue(1);              // Simulate compartiments for 1 minute.
 update_deco_table();        // Add one minute stops.
 	}
 	// Surface not reached, need more stops...
 update_startvalues();
 clear_deco_table();
 	temp_deco = pres_respiration;       // Starts from current real depth.
-// Loop until first top or surface is reached.
+// Loop until first stop, gas switch, or surface is reached.
 	for(;;)
 	{
-// Do not ascent while doing a gas switch.
+// Do we have a gas switch going on ?
-if( sim_gas_delay == 0 )
+if( sim_gas_delay > sim_dive_mins )
-		    temp_deco -= 1.0;           // Ascent 1 min, at 10m/min. == 1bar/min.
+break;
+// No: try ascending 1 full minute.
+	    temp_deco -= 1.0;               // Ascent 1 min, at 10m/min. == 1bar/min.
+// Did we reach surface ?
+if( temp_deco <= pres_surface )
+{
+temp_deco = pres_surface;   // Yes: finished !
+break;
+}
 // Compute sim_lead_tissue_limit at GF_low (deepest stop).
 sim_limit(GF_low);
-// Did we reach first stop ?
+// Did we reach deepest remaining stop ?
 if( temp_deco <= sim_lead_tissue_limit )
 {
 temp_deco = sim_lead_tissue_limit;
 break;                      // Return stop found !
 }
-// Next stop is surface ?
+temp_deco += 0.5;               // Check gas change 5 meter below new depth.
-if( temp_deco <= pres_surface )
-break;                      // Yes: finished !
-//---- Simulat gas switches
-if( sim_gas_delay > 0 )
-{
-sim_gas_delay--;            // Decrement switch delay
-update_deco_table();        // And mark stop in table
-}
-else
-{
-		    temp_deco += 0.5;           // Check gas change 5 meter below new depth.
 check_gas_switch();
-		    temp_deco -= 0.5;           // Back to new depth.
+	    temp_deco -= 0.5;               // Back to new depth.
-}
+sim_dive_mins++;                // Advance simulated time by 1 minute.
-// Then simulate with the new gas pressures... (1min)
+alveolar_presures();            // Calculate ppO2/ppHe at new depth.
-alveolar_presures();            // Calculated at true depth !
+		sim_tissue(1);                  // and update tissues for 1 min.
-		sim_tissue(1);
 	}
+// Always updates depth in meter, too:
+temp_depth_limit = (temp_deco - pres_surface) / 0.09985;
 }
 //////////////////////////////////////////////////////////////////////////////
 // calc_tissue
 //
 //
 // unchanged in v.101
 //
 static void calc_nullzeit(void)
 {
-overlay int loop;
+overlay unsigned char loop;
 update_startvalues();
 	char_O_nullzeit = 0;
 	for(loop = 1; loop <= 17; loop++)
 	{
 // + 0.7 to count 1 minute ascent time from 3 meter to surface
 overlay float ascent = pres_respiration - pres_surface + 0.7;
 if (ascent < 0.0)
 ascent = 0.0;
-int_O_ascenttime = (unsigned int)(ascent + 0.99);
+int_O_ascenttime = (unsigned short)(ascent + 0.99);
 for(x=0; x<32 && internal_deco_depth[x]; x++)
-int_O_ascenttime += (unsigned int)internal_deco_time[x];
+int_O_ascenttime += (unsigned short)internal_deco_time[x];
 }
 else
 int_O_ascenttime = 0;
 }
 // FIXED N2_ratio
 // unchanged in v.101
 //
 void deco_calc_desaturation_time(void)
 {
-overlay unsigned int desat_time;    // For a particular compartiment, in min.
+overlay unsigned short desat_time;    // For a particular compartiment, in min.
 overlay float temp1;
 overlay float temp2;
 overlay float temp3;
 overlay float temp4;
 RESET_C_STACK
 	temp4 = 0;
 	}
 // saturation_time (for flight)
 if (temp4 > temp2)
-desat_time = (unsigned int)temp4;
+desat_time = (unsigned short)temp4;
 else
-desat_time = (unsigned int)temp2;
+desat_time = (unsigned short)temp2;
 if(desat_time > int_O_desaturation_time)
 	int_O_desaturation_time = desat_time;
 // N2 saturation in multiples of halftime for display purposes
 temp2 = temp1 * 20.0;  // 0 = 1/8, 120 = 0, 249 = 8
 {
 overlay unsigned char md_i, md_j;   // Loop index.
 overlay unsigned char md_t;
 overlay unsigned char md_buffer[16];
 overlay unsigned char md_temp;
-overlay unsigned int  md_pointer;
+overlay unsigned short  md_pointer;
 RESET_C_STACK
 // init
 for(md_i=0;md_i<16;md_i++)
 // Used to compute NoFly remaining time.
 void deco_calc_percentage(void)
 {
 RESET_C_STACK
-int_I_temp = (int)(int_I_temp * (char_I_temp / 100.0));
+int_I_temp = (short)(int_I_temp * (char_I_temp / 100.0));
 }
 //////////////////////////////////////////////////////////////////////////////
 void deco_push_tissues_to_vault(void)

Mercurial > public > mk2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 203:2d9af08ed0ac