Mercurial > public > mk2

changeset 133:35567a646fe5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor merge fixes...
author JeanDo
date Wed, 05 Jan 2011 12:24:58 +0100
parents 49bb155ddfbf
children 48f12271eb18
files code_part1/OSTC_code_asm_part1/customview.asm code_part1/OSTC_code_asm_part1/pled_outputs.asm
diffstat 2 files changed, 31 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/customview.asm	Wed Jan 05 00:14:44 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/customview.asm	Wed Jan 05 12:24:58 2011 +0100
@@ -69,7 +69,7 @@
 	bra		customview_1sec_clock       ; Update the Clock
 	dcfsnz	WREG,F
 	bra		customview_1sec_lead_tiss   ; Update the leading tissue
-	dcfsnz	temp1,F
+	dcfsnz	WREG,F
 	bra		customview_1sec_average     ; Update the Average depth
 	dcfsnz	WREG,F
 	bra		customview_1sec_graphs      ; Update the leading tissue
@@ -87,7 +87,10 @@
 customview_1sec_marker:                 ; Do nothing extra
 customview_1sec_clock:                  ; Do nothing extra
 customview_1sec_lead_tiss:              ; Do nothing extra
+	return
+
 customview_1sec_graphs:                 ; Do nothing extra
+	call	PLED_tissue_saturation_graph
 	return
 
 ;=============================================================================
@@ -103,7 +106,7 @@
 	bra		customview_minute_clock     ; Update the Clock
 	dcfsnz	WREG,F
 	bra		customview_minute_lead_tiss ; Update the leading tissue
-	dcfsnz	temp1,F
+	dcfsnz	WREG,F
 	bra		customview_minute_average		; Update the Average depth
 	dcfsnz	WREG,F
 	bra		customview_minute_graphs	; Update the graphs
@@ -118,13 +121,11 @@
 	call	PLED_show_leading_tissue_2  ; Update the leading tissue
 	return
 
-customview_minute_graphs:
-	call	PLED_tissue_saturation_graph
-	return
 
 customview_minute_marker:               ; Do nothing extra
 customview_minute_stopwatch:            ; Do nothing extra
 customview_minute_average:			; Do nothing extra
+customview_minute_graphs:
 	return
 
 ;=============================================================================
@@ -148,7 +149,7 @@
 	bra		customview_init_clock			; Show the clock
 	dcfsnz	WREG,F
 	bra		customview_init_lead_tissue		; Show the leading tissue
-	dcfsnz	temp1,F
+	dcfsnz	WREG,F
 	bra		customview_init_average			; Show Total average depth
 	dcfsnz	WREG,F
 	bra		customview_init_graphs		    ; Show the graphs
@@ -192,9 +193,10 @@
 customview_init_graphs:					; Show tissue graph
  	GETCUSTOM8	d'52'					; Show Tissue Graph? (=1 in WREG)
 	decfsz		WREG,F					; WREG=1?	
-	call	PLED_tissue_saturation_graph
 	bra			customview_toggle		; No, use next Customview
 
+	call    PLED_tissue_saturation_graph
+	bra     customview_toggle_exit	
 customview_toggle_exit:
 	bcf		toggle_customview			; Clear flag
 	ostc_debug	'Y'		                ; Sends debug-information to screen in debugmode
@@ -217,7 +219,7 @@
 	dcfsnz	WREG,F
 	bra		surfcustomview_init_gaslist			; Show pre-dive gaslist/setpoint list
 	dcfsnz	WREG,F
-	bra		surfcustomview_init_interval		; Show the interval counter
+	bra		surfcustomview_init_interval; Show the interval counter
 	dcfsnz	WREG,F
 	bra		surfcustomview_init_cfview			; Show the interval counter
 
@@ -225,7 +227,7 @@
 	bra		surfcustomview_toggle_exit	
 
 surfcustomview_init_graphs:
-	call	PLED_tissue_saturation_graph		; Draw the graphs
+	call	PLED_tissue_saturation_graph; Draw the graphs
 	bra		surfcustomview_toggle_exit	
 
 surfcustomview_init_gaslist:
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Wed Jan 05 00:14:44 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Wed Jan 05 12:24:58 2011 +0100
@@ -2583,16 +2583,14 @@
 PLED_tsg_2:
 
     ;---- Draw grid ----------------------------------------------------------
+    btfss   divemode
+    bra     PLED_no_graph_grid
+    
 	movlw   color_grey
     call	PLED_set_color
 
-	movlw	.25+.1                      ; surfmode
-    btfsc   divemode
     movlw   .169+.1                     ; divemode
 	movff	WREG,win_top
-	
-	movlw	.120-.25-.1                 ; surfmode
-    btfsc   divemode
     movlw   .239-.169-.1                ; divemode
 	movff	WREG,win_height
 
@@ -2611,6 +2609,7 @@
     movlw   .149
     movff   WREG,win_leftx2
     call    PLED_box
+PLED_no_graph_grid:
     
     ;---- Draw N2 Tissues ----------------------------------------------------
 	lfsr	FSR2, char_O_tissue_saturation+.000	; N2
@@ -2623,7 +2622,7 @@
 	movff	WREG,win_height             ; row bottom (0-239)
 	movlw	.82+.18                     ; surfmode
     btfsc   divemode
-    movlw   .90+.10                     ; divemode
+    movlw   .90+.18                     ; divemode
 	movff	WREG,win_leftx2             ; column left (0-159)
 
 PLED_tissue_saturation_graph3:
@@ -2641,10 +2640,14 @@
 	rrcf	WREG                        ; And divide by 4
 	bcf		STATUS,C
 	rrcf	WREG
-	movff   WREG,win_width
-	movlw	d'57'                       ; limit display 
-	cpfslt	win_width                   ; skip if 157 (WREG) < box_temp+4
-	movwf	win_width
+	movwf   temp1
+
+	movlw	.57                         ; surfmode: max 57pix
+    btfsc   divemode
+	movlw	.57-8                       ; divemode: 8pix less...s
+	cpfslt	temp1                       ; skip if 57 (WREG) < win_width
+	movwf	temp1
+	movff   temp1,win_width
 
 	call	PLED_box	
 
@@ -2673,10 +2676,13 @@
 	rrcf	WREG                        ; And divide by 4
 	bcf		STATUS,C
 	rrcf	WREG
-	movff   WREG,win_width
-	movlw	d'57'                       ; limit display 
-	cpfslt	win_width                   ; skip if 157 (WREG) < box_temp+4
-	movwf	win_width
+	movwf   temp1
+	movlw	.57                         ; surfmode: max 57pix
+    btfsc   divemode
+	movlw	.57-8                       ; divemode: 8pix less...s
+	cpfslt	temp1                       ; skip if 57 (WREG) < win_width
+	movwf	temp1
+	movff   temp1,win_width
 
 	call	PLED_box