Mercurial > public > hwos_code

diff src/divemenu_tree.asm @ 511:7db10ebae205

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BUGFIX: Lost Diluent now possible in CCR and PSCR mode
author heinrichsweikamp
date Tue, 04 Jul 2017 16:12:53 +0200
parents 0910c227018f
children 4921aa796691
line wrap: on
line diff
--- a/src/divemenu_tree.asm	Fri Jun 30 15:12:56 2017 +0200
+++ b/src/divemenu_tree.asm	Tue Jul 04 16:12:53 2017 +0200
@@ -189,8 +189,8 @@
     movlw   .1
     movwf   menupos                 ; Set to first option in divemode menu
 do_lost_gas0:
-    bcf     ccr_diluent_setup       ; use OC gases
-    bsf     is_bailout_menu         ; =1: Bailout
+;    bcf     ccr_diluent_setup       ; use OC gases
+;    bsf     is_bailout_menu         ; =1: Bailout
     bsf     short_gas_decriptions
     MENU_BEGIN  tDivemenu_LostGas, .6
         MENU_DYNAMIC    gaslist_strcat_gas_mod, do_toggle_active    ; Toggle the gas (in)active
@@ -202,6 +202,10 @@
     MENU_END
 
 do_toggle_active:
+    movlw   .5
+    btfsc   ccr_diluent_setup       ; use OC gases
+    addwf   menupos,F		    ; -> 6-10 for Diluents
+    
     decf    menupos,W               ; 1-5 -> 0-4
     lfsr    FSR1,opt_gas_type+0
     movff   PLUSW1,lo
@@ -224,6 +228,10 @@
     lfsr    FSR1,opt_OC_bail_gas_change+0
     movff   lo,PLUSW1
 
+    movlw   .5
+    btfsc   ccr_diluent_setup       ; use OC gases?
+    subwf   menupos,F		    ; Back to 1-5 
+
     bra     do_lost_gas0            ; Return to list and show updated result
 
 do_toggle_active2:
@@ -233,6 +241,10 @@
     lfsr    FSR1,opt_OC_bail_gas_change+0
     clrf    PLUSW1
 
+    movlw   .5
+    btfsc   ccr_diluent_setup       ; use OC gases?
+    subwf   menupos,F		    ; Back to 1-5 
+    
     bra     do_lost_gas0            ; Return to list and show updated result
 
 do_dive_pO2: