Mercurial > public > hwos_code

diff src/tft_outputs.asm @ 134:4574aed5cd4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show clock in Apnea mode, minor layout changes in Apnea mode
author heinrichsweikamp
date Tue, 15 Jul 2014 10:20:37 +0200
parents 35b9da423de6
children e0b758865e91
line wrap: on
line diff
--- a/src/tft_outputs.asm	Mon Jul 14 15:17:07 2014 +0200
+++ b/src/tft_outputs.asm	Tue Jul 15 10:20:37 2014 +0200
@@ -3132,7 +3132,6 @@
 	bcf     leftbind
 	STRCAT_PRINT ""                 ; Show seconds in small font
 
-
     call    TFT_divemask_color
     WIN_TINY    total_apnoe_text_column,total_apnoe_text_row
     STRCPY_TEXT_PRINT   tApnoeTotal
@@ -3537,13 +3536,18 @@
 TFT_ead_end_tissues_clock_mask:
     ; The mask
     call    TFT_divemask_color
+	btfsc	FLAG_apnoe_mode					; In Apnoe mode?
+	bra		TFT_ead_end_tissues_clock_mask2 ; Yes
+	btfsc	FLAG_gauge_mode					; In Gauge mode?
+	bra		TFT_ead_end_tissues_clock_mask2 ; Yes
     ; Put three columns at HUD positions
-    WIN_TINY  dive_custom_hud_column1,dive_custom_hud_row
-    STRCPY_TEXT_PRINT tDiveClock
     WIN_TINY  dive_custom_hud_column2,dive_custom_hud_row
     STRCPY_TEXT_PRINT tDiveEAD_END
     WIN_TINY  dive_custom_hud_column3,dive_custom_hud_row
     STRCPY_TEXT_PRINT tDiveTissues
+TFT_ead_end_tissues_clock_mask2:            ; Show only clock
+    WIN_TINY  dive_custom_hud_column1,dive_custom_hud_row
+    STRCPY_TEXT_PRINT tDiveClock
     call	TFT_standard_color
     return
 
@@ -3552,6 +3556,12 @@
     ; Update clock and date
     WIN_SMALL   dive_clock_column,dive_clock_row
     call    TFT_clock2                          ; print clock
+
+	btfsc	FLAG_apnoe_mode					; In Apnoe mode?
+	return                                  ; Yes, done.
+	btfsc	FLAG_gauge_mode					; In Gauge mode?
+	return                                  ; Yes, done.
+
 ;    WIN_SMALL   dive_endtime_column,dive_endtime_row
 ;
 ;    btfss	decostop_active             ; Already in nodeco mode ?