Mercurial > public > hwos_code

diff src/divemode.asm @ 543:a92cecf8cee4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BUGFIX: "lost gas" showed current set of gases (Diluents in CC, OC in Bailout) for both "lost gas" menus
author heinrichsweikamp
date Wed, 06 Sep 2017 11:08:59 +0200
parents ad7dc231c180
children 7e6df19264b6
line wrap: on
line diff
--- a/src/divemode.asm	Tue Sep 05 15:32:51 2017 +0200
+++ b/src/divemode.asm	Wed Sep 06 11:08:59 2017 +0200
@@ -1211,7 +1211,6 @@
     bra     check_gas_change_OC_bail; Yes, check for OC or bailout
 
     ; Check Diluents
-    bsf     ccr_diluent_setup       ; in CCR menus
     movlw   .0
     rcall   check_dil_common        ; With Gas 0-4 in WREG
     movlw   .1
@@ -1225,7 +1224,6 @@
     bra     check_gas_change_exit
 
 check_gas_change_OC_bail:
-    bcf     ccr_diluent_setup       ; in OC menus
     movlw   .0
     rcall   check_gas_common        ; With Gas 0-4 in WREG
     movlw   .1
@@ -1625,6 +1623,7 @@
 	movlw	samplingrate_apnoe
 	movwf	samplesecs_value			; to avoid EEPROM access in the ISR
 divemode_boot1:
+    bsf     ccr_diluent_setup		; For CCR mode (Required to have better gas working)
     btfsc   FLAG_ccr_mode               ; =1: CCR mode (Fixed ppO2 or Sensor) active
     bra     divemode_boot2
     btfsc   FLAG_pscr_mode
@@ -1633,6 +1632,8 @@
     ; in OC Mode, disable ppO2 logging
     movlw   .0
     movwf   divisor_ppo2_sensors
+    
+    bcf     ccr_diluent_setup		; For OC mode (Required to have better gas working)
 divemode_boot2:
 
 	bcf		LEDg