diff src/start.asm @ 545:7e6df19264b6

BUGFIX: Simulator in CC mode BUGFIX: Changing the dive mode and starting the simulator (without leaving the menu first) caused false calculations in the simulator BUGFIX: PSCR Mode "OC Gases" showed Diluents, not OC gases BUGFIX: CCR Mode ("First Diluent") was chosen based on OC "First Gas" number
author heinrichsweikamp
date Wed, 06 Sep 2017 21:26:18 +0200
parents ad8acade5567
children b7eb98dbd800
line wrap: on
line diff
--- a/src/start.asm	Wed Sep 06 15:34:49 2017 +0200
+++ b/src/start.asm	Wed Sep 06 21:26:18 2017 +0200
@@ -386,14 +386,17 @@
     movlw   .10
     movwf   samplingrate
 restart_set_modes_and_flags1:
-    movff   opt_dive_mode,lo            ; 0=OC, 1=CC, 2=Gauge, 3=Apnea, 4=PSCR
+    bcf	    twosecupdate		; to have divemode routines in sync
+    movlw   .3
+    movff   WREG,char_O_deco_status	; will init the deco_calc_hauptroutine on first invocation
+    bcf	    FLAG_apnoe_mode
+    bcf     FLAG_ccr_mode		; =1: CCR mode (Fixed ppO2 or Sensor) active
+    bcf     FLAG_gauge_mode		; =1: In Gauge mode
+    bcf	    FLAG_pscr_mode
+    call    disable_ir_s8		; IR off
 
-	bcf		FLAG_apnoe_mode
-    bcf     FLAG_ccr_mode             ; =1: CCR mode (Fixed ppO2 or Sensor) active
-    bcf     FLAG_gauge_mode           ; =1: In Gauge mode
-    bcf	    FLAG_pscr_mode
-    call    disable_ir_s8             ; IR off
-
+    movff   opt_dive_mode,lo            ; 0=OC, 1=CC, 2=Gauge, 3=Apnea, 4=PSCR
+    
     tstfsz  lo
     bra     restart_set_modes_and_flags2
     ; OC Mode