Mercurial > public > hwos_code

diff src/tft_outputs.asm @ 118:abd30446e1cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
show heading with leading zeros
author heinrichsweikamp
date Fri, 27 Jun 2014 10:18:41 +0200
parents 6c577737c34e
children 3e84e2a64188
line wrap: on
line diff
--- a/src/tft_outputs.asm	Wed Jun 25 12:39:14 2014 +0200
+++ b/src/tft_outputs.asm	Fri Jun 27 10:18:41 2014 +0200
@@ -1786,16 +1786,22 @@
 TFT_surface_compass_heading2:
     WIN_STD   surf_compass_head_column,surf_compass_head_row
 	call	TFT_standard_color
+TFT_surface_compass_heading_common:     ; Show "000° N"
     lfsr	FSR2,buffer
     movff	compass_heading+0,lo
     movff	compass_heading+1,hi
     call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
     bsf     leftbind
-    output_16
+    output_16dp .2      ; Result is "0.000"
     bcf     leftbind
+    ; rearrange figures to "000"
+    movff   buffer+2,buffer+0
+    movff   buffer+3,buffer+1
+    movff   buffer+4,buffer+2
+    lfsr	FSR2,buffer+3
     STRCAT  "° "
     rcall   tft_compass_cardinal        ; Add cardinal and ordinal to POSTINC2
-    STRCAT_PRINT "  "
+    STRCAT_PRINT " "
     return
 
     global  TFT_dive_compass_heading
@@ -1811,16 +1817,7 @@
 TFT_dive_compass_heading2:
     WIN_STD dive_compass_head_column,dive_compass_head_row
 	call	TFT_standard_color
-    lfsr	FSR2,buffer
-    movff	compass_heading+0,lo
-    movff	compass_heading+1,hi
-    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-    bsf     leftbind
-    output_16
-    bcf     leftbind
-    STRCAT  "° "
-    rcall   tft_compass_cardinal        ; Add cardinal and ordinal to POSTINC2
-    STRCAT_PRINT "   "
+    rcall   TFT_surface_compass_heading_common  ; Show "000° N"
 TFT_dive_compass_heading3:
     return              ; No graphical output (yet)