diff code_part1/OSTC_code_asm_part1/customview.asm @ 111:ed7826c740a0

1.74beta rc1
author heinrichsweikamp
date Wed, 22 Dec 2010 09:37:24 +0100
parents a2b9eca1f396
children 9500f431248a
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/customview.asm	Wed Dec 22 03:23:55 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/customview.asm	Wed Dec 22 09:37:24 2010 +0100
@@ -100,8 +100,8 @@
 
 customview_toggle:		; Yes, show next customview (and delete this flag)
 	incf	menupos3,F			; Number of customview to show
-	movlw	d'5'				; Max number+1
-	cpfseq	menupos3			; Max reached?
+	movlw	d'4'				; Max number
+	cpfsgt	menupos3			; Max reached?
 	bra		customview_mask		; No, show
 	clrf	menupos3			; Reset to zero (Zero=no custom view)
 customview_mask:	
@@ -144,8 +144,8 @@
 
 surfcustomview_toggle:			; Yes, show next customview (and delete this flag)
 	incf	menupos3,F			; Number of customview to show
-	movlw	d'3'				; Max number+1
-	cpfseq	menupos3			; Max reached?
+	movlw	d'4'				; Max number
+	cpfsgt	menupos3			; Max reached?
 	bra		surfcustomview_mask	; No, show
 	clrf	menupos3			; Reset to zero (Zero=no custom view)
 surfcustomview_mask:	
@@ -155,6 +155,10 @@
 	bra		surfcustomview_init_graphs			; Show the tissue graphs
 	dcfsnz	temp1,F
 	bra		surfcustomview_init_gaslist			; Show pre-dive gaslist/setpoint list
+	dcfsnz	temp1,F
+	bra		surfcustomview_init_interval		; Show the interval counter
+	dcfsnz	temp1,F
+	bra		surfcustomview_init_cfview			; Show the interval counter
 ;	bra		surfcustomview_init_nocustomview	; menupos3=0 -> No Customview
 surfcustomview_init_nocustomview:
 	bra		surfcustomview_toggle_exit	
@@ -167,6 +171,30 @@
 	call	PLED_pre_dive_screen				; Show the Gaslist/Setpoint list
 	bra		surfcustomview_toggle_exit	
 
+surfcustomview_init_interval:
+	DISPLAYTEXT	d'189'							; Surface
+	DISPLAYTEXT	d'240'							; Interval:
+	call	PLED_interval						; Display the interval
+	bra		surfcustomview_toggle_exit	
+
+surfcustomview_init_cfview:
+	read_int_eeprom		d'34'					; Get Decomode
+	incf	EEDATA,W							; +1 -> WREG
+	movwf	temp10
+	dcfsnz	temp10,F
+	call	PLED_show_cf11_cf12_cf29			; =0 (ZH-L16 OC)
+	dcfsnz	temp10,F
+	bra		surfcustomview_toggle_exit			; =1 (Gauge)
+	dcfsnz	temp10,F
+	call	PLED_show_cf11_cf12_cf29			; =2 (ZH-L16 CC)
+	dcfsnz	temp10,F
+	bra		surfcustomview_toggle_exit			; =3 (Apnoe)
+	dcfsnz	temp10,F
+	call	PLED_show_cf32_cf33_cf29			; =4 (L16-GF OC)
+	dcfsnz	temp10,F
+	call	PLED_show_cf32_cf33_cf29			; =5 (L16-GF CC)
+	bra		surfcustomview_toggle_exit	
+
 surfcustomview_toggle_exit:
 	bcf		toggle_customview			; Clear flag
 
@@ -179,11 +207,16 @@
 	bra		surfcustomview_1sec_graphs		; Update the Graphs
 	dcfsnz	temp1,F
 	bra		surfcustomview_1sec_gaslist		; Update the Gaslist/SetPoint List
+	dcfsnz	temp1,F
+	bra		surfcustomview_1sec_interval	; Update the Interval display
+	dcfsnz	temp1,F
+	bra		surfcustomview_1sec_cfview		; Update the critical cf view
 	; Menupos3=0, do nothing
 	return
-	
+surfcustomview_1sec_cfview:				; Do nothing extra
 surfcustomview_1sec_graphs:				; Do nothing extra
-surfcustomview_1sec_gaslist:				; Do nothing extra
+surfcustomview_1sec_gaslist:			; Do nothing extra
+surfcustomview_1sec_interval:			; Do nothing extra
 	return
 
 
@@ -193,6 +226,10 @@
 	bra		surfcustomview_minute_graphs		; Update the Graphs
 	dcfsnz	temp1,F
 	bra		surfcustomview_minute_gaslist		; Update the Gaslist/SetPoint List
+	dcfsnz	temp1,F
+	bra		surfcustomview_minute_interval		; Update the Interval display
+	dcfsnz	temp1,F
+	bra		surfcustomview_minute_cfview			; Update the critical cf view
 	; Menupos3=0, do nothing
 	return
 
@@ -200,5 +237,10 @@
 	call	PLED_tissue_saturation_graph		; Draw/Update the graphs
 	return
 
+surfcustomview_minute_interval:
+	call	PLED_interval						; Display the interval	
+	return
+
 surfcustomview_minute_gaslist:					; Do nothing extra
-	return
+surfcustomview_minute_cfview:					; Do nothing extra
+	return
\ No newline at end of file