Mercurial > public > mk2

diff code_part1/OSTC_code_asm_part1/divemode_menu.asm @ 119:f24137eb85de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Background debugger now shows STKPTR
author heinrichsweikamp
date Sun, 26 Dec 2010 18:34:28 +0100
parents 50a06adabc67
children 4f9f477bb452
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Sun Dec 26 17:02:59 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Sun Dec 26 18:34:28 2010 +0100
@@ -160,7 +160,7 @@
 	bra		divemode_toggle_brightness	; Toggle OLED-Brightness
 	dcfsnz	menupos,F
 	bra		timeout_divemenu2			; Quit divemode menu
-	return
+	bra		timeout_divemenu2			; Quit divemode menu
 
 divemode_menu3:
 	movff	menupos3,temp1		; copy
@@ -175,7 +175,6 @@
 
 divemode_menu3_nothing:
 	bra		timeout_divemenu2			; Quit divemode menu
-	return
 
 set_marker:
 	movlw	d'6'				; Type of Alarm  (Manual Marker)
@@ -246,7 +245,7 @@
 
 divemode_menu_simulator2:
 	dcfsnz	menupos,F
-	bra		timeout_divemenu2			; quit underwater menu!
+	bra		timeout_divemenu2			; close underwater menu!
 	dcfsnz	menupos,F
 	bra		divemode_menu_simulator_p1	; Adjust +1m
 	dcfsnz	menupos,F
@@ -260,20 +259,20 @@
 divemode_menu_simulator_common:
 	call	PLED_divemode_simulator_mask		; Redraw Simualtor mask
 
-	; Check limits (140m and 0m)
-	movlw	LOW		d'15000'
+	; Check limits (130m and 0m)
+	movlw	LOW		d'14000'
 	movwf	sub_a+0
-	movlw	HIGH	d'15000'
+	movlw	HIGH	d'14000'
 	movwf	sub_a+1
 	movff	sim_pressure+0,sub_b+0
 	movff	sim_pressure+1,sub_b+1
 	call	sub16				; sub_c = sub_a - sub_b
 	btfss	neg_flag	
 	bra		divemode_menu_simulator_common2
-	; Too deep, limit to 140m
-	movlw	LOW		d'15000'
+	; Too deep, limit to 130m
+	movlw	LOW		d'14000'
 	movwf	sim_pressure+0
-	movlw	HIGH	d'15000'
+	movlw	HIGH	d'14000'
 	movwf	sim_pressure+1
 	return
 
@@ -616,6 +615,7 @@
 
 ; Restore some outputs
 	clrf	temp8					; Page 0-1 of deco list
+	call	PLED_clear_divemode_menu; Clear dive mode menu
 
 	btfsc	FLAG_apnoe_mode				; Ignore in Apnoe mode
 	bra		timeout_divemenu2a			; skip!
@@ -632,7 +632,6 @@
 	bcf		menubit
 	bcf		premenu					; Yes, clear flags and menu, display dive time and mask again
 	call	PLED_active_gas_divemode; Display gas, if required
-	call	PLED_clear_divemode_menu; Clear dive mode menu
 	call	PLED_divemode_mask		; Display mask
 	call	PLED_divemins			; Display (new) divetime!
 	call	customview_mask			; Redraw current customview mask