diff code_part1/OSTC_code_asm_part1/pled_outputs.asm @ 323:b7940978edc9

Fix "Future TTS" display customview. * Display "---" during wait. * Display ascent when there is no stops.
author JeanDo
date Sat, 07 May 2011 00:52:20 +0200
parents 676d18bce8d7
children a86c9d1219ce
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Sat May 07 00:08:08 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Sat May 07 00:52:20 2011 +0200
@@ -3131,13 +3131,13 @@
 ; Display TTS after extra time at the same depth.
 ;
 PLED_show_@5:
-	call		PLED_divemask_color     ; Set Color for Divemode mask
-
 	WIN_FONT    FT_SMALL
     WIN_LEFT    .160-.70                ; 10 chars aligned right.
     WIN_TOP     .170
+	call		PLED_divemask_color     ; Set Color for Divemode mask
     lfsr        FSR2,letter
-    OUTPUTTEXTH .305                    ; "TTS in ..."
+
+    OUTPUTTEXTH .305                    ; "Future TTS"
     call        word_processor
 
     WIN_LEFT	.97
@@ -3148,25 +3148,31 @@
 	bsf         leftbind
 	output_8
 	bcf         leftbind
-	STRCAT_PRINT "':"
+	STRCAT_PRINT "': "
     
-	WIN_LEFT    .97+7*5                ; "@10':" is 5 chars long
+	WIN_LEFT    .97+7*5                 ; "@10':" is 5 chars long
 	call        PLED_standard_color 
-	
 	lfsr        FSR2,letter
+
 	movff       int_O_extra_ascenttime+0,lo
     movff       int_O_extra_ascenttime+1,hi
     movf        lo,W
-	iorwf       hi,W
+	iorwf       hi,W                    ; extra_ascenttime == 0 ?
+	bz          PLED_show_@5_nodeco
+	movf        lo,W                    ; extra_ascenttime == 0xFFFF ?
+	andwf       hi,W
+	incf        WREG,w
 	bz          PLED_show_@5_wait
+
 	bsf         leftbind
 	output_16
 	bcf         leftbind
-	STRCAT_PRINT "'  "                  ; From "999'" to "1'  " we need 2 trailing spaces
+	STRCAT_PRINT "'  "                  ; From "none" to "1'" we need 2 trailing spaces
 	return
 
+PLED_show_@5_nodeco:
 PLED_show_@5_wait:
-    STRCPY_PRINT "xx' "
+    STRCPY_PRINT "--- "
     return
 
 ;=============================================================================