# HG changeset patch
# User heinrichsweikamp
# Date 1404408881 -7200
# Node ID c935f7fbd39c56bd0f49ff4be2c7c0c73c2cd600
# Parent  a329a948cedead9b83fb3e499336a207623c5019
no safety stop during menu display

diff -r a329a948cede -r c935f7fbd39c src/changelog.txt
--- a/src/changelog.txt	Thu Jul 03 12:08:06 2014 +0200
+++ b/src/changelog.txt	Thu Jul 03 19:34:41 2014 +0200
@@ -1,3 +1,6 @@
+New in 1.42:
+- Beta Version -
+
 New in 1.41:
 - Beta Version -
 NEW: Ceiling display (GF_hi based) in divemode
diff -r a329a948cede -r c935f7fbd39c src/ostc3.inc
--- a/src/ostc3.inc	Thu Jul 03 12:08:06 2014 +0200
+++ b/src/ostc3.inc	Thu Jul 03 19:34:41 2014 +0200
@@ -19,7 +19,7 @@
 #include <ports.inc>                        ; Portmap
 
 #DEFINE	softwareversion_x		d'1'		; Software version  XX.YY
-#DEFINE	softwareversion_y		d'41'		; Software version  XX.YY
+#DEFINE	softwareversion_y		d'42'		; Software version  XX.YY
 #DEFINE softwareversion_beta 	1 			; (and 0 for release)
 
 #DEFINE comm_service_key        0xABCDEF
diff -r a329a948cede -r c935f7fbd39c src/tft_outputs.asm
--- a/src/tft_outputs.asm	Thu Jul 03 12:08:06 2014 +0200
+++ b/src/tft_outputs.asm	Thu Jul 03 19:34:41 2014 +0200
@@ -729,6 +729,9 @@
 
     global  TFT_show_safety_stop
 TFT_show_safety_stop:
+    btfsc   divemode_menu               ; Is the dive mode menu shown?
+    return                              ; Yes, return
+
 	tstfsz	safety_stop_countdown			; Countdown at zero?
 	bra		TFT_show_safety_stop2			; No, show stop