--- a/src/compass_ops.asm	Mon Apr 29 13:05:18 2024 +0200
+++ b/src/compass_ops.asm	Thu Nov 27 18:32:58 2025 +0100
@@ -25,14 +25,14 @@
 
 
 ; local flags
-#DEFINE compass_show_cardinal	compass_flags,0		; =1: show the cardinal (N, NE, E, ...)
-#DEFINE compass_bearing_eq		compass_flags,1		; =1: bearing is in direction, do not show << or >> 
-#DEFINE compass_bearing_lft		compass_flags,2		; =1: bearing is to the left/<<, =0: to the right/>>
-#DEFINE compass_bearing_vis		compass_flags,3		; =1: bearing is visible (either ahead or behind/-180°)
-#DEFINE compass_bearing_ahd		compass_flags,4		; =1: bearing is ahead, =0: behind
-;								compass_flags,5		; --- unused
-;								compass_flags,6		; --- unused
-;								compass_flags,7		; --- unused
+;#DEFINE compass_show_cardinal	compass_flags,0		; =1: show the cardinal (N, NE, E, ...)
+;#DEFINE compass_bearing_eq		compass_flags,1		; =1: bearing is in direction, do not show << or >> 
+;#DEFINE compass_bearing_lft		compass_flags,2		; =1: bearing is to the left/<<, =0: to the right/>>
+;#DEFINE compass_bearing_vis		compass_flags,3		; =1: bearing is visible (either ahead or behind/-180°)
+;#DEFINE compass_bearing_ahd		compass_flags,4		; =1: bearing is ahead, =0: behind
+;;								compass_flags,5		; --- unused
+;;								compass_flags,6		; --- unused
+;;								compass_flags,7		; --- unused
 
 
 ; Make sure symbols from the .inc are available to the C code:
@@ -222,7 +222,7 @@
 	call	TFT_ClearScreen				; clear the screen
 	; Mask
 	WIN_STD .16,.0						; set position
-	FONT_COLOR color_greenish			; set font color
+	FONT_COLOR color_green			; set font color
 	STRCPY_TEXT_PRINT tCompassCalibration
 	btfss	switch_right2				; wait until button (with a moving magnet in some OSTC!) is released
 	bra		$-2
@@ -477,7 +477,7 @@
 	global	TFT_surface_compass_mask
 TFT_surface_compass_mask:
 	WIN_SMALL surf_compass_mask_column,surf_compass_mask_row
-	FONT_COLOR_MEMO						; set font color
+	FONT_COLOR color_green				; set font color
 	STRCPY_TEXT_PRINT tHeading			; print "Heading:"
 	return								; done
 
@@ -530,9 +530,11 @@
 ;-----------------------------------------------------------------------------
 ; Mask for Compass in Dive Mode
 ;
-	global	TFT_dive_compass_mask		; draws the white box around the heading tape
+	global	TFT_dive_compass_mask
 TFT_dive_compass_mask:
-	WIN_FRAME_STD dm_custom_compass_graph_row, dm_custom_compass_graph_row+dm_custom_compass_graph_height, .0, .159
+	FONT_COLOR_MASK						; select color
+    	WIN_TINY dm_custom_compass_mask_column,dm_custom_compass_mask_row
+	STRCPY_TEXT_PRINT tCompassMenu				; print label
 	return
 
 
@@ -542,628 +544,26 @@
 	global	TFT_dive_compass_heading
 TFT_dive_compass_heading:
 	call	compass_heading_common		; compute heading
