diff code_part1/OSTC_code_asm_part1/simulator.asm @ 344:797e2ac42d24 ScreenDump

MERGE with 1.91 main trunk.
author JeanDo
date Sat, 21 May 2011 14:48:07 +0200
parents 6bdf80d7276c 2144f19fa1eb
children 544a96faa9f3 93c0cb14b0d2
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/simulator.asm	Tue May 17 01:05:04 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/simulator.asm	Sat May 21 14:48:07 2011 +0200
@@ -132,8 +132,9 @@
 
 	movff	xC+0,sim_pressure+0
 	movff	xC+1,sim_pressure+1
-	
-	movff	sim_pressure+0,amb_pressure+0	; override readings with simulator values
+
+    ; This override is done in ISR too, but do it right now also:	
+	movff	sim_pressure+0,amb_pressure+0
 	movff	sim_pressure+1,amb_pressure+1
 
 	bcf		menubit2
@@ -348,7 +349,8 @@
 	DISPLAYTEXT	.12                     ; "Wait..."
 	WIN_INVERT	.0
 
-	movff	sim_pressure+0,amb_pressure+0	; override readings with simulator values
+    ; This override is done in ISR too, but do it right now also:	
+	movff	sim_pressure+0,amb_pressure+0
 	movff	sim_pressure+1,amb_pressure+1
 
 	call	divemode_check_decogases    ; Checks for decogases and sets the gases