Mercurial > public > mk2

diff code_part1/OSTC_code_asm_part1/divemode_menu.asm @ 788:9eba1eb8ca38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BUGFIX: False bailout flag in logbook
author heinrichsweikamp
date Mon, 11 Aug 2014 12:18:48 +0200
parents de7fa2316913
children d696a824682d
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Tue Jul 01 13:36:22 2014 +0200
+++ b/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Mon Aug 11 12:18:48 2014 +0200
@@ -756,9 +756,12 @@
 	bra		divemode_set_xgas			; Configure the extra gas
 
 divemenu_set_gas2b:
+    btfss   FLAG_const_ppO2_mode        ; In CCR mode ?
+    bra     divemenu_set_gas2c          ; No
 	bsf		is_bailout					;=1: CC mode, but bailout active!
     bsf     store_bailout_event
 	bsf		event_occured				; set global event flag
+divemenu_set_gas2c:
 	clrf	lo							; clear Setpoint, DISP_const_ppO2_value now displayes "Bail"
 	movff	lo,char_I_const_ppO2