Mercurial > public > hwos_code

changeset 130:c935f7fbd39c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
no safety stop during menu display
author heinrichsweikamp
date Thu, 03 Jul 2014 19:34:41 +0200
parents a329a948cede
children 35b9da423de6
files src/changelog.txt src/ostc3.inc src/tft_outputs.asm
diffstat 3 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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