Mercurial > public > mk2

diff code_part1/OSTC_code_asm_part1/divemode.asm @ 647:e6ac142e82b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New Diluent Submenu in Divemode
author heinrichsweikamp
date Sun, 07 Oct 2012 21:31:19 +0200
parents 3b50c9949b84
children 8c01edcf57fc
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/divemode.asm	Fri Oct 05 00:03:59 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/divemode.asm	Sun Oct 07 21:31:19 2012 +0200
@@ -2026,6 +2026,8 @@
 
 ; Read Start Gas and configure char_I_He_ratio, char_I_O2_ratio and char_I_N2_ratio
 set_first_gas:
+	btfsc	FLAG_const_ppO2_mode
+    bra     set_first_gas_ccr           ; In CCR mode
 	read_int_eeprom 	d'33'			; Read byte (stored in EEDATA)
 	movff	EEDATA,active_gas			; Read start gas (1-5)
     movff   EEDATA,char_I_current_gas
@@ -2054,3 +2056,19 @@
 	read_int_eeprom	d'27'
 	movff	EEDATA, gaslist_active
 	return
+
+set_first_gas_ccr:                      ; Set Diluent
+    movlw   .1
+    movwf   active_diluent              ; Always start with Diluent 1 (EEPROM 96/97)
+	read_int_eeprom 	d'97'			; Read He
+	movff	EEDATA,char_I_He_ratio		; And copy into hold register
+	read_int_eeprom 	d'96'			; Read O2
+	movff	EEDATA, char_I_O2_ratio		; O2 ratio
+	movff	char_I_He_ratio, wait_temp	; copy into bank1 register
+	bsf		STATUS,C					; Borrow bit
+	movlw	d'100'						; 100%
+	subfwb	wait_temp,W					; minus He
+	bsf		STATUS,C					; Borrow bit
+	subfwb	EEDATA,W					; minus O2
+	movff	WREG, char_I_N2_ratio		; = N2!
+    return
\ No newline at end of file