# HG changeset patch
# User heinrichsweikamp
# Date 1293201627 -3600
# Node ID 50a06adabc6782ab06c99040e97016fdf6d03c8d
# Parent  e39a6415df3daaf12fb6b45a83dd87d1ae6cccde
First gas is active, Gauge mode display

diff -r e39a6415df3d -r 50a06adabc67 code_part1/OSTC_code_asm_part1/changelog.txt
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Thu Dec 23 18:35:28 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Fri Dec 24 15:40:27 2010 +0100
@@ -1,3 +1,8 @@
+New in 1.75 Beta:
+BETA Version - Do NOT use for diving!
+BUGFIX: Decomask in Gauge mode removed
+
+
 New in 1.74 Beta:
 BETA Version - Do NOT use for diving!
 NEW: Added END (Equivalent narcotic depth) for GasSetup
diff -r e39a6415df3d -r 50a06adabc67 code_part1/OSTC_code_asm_part1/customview.asm
--- a/code_part1/OSTC_code_asm_part1/customview.asm	Thu Dec 23 18:35:28 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/customview.asm	Fri Dec 24 15:40:27 2010 +0100
@@ -149,7 +149,7 @@
 	bra		surfcustomview_mask	; No, show
 	clrf	menupos3			; Reset to zero (Zero=no custom view)
 surfcustomview_mask:	
-	call	PLED_clear_customview_surfacemode
+	call	PLED_clear_customview_surfmode
 	movff	menupos3,temp1		; Menupos3 holds number of customview function
 	dcfsnz	temp1,F
 	bra		surfcustomview_init_graphs			; Show the tissue graphs
diff -r e39a6415df3d -r 50a06adabc67 code_part1/OSTC_code_asm_part1/definitions.asm
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Thu Dec 23 18:35:28 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Fri Dec 24 15:40:27 2010 +0100
@@ -37,14 +37,6 @@
 
 #DEFINE		AAFONTS				; The nicer fonts (not working yet...)
 
-; Define max. 5 Binary Custom Functions here (add more in menu_custom.asm)
-#DEFINE	binary_cf1				d'31'
-#DEFINE	binary_cf2				d'38'
-#DEFINE	binary_cf3				d'39'
-#DEFINE	binary_cf4				d'40'
-#DEFINE	binary_cf5				d'41'
-#DEFINE	binary_cf6				d'42'
-
 ; Color Definitions: 8Bit RGB b'RRRGGGBB'
 ;#DEFINE	color_red	b'11100000'
 #DEFINE	color_blue	b'00000011'
diff -r e39a6415df3d -r 50a06adabc67 code_part1/OSTC_code_asm_part1/divemode.asm
--- a/code_part1/OSTC_code_asm_part1/divemode.asm	Thu Dec 23 18:35:28 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/divemode.asm	Fri Dec 24 15:40:27 2010 +0100
@@ -1587,14 +1587,6 @@
 	clrf	POSTINC0
 	clrf	POSTINC0
 
-;; Start with active Stopwatch?
-;	bsf			stopwatch_active
-;	GETCUSTOM8	d'41'			; =1: Start with active Stopwatch
-;	movwf		lo
-;	movlw		d'1'
-;	cpfseq		lo						; CF41=1?
-;	bcf			stopwatch_active		; No!
-
 ; Init profile recording parameters	
 	GETCUSTOM8	d'20'			; sample rate
 	movwf	samplesecs_value	; to avoid EEPROM access in the ISR
diff -r e39a6415df3d -r 50a06adabc67 code_part1/OSTC_code_asm_part1/divemode_menu.asm
--- a/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Thu Dec 23 18:35:28 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Fri Dec 24 15:40:27 2010 +0100
@@ -211,16 +211,6 @@
 	call	PLED_depth					; Displays new depth...
 	call	PLED_max_pressure			; ...and max. depth
 
-	btfsc	FLAG_apnoe_mode				; Ignore in Apnoe mode
-	bra		timeout_divemenu2			; quit menu!
-	btfsc	gauge_mode					; Ignore in Gauge mode
-	bra		timeout_divemenu2			; quit menu!
-
-; Redraw Outputs in Deco modes
-	btfsc	dekostop_active
-	call	PLED_display_deko_mask		; clear nostop time, display decodata
-	btfss	dekostop_active
-	call	PLED_display_ndl_mask		;  Clear deco data, display nostop time
 	bra		timeout_divemenu2			; quit menu!
 
 divemode_set_xgas:						; Set the extra gas...
@@ -621,11 +611,17 @@
 	cpfsgt	timeout_counter3		; ... longer then timeout_divemenu
 	return							; No!
 timeout_divemenu2:					; quit divemode menu
-	btfss	multi_gf_display		; Was the Multi-GF Table displayed?
-	bra		timeout_divemenu2a		; No, normal OLED rebuild
+;	btfss	multi_gf_display		; Was the Multi-GF Table displayed?
+;	bra		timeout_divemenu2a		; No, normal OLED rebuild
 
 ; Restore some outputs
 	clrf	temp8					; Page 0-1 of deco list
+
+	btfsc	FLAG_apnoe_mode				; Ignore in Apnoe mode
+	bra		timeout_divemenu2a			; skip!
+	btfsc	gauge_mode					; Ignore in Gauge mode
+	bra		timeout_divemenu2a			; skip!
+
 	btfsc	dekostop_active
 	call	PLED_display_deko_mask	; clear nostop time, display decodata
 	btfss	dekostop_active
