Mercurial > public > hwos_code

diff src/logbook.asm @ 549:7c408bfaf2e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2.26 stable RC1 BUGFIX: O2 Sensor readings were not updated in fixed setpoint mode CHANGE: Minor logbook layout fix
author heinrichsweikamp
date Mon, 25 Sep 2017 19:02:42 +0200
parents d36f9fca10ae
children b7eb98dbd800
line wrap: on
line diff
--- a/src/logbook.asm	Fri Sep 08 14:04:38 2017 +0200
+++ b/src/logbook.asm	Mon Sep 25 19:02:42 2017 +0200
@@ -1790,11 +1790,6 @@
     rcall   log_details_header	; Shows number, time/date and basic dive info
 
     ; OC/CC Gas List
-    LOG_POINT_TO    log_divemode
-    call	ext_flash_byte_read_plus            ; 0=OC, 1=CC, 2=Gauge, 3=Apnea into temp1
-    WIN_SMALL   .5,.65
-    WIN_COLOR   color_greenish
-    STRCPY_TEXT_PRINT   tGaslist
     bcf		leftbind
     LOG_POINT_TO    log_gas1
     movlw	color_white				; Color for Gas 1
@@ -1818,6 +1813,18 @@
     WIN_SMALL   .5,.190
     rcall       log_show_gas_common2
 
+    ; OC/CC Gas List
+    WIN_SMALL	    .5,.65
+    WIN_COLOR	    color_greenish
+    LOG_POINT_TO    log_divemode
+    call	ext_flash_byte_read_plus            ; 0=OC, 1=CC, 2=Gauge, 3=Apnea into temp1
+    decfsz	temp1,w		; =1 (CC)? 
+    bra		logbook_page3a
+    STRCPY_TEXT_PRINT   tGaslistCC  ; CC 
+    bra     logbook_page3b
+logbook_page3a:
+    STRCPY_TEXT_PRINT   tGaslist    ; OC
+logbook_page3b:
     movlw       color_lightblue
     call	TFT_set_color
     WIN_FRAME_COLOR16   .63,.220,.2,.90; Top, Bottom, Left, Right