diff src/divemode.asm @ 307:14719662fb95 new_screen_layout

Merged Screen layout work #4 into VSItextv2
author Janos Kovacs <kovjanos@gmail.com>
date Tue, 02 Jun 2015 23:38:21 +0100
parents 24daa6523218
children 453a3d13570f
line wrap: on
line diff
--- a/src/divemode.asm	Tue Jun 02 17:34:19 2015 +0100
+++ b/src/divemode.asm	Tue Jun 02 23:38:21 2015 +0100
@@ -447,7 +447,7 @@
 
 calc_velocity:								; called every two seconds
 	btfss	divemode						
-	bra		do_not_display_velocity			; display velocity only in divemode (Not at the surface after dive)
+	return                      			; display velocity only in divemode (Not at the surface after dive)
 
 calc_velocity2:
     SAFE_2BYTE_COPY amb_pressure, sub_a
@@ -476,21 +476,9 @@
 	movwf	divA+0						; divA=99
 
 calc_velocity3:
-	movlw	velocity_warning_level_1	; lowest threshold for display vertical velocity
-	subwf	divA+0,W					; 
-	btfss	STATUS,C
-	bra		do_not_display_velocity
-
-	bsf		display_velocity
 	call	TFT_display_velocity		; With divA+0 = m/min...
 	return
 
-do_not_display_velocity:
-	btfss	display_velocity			; Velocity was not displayed, do not delete
-	return
-	bcf		display_velocity			; Velocity was displayed, delete velocity now
-	call	TFT_display_velocity_clear
-	return
 
 ;=============================================================================