Mercurial > public > mk2

diff code_part1/OSTC_code_asm_part1/customview.asm @ 386:deced1cacff7 64kByte Logbook

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added velocity in divemode, BIG stopwatch in Gauge mode
author heinrichsweikamp
date Sat, 18 Jun 2011 20:17:39 +0200
parents b7940978edc9
children 7779bfa89171
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/customview.asm	Sat Jun 18 17:52:52 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/customview.asm	Sat Jun 18 20:17:39 2011 +0200
@@ -85,9 +85,16 @@
 	goto	PLED_total_average_show2	; Update the figures only
 	
 customview_1sec_stopwatch:
+	btfsc	gauge_mode					; In Gauge mode?
+	bra		customview_1sec_stopwatch_gauge; Yes
+
 	bsf		menu3_active                ; Set Flag
 	goto	PLED_stopwatch_show2        ; Update figures only
 
+customview_1sec_stopwatch_gauge:
+	bsf		menu3_active                ; Set Flag
+	goto	PLED_stopwatch_show_gauge  	; Update figures + Description
+
 customview_1sec_marker:                 ; Do nothing extra
 	bsf		menu3_active                ; Set Flag
 customview_1sec_clock:                  ; Do nothing extra
@@ -198,11 +205,22 @@
 	decfsz		WREG,F					; WREG=1?	
 	bra			customview_toggle		; No, use next Customview
 
+	btfsc		gauge_mode				; In Gauge mode?
+	bra			customview_init_stopwatch_gauge	; Yes
+
 	call	PLED_stopwatch_show			; Init Stopwatch display
 	bsf		menu3_active                ; Set Flag
 	bra		customview_toggle_exit	
 
+customview_init_stopwatch_gauge:
+	call	PLED_stopwatch_show_gauge	; Init Stopwatch display
+	bsf		menu3_active                ; Set Flag
+	bra		customview_toggle_exit	
+
 customview_init_marker:					; Init Marker
+	btfsc		gauge_mode				; In Gauge mode?
+	call		PLED_clear_divemode_menu; Yes, clear BIG stopwatch
+
 	GETCUSTOM8	d'50'					; Show Marker? (=1 in WREG)
 	decfsz		WREG,F					; WREG=1?	
 	bra			customview_toggle		; No, use next Customview