Mercurial > public > mk2

changeset 772:5d6da9ddde27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NEW: Show First Diluent (CCR Mode) permantely in surface mode
author heinrichsweikamp
date Sun, 02 Mar 2014 20:11:10 +0100
parents 3b69d3e23051
children 9e82de8dc12d
files code_part1/OSTC_code_asm_part1/definitions.asm code_part1/OSTC_code_asm_part1/outputs.asm
diffstat 2 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Tue Feb 11 13:43:53 2014 +0100
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Sun Mar 02 20:11:10 2014 +0100
@@ -22,7 +22,7 @@
 ; ToDo:
 
 #DEFINE	softwareversion_x		d'2'		; Software version  XX.YY
-#DEFINE	softwareversion_y		d'90'		; Software version  XX.YY
+#DEFINE	softwareversion_y		d'91'		; Software version  XX.YY
 
 #DEFINE softwareversion_beta 	0 			; (and 0 for release)
 
--- a/code_part1/OSTC_code_asm_part1/outputs.asm	Tue Feb 11 13:43:53 2014 +0100
+++ b/code_part1/OSTC_code_asm_part1/outputs.asm	Sun Mar 02 20:11:10 2014 +0100
@@ -1639,14 +1639,24 @@
 	WIN_INVERT	.0					; Init new Wordprocessor
 	call	DISP_standard_color
 
-	lfsr	FSR2,letter		
+	lfsr	FSR2,letter
 	read_int_eeprom	d'36'
 	movff	EEDATA,lo				; copy to lo
 	clrf	hi
 	output_16dp	d'3'		; outputs into Postinc2!
+	STRCAT_PRINT  TXT_BAR3
+
+    bsf     leftbind
+    call    get_first_diluent           ; Read first diluent into lo(O2) and hi(He)
+	WIN_TOP		.160
+	WIN_LEFT	.104
+	lfsr	FSR2,letter
+	output_8				; O2 Ratio
+	PUTC    '/'
+	movff	hi,lo
+	output_8				; He Ratio
+	STRCAT_PRINT  ""
 	bcf		leftbind
-
-	STRCAT_PRINT  TXT_BAR3
 	return								; Done.
 
 DISP_active_gas_surfmode2: