Mercurial > public > mk2

changeset 87:8d3c1bef6551

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some preparations for new custom view
author heinrichsweikamp
date Thu, 09 Dec 2010 22:07:36 +0100
parents b40a0a6284da
children eff0da5cb975
files code_part1/OSTC_code_asm_part1/divemode_menu.asm code_part1/OSTC_code_asm_part1/pled_outputs.asm code_part1/OSTC_code_asm_part1/text_table.asm
diffstat 3 files changed, 52 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Thu Dec 09 20:41:56 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Thu Dec 09 22:07:36 2010 +0100
@@ -212,7 +212,7 @@
 	bra		timeout_divemenu2			; quit menu!
 
 toggle_stopwatch2:
-	call	PLED_stopwatch_remove		; Remove Stopwatch Outputs
+	call	PLED_clear_customview_divemode	; Remove Stopwatch Outputs
 	bra		timeout_divemenu2			; quit menu!
 
 divemode_toggle_brightness:
@@ -737,7 +737,11 @@
 	call	PLED_clear_divemode_menu; Clear dive mode menu
 	call	PLED_divemode_mask		; Display mask
 	call	PLED_divemins			; Display (new) divetime!
-	call	PLED_temp_divemode		; redraw temperature
+	btfss	dekostop_active
+	call	PLED_display_ndl_mask
+	btfsc	dekostop_active
+	call	PLED_display_deko_mask
+
 	clrf	timeout_counter3		; Also clear timeout
 	bcf		display_see_deco		; clear all display flags
 	bcf		display_see_l_tissue
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Thu Dec 09 20:41:56 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Thu Dec 09 22:07:36 2010 +0100
@@ -391,10 +391,10 @@
 	call	PLED_standard_color
 	return
 
-PLED_clear_decoarea:
+PLED_clear_customview_divemode:
 	movlw	.0
 	movff	WREG,box_temp+0		; Data
-	movlw	.60
+	movlw	.168
 	movff	WREG,box_temp+1		; row top (0-239)
 	movlw	.239
 	movff	WREG,box_temp+2		; row bottom (0-239)
@@ -403,15 +403,27 @@
 	movlw	.159	
 	movff	WREG,box_temp+4		; column right (0-159)
 	call	PLED_box
-	call	PLED_temp_divemode					; redraw temperature
-	call	PLED_active_gas_divemode			; redraw active Gas
+	return
+
+PLED_clear_decoarea:
+	movlw	.0
+	movff	WREG,box_temp+0		; Data
+	movlw	.54
+	movff	WREG,box_temp+1		; row top (0-239)
+	movlw	.168
+	movff	WREG,box_temp+2		; row bottom (0-239)
+	movlw	.090
+	movff	WREG,box_temp+3		; column left (0-159)
+	movlw	.159	
+	movff	WREG,box_temp+4		; column right (0-159)
+	call	PLED_box
 	return
 
 PLED_display_ndl_mask:
 	; Clear Dekostop and Dekosum
 	rcall	PLED_clear_decoarea	
 
-	call		PLED_divemask_color	; Set Color for Divemode mask
+	call	PLED_divemask_color	; Set Color for Divemode mask
 	DISPLAYTEXT		d'84'			; NoStop
 	call	PLED_standard_color
 
@@ -425,12 +437,12 @@
 	return
 
 PLED_display_ndl:
-	btfsc	multi_gf_display			; Is the Multi-GF Table displayed?
-	return								; Yes, No update and return!
+	btfsc	menubit					; Divemode menu active?
+	return							; Yes, return
 
 	ostc_debug	'z'		; Sends debug-information to screen if debugmode active
 	
-	WIN_TOP		.185
+	WIN_TOP		.136
 	WIN_LEFT	.119
 	WIN_FONT 	FT_MEDIUM
 	WIN_INVERT	.0					; Init new Wordprocessor
@@ -454,11 +466,8 @@
 	return
 
 PLED_display_deko:
-	btfsc	multi_gf_display			; Is the Multi-GF Table displayed?
-	return								; Yes, No update and return!
-
 	btfsc	menubit					; Divemode menu active?
-	bra		PLED_display_deko1		; Yes, do not display dekostop
+	bra		PLED_display_deko1		; Yes, do not display deco, only GF (if required)
 
 	ostc_debug	'y'		; Sends debug-information to screen if debugmode active
 ; deco stop word
@@ -466,7 +475,7 @@
 	DISPLAYTEXT	d'82'			; DEKOSTOP
 	call	PLED_standard_color
 
-	WIN_TOP		.118
+	WIN_TOP		.80
 	WIN_LEFT	.94
 	WIN_FONT 	FT_MEDIUM
 	WIN_INVERT	.0					; Init new Wordprocessor
