diff src/tft_outputs.asm @ 636:2737ddc643bb

3.11 release
author heinrichsweikamp
date Mon, 25 May 2020 17:35:30 +0200
parents 9a64914a8fca
children 8c1f1f334275
line wrap: on
line diff
--- a/src/tft_outputs.asm	Thu May 07 09:12:59 2020 +0200
+++ b/src/tft_outputs.asm	Mon May 25 17:35:30 2020 +0200
@@ -71,12 +71,12 @@
 
 
 pallet_table:
-	;	mask			disabled			memo			advice			attention		warning			; pallet
-	;	---------------	-------------------	---------------	---------------	---------------	---------------	  --------
-	DB	color_green,	color_lightblue,	color_white,	color_green,	color_yellow,	color_red		; standard
-	DB	color_red,		color_dark_red,		color_orange,	color_green,	color_yellow,	color_red		; redish
-	DB	color_cyan,		color_dark_green,	color_green,	color_green,	color_yellow,	color_red		; greenish
-	DB	color_blue,		color_deepblue,		color_lightblue,color_green,	color_yellow,	color_red		; blueish
+    ;    mask         disabled          memo advice          attention     warning   ; pallet
+    ;    ------------ ----------------- ---------------- --------------- ------------- --------- ----------
+    DB   color_green, color_lightblue,  color_white, color_green,    color_yellow, color_red ; standard
+    DB   color_red,   color_dark_red,   color_orange, color_greenish, color_pink,   color_red ; reddish
+    DB   color_cyan,  color_dark_green, color_green, color_green,    color_cyan,   color_red ; greenish
+    DB   color_blue,  color_deepblue,   color_lightblue, color_greenish, color_orange, color_red ; blueish
 
 
 ;=============================================================================
@@ -6043,34 +6043,17 @@
 	btfsc	alt_layout_active					; alternative layout active?
 	return										; YES - abort
 
-;	WIN_TINY .100,.30							; surface mode: fits under the textual logo in the upper right corner
+	WIN_TINY .100,.30							; surface mode: fits under the textual logo in the upper right corner
 ;	WIN_TINY  .35, .0							; dive    mode: fits to the right side of the depth label
-	WIN_TINY   .0, .		0					; dive    mode: overwrites depth label
+;	WIN_TINY   .0, .		0					; dive    mode: overwrites depth label
 	FONT_COLOR_MEMO								; set color
 
-	; deco engine scheduling performance
-	MOVII	int_O_profiling_overrun,mpr			; runtime +/- versus target
-	btfss	mpr+1,7								; overrun?
-	bra		TFT_debug_output_1					; YES
-	bcf		mpr+1,7								; NO - clear flag
-	PUTC	"-"									;    - print a minus
-	bra		TFT_debug_output_2					;    - continue
-TFT_debug_output_1:
-	PUTC	" "									; print a space instead of the minus
-TFT_debug_output_2:
-	output_999									; print time (0-999)
-	PUTC	"."									; print a dot as separator
-	MOVII	int_O_profiling_overrun_max,mpr		; get max runtime so far
-	output_999									; print (0-999)
-	PUTC	"."									; print a dot as separator
-	movff	char_O_profiling_overrun_phase,WREG	; get calculation phase causing the max runtime
-	output_hex									; print a hex
-	PUTC	"."									; print a dot as separator
-	movff	char_O_profiling_runs_norm,mpr		; get runs/cycle normal plan
-	output_99									; print (0-99)
-	PUTC	"."									; print a dot as separator
-	movff	char_O_profiling_runs_alt,mpr		; get runs/cycle alternative plan
-	output_99									; print (0-99)
+	movff	analog_sw1,mpr
+	output_256
+	PUTC	','
+	movff	analog_sw2,mpr
+	output_256
+	
 	PRINT										; dump to screen
 	return										; done