Mercurial > public > hwos_code

diff src/divemode.asm @ 98:24b3fd59e61f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add event "bailout" in profile
author heinrichsweikamp
date Thu, 01 May 2014 21:16:31 +0200
parents 53a99a2dc6a1
children 87cc1adfe4da
line wrap: on
line diff
--- a/src/divemode.asm	Mon Apr 28 16:26:31 2014 +0200
+++ b/src/divemode.asm	Thu May 01 21:16:31 2014 +0200
@@ -768,11 +768,16 @@
     rcall   setup_gas_registers     ; With WREG=Gas 0-4
 
     call	TFT_active_gas_divemode	; Display gas/Setpoint
-	bsf		event_occured			; Set global event byte
-	bsf		stored_gas_changed		; Set Flag for profile
     bcf     divemode_gaschange      ; Clear flag
     clrf    WREG
     movff   WREG,char_O_deco_status ; Restart decoplan computation
+
+    ; Set flags for profile recording
+	bsf		event_occured			; Set global event byte
+    btfsc   is_bailout              ; Choose OC Bailouts (OC Gases)
+    bsf     bailoutgas_event        ; Bailout gas change
+    btfss   is_bailout              ; Choose OC Bailouts (OC Gases)
+	bsf		stored_gas_changed		; OC gas change
 	return
 
     global  setup_gas_registers
@@ -1147,6 +1152,7 @@
 	clrf 	timeout_counter2			; takes care of the timeout (High byte)
 	clrf	AlarmType					; Clear all alarms
 	bcf		event_occured				; clear flag
+    bcf     event2_occured              ; clear flag
 	clrf 	total_divetime_seconds+1
 	clrf	average_depth_hold_total+0
 	clrf	average_depth_hold_total+1