Mercurial > public > hwos_code

diff src/simulator.asm @ 298:2fe34fc0e2ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new submenu for gas consumption, show actual mix instead of GAS1-GAS5 in deco planner
author heinrichsweikamp
date Sun, 31 May 2015 16:19:56 +0200
parents af13a18a233b
children fec5eec4c8b7
line wrap: on
line diff
--- a/src/simulator.asm	Sun May 31 10:42:47 2015 +0200
+++ b/src/simulator.asm	Sun May 31 16:19:56 2015 +0200
@@ -20,6 +20,7 @@
 #include "math.inc"
 #include "eeprom_rs232.inc"
 #include "tft_outputs.inc"
+#include "gaslist.inc"
 
 gui     CODE
 
@@ -758,12 +759,13 @@
     call    TFT_standard_color   
 
 simulator_show_decoplan5_loop:
+    movff   wait_temp,PRODL             ; Copy to PRODL first
     incf    wait_temp,F                 ; Increment gas #
-    
-    STRCPY_TEXT tGas                    ; Print Gas number
-    bsf     leftbind
-    movff   wait_temp,lo
-	output_8
+    lfsr    FSR2,buffer
+    bsf     short_gas_decriptions
+    bsf     divemode                    ; Tweak "customview_show_mix:"
+    call    gaslist_strcat_gas          ; Input: PRODL : gas number (0..4), Output: "Nxlo", "Txlo/hi", "Air" or "O2" into Postinc2
+    bcf     divemode                    ; Tweak "customview_show_mix:"
     
 	movlw	.25
 	addwf	waitms_temp,F		        ; Increase row position
@@ -779,13 +781,12 @@
     incf    WREG
     bnz     simulator_show_decoplan5_2
     call    TFT_attention_color
-    STRCAT_PRINT  ": xxxx.x"
+    STRCAT_PRINT  ":xxxx.x"
     call    TFT_standard_color   
     bra     simulator_show_decoplan5_1
     
 simulator_show_decoplan5_2: 
-    STRCAT  ": "
-
+    PUTC    ":"
     bsf     leftbind
     output_16                           ; No decimal anymore.
     bcf     leftbind