-
-;	; ### for development only, hard-coding the bearing ###
-;	; 244° : SW - W
-;	MOVLI	.244,xA						; xA used as temp
-;	MOVII	xA,compass_bearing			; compass_bearing is stored in bank isr_backup
-
-	FONT_SIZE FT_SMALL					; set font size
-	MOVII	compass_heading_shown,xA	; get heading
-	; 160° viewing angle: add +360 offset if xA <= 292 for non-negative scale
-	MOVLI	.292,sub_a
-	MOVII	xA,  sub_b
-	call	subU16						; sub_c = sub_a - sub_b
-	btfsc	neg_flag					; xA > 292 ?
-	bra		TFT_dive_compass_heading_1	; YES
-	ADDLI	.360,xA						; NO  - add offset
-TFT_dive_compass_heading_1:
-	SUBLI	.80,xA						; subtract 80 (left pixel offset from the center)
-	MOVII	xA,xRD						; save result to xRD
-	ADDLI	.160,xA						; add 160 (display with in pixels)
-	MOVII	xA,xRDr						; save result to xRDr
-
+	; Text output
+	FONT_COLOR_MEMO						; set default / dive-mode standard color
+	WIN_MEDIUM dm_custom_compass_head_column, dm_custom_compass_head_row
+	MOVII	compass_heading_shown,mpr	; get heading to be shown
+	bsf	leading_zeros
+	output_999							; print bearing
+	bcf	leading_zeros
+	PRINT								; dump to screen
+	WIN_STD dm_custom_compass_unit_column, dm_custom_compass_unit_row
+	STRCAT	"°"
+	call	tft_compass_cardinal		; append cardinal buffer
+	PRINT
+	; shall show bearing?
 	btfss	compass_bearing_set			; is a bearing set?
