changeset 252:8b252ff2eded

Bug bb13 : strange failling assertion...
author JeanDo
date Wed, 30 Mar 2011 02:23:47 +0200
parents f0cba9cff25c
children 3a4096f32526
files code_part1/OSTC_code_asm_part1/pled_outputs.asm code_part1/OSTC_code_c_part2/p2_deco.c code_part1/OSTC_code_c_part2/p2_deco.o
diffstat 3 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Tue Mar 29 23:47:34 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Wed Mar 30 02:23:47 2011 +0200
@@ -379,7 +379,7 @@
 	bra		PLED_resetdebugger_loop		; Loop
 
     bcf     LED_blue
-    bcf     LED_red
+	bcf		switch_left	
 	return
 
 PLED_divemode_mask:					; Displays mask in Dive-Mode
--- a/code_part1/OSTC_code_c_part2/p2_deco.c	Tue Mar 29 23:47:34 2011 +0200
+++ b/code_part1/OSTC_code_c_part2/p2_deco.c	Wed Mar 30 02:23:47 2011 +0200
@@ -1901,6 +1901,9 @@
             						 // 0.6931 is ln(2), because the math function log() calculates with a base of e not 2 as requested.
             						 // minus because log is negative
             temp2 = var_N2_halftime * temp1 / float_desaturation_multiplier; // time necessary (in minutes ) for complete desaturation (see comment about 10 percent) , new in v.101: float_desaturation_multiplier
+
+            // HERE ==> This assert fails during simulated dives, and should not....
+            assert( temp2 < 28800.0 );  // 480h !!
         }
         else
         {
@@ -1936,7 +1939,7 @@
             desat_time = (unsigned short)temp4;
         else
             desat_time = (unsigned short)temp2;
-
+        
         if(desat_time > int_O_desaturation_time)
             int_O_desaturation_time = desat_time;
 
Binary file code_part1/OSTC_code_c_part2/p2_deco.o has changed