# HG changeset patch
# User heinrichsweikamp
# Date 1438093975 -7200
# Node ID 573f2251cf49bf06b24374cacf46ee155b214119
# Parent  5c6da9fa5cb08bf3fbc5ce9b36c4f29bc1c131fe
NEW: Quit Simulator automatically when starting a real dive

diff -r 5c6da9fa5cb0 -r 573f2251cf49 src/changelog.txt
--- a/src/changelog.txt	Tue Jul 28 13:23:09 2015 +0200
+++ b/src/changelog.txt	Tue Jul 28 16:32:55 2015 +0200
@@ -4,6 +4,7 @@
 BUGFIX: Rotate button sensitivity with screen (OSTC 2 and cR)
 CHANGE: GF and aGF high range increased to 45-110%
 NEW: New option to download "Compact Headers". Improved BLE support (OSTC 2 and OSTC 3+)
+NEW: Quit Simulator automatically when starting a real dive
 
 [1.82]
 
diff -r 5c6da9fa5cb0 -r 573f2251cf49 src/customview.asm
--- a/src/customview.asm	Tue Jul 28 13:23:09 2015 +0200
+++ b/src/customview.asm	Tue Jul 28 16:32:55 2015 +0200
@@ -375,7 +375,8 @@
 	clrf	menupos3			            ; Reset to zero (Zero=no custom view)
     global  customview_mask
 customview_mask:	
-	call	TFT_clear_customview_divemode	
+    ; Clear custom view area in divemode
+    WIN_BOX_BLACK    dm_customview_row, dm_customview_bot, dm_customview_column, dm_customview_rgt	; top, bottom, left, right
 	WIN_SMALL	dm_customview_column,dm_customview_row
 	call	TFT_standard_color
 	movff	menupos3,WREG                   ; Menupos3 holds number of customview function
diff -r 5c6da9fa5cb0 -r 573f2251cf49 src/ms5541.asm
--- a/src/ms5541.asm	Tue Jul 28 13:23:09 2015 +0200
+++ b/src/ms5541.asm	Tue Jul 28 16:32:55 2015 +0200
@@ -173,6 +173,17 @@
 	btfss	simulatormode_active		; are we in simulator mode?
 	bra		calc_compensation_2			; no
 
+    banksel isr_xC+2
+    movlw   .5
+    cpfsgt  isr_xC+2                    ; >1280mbar ?
+    bra     pressure_extra_common2      ; No
+    ; Yes, reset sim_pressure:2 to 1000mbar (End of sim)
+    movlw   LOW     .1000
+    movwf   sim_pressure+0
+    movlw   HIGH    .1000
+    movwf   sim_pressure+1
+
+pressure_extra_common2:
 	movff	sim_pressure+0,isr_xC+1	    ; override readings with simulator values
 	movff	sim_pressure+1,isr_xC+2
 	
diff -r 5c6da9fa5cb0 -r 573f2251cf49 src/tft_outputs.asm
--- a/src/tft_outputs.asm	Tue Jul 28 13:23:09 2015 +0200
+++ b/src/tft_outputs.asm	Tue Jul 28 16:32:55 2015 +0200
@@ -557,11 +557,6 @@
     call	TFT_standard_color
     return
 
-	global	TFT_clear_customview_divemode
-TFT_clear_customview_divemode:
-    WIN_BOX_BLACK    dm_customview_row, dm_customview_bot, dm_customview_column, dm_customview_rgt	; top, bottom, left, right
-	return
-
     global	TFT_draw_gassep_line
 TFT_draw_gassep_line:
     btfsc	FLAG_apnoe_mode				; Ignore in Apnoe mode
diff -r 5c6da9fa5cb0 -r 573f2251cf49 src/tft_outputs.inc
--- a/src/tft_outputs.inc	Tue Jul 28 13:23:09 2015 +0200
+++ b/src/tft_outputs.inc	Tue Jul 28 16:32:55 2015 +0200
@@ -69,7 +69,6 @@
 	extern	TFT_divemode_warning_clear
 	extern	TFT_velocity_clear
 	extern	TFT_display_velocity
-	extern	TFT_clear_customview_divemode
 	extern	TFT_display_deko
 	extern	TFT_mask_ppo2
 	extern	TFT_display_ppo2