comparison src/tft_outputs.asm @ 139:e0b758865e91

some cleanup
author heinrichsweikamp
date Thu, 17 Jul 2014 17:56:09 +0200
parents 4574aed5cd4c
children e3ac5b2021bc
comparison
equal deleted inserted replaced
138:2852b0bd6391 139:e0b758865e91
802 call TFT_standard_color 802 call TFT_standard_color
803 803
804 WIN_SMALL dive_custom_dyn_mask_column1,dive_custom_dyn_mask_row1 804 WIN_SMALL dive_custom_dyn_mask_column1,dive_custom_dyn_mask_row1
805 movlw .1 805 movlw .1
806 movwf tft_gaslist_temp+0 806 movwf tft_gaslist_temp+0
807 bsf short_gas_decriptions ; =1: Use short versions of gaslist_strcat_gas_mod and gaslist_strcat_setpoint
807 rcall TFT_dyn_gaslist_common 808 rcall TFT_dyn_gaslist_common
808 WIN_SMALL dive_custom_dyn_mask_column1,dive_custom_dyn_mask_row2 809 WIN_SMALL dive_custom_dyn_mask_column1,dive_custom_dyn_mask_row2
809 incf tft_gaslist_temp+0,F ; +1 810 incf tft_gaslist_temp+0,F ; +1
810 movf tft_gaslist_temp+0,W ; into W 811 movf tft_gaslist_temp+0,W ; into W
811 rcall TFT_dyn_gaslist_common 812 rcall TFT_dyn_gaslist_common
815 rcall TFT_dyn_gaslist_common 816 rcall TFT_dyn_gaslist_common
816 WIN_SMALL dive_custom_dyn_mask_column2,dive_custom_dyn_mask_row2 817 WIN_SMALL dive_custom_dyn_mask_column2,dive_custom_dyn_mask_row2
817 incf tft_gaslist_temp+0,F ; +1 818 incf tft_gaslist_temp+0,F ; +1
818 movf tft_gaslist_temp+0,W ; into W 819 movf tft_gaslist_temp+0,W ; into W
819 rcall TFT_dyn_gaslist_common 820 rcall TFT_dyn_gaslist_common
820 bcf short_gas_decriptions ; =1: Use short versions of gaslist_strcat_gas_mod and gaslist_strcat_setpoint
821 call TFT_standard_color 821 call TFT_standard_color
822 return 822 return
823 823
824 TFT_dyn_gaslist_common: 824 TFT_dyn_gaslist_common:
825 cpfseq active_gas ;1-5 825 cpfseq active_gas ;1-5
830 decf PRODL,F ;-1 to have 0-4 830 decf PRODL,F ;-1 to have 0-4
831 bsf leftbind 831 bsf leftbind
832 output_8 ; Gas number 832 output_8 ; Gas number
833 bcf leftbind 833 bcf leftbind
834 PUTC ":" 834 PUTC ":"
835 bsf short_gas_decriptions ; =1: Use short versions of gaslist_strcat_gas_mod and gaslist_strcat_setpoint
836 call gaslist_strcat_gas_mod ;Append gas description of gas #PRODL (0-4) to current string 835 call gaslist_strcat_gas_mod ;Append gas description of gas #PRODL (0-4) to current string
837 PUTC " " ; Clearing space 836 PUTC " " ; Clearing space
838 movlw 0x00 837 movlw 0x00
839 movff WREG,buffer+.11 ; limit to 11 chars 838 movff WREG,buffer+.11 ; limit to 11 chars
840 STRCAT_PRINT "" 839 STRCAT_PRINT ""
1718 1717
1719 ; Display ZH-L16-GF low/high model. 1718 ; Display ZH-L16-GF low/high model.
1720 TFT_surface_decosettings1: 1719 TFT_surface_decosettings1:
1721 TEXT_SMALL surf_gaslist_column,surf_gaslist_row, tZHL16GF 1720 TEXT_SMALL surf_gaslist_column,surf_gaslist_row, tZHL16GF
1722 WIN_TOP surf_gaslist_row+(surf_gaslist_spacing*.1) 1721 WIN_TOP surf_gaslist_row+(surf_gaslist_spacing*.1)
1723 lfsr FSR2,buffer
1724 STRCPY_TEXT tGF ; GF: 1722 STRCPY_TEXT tGF ; GF:
1725 movff char_I_GF_Low_percentage,lo 1723 movff char_I_GF_Low_percentage,lo
1726 output_99x 1724 output_99x
1727 STRCAT "/" 1725 STRCAT "/"
1728 movff char_I_GF_High_percentage,lo 1726 movff char_I_GF_High_percentage,lo
1730 STRCAT_PRINT "" 1728 STRCAT_PRINT ""
1731 ;bra TFT_surface_decosettings2 1729 ;bra TFT_surface_decosettings2
1732 TFT_surface_decosettings2: 1730 TFT_surface_decosettings2:
1733 ; FTTS 1731 ; FTTS
1734 WIN_TOP surf_gaslist_row+(surf_gaslist_spacing*.2) 1732 WIN_TOP surf_gaslist_row+(surf_gaslist_spacing*.2)
1735 lfsr FSR2,buffer
1736 STRCPY_TEXT tFTTSMenu 1733 STRCPY_TEXT tFTTSMenu
1737 movff char_I_extra_time,lo 1734 movff char_I_extra_time,lo
1738 bsf leftbind 1735 bsf leftbind
1739 output_8 1736 output_8
1740 STRCAT_TEXT_PRINT tMinutes 1737 STRCAT_TEXT_PRINT tMinutes
1741 1738
1742 ; Last Stop 1739 ; Last Stop
1743 WIN_TOP surf_gaslist_row+(surf_gaslist_spacing*.3) 1740 WIN_TOP surf_gaslist_row+(surf_gaslist_spacing*.3)
1744 lfsr FSR2,buffer
1745 STRCPY_TEXT tLastDecostop 1741 STRCPY_TEXT tLastDecostop
1746 movff char_I_depth_last_deco,lo 1742 movff char_I_depth_last_deco,lo
1747 output_8 1743 output_8
1748 STRCAT_TEXT_PRINT tMeters 1744 STRCAT_TEXT_PRINT tMeters
1749 1745
1750 ; Salinity 1746 ; Salinity
1751 WIN_TOP surf_gaslist_row+(surf_gaslist_spacing*.4) 1747 WIN_TOP surf_gaslist_row+(surf_gaslist_spacing*.4)
1752 lfsr FSR2,buffer
1753 STRCPY_TEXT tDvSalinity 1748 STRCPY_TEXT tDvSalinity
1754 movff opt_salinity,lo 1749 movff opt_salinity,lo
1755 output_8 1750 output_8
1756 bcf leftbind 1751 bcf leftbind
1757 STRCAT_TEXT_PRINT tPercent 1752 STRCAT_TEXT_PRINT tPercent
2382 WIN_SMALL surf_gaslist_column,surf_gaslist_row+(surf_gaslist_spacing*.4) 2377 WIN_SMALL surf_gaslist_column,surf_gaslist_row+(surf_gaslist_spacing*.4)
2383 movlw .4 2378 movlw .4
2384 movwf PRODL 2379 movwf PRODL
2385 call gaslist_strcat_setpoint ; Show SP#+1 of PRODL# 2380 call gaslist_strcat_setpoint ; Show SP#+1 of PRODL#
2386 STRCAT_PRINT "" 2381 STRCAT_PRINT ""
2387 bcf short_gas_decriptions ; =1: Use short versions of gaslist_strcat_gas_mod and gaslist_strcat_setpoint
2388 bcf leftbind 2382 bcf leftbind
2389 return 2383 return
2390 2384
2391 global TFT_gaslist_surfmode 2385 global TFT_gaslist_surfmode
2392 TFT_gaslist_surfmode: ; Displays Gas List 2386 TFT_gaslist_surfmode: ; Displays Gas List
2420 WIN_SMALL surf_gaslist_column,surf_gaslist_row+(surf_gaslist_spacing*.4) 2414 WIN_SMALL surf_gaslist_column,surf_gaslist_row+(surf_gaslist_spacing*.4)
2421 movlw .4 2415 movlw .4
2422 movwf PRODL 2416 movwf PRODL
2423 call gaslist_strcat_gas_mod ;Append gas description of gas #PRODL (0-4) to current string 2417 call gaslist_strcat_gas_mod ;Append gas description of gas #PRODL (0-4) to current string
2424 STRCAT_PRINT "" 2418 STRCAT_PRINT ""
2425 bcf short_gas_decriptions ; =1: Use short versions of gaslist_strcat_gas_mod and gaslist_strcat_setpoint
2426 bcf leftbind 2419 bcf leftbind
2427 return 2420 return
2428 2421
2429 global TFT_dillist_surfmode 2422 global TFT_dillist_surfmode
2430 TFT_dillist_surfmode: ; Displays Diluent List 2423 TFT_dillist_surfmode: ; Displays Diluent List
2457 WIN_SMALL surf_gaslist_column,surf_gaslist_row+(surf_gaslist_spacing*.4) 2450 WIN_SMALL surf_gaslist_column,surf_gaslist_row+(surf_gaslist_spacing*.4)
2458 movlw .9 2451 movlw .9
2459 movwf PRODL 2452 movwf PRODL
2460 call gaslist_strcat_gas_mod ;Append gas description of gas #PRODL (0-4) to current string 2453 call gaslist_strcat_gas_mod ;Append gas description of gas #PRODL (0-4) to current string
2461 STRCAT_PRINT "" 2454 STRCAT_PRINT ""
2462 bcf short_gas_decriptions ; =1: Use short versions of gaslist_strcat_gas_mod and gaslist_strcat_setpoint
2463 bcf leftbind 2455 bcf leftbind
2464 return 2456 return
2465 2457
2466 global TFT_depth 2458 global TFT_depth
2467 TFT_depth: 2459 TFT_depth: