Mercurial > public > hwos_code

changeset 518:72f6cb65ca4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BUGFIX: Do not check ppO2 for disabled gases
author heinrichsweikamp
date Thu, 03 Aug 2017 17:17:25 +0200
parents d339c9e1175d
children ff1e6adf55ad
files src/changelog.txt src/gaslist.asm
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/changelog.txt	Thu Aug 03 17:03:05 2017 +0200
+++ b/src/changelog.txt	Thu Aug 03 17:17:25 2017 +0200
@@ -3,6 +3,7 @@
 BUGFIX: Lost Diluent now possible in CCR and PSCR mode
 NEW: ppO2 blinks in sensor mode when min/max boundaries are hit
 CHANGE: Show actual GF (Not relative) in custom views in dive mode
+BUGFIX: Do not check ppO2 for disabled gases
 
 [2.18]
 - Beta Version -
--- a/src/gaslist.asm	Thu Aug 03 17:03:05 2017 +0200
+++ b/src/gaslist.asm	Thu Aug 03 17:17:25 2017 +0200
@@ -211,9 +211,8 @@
         movf    PLUSW1,W
         bnz     gaslist_strcat_3
         call    TFT_disabled_color
+	bra	gaslist_strcat_4	; NEW ; No MOD-check and red color for disabled gases
 gaslist_strcat_3:
-        rcall   gaslist_strcat_gas_0
-		PUTC	" "
         ; Read switch depth
         lfsr    FSR1,char_I_dil_change-.5   ; Setup Diluents-5
         movlw   .4
@@ -227,8 +226,11 @@
         bra		gaslist_strcat_4
         call    TFT_warnings_color      ; Turn red if bigger
 gaslist_strcat_4:
-		TSTOSS	opt_units               ; 0=Meters, 1=Feets
-		bra		gaslist_strcat_3_metric
+	rcall   gaslist_strcat_gas_0
+	PUTC	" "
+
+	TSTOSS	opt_units               ; 0=Meters, 1=Feets
+	bra		gaslist_strcat_3_metric
 ;gaslist_strcat_3_imperial:
         btfsc   ccr_diluent_setup       ; =1: Setting up Diluents ("Gas6-10")
         bra     gaslist_imperial_non_travel