diff src/tft_outputs.asm @ 116:737d6f488729

show decomode in logbook and simulator w/o sensor type
author heinrichsweikamp
date Mon, 23 Jun 2014 18:11:49 +0200
parents f3062a611eef
children 6c577737c34e
line wrap: on
line diff
--- a/src/tft_outputs.asm	Mon Jun 23 17:55:27 2014 +0200
+++ b/src/tft_outputs.asm	Mon Jun 23 18:11:49 2014 +0200
@@ -2332,15 +2332,14 @@
 	return
 
 	global	TFT_display_decotype_surface
-    global  TFT_display_decotype_surface1   ; Used from logbook!
 TFT_display_decotype_surface:
 	WIN_STD  surf_decotype_column,surf_decotype_row
     WIN_COLOR	color_lightblue
     lfsr	FSR2,buffer
     movff   opt_dive_mode,lo        ; 0=OC, 1=CC, 2=Gauge, 3=Apnea
-TFT_display_decotype_surface1:  ; Used from logbook!
     tstfsz  lo
     bra     TFT_display_decotype_surface2
+TFT_display_decotype_surface0:
     STRCAT_TEXT_PRINT	tDvOC	; OC
     bra     TFT_display_decotype_exit
 TFT_display_decotype_surface2:
@@ -2363,6 +2362,7 @@
 TFT_display_decotype_surface3:
     decfsz  lo,F
     bra     TFT_display_decotype_surface4
+TFT_display_decotype_surface3_1:
     STRCAT_TEXT_PRINT	tDvGauge	; Gauge
     bra     TFT_display_decotype_exit
 TFT_display_decotype_surface4:
@@ -2371,6 +2371,20 @@
     call	TFT_standard_color
     return
 
+    global  TFT_display_decotype_surface1   ; Used from logbook!
+TFT_display_decotype_surface1:  ; Used from logbook!
+    tstfsz  lo
+    bra     TFT_display_decotype_surface1_2
+    bra     TFT_display_decotype_surface0   ;OC
+TFT_display_decotype_surface1_2:
+    decfsz  lo,F
+    bra     TFT_display_decotype_surface1_3
+    STRCAT_TEXT_PRINT   tDvCC               ; CC (w/o Sensor/Fixed Display)
+TFT_display_decotype_surface1_3:
+    decfsz  lo,F
+    bra     TFT_display_decotype_surface4   ; Apnea
+    bra     TFT_display_decotype_surface3_1 ; Gauge
+
 ;=============================================================================
 
     global  TFT_splist_surfmode     ; Show Setpoint list