diff src/tft_outputs.asm @ 54:7d626c15b577

some cleanup/changelog
author heinrichsweikamp
date Sun, 29 Sep 2013 19:10:12 +0200
parents 2825f1d2262f
children 448ba265fdae
line wrap: on
line diff
--- a/src/tft_outputs.asm	Sun Sep 29 18:53:22 2013 +0200
+++ b/src/tft_outputs.asm	Sun Sep 29 19:10:12 2013 +0200
@@ -749,64 +749,27 @@
     lfsr	FSR2,buffer
     movlw   .1
     movwf   mcp_temp+0
-    cpfseq  active_gas  ;1-5
-    bra     $+4
-    incf    mcp_temp+0,F     ; +1
-    movff   mcp_temp+0,lo
-    movff   mcp_temp+0,PRODL
-    decf    PRODL,F     ;-1 to have 0-4
-    bsf     leftbind
-    output_8            ; Gas number
-    PUTC    ":"
-    bsf     short_gas_decriptions   ; =1: Use short versions of gaslist_strcat_gas_mod and gaslist_strcat_setpoint
-    call    gaslist_strcat_gas_mod  ;Append gas description of gas #PRODL (0-4) to current string
-    PUTC    " "         ; Clearing space
-    movlw   0x00
-    movff   WREG,buffer+.11  ; limit to 11 chars
-    STRCAT_PRINT ""
-
+    rcall   TFT_dyn_gaslist_common
     WIN_SMALL dive_custom_dyn_mask_column1,dive_custom_dyn_mask_row2
     lfsr	FSR2,buffer
     incf    mcp_temp+0,F     ; +1
     movf    mcp_temp+0,W     ; into W
-    cpfseq  active_gas  ;1-5
-    bra     $+4
-    incf    mcp_temp+0,F     ; +1
-    movff   mcp_temp+0,lo
-    movff   mcp_temp+0,PRODL
-    decf    PRODL,F     ;-1 to have 0-4
-    bsf     leftbind
-    output_8            ; Gas number
-    PUTC    ":"
-    call    gaslist_strcat_gas_mod  ;Append gas description of gas #PRODL (0-4) to current string
-    PUTC    " "         ; Clearing space
-    movlw   0x00
-    movff   WREG,buffer+.11  ; limit to 11 chars
-    STRCAT_PRINT ""
-
+    rcall   TFT_dyn_gaslist_common
     WIN_SMALL dive_custom_dyn_mask_column2,dive_custom_dyn_mask_row1
     lfsr	FSR2,buffer
     incf    mcp_temp+0,F     ; +1
     movf    mcp_temp+0,W     ; into W
-    cpfseq  active_gas  ;1-5
-    bra     $+4
-    incf    mcp_temp+0,F     ; +1
-    movff   mcp_temp+0,lo
-    movff   mcp_temp+0,PRODL
-    decf    PRODL,F     ;-1 to have 0-4
-    bsf     leftbind
-    output_8            ; Gas number
-    PUTC    ":"
-    call    gaslist_strcat_gas_mod  ;Append gas description of gas #PRODL (0-4) to current string
-    PUTC    " "         ; Clearing space
-    movlw   0x00
-    movff   WREG,buffer+.11  ; limit to 11 chars
-    STRCAT_PRINT ""
-
+    rcall   TFT_dyn_gaslist_common
     WIN_SMALL dive_custom_dyn_mask_column2,dive_custom_dyn_mask_row2
     lfsr	FSR2,buffer
     incf    mcp_temp+0,F     ; +1
     movf    mcp_temp+0,W     ; into W
+    rcall   TFT_dyn_gaslist_common
+    bcf     short_gas_decriptions   ; =1: Use short versions of gaslist_strcat_gas_mod and gaslist_strcat_setpoint
+    call	TFT_standard_color
+    return
+
+TFT_dyn_gaslist_common:
     cpfseq  active_gas  ;1-5
     bra     $+4
     incf    mcp_temp+0,F     ; +1
@@ -817,15 +780,15 @@
     output_8            ; Gas number
     bcf     leftbind
     PUTC    ":"
+    bsf     short_gas_decriptions   ; =1: Use short versions of gaslist_strcat_gas_mod and gaslist_strcat_setpoint
     call    gaslist_strcat_gas_mod  ;Append gas description of gas #PRODL (0-4) to current string
     PUTC    " "         ; Clearing space
     movlw   0x00
     movff   WREG,buffer+.11  ; limit to 11 chars
     STRCAT_PRINT ""
-    bcf     short_gas_decriptions   ; =1: Use short versions of gaslist_strcat_gas_mod and gaslist_strcat_setpoint
-    call	TFT_standard_color
     return
 
+
     global  TFT_update_avr_stopwatch           ; Update average depth and stopwatch
 TFT_update_avr_stopwatch:
     call    TFT_standard_color