# HG changeset patch
# User heinrichsweikamp
# Date 1292407295 -3600
# Node ID 2a2606e9db5fbf4eaa79c8cc0c75a1a69c51ed87
# Parent  fe195f7660144b6be4a5e50202b4a237647c4411
some fixes with the onboard simulator

diff -r fe195f766014 -r 2a2606e9db5f code_part1/OSTC_code_asm_part1/definitions.asm
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Tue Dec 14 11:14:32 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Wed Dec 15 11:01:35 2010 +0100
@@ -596,7 +596,7 @@
 #DEFINE	FLAG_active_descent		flag8,3	;=1: A Descent in Apnoe mode is active
 #DEFINE	display_see_deco		flag8,4	;=1: Display decoplan in Divemode
 #DEFINE	display_set_gas			flag8,5	;=1: Display Gaslist menu in Divemode
-#DEFINE	display_set_graphs		flag8,6	;=1: Display "Display Menu" in Divemode
+;free flag8,6	;=1: 
 #DEFINE	rs232_recieve_overflow	flag8,7	;=1: An RS232 timeout overflow occoured
 
 #DEFINE	nofly_active			flag9,0	;=1: Do not fly!
diff -r fe195f766014 -r 2a2606e9db5f code_part1/OSTC_code_asm_part1/divemode_menu.asm
--- a/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Tue Dec 14 11:14:32 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Wed Dec 15 11:01:35 2010 +0100
@@ -148,18 +148,12 @@
 	bcf		premenu					; clear premenu flag
 	clrf	timeout_counter3
 
-;	btfsc	display_see_l_tissue		; Is the leading tissue info screen active
-;	bra		divemenu_see_leading_tissue2; Yes, quit menu
-
 	btfsc	display_set_gas				; Are we in the "Gaslist" or "SetPoint" menu?
 	bra		divemenu_set_gas2			; Yes, so set gas and exit menu
 
 	btfsc 	display_see_deco			; Is the Decoplan displayed?
 	bra		divemenu_see_decoplan2		; Yes, exit menu on right button press
 
-	btfsc 	display_set_graphs			; Is the Graph displayed?
-	bra		divemode_set_graphs2		; Yes, exit menu on right button press
-
 	btfsc	display_set_xgas			; Are we in the "Set Gas" menu?
 	bra		divemenu_set_xgas2			; Yes, so configure gas or set menu and exit menu
 
@@ -278,7 +272,8 @@
 	bcf		premenu					; clear premenu flag
 	bcf		switch_right
 	bcf		switch_left				; Left button pressed!
-	bsf		display_set_simulator		; Set Flag
+	bsf		display_set_simulator	; Set Flag
+	bsf		menu3_active			; So "+1" is accessible at all times
 	call	PLED_clear_divemode_menu	; Clear Menu
 	call	PLED_divemode_simulator_mask; Show mask
 	movlw	d'1'
@@ -372,18 +367,6 @@
 	movwf	menupos						; reset cursor
 	bra		divemode_menu_simulator_common
 
-divemode_set_graphs:
-	bsf		display_set_graphs			; set flag
-	call	PLED_clear_divemode_menu	; Clear Menu
-	call	deco_main_calc_desaturation_time	; calculate desaturation time
-	movlb	b'00000001'						; select ram bank 1
-	call	PLED_saturation_graph_divemode	; Display saturation graph
-	return
-
-divemode_set_graphs2:
-	bcf		display_set_graphs			; clear flag
-	bra		timeout_divemenu2			; quit menu!
-
 divemenu_see_decoplan:
 	bsf		display_see_deco			; set flag
 	call	PLED_clear_divemode_menu	; Clear Menu
@@ -396,10 +379,6 @@
 	bsf		multi_gf_display			; Yes, display the multi-gf table screen
 	bcf		last_ceiling_gf_shown		; Clear flag
 
-;	movff	char_O_deco_status,deco_status		; 
-;	tstfsz	deco_status							; deco_status=0 if decompression calculation done
-;	return										; calculation not yet finished!
-
 	call	PLED_decoplan_gf_page1			; Display the new screen
 	return
 	
@@ -694,9 +673,7 @@
 	call	customview_mask			; Redraw current customview mask
 	clrf	timeout_counter3		; Also clear timeout
 	bcf		display_see_deco		; clear all display flags
-;	bcf		display_see_l_tissue
 	bcf		display_set_gas			
-	bcf		display_set_graphs
 	bcf		display_set_xgas
 	bcf		display_set_setpoint
 	bcf		display_set_simulator
@@ -718,8 +695,3 @@
 	call	PLED_divemode_simulator_mask; Show mask
 	call	PLED_divemenu_cursor		; update cursor
 	bra		timeout_divemenu1			; Check timeout
-	
-;timeout_divemenu7:
-;	; Update Leading tissue infos
-;	call	PLED_show_leading_tissue	; Update infos about leading tissue	
-;	bra		timeout_divemenu1			; Check timeout
\ No newline at end of file
diff -r fe195f766014 -r 2a2606e9db5f code_part1/OSTC_code_asm_part1/pled_outputs.asm
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Tue Dec 14 11:14:32 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Wed Dec 15 11:01:35 2010 +0100
@@ -2449,7 +2449,7 @@
 	return
 
 PLED_divemode_simulator_mask:
-	DISPLAYTEXT	.254			; EXIT
+	DISPLAYTEXT	.254			; Close
 	DISPLAYTEXT	.250			; + 1m
 	DISPLAYTEXT	.251			; - 1m
 	DISPLAYTEXT	.252			; +10m
@@ -2802,7 +2802,7 @@
 	movff	WREG,box_temp+2		; row bottom (0-239)
 	movlw	.082
 	movff	WREG,box_temp+3		; column left (0-159)
-	movlw	.159	
+movlw	.160
 	movff	WREG,box_temp+4		; column right (0-159)
 	call	PLED_box
 	return
diff -r fe195f766014 -r 2a2606e9db5f code_part1/OSTC_code_asm_part1/text_table.asm
--- a/code_part1/OSTC_code_asm_part1/text_table.asm	Tue Dec 14 11:14:32 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/text_table.asm	Wed Dec 15 11:01:35 2010 +0100
@@ -400,7 +400,7 @@
 	
 	DB	.100,.50			;281
 	DB	.90,.170			;282	Lead Tiss.
-	DB	.90,.170			;283	Stopwatch
+	DB	.93,.170			;283	Stopwatch
 	DB	.20,.95				;284
 	DB	.20,.125			;285
 
@@ -677,7 +677,7 @@
 	DA	"- 1m}}"				;251		l=6
 	DA	"+10m}}"				;252		l=6
 	DA	"-10m}}"				;253		l=6
-	DA	"Exit}}"				;254		l=6
+	DA	"Close}"				;254		l=6
 	DA	"Time}}"				;255		l=6
 	
 ; Text Bank2 (Texts 256-511):