diff src/tft_outputs.asm @ 105:0aaa4877ba25

Show HUD voltages only in CCR mode...
author heinrichsweikamp
date Tue, 03 Jun 2014 13:20:05 +0200
parents 223579e905c3
children bc7c022d2c74
line wrap: on
line diff
--- a/src/tft_outputs.asm	Tue Jun 03 12:25:47 2014 +0200
+++ b/src/tft_outputs.asm	Tue Jun 03 13:20:05 2014 +0200
@@ -933,14 +933,6 @@
 
     global  TFT_hud_voltages
 TFT_hud_voltages:                    ; Show HUD details
-    ; The mask
-    call    TFT_divemask_color
-    WIN_TINY  .5,dive_custom_hud_row
-    STRCPY_TEXT_PRINT tDiveHudMask1
-    WIN_TINY  .55,dive_custom_hud_row
-    STRCPY_TEXT_PRINT tDiveHudMask2
-    WIN_TINY  .105,dive_custom_hud_row
-    STRCPY_TEXT_PRINT tDiveHudMask3
     call	TFT_standard_color
     WIN_SMALL .5,dive_hud_data_row
     movff   o2_mv_sensor1+0,lo
@@ -1984,12 +1976,12 @@
 
 	global	TFT_debug_output
 TFT_debug_output:
-    return
     WIN_TINY   .107,.0
 	call	TFT_standard_color
 	lfsr	FSR2,buffer
-    movff   active_diluent,lo
-    output_8
+    movff   char_O_ceiling+0,lo
+    movff   char_O_ceiling+1,hi
+    output_16
 	STRCAT_PRINT ""
 	return
 
@@ -3548,42 +3540,42 @@
     ; Update clock and date
     WIN_SMALL   dive_clock_column,dive_clock_row
     call    TFT_clock2                          ; print clock
-    WIN_SMALL   dive_endtime_column,dive_endtime_row
-	lfsr	FSR2,buffer
-
-    btfss	decostop_active             ; Already in nodeco mode ?
-	bra     TFT_ead_end_tissues_clock2  ; No, overwrite with some spaces
-
-	STRCPY  0x94					; "End of dive" icon
-    movff	hours,WREG
-    mullw   .60
-    movf    mins,W
-    addwf   PRODL
-    movlw   .0
-    addwfc  PRODH
-	movff	PRODL, lo
-	movff	PRODH, hi
-
-    ; Add TTS
-    movff	int_O_ascenttime+0,WREG     ; TTS
-    addwf   lo,F
-	movff	int_O_ascenttime+1,WREG     ; TTS is 16bits
-    addwfc  hi,F
-
-	call	convert_time				; converts hi:lo in minutes to hours (hi) and minutes (lo)
-	movf	hi,W
-	movff	lo,hi
-	movwf	lo							; exchange lo and hi
-	output_99x
-	PUTC    ':'
-	movff	hi,lo
-	output_99x
-	STRCAT_PRINT ""
-    bra     TFT_ead_end_tissues_clock3
-
-TFT_ead_end_tissues_clock2:
-    STRCPY_PRINT "      "
-TFT_ead_end_tissues_clock3:
+;    WIN_SMALL   dive_endtime_column,dive_endtime_row
+;	lfsr	FSR2,buffer
+;
+;    btfss	decostop_active             ; Already in nodeco mode ?
+;	bra     TFT_ead_end_tissues_clock2  ; No, overwrite with some spaces
+;
+;	STRCPY  0x94					; "End of dive" icon
+;    movff	hours,WREG
+;    mullw   .60
+;    movf    mins,W
+;    addwf   PRODL
+;    movlw   .0
+;    addwfc  PRODH
+;	movff	PRODL, lo
+;	movff	PRODH, hi
+;
+;    ; Add TTS
+;    movff	int_O_ascenttime+0,WREG     ; TTS
+;    addwf   lo,F
+;	movff	int_O_ascenttime+1,WREG     ; TTS is 16bits
+;    addwfc  hi,F
+;
+;	call	convert_time				; converts hi:lo in minutes to hours (hi) and minutes (lo)
+;	movf	hi,W
+;	movff	lo,hi
+;	movwf	lo							; exchange lo and hi
+;	output_99x
+;	PUTC    ':'
+;	movff	hi,lo
+;	output_99x
+;	STRCAT_PRINT ""
+;    bra     TFT_ead_end_tissues_clock3
+;
+;TFT_ead_end_tissues_clock2:
+;    STRCPY_PRINT "      "
+;TFT_ead_end_tissues_clock3:
 
     ; Show END/EAD
     WIN_SMALL   dive_ead_column,dive_ead_row