@@ -483,13 +492,10 @@
 	call	word_processor
 	WIN_FONT 	FT_SMALL
 	
-PLED_display_deko1:
-	btfsc	multi_gf_display			; Is the Multi-GF Table displayed?
-	return								; Yes, No update and return!
-
+;PLED_display_deko1:
 	ostc_debug	'x'		; Sends debug-information to screen if debugmode active
 	
-	WIN_TOP		.185
+	WIN_TOP		.136
 	WIN_LEFT	.119
 	WIN_FONT 	FT_MEDIUM
 	WIN_INVERT	.0					; Init new Wordprocessor
@@ -505,6 +511,7 @@
 	movwf	POSTINC2
 	call	word_processor
 
+PLED_display_deko1:
 	movff	char_O_gradient_factor,lo		; gradient factor
 	GETCUSTOM8	d'8'		; threshold for display
 	cpfslt	lo				; show value?
@@ -2300,41 +2307,34 @@
 	WIN_FONT	FT_SMALL
 	return
 
-PLED_stopwatch_remove:
-	movlw	.0
-	movff	WREG,box_temp+0		; Data
-	movlw	.54
-	movff	WREG,box_temp+1		; row top (0-239)
-	movlw	.102
-	movff	WREG,box_temp+2		; row bottom (0-239)
-	movlw	.062
-	movff	WREG,box_temp+3		; column left (0-159)
-	movlw	.159	
-	movff	WREG,box_temp+4		; column right (0-159)
-	call	PLED_box
-	return
+;PLED_stopwatch_remove:
+;	movlw	.0
+;	movff	WREG,box_temp+0		; Data
+;	movlw	.54
+;	movff	WREG,box_temp+1		; row top (0-239)
+;	movlw	.102
+;	movff	WREG,box_temp+2		; row bottom (0-239)
+;	movlw	.062
+;	movff	WREG,box_temp+3		; column left (0-159)
+;	movlw	.159	
+;	movff	WREG,box_temp+4		; column right (0-159)
+;	call	PLED_box
+;	return
 	
 
 PLED_stopwatch_show:
-	btfsc	menubit						; Divemode menu active?
-	return								; Yes, No update and return!
-
 	ostc_debug	'V'		; Sends debug-information to screen if debugmode active
 	; Stopwatch
 
 	call		PLED_divemask_color	; Set Color for Divemode mask
-	DISPLAYTEXTH	d'283'			; Counter
+	DISPLAYTEXTH	d'283'			; Stopwatch
 	call	PLED_standard_color
 
-
-	WIN_TOP		.80
+	WIN_TOP		.192
 	WIN_LEFT	.110
 	WIN_FONT	FT_SMALL
 	call	PLED_standard_color
 
-
-
-
 	lfsr	FSR2,letter
 	movff	average_divesecs+0,lo				; Stopwatch
 	movff	average_divesecs+1,hi				; Stopwatch
@@ -2362,8 +2362,8 @@
 
 	ostc_debug	'U'				; Sends debug-information to screen if debugmode active
 
-	WIN_TOP		.80
-	WIN_LEFT	.62
+	WIN_TOP		.216
+	WIN_LEFT	.110
 	WIN_FONT	FT_SMALL
 	call	PLED_standard_color
 
@@ -2372,14 +2372,11 @@
 	movff	avr_rel_pressure+0,lo
 	movff	avr_rel_pressure+1,hi
 	call	adjust_depth_with_salinity			; computes salinity setting into lo:hi [mBar]
-	bsf		leftbind
 	bsf		ignore_digit5		; do not display 1cm depth
 	output_16dp	d'3'
 	bcf		leftbind
 	movlw	'm'
 	movwf	POSTINC2
-	movlw	' '
-	movwf	POSTINC2
 	call	word_processor
 	return
 
--- a/code_part1/OSTC_code_asm_part1/text_table.asm	Thu Dec 09 20:41:56 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/text_table.asm	Thu Dec 09 22:07:36 2010 +0100
@@ -185,10 +185,10 @@
 	DB	.0,.215		;81
 ; end of licence
 
-	DB	.102,.150	;82 Decostop
+	DB	.102,.54	;82 Decostop
 	DB	.0,.0		;83
-	DB	.108,.216	;84	No Stop
-	DB	.135,.216	;85 TTS
+	DB	.108,.112	;84	No Stop
+	DB	.135,.112	;85 TTS
 	DB	.100,.0		;86 Divetime
 	DB	.0,.0		;87 Depth
 	DB	.0,.0		;88
@@ -400,7 +400,7 @@
 	
 	DB	.100,.50			;281
 	DB	.100,.0				;282
-	DB	.90,.54				;283	Stopwatch
+	DB	.90,.170			;283	Stopwatch
 	DB	.20,.95				;284
 	DB	.20,.125			;285