# HG changeset patch
# User heinrichsweikamp
# Date 1462111779 -7200
# Node ID f8afe90796d6ed9abfb6e09d6b4626c10f05c82a
# Parent  ee245b9f37126219d27175e7a55be416d78f5ba7
3.14 beta Release
CHANGE: Calculate velocity over a 6sec period

diff -r ee245b9f3712 -r f8afe90796d6 code_part1/OSTC_code_asm_part1/changelog.txt
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Mon Jan 11 12:34:42 2016 +0100
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Sun May 01 16:09:39 2016 +0200
@@ -1,3 +1,7 @@
+New in 3.14:
+Beta Release
+CHANGE: Calculate velocity over a 6sec period
+
 New in 3.13:
 Stable Release
 NEW: Logbook shows markers with small orange boxes in the profile
diff -r ee245b9f3712 -r f8afe90796d6 code_part1/OSTC_code_asm_part1/definitions.asm
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Mon Jan 11 12:34:42 2016 +0100
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Sun May 01 16:09:39 2016 +0200
@@ -22,9 +22,9 @@
 ; ToDo:
 
 #DEFINE	softwareversion_x		d'3'		; Software version  XX.YY
-#DEFINE	softwareversion_y		d'13'		; Software version  XX.YY
+#DEFINE	softwareversion_y		d'14'		; Software version  XX.YY
 
-#DEFINE softwareversion_beta 	0 			; (and 0 for release)
+#DEFINE softwareversion_beta 	1 			; (and 0 for release)
 
 #DEFINE	max_custom_number		d'73'		; Number of last used custom function
 
@@ -278,7 +278,7 @@
 max_pressure    res 2           ; Max. pressure for the dive [mbar]
 avr_rel_pressure res 2          ; Average rel. pressure (Average depth) for the dive [mbar], Resettable
 avr_rel_pressure_total res 2    ; Average rel. pressure (Average depth) for the dive [mbar], Non-Resettable
-last_pressure   res 2
+last_pressure   res 6
 temperature_avg res 2           ; Temperature summing buffer.
 temperature     res 2           ; Final temperature. SIGNED.
 last_temperature res 2          ; Last displayed temperature (used to detect changes).
diff -r ee245b9f3712 -r f8afe90796d6 code_part1/OSTC_code_asm_part1/divemode.asm
--- a/code_part1/OSTC_code_asm_part1/divemode.asm	Mon Jan 11 12:34:42 2016 +0100
+++ b/code_part1/OSTC_code_asm_part1/divemode.asm	Sun May 01 16:09:39 2016 +0200
@@ -951,11 +951,19 @@
 	bra		do_not_display_velocity			; display velocity only in divemode
 
 calc_velocity2:
-    SAFE_2BYTE_COPY amb_pressure, sub_a
-	movff	last_pressure+0,sub_b+0
-	movff	last_pressure+1,sub_b+1
-	movff	sub_a+0,last_pressure+0	; store old value for velocity
-	movff	sub_a+1,last_pressure+1
+	; Update ring buffer
+	movff	last_pressure+2,last_pressure+4
+	movff	last_pressure+3,last_pressure+5
+	movff	last_pressure+0,last_pressure+2
+	movff	last_pressure+1,last_pressure+3
+	SAFE_2BYTE_COPY amb_pressure, last_pressure
+
+
+	; use 6sec interval for velocity
+	movff	last_pressure+4,sub_b+0
+	movff	last_pressure+5,sub_b+1
+    	movff	last_pressure+0,sub_a+0
+	movff	last_pressure+1,sub_a+1
 
 	call	sub16						; sub_c = amb_pressure - last_pressure
 
diff -r ee245b9f3712 -r f8afe90796d6 code_part1/OSTC_code_asm_part1/surfmode.asm
--- a/code_part1/OSTC_code_asm_part1/surfmode.asm	Mon Jan 11 12:34:42 2016 +0100
+++ b/code_part1/OSTC_code_asm_part1/surfmode.asm	Sun May 01 16:09:39 2016 +0200
@@ -72,12 +72,16 @@
 ; Startup tasks for all modes
 	clrf	timeout_counter2				
 	clrf 	timeout_counter3
-	bcf		premenu						; clear premenu flag
-	bcf		menubit						; clear menu flag
+	bcf	premenu						; clear premenu flag
+	bcf	menubit						; clear menu flag
 	clrf	timer1int_counter2			; reset state counter
-	bcf		pressure_refresh			; Start new sensor run
+	bcf	pressure_refresh			; Start new sensor run
 	clrf	last_pressure+0
 	clrf	last_pressure+1
+	clrf	last_pressure+2
+	clrf	last_pressure+3
+	clrf	last_pressure+4
+	clrf	last_pressure+5
 	clrf	last_temperature+0
 	clrf	last_temperature+1