--- a/src/tft_outputs.asm	Thu Jan 14 16:24:07 2021 +0100
+++ b/src/tft_outputs.asm	Mon May 24 18:40:53 2021 +0200
@@ -1571,6 +1571,10 @@
 	; depth in meters and decimeters
 	btfsc	cur_depth_greater_100m		; was the depth >= 100 meter during last call?
 	rcall	TFT_depth_box_black			; YES - clear depth area
+
+	btfsc	cur_depth_greater_100m		; was the depth >= 100 meter during last call?
+	rcall	TFT_depth_position_m_ft		; re-set output position for full meters/feet
+
 	bcf		cur_depth_greater_100m		; current depth is now < 100 meter
 	PRINT								; dump full meters to screen
 
@@ -1596,6 +1600,10 @@
 	; full meters only
 	btfss	cur_depth_greater_100m		; was the depth >= 100 meter during last call?
 	rcall	TFT_depth_box_black			; NO - clear depth area
+	
+	btfss	cur_depth_greater_100m		; was the depth >= 100 meter during last call?
+	rcall	TFT_depth_position_m_ft		; re-set output position for full meters/feet
+	
 	bsf		cur_depth_greater_100m		; depth is >= 100 meter now
 	REINIT_BUFFER						; re-initialize the output buffer
 	bsf		omit_digit_2				; print depth in full meters, i.e. do not print 1st and 2nd digit
@@ -2833,6 +2841,21 @@
 	WIN_BOX_BLACK surf_warning2_row, surf_warning2_row+.24, surf_warning2_column, surf_warning2_column+.76	; top, bottom, left, right
 	return									; done
 
+;-----------------------------------------------------------------------------
+; Surface Mode - Message - when "I2CFail" was triggered
+;
+	global	TFT_message_i2c_error
+TFT_message_i2c_error:	
+	rcall	TFT_message_open			; set row and column for the message
+	tstfsz	WREG						; is there room for the message?
+	return								; NO - skip message in this cycle
+	STRCPY	"I2C "						; print "I2C Error:"
+	movff	i2c_error_vault+0,WREG				; last device adress
+	output_hex
+	PUTC	" "
+	movff	i2c_error_vault+1,WREG				; last data byte 
+	output_hex
+	bra		TFT_message_close			; finalize message output
 
 ;-----------------------------------------------------------------------------
 ; Surface Mode - Message - Desaturation
@@ -6030,7 +6053,6 @@
 tft_out16	CODE
 ;=============================================================================
 
-
 	global	TFT_debug_output
 TFT_debug_output:
 
@@ -6048,14 +6070,33 @@
 ;	WIN_TINY   .0, .		0					; dive    mode: overwrites depth label
 	FONT_COLOR_MEMO								; set color
 	
+	movff	D1+2,lo
+	output_256
+	PUTC	","
+	movff	D1+0,lo
+	movff	D1+1,hi
+	output_65535
+	PRINT
+	WIN_TINY .100,.45							; surface mode: fits under the textual logo in the upper right corner
+	movff	D2+2,lo
+	output_256
+	PUTC	","
+	movff	D2+0,lo
+	movff	D2+1,hi
+	output_65535
+	PRINT
+	WIN_TINY .100,.60							; surface mode: fits under the textual logo in the upper right corner
+;	movf	HW_flags_state3,W
+;	output_hex
+;	PUTC	","
 	movff	max_CCPR1L,lo
 	output_256
 	PUTC	","
-	movff	analog_sw2,lo; left
-	output_256
-	PUTC	","
-	movff	analog_sw1,lo; right
-	output_256
+	movff	divesecs_avg_trip+0,lo
+	movff	divesecs_avg_trip+1,hi
+	output_65535
+
+	
 
 ;	; deco engine scheduling performance
 ;	MOVII	int_O_profiling_overrun,mpr			; runtime +/- versus target