Mercurial > public > mk2

changeset 551:c67bf1ca73ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 550
author heinrichsweikamp
date Thu, 02 Feb 2012 19:43:45 +0100
parents cdc1163a8e9e (current diff) 9e20de11fb78 (diff)
children 44e9b961f156
files
diffstat 3 files changed, 14 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Thu Feb 02 16:05:09 2012 +0100
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Thu Feb 02 19:43:45 2012 +0100
@@ -1,7 +1,10 @@
+New in 2.21 beta:
+BETA Version - Do NOT use for diving!
+BUGFIX: GF warning in logbook memory
+
 New in 2.20:
 Stable Release
 
-
 New in 2.10 beta:
 BETA Version - Do NOT use for diving!
 BUGFIX: Spurious logbook read issue
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Thu Feb 02 16:05:09 2012 +0100
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Thu Feb 02 19:43:45 2012 +0100
@@ -22,9 +22,9 @@
 ; ToDo:
 
 #DEFINE	softwareversion_x		d'2'		; Software version  XX.YY
-#DEFINE	softwareversion_y		d'20'		; Software version  XX.YY
+#DEFINE	softwareversion_y		d'21'		; 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'58'		; Number of last used custom function
 
--- a/code_part1/OSTC_code_asm_part1/divemode.asm	Thu Feb 02 16:05:09 2012 +0100
+++ b/code_part1/OSTC_code_asm_part1/divemode.asm	Thu Feb 02 19:43:45 2012 +0100
@@ -249,23 +249,15 @@
 	return
 
 set_leds_divemode:
-	movff	char_O_gradient_factor,lo		; gradient factor absolute
-
-	GETCUSTOM8	d'14'		; threshold for LED warning
-	cpfslt	lo				; 
-	call	warn_gf1		; show warning, set flags
-
-	movff	char_I_deco_model,lo
-		decfsz	lo,W		; jump over return if char_I_deco_model == 1
-	return
-
+	movff	char_O_gradient_factor,lo			; gradient factor absolute (Non-GF model)
+	movff	char_I_deco_model,hi
+	decfsz	hi,F		; jump over next line if char_I_deco_model == 1
 	movff	char_O_relative_gradient_GF,lo		; gradient factor relative (GF model)
-
-	GETCUSTOM8	d'14'		; threshold for LED warning
-	cpfslt	lo				; 
-	call	warn_gf1		; show warning, set flags
-
-	return
+	
+	GETCUSTOM8	d'14'		; threshold for LED warning into WREG
+	cpfslt	lo				; Lower then actual warning?
+	rcall	warn_gf1		; No, show warning and set flags
+	return					; Yes, return
 
 warn_gf1:
 	movlw		d'2'			; Type of Alarm