Mercurial > public > mk2

changeset 657:8dd730d3a5d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
show first diluent in simulator result screen (Instead of first gas)
author heinrichsweikamp
date Thu, 01 Nov 2012 20:36:19 +0100
parents 5063fb9f07db
children 75dc320f4681
files code_part1/OSTC_code_asm_part1/pled_outputs.asm
diffstat 1 files changed, 2 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Mon Oct 29 20:05:59 2012 +0100
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Thu Nov 01 20:36:19 2012 +0100
@@ -4029,26 +4029,10 @@
 	cpfseq	decoplan_index		; All gases shown?
 	bra		PLED_simdata_screen3_loop	;no
 
-	read_int_eeprom 	d'33'			; Read byte (stored in EEDATA)
-	movff	EEDATA,active_gas			; Read start gas (1-5)
-	decf	active_gas,W				; Gas 0-4
-	mullw	d'4'
-	movf	PRODL,W			
-	addlw	d'7'						; = address for He ratio
-	movwf	EEADR
-	call	read_eeprom					; Read He ratio
-	movff	EEDATA,hi		; And copy into hold register
-	decf	active_gas,W				; Gas 0-4
-	mullw	d'4'
-	movf	PRODL,W			
-	addlw	d'6'						; = address for O2 ratio
-	movwf	EEADR
-	call	read_eeprom					; Read O2 ratio
-	movff	EEDATA, lo		; O2 ratio
-
+    ; Show Diluent
+    call    get_first_diluent           ; Read first diluent into lo(O2) and hi(He)
 	WIN_LEFT	.0
 	WIN_TOP		.110
-
 	STRCPY  TXT_DIL4
 	output_8				; O2 Ratio
 	STRCAT  "/"
@@ -4059,8 +4043,6 @@
 	bcf		leftbind
 	return				; Return (CC Mode)
 
-
-
 adjust_depth_with_salinity:			; computes salinity setting into lo:hi [mbar]
 
 	btfsc	simulatormode_active	; Do apply salinity in Simulatormode