@@ -639,10 +635,6 @@
 	call	PLED_clear_divemode_menu; Clear dive mode menu
 	call	PLED_divemode_mask		; Display mask
 	call	PLED_divemins			; Display (new) divetime!
-	btfss	dekostop_active
-	call	PLED_display_ndl_mask
-	btfsc	dekostop_active
-	call	PLED_display_deko_mask
 	call	customview_mask			; Redraw current customview mask
 	clrf	timeout_counter3		; Also clear timeout
 	bcf		display_see_deco		; clear all display flags
diff -r e39a6415df3d -r 50a06adabc67 code_part1/OSTC_code_asm_part1/menu_gassetup.asm
--- a/code_part1/OSTC_code_asm_part1/menu_gassetup.asm	Thu Dec 23 18:35:28 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/menu_gassetup.asm	Fri Dec 24 15:40:27 2010 +0100
@@ -885,6 +885,23 @@
 	movlw	d'33'
 	movwf	EEADR
 	call	write_eeprom			; store in internal EEPROM
+
+; Set First gas to "Active"
+	read_int_eeprom		d'27'		; read flag register
+	movff	decodata+0,lo			; selected gas 0-4
+	incf	lo,F
+	dcfsnz	lo,F
+	bsf		EEDATA,0
+	dcfsnz	lo,F
+	bsf		EEDATA,1
+	dcfsnz	lo,F
+	bsf		EEDATA,2
+	dcfsnz	lo,F
+	bsf		EEDATA,3
+	dcfsnz	lo,F
+	bsf		EEDATA,4
+	write_int_eeprom	d'27'		; write flag register
+
 	movlw	d'3'
 	movwf	menupos
 	bra		next_gas_page1
@@ -1160,30 +1177,8 @@
 	WIN_TOP		.35
 	lfsr	FSR2,letter
 	OUTPUTTEXT 	d'149'		; (ppO2:
-;	movlw	'('
-;	movwf	POSTINC2
-;	movlw	'p'
-;	movwf	POSTINC2
-;	movlw	'p'
-;	movwf	POSTINC2
-;	movlw	'O'
-;	movwf	POSTINC2
-;	movlw	'2'
-;	movwf	POSTINC2
-;	movlw	':'
-;	movwf	POSTINC2
 	output_16dp	d'3'
 	OUTPUTTEXT 	d'150'		; Bar: 
-;	movlw	'B'
-;	movwf	POSTINC2
-;	movlw	'a'
-;	movwf	POSTINC2
-;	movlw	'r'
-;	movwf	POSTINC2
-;	movlw	')'
-;	movwf	POSTINC2
-;	movlw	' '
-;	movwf	POSTINC2
 	call	word_processor
 	return
 
diff -r e39a6415df3d -r 50a06adabc67 code_part1/OSTC_code_asm_part1/menu_reset.asm
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm	Thu Dec 23 18:35:28 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm	Fri Dec 24 15:40:27 2010 +0100
@@ -154,9 +154,9 @@
 	CF_DEFAULT    CF_BOOL,	    d'0',   0,      0       ; show_seconds_divemode		=1 Show the seconds in Divemode
 	CF_DEFAULT    CF_INT15,     0,      0,      0 		; UNUSED
 	CF_DEFAULT    CF_BOOL,	    d'1',   0,      0       ; warn_ceiling_divemode		=1 Warn ceiling violation in divemode
-	CF_DEFAULT    CF_BOOL, 	    d'0',   0,      0       ; start_with_stopwatch		=1 start with stopwatch
+	CF_DEFAULT    CF_INT15,     0,      0,      0 		; UNUSED
     
-	CF_DEFAULT    CF_BOOL,	    d'0',   0,      0       ; blink_gas_divemode 		=1 Show (resetable) average Depth instead of temperature
+	CF_DEFAULT    CF_BOOL,	    d'0',   0,      0       ; blink_gas_divemode 		=1 blink better gas
 	CF_DEFAULT    CF_INT15,     d'13000', 0,   d'13000' ; color_warn_depth_mBar		Warn depths
 	CF_DEFAULT    CF_PERCENT,	d'101', d'50',  d'101'	; color_warn_cns_percent    Warn-%
 	CF_DEFAULT    CF_PERCENT,	d'101', d'50',  d'101'  ; color_warn_gf_percent		Warn-%
diff -r e39a6415df3d -r 50a06adabc67 code_part1/OSTC_code_asm_part1/pled_outputs.asm
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Thu Dec 23 18:35:28 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Fri Dec 24 15:40:27 2010 +0100
@@ -405,7 +405,7 @@
 	call	PLED_box
 	return
 
-PLED_clear_customview_surfacemode:
+PLED_clear_customview_surfmode:
 	movlw	.0
 	movff	WREG,box_temp+0		; Data
 	movlw	.25
diff -r e39a6415df3d -r 50a06adabc67 code_part1/OSTC_code_asm_part1/text_table.asm
--- a/code_part1/OSTC_code_asm_part1/text_table.asm	Thu Dec 23 18:35:28 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/text_table.asm	Fri Dec 24 15:40:27 2010 +0100
@@ -576,7 +576,7 @@
 	DA	"Divemode secs. }"		;160
 	DA	"not used       }"		;161
 	DA	"Warn Ceiling   }"		;162
-	DA	"Average Depth  }"		;163
+	DA	"not used       }"		;163
 	DA	"Blink BetterGas}"		;164
 	DA	"DepthWarn[mBar]}"		;165
 	DA	"CNS warning [%]}"		;166