diff src/customview.asm @ 188:ebc28381f17d

NEW: Show Bailout Gas List in Surface mode (CCR Modes) CHANGE: Faster update rate for sensor display in surface mode
author heinrichsweikamp
date Mon, 27 Oct 2014 11:28:48 +0100
parents faa06c58e977
children e79bc535ef9e
line wrap: on
line diff
--- a/src/customview.asm	Sat Oct 25 15:28:18 2014 +0200
+++ b/src/customview.asm	Mon Oct 27 11:28:48 2014 +0100
@@ -138,7 +138,9 @@
     global  surf_customview_mask
 surf_customview_mask:
     WIN_BOX_BLACK    .50,surf_warning1_row-1, .0, surf_decotype_column-.1	; top, bottom, left, right
-	call	TFT_standard_color
+    ; Prepare title
+    WIN_TINY    surf_customview_title_column,surf_customview_title_row
+    WIN_COLOR   color_greenish
 	movff	menupos3,WREG                   ; Menupos3 holds number of customview function
 	dcfsnz	WREG,F
 	bra		surf_customview_init_view1      ; OC Gas list
@@ -162,12 +164,20 @@
 	movwf   menupos3			            ; Reset to one (Always one custom view visible)
 
 surf_customview_init_view1:                 ; View1: OC Gas list
-    btfsc   FLAG_ccr_mode
-    bra     surf_customview_toggle
     btfsc   FLAG_gauge_mode
     bra     surf_customview_toggle
     btfsc   FLAG_apnoe_mode
     bra     surf_customview_toggle
+    btfsc   FLAG_ccr_mode
+    bra     surf_customview_init_view1_bail ; Bailoutversion
+    STRCPY_TEXT_PRINT tGaslist              ; Title of customview
+    call    TFT_standard_color
+    call	TFT_gaslist_surfmode            ; Show gas list
+    bra		customview_toggle_exit          ; Done.
+
+surf_customview_init_view1_bail:
+    STRCPY_TEXT_PRINT tDiveBailout          ; Title of customview
+    call    TFT_standard_color
     call	TFT_gaslist_surfmode            ; Show gas list
     bra		customview_toggle_exit          ; Done.
 
@@ -178,6 +188,8 @@
     bra     surf_customview_toggle
     btfsc   FLAG_apnoe_mode
     bra     surf_customview_toggle
+    STRCPY_TEXT_PRINT tGaslistCC            ; Title of customview
+    call    TFT_standard_color
     call	TFT_dillist_surfmode            ; Show diluent list
     bra		customview_toggle_exit          ; Done.
 
@@ -188,10 +200,13 @@
     bra     surf_customview_toggle
     btfsc   FLAG_apnoe_mode
     bra     surf_customview_toggle
+    STRCPY_TEXT_PRINT tFixedSetpoints       ; Title of customview
+    call    TFT_standard_color
     call	TFT_splist_surfmode             ; Show Setpoint list
     bra		customview_toggle_exit          ; Done.
 
 surf_customview_init_view4:                 ; View4: Custom text
+    call    TFT_standard_color
     call	TFT_custom_text                 ; Show the custom text
     bra		customview_toggle_exit          ; Done.
 
@@ -200,6 +215,7 @@
     bra     surf_customview_toggle
     btfsc   FLAG_apnoe_mode
     bra     surf_customview_toggle
+    call    TFT_standard_color
     call	TFT_surface_tissues             ; Show Tissue diagram
     bra		customview_toggle_exit          ; Done.