Mercurial > public > mk2

diff code_part1/OSTC_code_asm_part1/simulator.asm @ 197:f15e804ff67f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Gas switch delay + New CF#55 for additional delay in decoplan for gas switch. + BUGFIX compute integration at full ascent, not half (or the formula is wrong). + BUGFIX minor typo in 2sec exposition factors.
author JeanDo
date Sun, 13 Feb 2011 17:27:43 +0100
parents 016c45a0caaf
children 0a3ca358c684
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/simulator.asm	Sun Feb 13 10:16:59 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/simulator.asm	Sun Feb 13 17:27:43 2011 +0100
@@ -246,7 +246,7 @@
 
 	movff	logbook_temp1,logbook_temp3		; store bottom time
 
-	movff	logbook_temp2,xA+0
+	movff	logbook_temp2,xA+0              ; Bottom depth. 
 	clrf	xA+1
 	movlw	d'100'
 	movwf	xB+0
@@ -264,87 +264,78 @@
 	movff	sim_pressure+0,amb_pressure+0	; override readings with simulator values
 	movff	sim_pressure+1,amb_pressure+1
 
-	call	simulator_save_tissue_data		; Stores 32 floats "pre_tissue" into bank3
+	call	simulator_save_tissue_data  ; Stores 32 floats "pre_tissue" into bank3
 
 	call	PLED_topline_box
 	WIN_INVERT	.1
-	DISPLAYTEXT	.12							;" Wait.."
+	DISPLAYTEXT	.12                     ; "Wait..."
 	WIN_INVERT	.0
 
+	call	divemode_check_decogases    ; Checks for decogases and sets the gases
+	call	divemode_prepare_flags_for_deco
+	movlw	d'0'                        ; Begin of deco cycle (init sim tissues)
+	movff	WREG,char_O_deco_status     ; Reset Deco module.
+
 simulator_calc_deco_loop1:
-	call	divemode_check_decogases        ; Checks for decogases and sets the gases
-	call	divemode_prepare_flags_for_deco
-
-	call	deco_calc_hauptroutine		    ; calc_tissue
-	movlb	b'00000001'						; rambank 1 selected
+	call	deco_calc_hauptroutine      ; calc_tissue
+	movlb	b'00000001'                 ; rambank 1 selected
 
 	movff	char_O_deco_status,WREG
 	tstfsz	WREG                        ; deco_status=0 if decompression calculation done
-	bra		simulator_calc_deco_loop1			; Not finished
+	bra		simulator_calc_deco_loop1   ; Not finished
 
 	movlw	d'1'
-	movff	WREG,char_I_step_is_1min		; 1 minute mode
-
-	movlw	d'2'
-	movff	WREG,char_O_deco_status			; Reset Deco module
+	movff	WREG,char_I_step_is_1min    ; 1 minute mode
 
 simulator_calc_deco_loop2:
-	
 	call	PLED_simulator_data
+	btg     LED_red
 
-	btg		LED_red
-
-	call	divemode_check_decogases			; Checks for decogases and sets the gases
+	call	divemode_check_decogases    ; Checks for decogases and sets the gases
 	call	divemode_prepare_flags_for_deco
 
 	call	deco_calc_hauptroutine		; calc_tissue
-	movlb	b'00000001'						; rambank 1 selected
-	ostc_debug	'C'		; Sends debug-information to screen if debugmode active
-	
-	decfsz	logbook_temp1,F
-	bra		simulator_calc_deco_loop2
+	movlb	b'00000001'                 ; rambank 1 selected
+	ostc_debug	'C'	                    ; Sends debug-information to screen if debugmode active
+
+	decfsz	logbook_temp1,F             ; Decrement bottom time.
+	bra     simulator_calc_deco_loop2
 
 	movlw	d'0'
-	movff	WREG,char_I_step_is_1min		; 2 second deco mode
+	movff	WREG,char_I_step_is_1min    ; 2 second deco mode
+
+simulator_calc_deco2:
+	call	divemode_check_decogases    ; Checks for decogases and sets the gases
+	call	divemode_prepare_flags_for_deco
 
-	movlw	d'2'
-	movff	WREG,char_O_deco_status			; Reset Deco module
+	call	deco_calc_hauptroutine		; calc_tissue
+	movlb	b'00000001'                 ; rambank 1 selected
 
-	bra		simulator_calc_deco2				; Not finished
+	movff	char_O_deco_status,WREG
+	tstfsz	WREG                        ; deco_status=0 if decompression calculation done
+	bra		simulator_calc_deco2        ; Not finished
 
-simulator_calc_deco3:
+    ; Finished
 	bsf		LED_red
 	
 	call	simulator_restore_tissue_data	; Restore 32 floats "pre_tissue" from bank3
 
-	bcf		simulatormode_active			; normal simulator mode
-	bcf		standalone_simulator			; Standalone Simulator active
+	bcf		simulatormode_active        ; normal simulator mode
+	bcf		standalone_simulator        ; Standalone Simulator active
 
 	WAITMS	d'250'
 	WAITMS	d'250'
-	WAITMS	d'250'							; Wait for Pressure Sensor to get real pressure again...
+	WAITMS	d'250'                      ; Wait for Pressure Sensor to get real pressure again...
 
-	bcf		LED_red
+	bcf     LED_red
 	
 	movlw	d'1'
-	movwf	logbook_temp1					; Bottom time>0!
-
-	movlw	d'5'							; Pre-Set Cursor to "Show Decoplan"
-	movwf	menupos
-	movff	logbook_temp3,logbook_temp1		; restore bottom time
-	bra		menu_simulator1					; Done.
+	movwf	logbook_temp1                   ; Bottom time>0!
 
-simulator_calc_deco2:
-	call	divemode_check_decogases			; Checks for decogases and sets the gases
-	call	divemode_prepare_flags_for_deco
-
-	call	deco_calc_hauptroutine		; calc_tissue
-	movlb	b'00000001'						; rambank 1 selected
-
-	movff	char_O_deco_status,WREG
-	tstfsz	WREG                        ; deco_status=0 if decompression calculation done
-	bra		simulator_calc_deco2				; Not finished
-	bra		simulator_calc_deco3				; finished!
+	movlw	d'5'                            ; Pre-Set Cursor to "Show Decoplan"
+	movwf	menupos
+	movff	logbook_temp3,logbook_temp1     ; restore bottom time
+	bra     menu_simulator1                 ; Done.
 
 
 simulator_save_tissue_data: