changeset 786:0d1a82cdb3dc

compute ceiling in calc_hauptroutine_update_tissues
author heinrichsweikamp
date Mon, 30 Jun 2014 11:01:22 +0200
parents b0c96aaa86e4
children 9c52519871ba
files code_part1/OSTC_code_asm_part1/shared_definitions.h code_part1/OSTC_code_c_part2/p2_deco.c
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/shared_definitions.h	Sun Jun 29 15:13:32 2014 +0200
+++ b/code_part1/OSTC_code_asm_part1/shared_definitions.h	Mon Jun 30 11:01:22 2014 +0200
@@ -91,7 +91,6 @@
 #define NUM_STOPS   0x20
 #define NUM_GAS     5
 
-VAR_UINT  (int_O_gtissue_limit);
 VAR_UINT  (int_O_gtissue_press);
 VAR_UINT  (int_O_desaturation_time);       //
 VAR_UINT  (int_O_ascenttime);              // TTS (in minutes)
--- a/code_part1/OSTC_code_c_part2/p2_deco.c	Sun Jun 29 15:13:32 2014 +0200
+++ b/code_part1/OSTC_code_c_part2/p2_deco.c	Mon Jun 30 11:01:22 2014 +0200
@@ -1041,12 +1041,6 @@
     calc_hauptroutine_update_tissues();
     calc_gradient_factor();
 
-    // Fill int_O_ceiling if ceiling is below the surface
-    if ((calc_lead_tissue_limit-pres_surface)>0)
-        int_O_ceiling = (short)((calc_lead_tissue_limit-pres_surface)*1000);
-    else
-        int_O_ceiling = 0;
-
     // toggle between calculation for nullzeit (bottom time),
     //                deco stops
     //                and more deco stops (continue)
@@ -1238,7 +1232,12 @@
     // Calc limit for surface, ie. GF_high.
     calc_limit();
 
-    int_O_gtissue_limit = (short)(calc_lead_tissue_limit * 1000);
+    // Fill int_O_ceiling if ceiling is below the surface
+    if ((calc_lead_tissue_limit-pres_surface)>0)
+        int_O_ceiling = (short)((calc_lead_tissue_limit-pres_surface)*1000);
+    else
+        int_O_ceiling = 0;
+
     int_O_gtissue_press = (short)((pres_tissue_N2[char_O_gtissue_no] + pres_tissue_He[char_O_gtissue_no]) * 1000);
 }