# HG changeset patch
# User heinrichsweikamp
# Date 1372011631 -7200
# Node ID 65822fa08333fa10da6c573d7a63894e32a3cc0b
# Parent  b064dd9c9899f8cb7ff1b5a081272ab4b4afc183
use "first Gas" as first bailout

diff -r b064dd9c9899 -r 65822fa08333 code_part1/OSTC_code_asm_part1/divemode_menu.asm
--- a/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Wed Jun 19 11:21:09 2013 +0200
+++ b/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Sun Jun 23 20:20:31 2013 +0200
@@ -665,18 +665,26 @@
 	btfss	FLAG_const_ppO2_mode		; are we in ppO2 mode?
 	bra		divemenu_set_gas2a			; no, choose gas
 	; Yes, so select SP 1-3
-	bcf		is_bailout					;=1: CC mode, but bailout active!		
-	call	DISP_show_ppO2_clear		; Clear ppO2 value
 	
 divemenu_set_gas1:
 	movlw	d'1'				
 	cpfseq	menupos						; At the "Bailout" position?		
 	bra		divemenu_set_gas1b			; No, select SetPoint 1-3 or Diluent
-	bsf		select_bailoutgas			; Set Flag
+
+    bsf		select_bailoutgas			; Set Flag
 	bcf		display_set_setpoint		; Clear Flag
+    btfsc   is_bailout                  ; Already in bailout?
+	bra		divemenu_set_gas_2			; Yes.
+    
+    ;Setup first gas as better gas
+    bsf     better_gas_available
+    read_int_eeprom .33                 ; 1-5
+    movff   EEDATA,better_gas_number
 	bra		divemenu_set_gas_2			; Configure the extra gas / Select Bailout
 
 divemenu_set_gas1b:
+	bcf		is_bailout					;=1: CC mode, but bailout active!
+	call	DISP_show_ppO2_clear		; Clear ppO2 value
 	movlw	d'5'
 	cpfseq	menupos						; At the "Diluent" position?
 	bra		divemenu_set_gas1c			; No, select SetPoint 1-3
diff -r b064dd9c9899 -r 65822fa08333 code_part1/OSTC_code_asm_part1/outputs.asm
--- a/code_part1/OSTC_code_asm_part1/outputs.asm	Wed Jun 19 11:21:09 2013 +0200
+++ b/code_part1/OSTC_code_asm_part1/outputs.asm	Sun Jun 23 20:20:31 2013 +0200
@@ -3105,6 +3105,7 @@
 	cpfseq	hi				; All gases shown?
 	bra		DISP_gas_list_loop	; No
 
+    WIN_INVERT	.0
 	DISPLAYTEXT		d'122'		; More
 	return					;  return (OC mode)