Mercurial > public > hwos_code

diff src/tft_outputs.asm @ 485:18e047102e49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
3.14 BETA release
author heinrichsweikamp
date Mon, 20 Feb 2017 15:49:38 +0100
parents c0ee33f1f399
children 5c7bee6df71c
line wrap: on
line diff
--- a/src/tft_outputs.asm	Mon Feb 20 12:00:58 2017 +0100
+++ b/src/tft_outputs.asm	Mon Feb 20 15:49:38 2017 +0100
@@ -1909,9 +1909,14 @@
 
 TFT_show_pscr_mode_divemode:
     WIN_TINY   dm_active_dil_column, dm_active_dil_row+.1
+    btfsc   is_bailout                  ; =1: Bailout
+    bra     TFT_show_pscr_mode_divemode_bail	; Show "Bailout" instead of PSCR
     STRCPY_TEXT_PRINT   tDvPSCR		; PSCR
     return
     
+TFT_show_pscr_mode_divemode_bail:    
+    STRCPY_TEXT_PRINT   tDiveBailout    ; Bailout
+    return
     
 	global	TFT_active_gas_divemode
 TFT_active_gas_divemode:				; Display gas/Setpoint
@@ -3719,6 +3724,9 @@
 TFT_display_ppo2_val:
     btfss	FLAG_pscr_mode
     bra		TFT_display_ppo2_val_non_pscr	; Non-PSCR modes...
+    btfsc	is_bailout
+    bra		TFT_display_ppo2_val_non_pscr	; In bailout
+
     	; in PSCR mode
     call		compute_pscr_ppo2		; pSCR ppO2 into sub_c:2
     movff		sub_c+0,xA+0