Mercurial > public > hwos_code

diff src/tft_outputs.asm @ 507:4e6f5c36f4cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NEW: Two ppO2 max settings. One for travel/bottom and one for deco gases
author heinrichsweikamp
date Tue, 27 Jun 2017 13:50:42 +0200
parents f522210b3743
children 2ef8cf6b320d
line wrap: on
line diff
--- a/src/tft_outputs.asm	Mon Jun 26 13:02:04 2017 +0200
+++ b/src/tft_outputs.asm	Tue Jun 27 13:50:42 2017 +0200
@@ -159,7 +159,15 @@
     bra			TFT_warnings_color      ; too low -> Warning Color!
 
 ; Check for high ppo2
-	movff		opt_ppO2_max,WREG		; PPO2 Max for MOD calculation and color coding in divemode
+    	movff   gaslist_gas_global,WREG	; Read current gas O2 ratio
+	lfsr	FSR1,opt_gas_type	; 0=Disabled, 1=First, 2=Travel, 3=Deco for OC gases and 0=Disabled, 1=First, 2=Normal for diluents
+	movff   PLUSW1,xA+0		; xA+0 used as temp here -> holds type
+	
+	movff   opt_ppO2_max_deco,xB+1	; xB+1 used as temp here
+	movlw	.3			
+	cpfseq	xA+0			; Deco?
+	movff   opt_ppO2_max,xB+1	; No, overwrite with travel/bottom max
+	movf	xB+1,W			; Result in WREG
 	mullw		d'100'					; opt_ppO2_max*100
 	movff		PRODL,sub_b+0
 	movff		PRODH,sub_b+1
@@ -240,7 +248,13 @@
 
 	movff	xC+0,sub_a+0
 	movff	xC+1,sub_a+1
-	movff	opt_ppO2_max,WREG		; PPO2 Max for MOD calculation and color coding in divemode
+	;active_gas_type -> 0=Disabled, 1=First, 2=Travel, 3=Deco for OC gases and 0=Disabled, 1=First, 2=Normal for diluents	
+	movff   active_gas_type,xA+0	; xA+0 used as temp here -> holds type
+	movff   opt_ppO2_max_deco,xB+1	; xB+1 used as temp here
+	movlw	.3			
+	cpfseq	xA+0			; Deco?
+	movff   opt_ppO2_max,xB+1	; No, overwrite with travel/bottom max
+	movf	xB+1,W			; Result in WREG
 	mullw	d'100'
 	movff	PRODL,sub_b+0
 	movff	PRODH,sub_b+1
@@ -299,7 +313,15 @@
 
 	movff	xC+0,sub_a+0
 	movff	xC+1,sub_a+1
-	movff	opt_ppO2_max,WREG		; PPO2 Max for MOD calculation and color coding in divemode
+	
+	;active_gas_type -> 0=Disabled, 1=First, 2=Travel, 3=Deco for OC gases and 0=Disabled, 1=First, 2=Normal for diluents	
+	movff   active_gas_type,xA+0	; xA+0 used as temp here -> holds type
+	movff   opt_ppO2_max_deco,xB+1	; xB+1 used as temp here
+	movlw	.3			
+	cpfseq	xA+0			; Deco?
+	movff   opt_ppO2_max,xB+1	; No, overwrite with travel/bottom max
+	movf	xB+1,W			; Result in WREG
+
 	mullw	d'100'
 	movff	PRODL,sub_b+0
 	movff	PRODH,sub_b+1
@@ -3072,14 +3094,24 @@
     return                      ; Done.
 
 	global	divesets_ppo2_min
-    extern  tPPO2Min
+    extern  tPPO2MIN
 divesets_ppo2_min:
-    lfsr    FSR1,tPPO2Min
+    lfsr    FSR1,tPPO2MIN
     call    strcat_text
 	movff	opt_ppO2_min,lo
     movlw   ppo2_warning_low
     bra     divesets_ppo2_common
 
+	global	divesets_ppo2_max_deco
+    extern  tPPO2DECO
+divesets_ppo2_max_deco:
+    lfsr    FSR1,tPPO2DECO
+    call    strcat_text
+	movff	opt_ppO2_max_deco,lo
+    movlw   ppo2_warning_high_deco
+    bra     divesets_ppo2_common
+    
+    
 ;=============================================================================
 
     global  TFT_clear_warning_text