Mercurial > public > mk2

diff code_part1/OSTC_code_asm_part1/menu_ppO2.asm @ 575:cbdcbbc91877

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some code cleaning
author heinrichsweikamp
date Sat, 21 Apr 2012 15:08:09 +0200
parents 6e57b5bb98ce
children ab2686087bce
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/menu_ppO2.asm	Sat Apr 21 13:58:30 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_ppO2.asm	Sat Apr 21 15:08:09 2012 +0200
@@ -136,26 +136,20 @@
 	call	check_switches_logbook
 
 	btfsc	menubit3
-	bra	menu_const_ppO22	; move cursor
+	bra		menu_const_ppO22	; move cursor
 
 	btfsc	menubit2
-	bra	do_menu_const_ppO2		; call submenu
-
-	btfsc	divemode
-	goto	restart			; dive started!
+	bra		do_menu_const_ppO2		; call submenu
 
 	btfsc	onesecupdate
-	call	timeout_surfmode
-
-	btfsc	onesecupdate
-	call	set_dive_modes
+	call	menu_check_dive_and_timeout	; "Goto restart" or sets sleepmode flag
 
 	bcf		onesecupdate	; 1 sec. functions done
 
 	btfsc	sleepmode
-	bra	exit_menu_const_ppO2
+	bra		exit_menu_const_ppO2
 
-	bra	menu_const_ppO2_loop
+	bra		menu_const_ppO2_loop
 
 menu_const_ppO22:
 	incf	menupos,F