Mercurial > public > mk2

changeset 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
files code_part1/OSTC_code_asm_part1/english_text.asm code_part1/OSTC_code_asm_part1/french_text.asm code_part1/OSTC_code_asm_part1/german_text.asm code_part1/OSTC_code_asm_part1/simulator.asm code_part1/OSTC_code_asm_part1/spanish_text.asm
diffstat 5 files changed, 29 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/english_text.asm	Tue Mar 15 18:44:16 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/english_text.asm	Wed Mar 16 19:03:01 2011 +0100
@@ -380,8 +380,9 @@
 	TCODE    .20,   .125,    "Show raw data"             ;295 Show raw data
 	TCODE    .50,    .2,     "Raw Data:"                 ;296 Raw Data:
 ; Gas-setup addons:
-    TCODE    .0,    .0,      "MOD:"                      ; 297 MOD:                 (max operating depth of a gas).
-    TCODE    .0,    .0,      "END:"                      ; 298 END:                 (equivalent nitrogen depth of a gas).
-    TCODE    .0,    .0,      "EAD:"                      ; 299 EAD:                 (equivalent air depth of a gas).
-	TCODE	 .100,	.125,	 "Active?"					 ; 300 Active? 				(Enable/Disable Gas underwater)
+    TCODE    .0,    .0,      "MOD:"                      ;297 MOD:                  (max operating depth of a gas).
+    TCODE    .0,    .0,      "END:"                      ;298 END:                  (equivalent nitrogen depth of a gas).
+    TCODE    .0,    .0,      "EAD:"                      ;299 EAD:                  (equivalent air depth of a gas).
+	TCODE	 .100,	.125,	 "Active?"					 ;300 Active?               (Enable/Disable Gas underwater)
+	TCODE    .0,    .2,      "OCR Gas Usage:"            ;301 OCR Gas Usage:        (Planned gas consumtion by tank).
 ;=============================================================================
--- a/code_part1/OSTC_code_asm_part1/french_text.asm	Tue Mar 15 18:44:16 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/french_text.asm	Wed Mar 16 19:03:01 2011 +0100
@@ -381,8 +381,9 @@
 	TCODE    .20,   .125,    "Aff. donn. brutes"         ;295 Show raw data
 	TCODE    .50,    .2,     "Données brutes:"           ;296 Raw Data:
 ; Gas-setup addons:
-    TCODE    .0,    .0,      "PMU:"                      ; 297 MOD:                 (max operating depth of a gas).
-    TCODE    .0,    .0,      "PEN:"                      ; 298 END:                 (equivalent nitrogen depth of a gas).
-    TCODE    .0,    .0,      "PEA:"                      ; 299 EAD:                 (equivalent air depth of a gas).
-	TCODE	 .100,	.125,	 "Active?"					 ; 300 Active? 				(Enable/Disable Gas underwater)
+    TCODE    .0,    .0,      "PMU:"                      ;297 MOD:                  (max operating depth of a gas).
+    TCODE    .0,    .0,      "PEN:"                      ;298 END:                  (equivalent nitrogen depth of a gas).
+    TCODE    .0,    .0,      "PEA:"                      ;299 EAD:                  (equivalent air depth of a gas).
+	TCODE	 .100,	.125,	 "Active?"					 ;300 Active?               (Enable/Disable Gas underwater)
+	TCODE    .0,    .2,      "OCR Gas Usage:"            ;301 OCR Gas Usage:        (Planned gas consumtion by tank).
 ;=============================================================================
--- a/code_part1/OSTC_code_asm_part1/german_text.asm	Tue Mar 15 18:44:16 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/german_text.asm	Wed Mar 16 19:03:01 2011 +0100
@@ -380,8 +380,9 @@
 	TCODE    .20,   .125,    "Show raw data"             ;295 Show raw data
 	TCODE    .50,    .2,     "Raw Data:"                 ;296 Raw Data:
 ; Gas-setup addons:
-    TCODE    .0,    .0,      "MOD:"                      ; 297 MOD:                 (max operating depth of a gas).
-    TCODE    .0,    .0,      "END:"                      ; 298 END:                 (equivalent nitrogen depth of a gas).
-    TCODE    .0,    .0,      "EAD:"                      ; 299 EAD:                 (equivalent air depth of a gas).
-	TCODE	 .100,	.125,	 "Active?"					 ; 300 Active? 				(Enable/Disable Gas underwater)
+    TCODE    .0,    .0,      "MOD:"                      ;297 MOD:                  (max operating depth of a gas).
+    TCODE    .0,    .0,      "END:"                      ;298 END:                  (equivalent nitrogen depth of a gas).
+    TCODE    .0,    .0,      "EAD:"                      ;299 EAD:                  (equivalent air depth of a gas).
+	TCODE	 .100,	.125,	 "Active?"					 ;300 Active?               (Enable/Disable Gas underwater)
+	TCODE    .0,    .2,      "OCR Gas Usage:"            ;301 OCR Gas Usage:        (Planned gas consumtion by tank).
 ;=============================================================================
--- 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		
--- a/code_part1/OSTC_code_asm_part1/spanish_text.asm	Tue Mar 15 18:44:16 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm	Wed Mar 16 19:03:01 2011 +0100
@@ -380,8 +380,9 @@
 	TCODE    .20,   .125,    "Show raw data"             ;295 Show raw data
 	TCODE    .50,    .2,     "Raw Data:"                 ;296 Raw Data:
 ; Gas-setup addons:
-    TCODE    .0,    .0,      "MOD:"                      ; 297 MOD:                 (max operating depth of a gas).
-    TCODE    .0,    .0,      "END:"                      ; 298 END:                 (equivalent nitrogen depth of a gas).
-    TCODE    .0,    .0,      "EAD:"                      ; 299 EAD:                 (equivalent air depth of a gas).
-	TCODE	 .100,	.125,	 "Active?"					 ; 300 Active? 				(Enable/Disable Gas underwater)
+    TCODE    .0,    .0,      "MOD:"                      ;297 MOD:                  (max operating depth of a gas).
+    TCODE    .0,    .0,      "END:"                      ;298 END:                  (equivalent nitrogen depth of a gas).
+    TCODE    .0,    .0,      "EAD:"                      ;299 EAD:                  (equivalent air depth of a gas).
+	TCODE	 .100,	.125,	 "Active?"					 ;300 Active?               (Enable/Disable Gas underwater)
+	TCODE    .0,    .2,      "OCR Gas Usage:"            ;301 OCR Gas Usage:        (Planned gas consumtion by tank).
 ;=============================================================================