diff code_part1/OSTC_code_asm_part1/menu_gassetup.asm @ 121:e0f29e20bd24

Mix-type icons: check apnoe/gauge/CF#41, depth=0, and first gas. Changed colors.
author JeanDo
date Sun, 26 Dec 2010 23:49:11 +0100
parents 50a06adabc67
children 6a94f96e9cea
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/menu_gassetup.asm	Sun Dec 26 18:34:28 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/menu_gassetup.asm	Sun Dec 26 23:49:11 2010 +0100
@@ -64,7 +64,8 @@
 	movlw	':'
 	movwf	POSTINC2
 	
-	call	menu_gassetup_grey_inactive			; Sets Greyvalue for inactive gases
+	movf    decodata+0,W
+	call	PLED_grey_inactive_gas			; Sets Greyvalue for inactive gases
 	call	word_processor
 	WIN_LEFT	.40
 	movf	waitms_temp,W		; Load row into WREG
@@ -82,7 +83,8 @@
 
 ; New v1.44se
 menu_gassetup_Tx:
-	call	menu_gassetup_grey_inactive			; Sets Greyvalue for inactive gases	
+	movf    decodata+0,W
+	call	PLED_grey_inactive_gas			; Sets Greyvalue for inactive gases	
 	call	word_processor
 
 	WIN_LEFT	.48
@@ -172,7 +174,8 @@
 
 ; Changed v1.44se
 menu_gassetup_list0:
-	call	menu_gassetup_grey_inactive			; Sets Greyvalue for inactive gases
+	movf    decodata+0,W
+	call	PLED_grey_inactive_gas			; Sets Greyvalue for inactive gases
 	call	word_processor
 
 	WIN_LEFT	.105
@@ -196,7 +199,8 @@
 	output_8
 	movlw	'm'
 	movwf	POSTINC2
-	call	menu_gassetup_grey_inactive			; Sets Greyvalue for inactive gases
+	movf    decodata+0,W
+	call	PLED_grey_inactive_gas			; Sets Greyvalue for inactive gases
 	call	word_processor	
 
 	call	PLED_standard_color
@@ -1125,29 +1129,6 @@
 	movwf	POSTINC2
 	return
 
-; New v1.44se
-menu_gassetup_grey_inactive:
-; Set Greyvalue to lower value when gas is inactive
-	read_int_eeprom		d'27'	; read flag register
-	movff	decodata+0,lo		; copy gas number 0-4
-	incf	lo,F				; 1-5
-menu_gassetup_list1:
-	rrcf	EEDATA			; roll flags into carry
-	decfsz	lo,F			; max. 5 times...
-	bra		menu_gassetup_list1
-	
-	btfss	STATUS,C		; test carry
-	bra		menu_gassetup_list1_grey
-
-	GETCUSTOM8	d'35'		;movlw	color_white	
-	call	PLED_set_color	; grey out inactive gases!
-	return
-
-menu_gassetup_list1_grey:
-	movlw	color_grey
-	call	PLED_set_color	; grey out inactive gases!
-	return
-	
 gassetup_show_ppO2:
 	movf	divemins+0,W
 	addlw	0x06