mk2: code_part1/OSTC_code_c_part2/p2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 184:016c45a0caaf

Enable to compile p2_deco.c on other platforms.

author	JeanDo
date	Sun, 06 Feb 2011 19:32:11 +0100
parents	7f3e1bf588bc
children	ae3a83982ab2

comparison

equal deleted inserted replaced

-:f720ce017244
+:016c45a0caaf
 // ***********************************************
 // ** V A R I A B L E S   D E F I N I T I O N S **
 // ***********************************************
 #include "p2_definitions.h"
-#include "../OSTC_code_c_part2/shared_definitions.h"
+#include "shared_definitions.h"
 //---- Bank 3 parameters -----------------------------------------------------
 #pragma udata bank4=0x400
 static unsigned char 	lock_GF_depth_list;
 	 && int_I_pres_respiration > 3000   // And we hit the 20m limit ?
 	)
 	{
 		char_O_NDL_at_20mtr = char_O_nullzeit;  // change to max bottom time.
 		if( char_O_NDL_at_20mtr == 255)         // and avoid confusion.
-			char_O_NDL_at_20mtr == 254;
+			char_O_NDL_at_20mtr = 254;
 	}
 }
 //////////////////////////////////////////////////////////////////////////////
 // DBG - multi main during dive
 //
-static void check_dbg(static char is_post_check)
+static void check_dbg(PARAMETER char is_post_check)
 {
 	overlay unsigned int temp_DBS = 0;
 overlay char i;                     // Local loop index.
 	if( (DBG_N2_ratio != N2_ratio) || (DBG_He_ratio != He_ratio) )
 //////////////////////////////////////////////////////////////////////////////
 ///////////////////////  U T I L I T I E S   /////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
-static int read_custom_function(static unsigned char cf)
+static int read_custom_function(PARAMETER unsigned char cf)
 {
+#ifdef CROSS_COMPILE
+extern unsigned short custom_functions[];
+return custom_functions[cf];
+#else
 extern unsigned char hi, lo;
 extern void getcustom15();
 _asm
 movff   cf,WREG
 call    getcustom15,0
 movff   lo,PRODL
 movff   hi,PRODH
 _endasm
+#endif
 }
 //////////////////////////////////////////////////////////////////////////////
 // read buhlmann tables for compatriment ci
 // If period == 0 : 2sec interval
 //              1 : 1 min interval
 //              2 : 10 min interval.
-static void read_buhlmann_coeffifients(static char period)
+static void read_buhlmann_coefficients(PARAMETER char period)
 {
+#ifndef CROSS_COMPILE
 // Note: we don't use far rom pointer, because the
 //       24 bits is to complex, hence we have to set
 //       the UPPER page ourself...
 //       --> Set zero if tables are moved to lower pages !
 _asm
 movlw 1
 movwf TBLPTRU,0
 _endasm
+#endif
 var_N2_a = buhlmann_a[ci];
 var_N2_b = buhlmann_b[ci];
 var_He_a = (buhlmann_a+16)[ci];
 var_He_b = (buhlmann_b+16)[ci];
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 void fillDataStack(void)
 {
+#ifndef CROSS_COMPILE
 _asm
 LFSR    1,C_STACK
 MOVLW   0xCC
 loop:   MOVWF   POSTINC1,0
 TSTFSZ  FSR1L,0
 BRA     loop
 LFSR    1,C_STACK
 LFSR    2,C_STACK
 _endasm
+#endif
 }
 //////////////////////////////////////////////////////////////////////////////
 // When calling C code from ASM context, the data stack pointer and
 // frames should be reset. Bank3 is dedicated to the stack (see the
 // .lkr script).
-#ifdef __DEBUG
+#ifdef CROSS_COMPILE
-#   define RESET_C_STACK fillDataStack();
+#       define RESET_C_STACK
 #else
-#   define RESET_C_STACK    \
+#   ifdef __DEBUG
-_asm                    \
+#       define RESET_C_STACK fillDataStack();
-LFSR    1, C_STACK  \
+#   else
-LFSR    2, C_STACK  \
+#       define RESET_C_STACK    \
-_endasm
+_asm                    \
+LFSR    1, C_STACK  \
+LFSR    2, C_STACK  \
+_endasm
+#   endif
 #endif
 //////////////////////////////////////////////////////////////////////////////
 // Called every 2 seconds during diving.
 // update tissues every time.
+//
 // Every 6 seconds (or slower when TTS > 16):
 //    - update deco table (char_O_deco_time/depth) with new values.
 //    - update ascent time,
 //    - set status to zero (so we can check there is new results).
 //
 calc_without_deco();
 deco_calc_desaturation_time();
 }
 //////////////////////////////////////////////////////////////////////////////
+// Reset decompression model:
+// + Set all tissues to equilibrium with Air at ambient pressure.
+// + Reset last stop to 0m
+// + Reset all model output.
 void deco_clear_tissue(void)
 {
 RESET_C_STACK
 clear_tissue();
-char_I_depth_last_deco	= 0;		// for compatibility with v.101pre_no_last_deco
 }
 //////////////////////////////////////////////////////////////////////////////
 void deco_calc_wo_deco_step_1_min(void)
 {
 // cycle through the 16 b"uhlmann tissues
 overlay float p = N2_ratio * (pres_respiration -  0.0627);
 pres_tissue[ci] = p;
-read_buhlmann_coeffifients(-1);
+read_buhlmann_coefficients(-1);
 p = (p - var_N2_a) * var_N2_b ;
 if( p < 0.0 )
 p = 0.0;
 pres_tissue_limit[ci] = p;
 char_O_deco_status = 0;
 char_O_nullzeit = 0;
 int_O_ascenttime = 0;
 char_O_gradient_factor = 0;
 char_O_relative_gradient_GF = 0;
+char_I_depth_last_deco	= 0;		// for compatibility with v.101pre_no_last_deco
 }
 //////////////////////////////////////////////////////////////////////////////
 // calc_without_deco
 //
 deco_He_ratio3      = char_I_deco_He_ratio3 / 100.0;
 deco_N2_ratio4      = char_I_deco_N2_ratio4 / 100.0;
 deco_He_ratio4      = char_I_deco_He_ratio4 / 100.0;
 deco_N2_ratio5      = char_I_deco_N2_ratio5 / 100.0;
 deco_He_ratio5      = char_I_deco_He_ratio5 / 100.0;
-float_deco_distance = char_I_deco_distance / 100.0;
+float_deco_distance = char_I_deco_distance / 100.0;     // Get offset is in mbar.
 // ____________________________________________________
 //
 // _____________ G A S _ C H A N G E S ________________
 // ____________________________________________________
 	}
 }
 const_ppO2 = (float)char_I_const_ppO2 / 100.0;
 deco_ppO2_change = (float)char_I_deco_ppO2_change / 99.95 + pres_surface;
-deco_ppO2_change = deco_ppO2_change + float_deco_distance;
+deco_ppO2_change += float_deco_distance;
 deco_ppO2 = (float)char_I_deco_ppO2 / 100.0;
 float_desaturation_multiplier = char_I_desaturation_multiplier / 100.0;
 float_saturation_multiplier = char_I_saturation_multiplier / 100.0;
 GF_low = (float)char_I_GF_Low_percentage / 100.0;
 GF_high = (float)char_I_GF_High_percentage / 100.0;
 		calc_tissue_2_secs();
 	else
 		calc_tissue_1_min();
 	int_O_gtissue_limit = (int)(pres_tissue_limit[char_O_gtissue_no] * 1000);
-	int_O_gtissue_press = (int)((pres_tissue[char_O_gtissue_no] + pres_tissue[char_O_gtissue_no+16]) * 1000);
+	int_O_gtissue_press = (int)((pres_tissue[char_O_gtissue_no] + (pres_tissue+16)[char_O_gtissue_no]) * 1000);
 	if (char_I_deco_model == 1)
 	{
 		temp1 = temp1 * GF_high;
 	}
 	else
 //////////////////////////////////////////////////////////////////////////////
 // calc_tissue
 //
 // optimized in v.101
 //
-static void calc_tissue(static unsigned char period)
+static void calc_tissue(PARAMETER unsigned char period)
 {
 char_O_gtissue_no = 255;
 pres_gtissue_limit = 0.0;
 for (ci=0;ci<16;ci++)
 {
-read_buhlmann_coeffifients(period);   // 2 sec or 1 min period.
+read_buhlmann_coefficients(period);   // 2 sec or 1 min period.
 // N2
 temp_tissue = (temp_atem - pres_tissue[ci]) * var_N2_e;
 temp_tissue_safety();
 pres_tissue[ci] += temp_tissue;
 // Function very simular to calc_tissue, but:
 //   + Use a 1min or 10min period.
 //   + Do it on sim_pres_tissue, instead of pres_tissue.
 //   + Update GF_low state for GF decompression model.
 //
-static void sim_tissue(static unsigned char period)
+static void sim_tissue(PARAMETER unsigned char period)
 {
 sim_pres_gtissue_limit = 0.0;
 sim_gtissue_no = 255;
 for (ci=0;ci<16;ci++)
 {
-read_buhlmann_coeffifients(period);  // 1 or 10 minute(s) interval
+read_buhlmann_coefficients(period);  // 1 or 10 minute(s) interval
 // N2
 temp_tissue = (temp_atem - sim_pres_tissue[ci]) * var_N2_e;
 temp_tissue_safety();
 sim_pres_tissue[ci] += temp_tissue;
 // FIXED N2_ratio
 // unchanged in v.101
 //
 void deco_calc_desaturation_time(void)
 {
-overlay int desat_time;     // For a particular compartiment, in min.
+overlay unsigned int desat_time;    // For a particular compartiment, in min.
 RESET_C_STACK
 N2_ratio = 0.7902; // FIXED sum as stated in b"uhlmann
 pres_surface = (float)int_I_pres_surface / 1000.0;
 	temp4 = 0;
 	}
 // saturation_time (for flight)
 if (temp4 > temp2)
-desat_time = (int)temp4;
+desat_time = (unsigned int)temp4;
 else
-desat_time = (int)temp2;
+desat_time = (unsigned int)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
 //////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////// deco_hash /////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
+#ifndef CROSS_COMPILE
 void deco_hash(void)
 {
 overlay unsigned char md_i, md_j;   // Loop index.
 overlay unsigned char md_t;
 overlay unsigned char md_buffer[16];
 char_O_hash[md_i] ^= md_pi_subst[(md_buffer[md_i] ^ md_t)];
 md_t = char_O_hash[md_i];
 } // for md_i 16
 } // for md_pointer
 } // void deco_hash(void)
+#endif
 //////////////////////////////////////////////////////////////////////////////
 // deco_clear_CNS_fraction
 //
 // new in v.101
 		pres_tissue[x] = pres_tissue_vault[x];
 }
 //////////////////////////////////////////////////////////////////////////////
 //
+#ifndef CROSS_COMPILE
 void main() {}
+#endif

Mercurial > public > mk2

comparison code_part1/OSTC_code_c_part2/p2_deco.c @ 184:016c45a0caaf