-	bra		TFT_dive_compass_ruler		; NO  - skip next calculations
-	MOVII	xRDr,sub_a					; YES - calculate xRD180 = xRDr - 180
-	MOVLI	.180,sub_b
-	call	subU16						; sub_c = sub_a - sub_b
-	MOVII	sub_c,xRD180
-
-TFT_dive_compass_bearing_1:
-	; calculate bearing position and visibility (ahead or behind)
-	bcf		compass_bearing_vis			; default is not-visible
-	bcf		compass_bearing_ahd			; default is behind
-	MOVII	compass_bearing,xA
-	ADDLI	.360,xA						; calculate the bearing virtual display offset
-	MOVII	xA,divA						; save it for reuse for upper/lower turns and ahead/behind checks
-
-	; check if bearing is ahead
-	MOVII	divA,sub_a					; load the bearing offset into sub_a
-	MOVII	xRD, sub_b					; load the display offset back to sub_b
-	rcall	TFT_dive_compass_bearing_ap
-	btfsc	compass_bearing_vis			; bearing visible?
-	bra		TFT_dive_compass_bearing_dir; YES
-
-	; check if it is ahead with an upper turn
-	MOVII	divA,sub_a					; load the bearing offset into sub_a
-	MOVII	xRD, sub_b					; load the display offset back to sub_b
-	ADDLI	.360,sub_b
-	rcall	TFT_dive_compass_bearing_ap
-	btfsc	compass_bearing_vis			; bearing visible?
-	bra		TFT_dive_compass_bearing_dir; YES
-
-	; check if it is ahead with a lower turn
-	MOVII	divA,sub_a					; load the bearing offset into sub_a
-	ADDLI	.360,sub_a
-	MOVII	xRD, sub_b					; load the display offset back to sub_b
-	rcall	TFT_dive_compass_bearing_ap
-	btfsc	compass_bearing_vis			; bearing visible?
-	bra		TFT_dive_compass_bearing_dir; YES
-
-	; marker is not ahead of us, check if it is behind of us
-	; use the (160 - (xRD180 - xCM)) formula to see if it's on the display
-	MOVII	xRD180,sub_a				; load the display offset back to sub_a
-	MOVII	divA,  sub_b				; load the marker's offset into sub_b
-	rcall	TFT_dive_compass_bearing_bp
-	btfsc	compass_bearing_vis			; bearing behind of us?
-	bra		TFT_dive_compass_bearing_dir; YES
-
-	; check if it is behind with the upper turn
-	MOVII	xRD180,sub_a
-	MOVII	divA,  sub_b
-	ADDLI	.360,  sub_b
-	rcall	TFT_dive_compass_bearing_bp
-	btfsc	compass_bearing_vis			; bearing behind of us?
-	bra		TFT_dive_compass_bearing_dir; YES
-
-	; check if it is behind with the lower turn
-	MOVII	xRD180,sub_a
-	ADDLI	.360,  sub_a
-	MOVII	divA,  sub_b				; load the marker's offset into sub_b
-	rcall	TFT_dive_compass_bearing_bp
-	bra		TFT_dive_compass_bearing_dir
-
-TFT_dive_compass_bearing_ap:
-	; xCM received in sub_a
-	; xRD received in sub_b
-	; 1/a. check if it's viewable from the left side
-	call	subU16						; sub_c = sub_a - sub_b
-	btfsc	neg_flag					; xRD > divA ?
-	return								; NO  - done
-	MOVII	sub_c,xC					; YES - store the RO=RP-RD for drawing
-	; 1/b. check if it's viewable from the right side
-	ADDLI	  .2,sub_a					; avoid thin mess on the side of the display
-	ADDLI	.158,sub_b					; load the display offset right side into sub_b
-	call	subU16						; sub_c = sub_a - sub_b
-	btfss	neg_flag					; xRDr > xA(+2) ?
-	return								; NO  - done
-										; YES - print the bearing lines on the screen
-	movff	xC+0,xCM
-	bsf		compass_bearing_vis			; set visible
-	bsf		compass_bearing_ahd			; set ahead
-	return								; done
-
-TFT_dive_compass_bearing_bp:
-	; use the (160 - (xRD180 - xCM)) formula to see if it's on the display
-	; the marker's offset received in sub_b
-	; the xRD180 display offset received in sub_a
-	; xRD180 - xCM
-	call	subU16						; sub_c = sub_a - sub_b
-	btfsc	neg_flag					; CM > xRD180 ?
-	return								; NO -  not on screen, done
-										; YES - check 160 - (X)
-	MOVLI	.158, sub_a					; 158 to avoid thin mess on the side of the display
-	MOVII	sub_c,sub_b
-	call	subU16						; sub_c = sub_a - sub_b
-	btfsc	neg_flag					; X > 160 ?
-	return								; NO - not on screen, done
-	; check if not overflow - this sounds like a double check...
-	tstfsz	sub_c+1						; high byte = 0 ?
-	return								; NO - sub_c must be > 160 then, done
-	movlw	d'158'						; YES - load a 158
-	cpfslt	sub_c+0						;     - low byte < 158 ?
-	return								;       NO  - done
-	movff	sub_c+0,xCM					;       YES - print the bearing lines on the screen
-	bsf		compass_bearing_vis			;           - flag to show bearing lines
-	return								;           - done
-
-TFT_dive_compass_bearing_dir:
-	; check if bearing to heading, and calculate the direction
-	bcf		compass_bearing_eq
-	btfss	compass_bearing_vis
-	bra		TFT_dive_compass_bearing_lr
-	btfss	compass_bearing_ahd
-	bra		TFT_dive_compass_bearing_lr
-	movff	xCM,xA+0
-	movlw	d'80'
-	cpfseq	xA+0
-	bra		TFT_dive_compass_bearing_lr
-	bsf		compass_bearing_eq
-	bra		TFT_dive_compass_ruler		; bearing points to heading, no signs are required, go to the ruler
-
-TFT_dive_compass_bearing_lr:
-	; get the bearing virtual display offset
-	MOVII	compass_bearing,xA
-	; xA = xA > 292 ? xA : xA+360
-	MOVLI	.292,sub_a
-	MOVII	xA,  sub_b
-	call	subU16						; sub_c = sub_a - sub_b
-	btfsc	neg_flag					; xA > 292 ?
-	bra		TFT_dive_compass_bearing_lr_1; YES
-	ADDLI	.360,xA						; NO  - add 360
-
-TFT_dive_compass_bearing_lr_1:
-	; 1. calculate whether bearing is to left or to right
-	bsf		compass_bearing_lft			; to the left by default
-	; xC: save center value to compare the direction to front value
-	MOVII	xA,xC
-	; xB: we need the left side for comparison... left = -180
-	MOVII	xA,  sub_a
-	MOVLI	.180,sub_b
-	call	subU16						; sub_c = sub_a - sub_b
-	MOVII	sub_c,xB					; xB has the left side of the 180° distance center
-	; xA = xRD > (xC+100) ? RD-280 : xRD+80
-	MOVII	xC,  sub_a
-	ADDLI	.100,sub_a
-	MOVII	xRD, sub_b
-	call	subU16						; sub_c = sub_a - sub_b
-	btfsc	neg_flag					; xRD > xC + 100 ?
-	bra		TFT_dive_compass_bearing_lr_2; YES - xA = xRD - 280
-										; NO  - xA = xRD + 80
-	MOVII	xRD,xA
-	ADDLI	.80,xA
-	bra		TFT_dive_compass_bearing_lr_c
-
-TFT_dive_compass_bearing_lr_2:
-	MOVII	xRD,sub_a
-	MOVLI	.280,sub_b
-	call	subU16						; sub_c = sub_a - sub_b
-	MOVII	sub_c,xA
-	;bra	TFT_dive_compass_bearing_lr_c
-
-TFT_dive_compass_bearing_lr_c:
-	; xB < xA < xC => right, otherwise left (default)
-	MOVII	xA,sub_b
-	MOVII	xB,sub_a
-	call	subU16						; sub_c = sub_a - sub_b
-	btfss	neg_flag					; xA > xB ?
-	bra		TFT_dive_compass_ruler		; NO - xB >= xA, keep default left
-	MOVII	xA,sub_a
-	MOVII	xC,sub_b
-	call	subU16						; sub_c = sub_a - sub_b
-	btfss	neg_flag					; xC > xA ?
-	bra		TFT_dive_compass_ruler		; NO - xA >= xC, keep default left
-	bcf		compass_bearing_lft
-
-TFT_dive_compass_ruler:
-	; calculate mod15 for the ticks
-	MOVII	xRD,xA
-	MOVLI	.15,xB
-	call	div16x16					; xA/xB=xC with xA+0 as remainder
-	; check the remainder
-	movlw	d'0'
-	cpfsgt	xA+0						; mod15 > 0 ?
-	bra		TFT_dive_compass_ruler_1	; NO  - RM = 0
-										; YES - RM = 15 - RDmod15
-	movlw	d'15'
-	subfwb	xA+0,F
-TFT_dive_compass_ruler_1:
-	movff	xA+0,lo						; xA+0 holds the RM, store it to 'lo'
-	clrf	hi							; initialize DD to zero, store it to 'hi'
-
-TFT_dive_compass_ruler_loop:
-	; 1. check if we run out of the display
-	movlw	d'159'						; looks like 159 works because TFT_box limits the display
-	cpfslt	lo,1
-	bra		TFT_dive_compass_ruler_lend	; xRM >= W
-	; 2. Clear the tick area from DD to RM - in segments to avoid blinking
-	;    don't do a clear if we are at 0 (zero) otherwise it will blink
-	;    because of the width underflow
-	movlw	d'0'
-	cpfsgt	lo,1
-	bra		TFT_dive_compass_ruler_loop_zz
-	rcall	TFT_dive_compass_clr_ruler
-TFT_dive_compass_ruler_loop_zz:
-	; 3. Draw the markers @ RM
-	;    we receive RM in lo and DD in hi
-	movlw	d'2'
-	movwf	win_bargraph				; set with of  ticks
-	movwf	win_width+0
-	clrf	win_width+1
-	movff	lo,win_leftx2				; 0..159
-	movlw	dm_custom_compass_tick_top_top
-	movwf	win_top						; set position for upper ticks
-	movlw	dm_custom_compass_tick_height
-	movwf	win_height					; set hight of ticks
-	movf	pallet_color_memo,W			; select color
-	BOX_COLOR							; draw tick
-	movlw	dm_custom_compass_tick_bot_top
-	movwf	win_top						; set position for lower ticks
-	movlw	dm_custom_compass_tick_height
-	movwf	win_height					; set hight of ticks
-	movf	pallet_color_memo,W			; select color
-	BOX_COLOR							; draw tick
-	; 4. If D < 82 and RM > 79: means we put something over the center line,
-	;							so redraw the center line
-	movlw	d'82'
-	cpfslt	hi,1
-	bra		TFT_dive_compass_ruler_loop_zz2
-	movlw	d'79'
-	cpfsgt	lo,1
-	bra		TFT_dive_compass_ruler_loop_zz2
-	; enough to print center line as bearing marker is not in the ticker area
-	rcall	TFT_dive_compass_c			; draw center line in yellow
-TFT_dive_compass_ruler_loop_zz2:
-	; 5. set D = RM + 2 : position after the 2px tick
-	movff	lo,hi
-	movlw	d'2'
-	addwf	hi,F
-	; 6. set RM = RM + 15 : position to the next tick
-	movlw	d'15'
-	addwf	lo,F
-	; 7. loop
-	bra		TFT_dive_compass_ruler_loop
-
-TFT_dive_compass_ruler_lend:			; loop end
-	; 8. clear the rest of the tick area if D < 160
-	movlw	d'160'
-	cpfslt	hi
-	bra		TFT_dive_compass_labels		 ; D >= W
-	; 9. position left to end of display to clear the remaining area
-	movlw	d'159'
-	movwf	lo
-	; 10. clear it
-	rcall	TFT_dive_compass_clr_ruler
-
-TFT_dive_compass_labels:
-	; done with the compass ruler, put the labels on the screen
-	FONT_COLOR_MEMO						; set dive-mode standard color
-	clrf	hi							; hi stores the display position
-	movff	hi,xHI						; bank-safe clear of xHI
-	clrf	lo							; lo stores the last item's display position
-	movff	lo,xLO						; bank-safe clear of xLO
-	MOVLI	.219,sub_a					; position of the cardinal
-	MOVII	xRD, sub_b					; get the RD back to sub_b
-	rcall	TFT_dive_compass_label_proc	; check if the cardinal shall be on screen
-	btfss	compass_show_cardinal		; shall show cardinal?
-	bra		dcr_1						; NO
-	STRCPY_TEXT_PRINT tSW				; YES - print it
-dcr_1:
-	rcall	TFT_dive_compass_c_mk		; check if cardinal is on the center line or the marker
-	MOVLI	.267,sub_a					; position of the cardinal
-	rcall	TFT_dive_compass_label_proc	; check if the cardinal shall be on screen
-	btfss	compass_show_cardinal		; shall show cardinal?
-	bra		dcr_2						; NO
-	STRCPY_TEXT_PRINT tW				; YES - print it
-dcr_2:
-	rcall	TFT_dive_compass_c_mk		; check if cardinal is on the center line or the marker
-	MOVLI	.309,sub_a					; position of the cardinal
-	rcall	TFT_dive_compass_label_proc	; check if the cardinal shall be on screen
-	btfss	compass_show_cardinal		; shall show cardinal?
-	bra		dcr_3						; NO
-	STRCPY_TEXT_PRINT tNW				; YES - print it
-dcr_3:
-	rcall	TFT_dive_compass_c_mk		; check if cardinal is on the center line or the marker
-	MOVLI	.358,sub_a					; position of the cardinal
-	rcall	TFT_dive_compass_label_proc	; check if the cardinal shall be on screen
-	btfss	compass_show_cardinal		; shall show cardinal?
-	bra		dcr_4						; NO
-	STRCPY_TEXT_PRINT tN				; YES - print it
-dcr_4:
-	rcall	TFT_dive_compass_c_mk		; check if cardinal is on the center line or the marker
-	MOVLI	.399,sub_a					; position of the cardinal
-	rcall	TFT_dive_compass_label_proc	; check if the cardinal shall be on screen
-	btfss	compass_show_cardinal		; shall show cardinal?
-	bra		dcr_5						; NO
-	STRCPY_TEXT_PRINT tNE				; YES - print it
-dcr_5:
-	rcall	TFT_dive_compass_c_mk		; check if cardinal is on the center line or the marker
-	MOVLI	.448,sub_a					; position of the cardinal
-	rcall	TFT_dive_compass_label_proc	; check if the cardinal shall be on screen
-	btfss	compass_show_cardinal		; shall show cardinal?
-	bra		dcr_6						; NO
-	STRCPY_TEXT_PRINT	tE				; YES - print it
-dcr_6:
-	rcall	TFT_dive_compass_c_mk		; check if cardinal is on the center line or the marker
-	MOVLI	.489,sub_a					; position of the cardinal
-	rcall	TFT_dive_compass_label_proc	; check if the cardinal shall be on screen
-	btfss	compass_show_cardinal		; shall show cardinal?
-	bra		dcr_7						; NO
-	STRCPY_TEXT_PRINT	tSE				; YES - print it
-dcr_7:
-	rcall	TFT_dive_compass_c_mk		; check if cardinal is on the center line or the marker
-	MOVLI	.538,sub_a					; position of the cardinal
-	rcall	TFT_dive_compass_label_proc	; check if the cardinal shall be on screen
-	btfss	compass_show_cardinal		; shall show cardinal?
-	bra		dcr_8						; NO
-	STRCPY_TEXT_PRINT tS				; YES - print it
-dcr_8:
-	rcall	TFT_dive_compass_c_mk		; check if cardinal is on the center line or the marker
-	MOVLI	.579,sub_a					; position of the cardinal
-	rcall	TFT_dive_compass_label_proc	; check if the cardinal shall be on screen
-	btfss	compass_show_cardinal		; shall show cardinal?
-	bra		dcr_9						; NO
-	STRCPY_TEXT_PRINT tSW				; YES - print it
-dcr_9:
-	rcall	TFT_dive_compass_c_mk		; check if cardinal is on the center line or the marker
-	MOVLI	.627,sub_a					; position of the cardinal
-	rcall	TFT_dive_compass_label_proc	; check if the cardinal shall be on screen
-	btfss	compass_show_cardinal		; shall show cardinal?
-	bra		dcr_10						; NO
-	STRCPY_TEXT_PRINT tW				; YES - print it
-dcr_10:
-	rcall	TFT_dive_compass_c_mk		; check if cardinal is on the center line or the marker
-	MOVLI	.669,sub_a					; position of the cardinal
-	rcall	TFT_dive_compass_label_proc	; check if the cardinal shall be on screen
-	btfss	compass_show_cardinal		; shall show cardinal?
-	bra		dcr_11						; NO
-	STRCPY_TEXT_PRINT tNW				; YES - print it
-dcr_11:
-	rcall	TFT_dive_compass_c_mk		; check if cardinal is on the center line or the marker
-	MOVLI	.718,sub_a					; position of the cardinal
-	rcall	TFT_dive_compass_label_proc	; check if the cardinal shall be on screen
-	btfss	compass_show_cardinal		; shall show?
-	bra		dcr_12						; NO
-	STRCPY_TEXT_PRINT tN				; YES - print it
-dcr_12:
-	rcall	TFT_dive_compass_c_mk		; check if cardinal is on the center line or the marker
-
-TFT_dive_compass_label_end:
-	rcall	TFT_dive_compass_c_mk		; check if cardinal is on the center line or the marker
-	; restore lo and hi for the final cleanup
-	movff	xLO,lo						; xLO and xHI are stored in bank isr_backup
-	movff	xHI,hi
-	; clear the rest of the SQ area if there is more space
-	movlw	d'159'
-	cpfslt	hi
-	bra		TFT_dive_compass_label_end2	; D >= 160, no more space
-	; position left to end of display to clear the remaining area
-	movlw	d'158'
-	movwf	lo
-	; clear it
-	rcall	TFT_dive_compass_clr_label
-TFT_dive_compass_label_end2:
-	rcall	TFT_dive_compass_c_mk		; check if cardinal is on the center line or the marker
-	; do we have bearing set?
-	btfsc	compass_bearing_set			; bearing set?
-	bra		TFT_dive_compass_dir_text	; YES - print the direction (<< or >>)
-	rcall	TFT_dive_compass_dir_lclr	; NO  - clear the area (e.g. we had but removed)
-	rcall	TFT_dive_compass_dir_rclr
-	bra		TFT_dive_compass_text
-
-TFT_dive_compass_dir_text:
-	; bearing set, but does it point to heading?
-	btfss	compass_bearing_eq
-	bra		TFT_dive_compass_dir_text_2	; bearing != heading - go and print the direction
-	rcall	TFT_dive_compass_dir_lclr	; bearing == heading - no need for direction markers
-	rcall	TFT_dive_compass_dir_rclr
-	bra		TFT_dive_compass_text
-
-TFT_dive_compass_dir_text_2:
-	FONT_COLOR color_green
-	btfsc	compass_bearing_lft
-	bra		TFT_dive_compass_dir_ldir	; bearing_lft=1, print the left marker
-;TFT_dive_compass_text_rdir:
-	WIN_SMALL dm_custom_compass_rdir_column, dm_custom_compass_head_row-.2
-	STRCPY_PRINT ">>"
-	rcall	TFT_dive_compass_dir_lclr	; do not forget to clear the left
-	bra		TFT_dive_compass_text
-
-TFT_dive_compass_dir_ldir:
-	WIN_SMALL dm_custom_compass_ldir_column, dm_custom_compass_head_row-.2
-	STRCPY_PRINT "<<"
-	rcall	TFT_dive_compass_dir_rclr	; do not forget to clear the right
-	;bra	TFT_dive_compass_text
-
-TFT_dive_compass_text:
-	; Clear some unused space on the right mH
-	WIN_BOX_BLACK dm_custom_compass_tick_top_bot+.1,dm_custom_compass_tick_bot_top-.1,.158,.159	; top, bottom, left, right
-
-	; Text output
-	WIN_SMALL dm_custom_compass_head_column, dm_custom_compass_head_row
-	call	TFT_surface_compass_heading_com	; show "xxx° N"
-	return
-
-TFT_dive_compass_dir_lclr:
-	WIN_SMALL dm_custom_compass_ldir_column, dm_custom_compass_head_row-.2
-	STRCPY_PRINT "  "
-	return
-
-TFT_dive_compass_dir_rclr:
-	WIN_SMALL dm_custom_compass_rdir_column, dm_custom_compass_head_row-.2
-	STRCPY_PRINT "  "
-	return
-
-TFT_dive_compass_label_proc:
-	movlw	d'14'
-	movwf	up							; cardinal width in px
-	bcf		compass_show_cardinal
-	; 1/a. check if it's viewable ? sub_a(RP) >= sub_b(RD) ?
-	;      set the carry flag if sub_b(xRD) is equal to or greater than sub_a(xRP):
-	MOVII	xRD,sub_b
-	call	subU16						; sub_c = sub_a - sub_b
-	btfsc	neg_flag					; >= 0 ?
-	return								; NO
-	; store the RO=RP-RD for drawing
-	MOVII	sub_c,xC
-
-	; 1/b. check if it's viewable ? sub_a(RP)+up(width) < sub_b(RD)+160
-	;      if already above, no need to process the rest of the labels
-	movff	up,WREG						; take care about the width
-	addwf	sub_a+0,1
-	btfsc	STATUS, C
-	incf	sub_a+1
-
-	MOVII	xRDr,sub_b
-	call	subU16	 					; sub_c = sub_a - sub_b
-	btfss	neg_flag					; < 0 ?
-	bra		TFT_dive_compass_label_end	; NO
-
-	; 2. restore RO=RP-RD from 1/a.
-	movff	xC+0,lo
-
-	; 3. Clear the segment from DD(hi) to lo
-	;    don't do a clear if we are at 0 (zero) otherwise it will blink
-	;   ?because of the width underflow?
-	movlw	d'1'
-	cpfsgt	lo
-	bra		TFT_dive_compass_label_proc_p
-	rcall	TFT_dive_compass_clr_label
-TFT_dive_compass_label_proc_p:
-	; 4. print the SQ on the screen
-	FONT_COLOR_MEMO
-	bsf		compass_show_cardinal
-;TFT_dive_compass_label_print:
-	movlw	dm_custom_compass_label_row	; set output position
-	movff	WREG,win_top				; ...
-	movff	lo,win_leftx2				; ...
-	FONT_SIZE FT_SMALL					; set font size
-	; 6. retain the new display positions
-	movff	lo,hi
-	movff	up,WREG
-	addwf	hi,F
-	movff	lo,xLO
-	movff	hi,xHI
-	return
-
-TFT_dive_compass_c_mk:
-	; Common task to draw center line and marker
-	; until a proper implementation make it simple:
-	rcall	TFT_dive_compass_mk
-TFT_dive_compass_c:
-	movlw	color_yellow
-	WIN_BOX_COLOR dm_custom_compass_tick_top_top, dm_custom_compass_tick_bot_bot,.80,.81 ; center line in yellow
-	return
-
-TFT_dive_compass_mk:
-	; draw the bearing on the screen if visible and if we just put something over it
-	btfss	compass_bearing_set			; bearing set?
-	return								; NO  - done
-	btfss	compass_bearing_vis			; YES - bearing visible?
-	return								;       NO  - bearing set but not visible, done
-
-	; save lo/hi from trashing
-	MOVII	mpr,xA
-
-	; did we just update the marker's position?
-	; DD.......DD
-	; CM+2>=DD(old) or CM-2<=DD
-	; ToDo
-
-	btfss	compass_bearing_ahd
-	bra		TFT_dive_compass_mk_rear
-;TFT_dive_compass_mk_front:
-	clrf	lo
-	movff	xCM,lo
-	bsf		compass_show_cardinal		; set=green marker
-	rcall	TFT_dive_compass_mk_print
-	bcf		compass_show_cardinal
-	bra		TFT_dive_compass_mk_end
-
-TFT_dive_compass_mk_rear:
-	clrf	lo
-	movff	xCM,lo
-	bcf		compass_show_cardinal		; set=red marker
-	rcall	TFT_dive_compass_mk_print
-
-TFT_dive_compass_mk_end:
-	MOVII	xA,mpr
-	return
-
-TFT_dive_compass_mk_print:
-	movlw	d'1'
-	cpfsgt	lo
-	bra		TFT_dive_compass_mk_print_2	; lo <= 1, skip the first line
-	movlw	d'2'
-	subwf	lo,0
-;	movff	WREG,win_leftx2
-	rcall	TFT_dive_compass_mk_print_3
-TFT_dive_compass_mk_print_2:
-	; save hi/lo
-	MOVII	mpr,divA
-	; clear the middle of the bearing marker
-	movff	lo,hi
-	movlw	d'2'
-	addwf	lo,1
-	rcall	TFT_dive_compass_clr_label
-	; restore hi/lo
-	MOVII	divA,mpr
-	; print a dot on the middle
-	movf	lo,W
-	rcall	TFT_dive_compass_mk_print_dot
-	; finally print the right marker line
-	movlw	d'2'
-	addwf	lo,0
-;	rcall	TFT_dive_compass_mk_print_3
-;	return
-TFT_dive_compass_mk_print_3:
-	movwf	win_leftx2
-	movlw	dm_custom_compass_label_row
-	movwf	win_top
-	movlw	dm_custom_compass_label_height-.2
-	movwf	win_height
-	bra		TFT_dive_compass_mk_print_4
-TFT_dive_compass_mk_print_dot:
-	movwf	win_leftx2
-	movlw	dm_custom_compass_label_row + .9
-	movwf	win_top
-	movlw	d'4'
-	movwf	win_height
-TFT_dive_compass_mk_print_4:
-	movlw	.158
-	cpfslt	win_leftx2
-	bra		TFT_dive_compass_mk_print_5
-	movlw	d'2'
-	movwf	win_bargraph
-	movwf	win_width+0
-	clrf	win_width+1
-	movlw	color_green
-	btfss	compass_show_cardinal
-	movlw	color_red						; select color
-	BOX_COLOR									; draw box
-TFT_dive_compass_mk_print_5:
-	return
-
-TFT_dive_compass_clr_label:
-	movlw	dm_custom_compass_label_row-.2	; set top & height
-	movwf	win_top
-	movlw	dm_custom_compass_label_height+.2
-	movwf	win_height
-	rcall	TFT_dive_compass_clear
-	return
-
-TFT_dive_compass_clr_ruler:
-	; top tick
-	movlw	dm_custom_compass_tick_top_top	; set top & height
-	movwf	win_top
-	movlw	dm_custom_compass_tick_height
-	movwf	win_height
-	rcall	TFT_dive_compass_clear
-	;bottom tick
-	movlw	dm_custom_compass_tick_bot_top	; set top & height
-	movwf	win_top
-	movlw	dm_custom_compass_tick_height
-	movwf	win_height
-;	rcall	TFT_dive_compass_clear
-;	return
-TFT_dive_compass_clear:
-	; we receive RM in lo and DD in hi
-	; calculate width = RM-D
-	movf	hi,W
-	subwf	lo,W
-	bz		TFT_dive_compass_clear3		; do nothing if there is nothing to do
-	movwf	win_width+0					; RM-DD
-	movwf	win_bargraph
-	clrf	win_width+1
-	movlw	.1
-	cpfsgt	win_width+0
-	bra		TFT_dive_compass_clear3		; do not clear a single pixel (or less)
-	movff	hi,win_leftx2
-	movlw	color_black					; select color
-	BOX_COLOR								; draw box
-TFT_dive_compass_clear3:
-	return
+	return								; NO - done
+	; show bearing
+	WIN_SMALL dm_compass_bear_column,dm_compass_bear_row
+	FONT_COLOR	color_yellow			; set font color
+	MOVII	compass_bearing,mpr			; get bearing
+	goto	TFT_compass_helper			; show number and cardinal and return
 
 tft_compass_cardinal:
 	btfsc	hi,0						; heading > 255° ?