Mercurial > public > hwos_code

diff src/tft_outputs.asm @ 437:23b58c4bc6aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CHANGE: Language fixes, 2.08 release
author heinrichsweikamp
date Thu, 30 Jun 2016 10:28:12 +0200
parents 929feb0da4f5
children d93d75ae01bf
line wrap: on
line diff
--- a/src/tft_outputs.asm	Fri Jun 24 12:51:14 2016 +0200
+++ b/src/tft_outputs.asm	Thu Jun 30 10:28:12 2016 +0200
@@ -1062,11 +1062,11 @@
     ; The mask
     call    TFT_divemask_color
     WIN_TINY          dm_custom_avr_stop_title_column1,dm_custom_avr_stop_title_row
-    STRCPY_TEXT_PRINT tDiveTotalAvr
+    STRCPY_TEXT_PRINT tDiveTotalAvg
     WIN_TINY          dm_custom_avr_stop_title_column2,dm_custom_avr_stop_title_row
     STRCPY_TEXT_PRINT tDiveStopwatch
     WIN_TINY          dm_custom_avr_stop_title_column3,dm_custom_avr_stop_title_row
-    STRCPY_TEXT_PRINT tDiveStopAvr
+    STRCPY_TEXT_PRINT tDiveStopAvg
     goto	TFT_standard_color  ; and return...
 
     global  TFT_dyn_gaslist
@@ -1135,8 +1135,8 @@
     TSTOSS  opt_units   			; 0=m, 1=ft
 	bra		TFT_update_avr_stopwatch_metric
 ;TFT_update_avr_stopwatch_imperial
-    movff   avr_rel_pressure_total+0,lo
-    movff   avr_rel_pressure_total+1,hi
+    movff   avg_rel_pressure_total+0,lo
+    movff   avg_rel_pressure_total+1,hi
     call	adjust_depth_with_salinity			; computes salinity setting into lo:hi [mbar]
     call	convert_mbar_to_feet       	; convert value in lo:hi from mbar to feet
     WIN_MEDIUM  dm_custom_avr_stop_column1,dm_custom_avr_stop_row
@@ -1144,8 +1144,8 @@
     output_16                       ; yxz
     STRCAT_PRINT " "
     ; Stopped average depth
-    movff   avr_rel_pressure+0,lo
-    movff   avr_rel_pressure+1,hi
+    movff   avg_rel_pressure+0,lo
+    movff   avg_rel_pressure+1,hi
     call	adjust_depth_with_salinity			; computes salinity setting into lo:hi [mbar]
     call	convert_mbar_to_feet       	; convert value in lo:hi from mbar to feet
     WIN_MEDIUM  dm_custom_avr_stop_column3,dm_custom_avr_stop_row
@@ -1156,16 +1156,16 @@
 
 TFT_update_avr_stopwatch_metric:
     ; Non-resettable average depth
-    movff   avr_rel_pressure_total+0,lo
-    movff   avr_rel_pressure_total+1,hi
+    movff   avg_rel_pressure_total+0,lo
+    movff   avg_rel_pressure_total+1,hi
     call	adjust_depth_with_salinity			; computes salinity setting into lo:hi [mbar]
     WIN_MEDIUM  dm_custom_avr_stop_column1,dm_custom_avr_stop_row
     bsf     ignore_digit5         ; no cm
     output_16dp  .3               ; yxz.a
     STRCAT_PRINT " "
     ; Stopped average depth
-    movff   avr_rel_pressure+0,lo
-    movff   avr_rel_pressure+1,hi
+    movff   avg_rel_pressure+0,lo
+    movff   avg_rel_pressure+1,hi
     call	adjust_depth_with_salinity			; computes salinity setting into lo:hi [mbar]
     WIN_MEDIUM  dm_custom_avr_stop_column3,dm_custom_avr_stop_row
     bsf     ignore_digit5         ; no cm