diff src/customview.asm @ 413:12e85930d95c

NEW: New Customview shows ppO2(O2) and ppO2(Diluent) during CCR mode
author heinrichsweikamp
date Tue, 22 Mar 2016 16:39:00 +0100
parents e99bb91f6f92
children 881399cf0f5b
line wrap: on
line diff
--- a/src/customview.asm	Tue Mar 15 12:19:12 2016 +0100
+++ b/src/customview.asm	Tue Mar 22 16:39:00 2016 +0100
@@ -48,6 +48,8 @@
 	bra		customview_1sec_view8
 	dcfsnz	WREG,F
 	bra		customview_1sec_view9           ; Make sure to change value in "check_ppo2_display:" when moving around custom views
+	dcfsnz	WREG,F
+	bra		customview_1sec_view10
 	; Menupos3=0, do nothing
 	return
 
@@ -89,6 +91,10 @@
 
     return
 
+customview_1sec_view10:                     ; Sensor check
+    call    TFT_sensor_check                ; Show ppO2 of O2 and Diluent
+    return
+
 
 ;=============================================================================
 ; Do every-minute tasks for the custom view area
@@ -368,7 +374,7 @@
 customview_toggle:
 	bcf		switch_right
 	incf	menupos3,F			            ; Number of customview to show
-	movlw	d'9'							; Max number of customsviews in divemode
+	movlw	d'10'							; Max number of customsviews in divemode
 	cpfsgt	menupos3			            ; Max reached?
 	bra		customview_mask		            ; No, show
 customview_toggle_reset:					; Timeout occured
@@ -398,6 +404,8 @@
 	bra		customview_init_view8           ; HUD voltages
 	dcfsnz	WREG,F
 	bra		customview_init_view9           ; Ceiling
+	dcfsnz	WREG,F
+	bra		customview_init_view10          ; Sensor check
 customview_init_nocustomview:
     call    I2C_sleep_accelerometer         ; Stop accelerometer
     call    I2C_sleep_compass               ; Stop compass
@@ -501,9 +509,17 @@
     bra     customview_toggle_exit          ; No GF info for non-GF modes
     call    TFT_gf_mask_cGF                 ; Setup Mask - current GF only
     call    TFT_gf_info                     ; Show GF informations
-
     bra		customview_toggle_exit
 
+customview_init_view10:                     ; Sensor check
+	btfsc	FLAG_apnoe_mode					; In Apnoe mode?
+	bra		customview_toggle				; yes, Call next view...
+	btfsc	FLAG_gauge_mode					; In Gauge mode?
+	bra		customview_toggle				; Yes, Call next view...
+
+    call    TFT_sensor_check_mask           ; Show ppO2 of O2 and Diluent mask
+    call    TFT_sensor_check                ; Show ppO2 of O2 and Diluent
+    bra		customview_toggle_exit
 
 customview_toggle_exit:
 	call	TFT_standard_color