Mercurial > public > mk2

diff code_part1/OSTC_code_asm_part1/simulator.asm @ 231:f9d42f8ff97b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BUGFIX Don't show (nosense) gas consumption in CCR mode (bug BB20).
author JeanDo
date Wed, 16 Mar 2011 19:03:01 +0100
parents 9406a5b0ba5e
children 59c479181724
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/simulator.asm	Tue Mar 15 18:44:16 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/simulator.asm	Wed Mar 16 19:03:01 2011 +0100
@@ -235,11 +235,16 @@
 	call	PLED_decoplan               ; Re-Draw Current page of GF Decoplan
 	bra		simulator_show_decoplan1	
 
-simulator_show_decoplan5_0:
-    btfss   display_see_deco
-    bra     simulator_show_decoplan4
+;---- In OCR mode, show the gas Usage special page ---------------------------
+simulator_show_decoplan5_0:    
+    btfss   display_see_deco            ; Already displayed ?
+    bra     simulator_show_decoplan4    ; Exit to menu.
+
 	bcf		display_see_deco			; clear flag
    
+    btfsc   FLAG_const_ppO2_mode        ; In CCR mode ?
+    bra     simulator_show_decoplan4    ; YES: finished.
+
    ; Re-read gas change depth, from the unsorted list.
     movlw   .27                         ; Active flags.
     movwf   EEADR
@@ -313,10 +318,8 @@
 	cpfseq	wait_temp                   ; All gases shown?
 	bra		simulator_show_decoplan5_loop	; No
 	
-	WIN_TOP  .2
-	WIN_LEFT .0
 	WIN_INVERT 1
-	STRCPY_PRINT "Gas usage:  "
+	DISPLAYTEXTH .301                   ; OCR Gas Usage:
 	WIN_INVERT 0
 
 	bra		simulator_show_decoplan1