Mercurial > public > hwos_code

diff src/customview.asm @ 300:5ad479f2a868

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged Screen layout mod #1 into Screen layout work #3
author Janos Kovacs <kovjanos@gmail.com>
date Sun, 31 May 2015 21:24:16 +0200
parents 653a3ab08062
children 4f83470dcece
line wrap: on
line diff
--- a/src/customview.asm	Sun May 31 20:25:12 2015 +0200
+++ b/src/customview.asm	Sun May 31 21:24:16 2015 +0200
@@ -250,16 +250,16 @@
 	clrf	menupos2
     bcf     menuview
 menuview_mask:
-    WIN_BOX_BLACK   divemode_simtext_row, divemode_simtext_row+.24, divemode_simtext_column, divemode_simtext_column+.49    ; top, bottom, left, right
+    WIN_BOX_BLACK   dm_simtext_row, dm_simtext_row+.23, dm_simtext_column, dm_simtext_column+.49 ; top, bottom, left, right
     btfss   FLAG_gauge_mode
     bra     menuview_mask2
-    ; Clear some more in gauge mode
-    WIN_BOX_BLACK   divemode_simtext_row, divemode_simtext_row+.24, divemode_simtext_column+.50, divemode_simtext_column+.70    ; top, bottom, left, right
+    ; Clear some more in gauge mode  --
+    WIN_BOX_BLACK   dm_simtext_row, dm_simtext_row+.23, dm_simtext_column+.50, dm_simtext_column+.70  ; top, bottom, left, right
 menuview_mask2:
     movlw   color_yellow
     call	TFT_set_color
     bsf     win_invert                  ; Set invert flag
-    WIN_SMALL   divemode_simtext_column,divemode_simtext_row
+    WIN_SMALL   dm_simtext_column,dm_simtext_row
 	movff	menupos2,WREG                   ; Menupos2 holds number of menu option to show
 	dcfsnz	WREG,F
 	bra		menuview_view_gaschange         ; If a better gas is indicated
@@ -365,7 +365,7 @@
     global  customview_mask
 customview_mask:	
 	call	TFT_clear_customview_divemode	
-	WIN_SMALL	divemode_customview_column,divemode_customview_row
+	WIN_SMALL	dm_customview_column,dm_customview_row
 	call	TFT_standard_color
 	movff	menupos3,WREG                   ; Menupos3 holds number of customview function
 	dcfsnz	WREG,F