Mercurial > public > mk2

changeset 778:43ef5a003df7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NEW: Show End-of-Dive time together with clock during deco
author heinrichsweikamp
date Wed, 07 May 2014 14:58:03 +0200
parents b92ee354baae
children d2b7d78b0019
files code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/customview.asm code_part1/OSTC_code_asm_part1/definitions.asm code_part1/OSTC_code_asm_part1/outputs.asm
diffstat 4 files changed, 49 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Fri May 02 21:40:54 2014 +0200
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Wed May 07 14:58:03 2014 +0200
@@ -1,3 +1,7 @@
+New in 2.92:
+BETA Version
+NEW: Show End-of-Dive time together with clock during deco
+
 New in 2.91:
 BETA Version
 New: Show bailout event in internal logbook
--- a/code_part1/OSTC_code_asm_part1/customview.asm	Fri May 02 21:40:54 2014 +0200
+++ b/code_part1/OSTC_code_asm_part1/customview.asm	Wed May 07 14:58:03 2014 +0200
@@ -125,10 +125,12 @@
 customview_1sec_marker:                 ; Do nothing extra
 customview_1sec_show_change_gf:         ; Do nothing extra
 	bsf		menu3_active                ; Set Flag
-customview_1sec_clock:                  ; Do nothing extra
 customview_1sec_lead_tiss:              ; Do nothing extra
 	return
 
+customview_1sec_clock:
+    goto    DISP_diveclock3             ; Update end of divetime only
+
 customview_1sec_graphs:                 ; Do nothing extra
     decfsz  apnoe_mins                  ; 10 sec passed ?
     return                              ; No: skip.
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Fri May 02 21:40:54 2014 +0200
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Wed May 07 14:58:03 2014 +0200
@@ -22,7 +22,7 @@
 ; ToDo:
 
 #DEFINE	softwareversion_x		d'2'		; Software version  XX.YY
-#DEFINE	softwareversion_y		d'91'		; Software version  XX.YY
+#DEFINE	softwareversion_y		d'92'		; Software version  XX.YY
 
 #DEFINE softwareversion_beta 	1 			; (and 0 for release)
 
--- a/code_part1/OSTC_code_asm_part1/outputs.asm	Fri May 02 21:40:54 2014 +0200
+++ b/code_part1/OSTC_code_asm_part1/outputs.asm	Wed May 07 14:58:03 2014 +0200
@@ -831,7 +831,7 @@
 
 DISP_diveclock:
 	call	DISP_divemask_color	; Set Color for Divemode mask
-	DISPLAYTEXT		d'255'			; Clock
+	DISPLAYTEXT		d'255'			; Time:
 	call	DISP_standard_color
 
 DISP_diveclock2:
@@ -847,8 +847,48 @@
 	movff	mins,lo
 	output_99x
 	call	word_processor
+
+DISP_diveclock3:                    ; Update end of divetime only
+	WIN_TOP		.216
+	WIN_LEFT	.116
+	WIN_FONT 	FT_SMALL
+	WIN_INVERT	.0
+	call	DISP_standard_color
+
+    btfss	dekostop_active         ; Already in nodeco mode ?
+	bra     DISP_diveclock4         ; No, overwrite with some spaces
+
+	STRCPY  0x94					; "End of dive" icon
+    movff	hours,WREG
+    mullw   .60
+    movf    mins,W
+    addwf   PRODL
+    movlw   .0
+    addwfc  PRODH
+	movff	PRODL, lo
+	movff	PRODH, hi
+
+    ; Add TTS
+    movff	int_O_ascenttime+0,WREG     ; TTS
+    addwf   lo,F
+	movff	int_O_ascenttime+1,WREG     ; TTS is 16bits
+    addwfc  hi,F
+
+	call	convert_time				; converts hi:lo in minutes to hours (hi) and minutes (lo)
+	movf	hi,W
+	movff	lo,hi
+	movwf	lo							; exchange lo and hi
+	output_99x
+	PUTC    ':'
+	movff	hi,lo
+	output_99x
+	STRCAT_PRINT ""
 	return
 
+DISP_diveclock4:
+    STRCPY_PRINT "      "
+    return
+
 DISP_clock:
 	ostc_debug	'c'
 	WIN_TOP		.50