comparison src/tft_outputs.asm @ 437:23b58c4bc6aa

CHANGE: Language fixes, 2.08 release
author heinrichsweikamp
date Thu, 30 Jun 2016 10:28:12 +0200
parents 929feb0da4f5
children d93d75ae01bf
comparison
equal deleted inserted replaced
436:95ee78f4a974 437:23b58c4bc6aa
1060 global TFT_mask_avr_stopwatch ; Show mask for average depth and stopwatch 1060 global TFT_mask_avr_stopwatch ; Show mask for average depth and stopwatch
1061 TFT_mask_avr_stopwatch: 1061 TFT_mask_avr_stopwatch:
1062 ; The mask 1062 ; The mask
1063 call TFT_divemask_color 1063 call TFT_divemask_color
1064 WIN_TINY dm_custom_avr_stop_title_column1,dm_custom_avr_stop_title_row 1064 WIN_TINY dm_custom_avr_stop_title_column1,dm_custom_avr_stop_title_row
1065 STRCPY_TEXT_PRINT tDiveTotalAvr 1065 STRCPY_TEXT_PRINT tDiveTotalAvg
1066 WIN_TINY dm_custom_avr_stop_title_column2,dm_custom_avr_stop_title_row 1066 WIN_TINY dm_custom_avr_stop_title_column2,dm_custom_avr_stop_title_row
1067 STRCPY_TEXT_PRINT tDiveStopwatch 1067 STRCPY_TEXT_PRINT tDiveStopwatch
1068 WIN_TINY dm_custom_avr_stop_title_column3,dm_custom_avr_stop_title_row 1068 WIN_TINY dm_custom_avr_stop_title_column3,dm_custom_avr_stop_title_row
1069 STRCPY_TEXT_PRINT tDiveStopAvr 1069 STRCPY_TEXT_PRINT tDiveStopAvg
1070 goto TFT_standard_color ; and return... 1070 goto TFT_standard_color ; and return...
1071 1071
1072 global TFT_dyn_gaslist 1072 global TFT_dyn_gaslist
1073 TFT_dyn_gaslist: ; Show the dynamic gaslist 1073 TFT_dyn_gaslist: ; Show the dynamic gaslist
1074 ; The mask 1074 ; The mask
1133 STRCAT_PRINT "" 1133 STRCAT_PRINT ""
1134 1134
1135 TSTOSS opt_units ; 0=m, 1=ft 1135 TSTOSS opt_units ; 0=m, 1=ft
1136 bra TFT_update_avr_stopwatch_metric 1136 bra TFT_update_avr_stopwatch_metric
1137 ;TFT_update_avr_stopwatch_imperial 1137 ;TFT_update_avr_stopwatch_imperial
1138 movff avr_rel_pressure_total+0,lo 1138 movff avg_rel_pressure_total+0,lo
1139 movff avr_rel_pressure_total+1,hi 1139 movff avg_rel_pressure_total+1,hi
1140 call adjust_depth_with_salinity ; computes salinity setting into lo:hi [mbar] 1140 call adjust_depth_with_salinity ; computes salinity setting into lo:hi [mbar]
1141 call convert_mbar_to_feet ; convert value in lo:hi from mbar to feet 1141 call convert_mbar_to_feet ; convert value in lo:hi from mbar to feet
1142 WIN_MEDIUM dm_custom_avr_stop_column1,dm_custom_avr_stop_row 1142 WIN_MEDIUM dm_custom_avr_stop_column1,dm_custom_avr_stop_row
1143 bsf leftbind 1143 bsf leftbind
1144 output_16 ; yxz 1144 output_16 ; yxz
1145 STRCAT_PRINT " " 1145 STRCAT_PRINT " "
1146 ; Stopped average depth 1146 ; Stopped average depth
1147 movff avr_rel_pressure+0,lo 1147 movff avg_rel_pressure+0,lo
1148 movff avr_rel_pressure+1,hi 1148 movff avg_rel_pressure+1,hi
1149 call adjust_depth_with_salinity ; computes salinity setting into lo:hi [mbar] 1149 call adjust_depth_with_salinity ; computes salinity setting into lo:hi [mbar]
1150 call convert_mbar_to_feet ; convert value in lo:hi from mbar to feet 1150 call convert_mbar_to_feet ; convert value in lo:hi from mbar to feet
1151 WIN_MEDIUM dm_custom_avr_stop_column3,dm_custom_avr_stop_row 1151 WIN_MEDIUM dm_custom_avr_stop_column3,dm_custom_avr_stop_row
1152 output_16 ; yxz 1152 output_16 ; yxz
1153 bcf leftbind 1153 bcf leftbind
1154 STRCAT_PRINT " " 1154 STRCAT_PRINT " "
1155 return 1155 return
1156 1156
1157 TFT_update_avr_stopwatch_metric: 1157 TFT_update_avr_stopwatch_metric:
1158 ; Non-resettable average depth 1158 ; Non-resettable average depth
1159 movff avr_rel_pressure_total+0,lo 1159 movff avg_rel_pressure_total+0,lo
1160 movff avr_rel_pressure_total+1,hi 1160 movff avg_rel_pressure_total+1,hi
1161 call adjust_depth_with_salinity ; computes salinity setting into lo:hi [mbar] 1161 call adjust_depth_with_salinity ; computes salinity setting into lo:hi [mbar]
1162 WIN_MEDIUM dm_custom_avr_stop_column1,dm_custom_avr_stop_row 1162 WIN_MEDIUM dm_custom_avr_stop_column1,dm_custom_avr_stop_row
1163 bsf ignore_digit5 ; no cm 1163 bsf ignore_digit5 ; no cm
1164 output_16dp .3 ; yxz.a 1164 output_16dp .3 ; yxz.a
1165 STRCAT_PRINT " " 1165 STRCAT_PRINT " "
1166 ; Stopped average depth 1166 ; Stopped average depth
1167 movff avr_rel_pressure+0,lo 1167 movff avg_rel_pressure+0,lo
1168 movff avr_rel_pressure+1,hi 1168 movff avg_rel_pressure+1,hi
1169 call adjust_depth_with_salinity ; computes salinity setting into lo:hi [mbar] 1169 call adjust_depth_with_salinity ; computes salinity setting into lo:hi [mbar]
1170 WIN_MEDIUM dm_custom_avr_stop_column3,dm_custom_avr_stop_row 1170 WIN_MEDIUM dm_custom_avr_stop_column3,dm_custom_avr_stop_row
1171 bsf ignore_digit5 ; no cm 1171 bsf ignore_digit5 ; no cm
1172 output_16dp .3 ; yxz.a 1172 output_16dp .3 ; yxz.a
1173 bcf leftbind 1173 bcf leftbind