comparison Discovery/Src/vpm.c @ 160:e3ca52b8e7fa

Merge with FlipDisplay
author heinrichsweikamp
date Thu, 07 Mar 2019 15:06:43 +0100
parents e1d66bc78f9a
children 3949781096d4
comparison
equal deleted inserted replaced
80:cc2bb7bb8456 160:e3ca52b8e7fa
1095 float stop_time; 1095 float stop_time;
1096 int count = 0; 1096 int count = 0;
1097 static int dp_max; 1097 static int dp_max;
1098 static float surfacetime; 1098 static float surfacetime;
1099 _Bool first_stop = false; 1099 _Bool first_stop = false;
1100 // hw 1601209 float tissue_He_saturation[16];
1101 // hw 1601209 float tissue_N2_saturation[16];
1102 float vpm_buehlmann_safety_gradient = 1.0f - (((float)pDiveSettings->vpm_conservatism) / 40);
1103 max_first_stop_depth = fmaxf(first_stop_depth,max_first_stop_depth); 1100 max_first_stop_depth = fmaxf(first_stop_depth,max_first_stop_depth);
1104 if(begin) 1101 if(begin)
1105 { 1102 {
1106 gCNS_VPM = 0; 1103 gCNS_VPM = 0;
1107 dp_max = 0; 1104 dp_max = 0;
2108 /* to the next stop. If so, write error message and terminate program. */ 2105 /* to the next stop. If so, write error message and terminate program. */
2109 /* =============================================================================== */ 2106 /* =============================================================================== */
2110 2107
2111 //deco_ceiling_depth = next_stop +1; //deco_ceiling_depth = next_stop + 1; 2108 //deco_ceiling_depth = next_stop +1; //deco_ceiling_depth = next_stop + 1;
2112 if(!vpm_violates_buehlmann) 2109 if(!vpm_violates_buehlmann)
2110 {
2113 calc_deco_ceiling(&deco_ceiling_depth, false); //weg, weil auf jeden Fall schleife für safety und so konservativer 2111 calc_deco_ceiling(&deco_ceiling_depth, false); //weg, weil auf jeden Fall schleife für safety und so konservativer
2112 }
2114 else 2113 else
2114 {
2115 deco_ceiling_depth = next_stop + 1; 2115 deco_ceiling_depth = next_stop + 1;
2116 2116 }
2117 if(deco_ceiling_depth > next_stop) 2117 if(deco_ceiling_depth > next_stop)
2118 { 2118 {
2119 while (deco_ceiling_depth > next_stop) 2119 while (deco_ceiling_depth > next_stop)
2120 { 2120 {
2121 2121
2220 2220
2221 buehlmann_wait = true; 2221 buehlmann_wait = true;
2222 } 2222 }
2223 } 2223 }
2224 if(buehlmann_wait) 2224 if(buehlmann_wait)
2225 {
2225 vpm_violates_buehlmann = true; 2226 vpm_violates_buehlmann = true;
2226 2227 }
2227 if(!buehlmann_wait) 2228 if(!buehlmann_wait)
2228 { 2229 {
2229 if(deco_ceiling_depth < next_stop) 2230 if(deco_ceiling_depth < next_stop)
2230 { 2231 {
2231 segment_time -= 1; 2232 segment_time -= 1;
2232 gCNS_VPM = initial_CNS; 2233 gCNS_VPM = initial_CNS;