# HG changeset patch
# User heinrichsweikamp
# Date 1349262722 -7200
# Node ID 420e62cd88ad2bfa658b0340a5c943bdf6d54039
# Parent  3b50c9949b84134ab5d8964c6523540b6fb1359e
point to correct diluent location

diff -r 3b50c9949b84 -r 420e62cd88ad code_part1/OSTC_code_asm_part1/dive_icons.asm
--- a/code_part1/OSTC_code_asm_part1/dive_icons.asm	Wed Oct 03 12:40:00 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/dive_icons.asm	Wed Oct 03 13:12:02 2012 +0200
@@ -41,6 +41,8 @@
             return                      ; YES: just return.
             btfsc   gauge_mode          ; gauge mode ?
             return                      ; YES: also return.
+            btfsc   FLAG_const_ppO2_mode; Not in CC modes
+            return
             
             ;---- Don't display CF#41 is false -------------------------------
             GETCUSTOM8  d'41'           ; Read CF#41
diff -r 3b50c9949b84 -r 420e62cd88ad code_part1/OSTC_code_asm_part1/menu_custom.asm
--- a/code_part1/OSTC_code_asm_part1/menu_custom.asm	Wed Oct 03 12:40:00 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_custom.asm	Wed Oct 03 13:12:02 2012 +0200
@@ -899,6 +899,7 @@
     movff   cf_checker_counter,lo
     output_99x
 	STRCAT_PRINT "!"
+    WIN_INVERT	.0					    ; Init new Wordprocessor
     
     ; When failed, increment counter modulo 64, to restart checks.
     incf    cf_checker_counter,W
diff -r 3b50c9949b84 -r 420e62cd88ad code_part1/OSTC_code_asm_part1/menu_gassetup.asm
--- a/code_part1/OSTC_code_asm_part1/menu_gassetup.asm	Wed Oct 03 12:40:00 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_gassetup.asm	Wed Oct 03 13:12:02 2012 +0200
@@ -163,6 +163,7 @@
 	movwf	EEADR
 	call	read_eeprom			; Low-value
 	movff	EEDATA,lo
+ 
 	output_8
     PUTC	TXT_METER_C
 	movf    decodata+0,W
diff -r 3b50c9949b84 -r 420e62cd88ad code_part1/OSTC_code_asm_part1/pled_outputs.asm
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Wed Oct 03 12:40:00 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Wed Oct 03 13:12:02 2012 +0200
@@ -1450,18 +1450,12 @@
 	cpfseq	apnoe_mins          ; All gases shown?
 	bra		PLED_pre_dive_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'6'						; = address for O2 ratio
-	movwf	EEADR
-	call	read_eeprom                 ; Read O2 ratio
-	movff	EEDATA, lo                  ; O2 ratio
-	incf	EEADR,F                     ; = address for He
-	call	read_eeprom					; Read He ratio
-	movff	EEDATA,hi                   ; And copy into hold register
+    movlw   .1
+    movwf   EEADRH
+	read_int_eeprom 	d'96'			; Read O2
+	movff	EEDATA,lo
+	read_int_eeprom 	d'97'			; Read He
+    clrf    EEADRH
 
 	WIN_LEFT	.90
 	WIN_TOP		.100
diff -r 3b50c9949b84 -r 420e62cd88ad code_part1/OSTC_code_asm_part1/surfmode.asm
--- a/code_part1/OSTC_code_asm_part1/surfmode.asm	Wed Oct 03 12:40:00 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/surfmode.asm	Wed Oct 03 13:12:02 2012 +0200
@@ -135,7 +135,7 @@
 	call	set_leds_surfmode			; Sets Warning and No-Fly LEDs
 	call    check_customfunctions       ; Checks CF functions and displays warning symbol if something critical is wrong
 	call	surfcustomview_second		; Do every-second tasks for the custom view area
-	call    dive_type_icons             ; Draw Air/Nitrox/Trimix color icon.
+  	call    dive_type_icons             ; Draw Air/Nitrox/Trimix color icon.
 
 ; Every 2 seconds, overwrite with GF value (if needed to display)
     btfsc   secs,1                      ; Alternating every 2sec (if needed)