Mercurial > public > hwos_code

diff src/tft_outputs.asm @ 97:53a99a2dc6a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CHANGE: Always compute bailout plan based on all active gases CHANGE: Re-select last diluent when returning from bailout to OC
author heinrichsweikamp
date Mon, 28 Apr 2014 16:26:31 +0200
parents a4bff632e97b
children 24b3fd59e61f
line wrap: on
line diff
--- a/src/tft_outputs.asm	Mon Apr 28 11:33:00 2014 +0200
+++ b/src/tft_outputs.asm	Mon Apr 28 16:26:31 2014 +0200
@@ -641,8 +641,8 @@
 	bra		TFT_display_deko2			; Yes
 	; No, clear output and return
 	call	TFT_standard_color
-	WIN_SMALL	decostop_4th_stop_column+.16,decostop_4th_stop_row
-	STRCPY_PRINT "---"
+	WIN_SMALL	decostop_4th_stop_column,decostop_4th_stop_row
+	STRCPY_PRINT "  ---  "
 	WIN_BOX_BLACK   decostop_2nd_stop_row, divemode_simtext_row-1, decostop_2nd_stop_column, decostop_4th_stop_column	; top, bottom, left, right
 	WIN_BOX_BLACK   decostop_5th_stop_row, divemode_simtext_row-1, decostop_5th_stop_column, decostop_6th_stop_column	; top, bottom, left, right
 	WIN_BOX_BLACK   decostop_6th_stop_row, divemode_simtext_row-1, decostop_6th_stop_column, .159	; top, bottom, left, right
@@ -1915,7 +1915,7 @@
     WIN_TINY   .107,.0
 	call	TFT_standard_color
 	lfsr	FSR2,buffer
-    movff   CCPR1L,lo
+    movff   active_diluent,lo
     output_8
 	STRCAT_PRINT ""
 	return