Mercurial > public > mk2

changeset 559:c84ea647ff58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not show gas switch stops in yellow when CF55=0
author heinrichsweikamp
date Tue, 21 Feb 2012 07:44:33 +0100
parents 575f1a65ab5a
children 3a863016cb40
files code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/definitions.asm code_part1/OSTC_code_asm_part1/pled_outputs.asm
diffstat 3 files changed, 15 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Mon Feb 20 13:47:49 2012 +0100
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Tue Feb 21 07:44:33 2012 +0100
@@ -1,10 +1,10 @@
-New in 2.21 beta:
-BETA Version - Do NOT use for diving!
+New in 2.21:
 BUGFIX: GF warning in logbook memory
 NEW: Compute ppO2 for pSCR diving
 NEW: CF61: Show pSCR ppO2 in customview
 NEW: CF62: pSCR O2 Drop in percent
 NEW: CF63: pSCR counterlung ratio 1/x
+BUGFIX: CF55 behaviour
 
 New in 2.20:
 Stable Release
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Mon Feb 20 13:47:49 2012 +0100
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Tue Feb 21 07:44:33 2012 +0100
@@ -24,7 +24,7 @@
 #DEFINE	softwareversion_x		d'2'		; Software version  XX.YY
 #DEFINE	softwareversion_y		d'21'		; Software version  XX.YY
 
-#DEFINE softwareversion_beta 	1 			; (and 0 for release) 
+#DEFINE softwareversion_beta 	0 			; (and 0 for release) 
 
 #DEFINE	max_custom_number		d'63'		; Number of last used custom function
 
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Mon Feb 20 13:47:49 2012 +0100
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Tue Feb 21 07:44:33 2012 +0100
@@ -2598,11 +2598,18 @@
         WIN_LEFT .100
         
         btfss   lo,7                    ; Bit set ?
-        bra     PLED_decoplan_std_stop  ; No : Just an usual stop.
-
-        movlw   b'11111101'             ; Yellow.
-        call    PLED_set_color
-        bcf     lo,7                    ; and cleanup depth.
+        bra     PLED_decoplan_std_stop  ; No : Just an usual stop
+
+        bcf     lo,7                    ; cleanup depth
+		
+		GETCUSTOM8	d'55'				; Load gas switch [min] in wreg
+		tstfsz	WREG					; =0?
+		bra		PLED_decoplan_show_stop1; No: Show gas switch stop
+		bra     PLED_decoplan_std_stop  ; Yes: Just an usual stop
+		
+PLED_decoplan_show_stop1:		
+        movlw   color_yellow
+        call    PLED_set_color			; Show in yellow for gas switch
         bra     PLED_decoplan_nstd_stop
 
 PLED_decoplan_std_stop: