diff code_part1/OSTC_code_asm_part1/pled_outputs.asm @ 24:571a79f1d06a

1.61 beta rc1
author heinrichsweikamp
date Wed, 05 May 2010 18:55:50 +0200
parents 70215309143d
children
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Tue May 04 19:23:21 2010 +0200
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Wed May 05 18:55:50 2010 +0200
@@ -809,15 +809,35 @@
 	btfsc	multi_gf_display			; Is the Multi-GF Table displayed?
 	return								; Yes, No update and return!
 
+	WIN_INVERT	.0					; Init new Wordprocessor	
+	call	PLED_active_gas_divemode_show	; Show gas (Non-Inverted in all cases)
+
+	btfss	better_gas_available	;=1: A better gas is available and a gas change is advised in divemode
+	return					; Done.
+
+; Check if Gas Output should blink when a better gas is available...
+	GETCUSTOM8	d'42'			; =1 if gas should blink
+	movwf	lo
+	movlw	d'1'
+	cpfseq	lo					; =1?
+	return						; No, Done.
+
+	btg		blinking_better_gas		; Toggle blink bit...
+	btfss	blinking_better_gas		; blink now?
+	return							; No, Done.
+	WIN_INVERT	.1					; Init new Wordprocessor	
+	call	PLED_active_gas_divemode_show	; Show gas (Non-Inverted in all cases)
+	WIN_INVERT	.0					; Init new Wordprocessor	
+	return							; Done.
+
+PLED_active_gas_divemode_show:
 	ostc_debug	's'		; Sends debug-information to screen if debugmode active
 ; gas
 	WIN_TOP		.192
 	WIN_LEFT	.65
 	WIN_FONT 	FT_SMALL
-	WIN_INVERT	.0					; Init new Wordprocessor
 	call	PLED_standard_color
 
-
 	movlw	d'100'						; 100% in the tank
 	movff	char_I_N2_ratio,lo			; minus N2
 	bsf		STATUS,C					; set borrow bit
@@ -854,7 +874,7 @@
 	movlw	'*'
 	movwf	POSTINC2
 	call	word_processor
-	bra		PLED_active_gas_divemode_exit
+	return
 
 PLED_active_gas_divemode4:
 	lfsr	FSR2,letter
@@ -870,23 +890,8 @@
 	movwf	POSTINC2
 	bcf		leftbind
 	call	word_processor
-
-PLED_active_gas_divemode_exit:
-	btfss	better_gas_available	;=1: A better gas is available and a gas change is advised in divemode
-	return					; Done.
-
-; Check if Gas Output should blink when a better gas is available...
-	GETCUSTOM8	d'42'			; =1 if gas should blink
-	movwf	lo
-	movlw	d'1'
-	cpfseq	lo					; =1?
-	return						; No, Done.
-
-	btg		blinking_better_gas		; Toggle blink bit...
-	btfss	blinking_better_gas		; blink now?
-	return							; No, Done.
-	call	PLED_active_gas_clear	; Blink once.
-	return							; Done.
+	return
+
 
 
 PLED_display_decotype_surface:
@@ -3194,29 +3199,29 @@
 
 PLED_gaschange_DEBUG:
 	WIN_LEFT	.0
-	WIN_TOP		.164
+	WIN_TOP		.160
 	lfsr	FSR2,letter
 	movff	char_I_deco_He_ratio,lo
 	output_8
 	call	word_processor
 
-	WIN_LEFT	.60
-	WIN_TOP		.164
+	WIN_LEFT	.25
+	WIN_TOP		.160
 	call	PLED_SetRow
 	lfsr	FSR2,letter
 	movff	char_I_deco_N2_ratio,lo
 	output_8
 	call	word_processor
 
-	WIN_LEFT	.120
-	WIN_TOP		.164
+	WIN_LEFT	.50
+	WIN_TOP		.160
 	lfsr	FSR2,letter
 	movff	char_I_deco_gas_change,lo
 	output_8
 	call	word_processor
 
-	WIN_LEFT	.140
-	WIN_TOP		.164
+	WIN_LEFT	.75
+	WIN_TOP		.160
 	lfsr	FSR2,letter
 	movff	hi,lo
 	output_8