# HG changeset patch
# User JeanDo
# Date 1305587104 -7200
# Node ID 6bdf80d7276c44a400b248ce20bb60d198db7d45
# Parent  9ee86a19f1fa3f564ca749c138039275125626bf
Added screen dumps of general menus.
Added screen dumps in logbook, gassetup, license.
Added screen dumps in altimeter, decoplan.

diff -r 9ee86a19f1fa -r 6bdf80d7276c code_part1/OSTC_code_asm_part1/altimeter.asm
--- a/code_part1/OSTC_code_asm_part1/altimeter.asm	Mon May 16 23:52:38 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/altimeter.asm	Tue May 17 01:05:04 2011 +0200
@@ -303,6 +303,9 @@
     	bcf		    switch_right
 
 alt_menu_loop1:                         ; Wait for button.
+    	btfsc	uart_dump_screen        ; Asked to dump screen contains ?
+    	call	dump_screen     		; Yes!
+
     	btfsc   	switch_right        ; [[MENU]] button
     	bra	        alt_menu_next
 
diff -r 9ee86a19f1fa -r 6bdf80d7276c code_part1/OSTC_code_asm_part1/divemode_menu.asm
--- a/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Mon May 16 23:52:38 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/divemode_menu.asm	Tue May 17 01:05:04 2011 +0200
@@ -24,6 +24,9 @@
 
 
 test_switches_divemode:				; checks switches in divemode
+	btfsc	uart_dump_screen                ; Asked to dump screen contains ?
+	call	dump_screen     			    ; Yes!
+
 	btfsc	switch_left
 	bra		test_switches_divemode2
 
@@ -103,14 +106,14 @@
 	return
 
 test_switches_divemode_menu:
+	btfsc	uart_dump_screen                ; Asked to dump screen contains ?
+	call	dump_screen     			    ; Yes!
+
 	btfsc	switch_left
 	bra		test_switches_divemode_menu3
 	btfss	switch_right
 	return
 
-	btfsc	uart_dump_screen                ; Asked to dump screen contains ?
-	call	dump_screen     			    ; Yes!
-
 	btfsc 	display_see_deco			; Is the Decoplan displayed?
 	bra		divemenu_see_decoplan2		; Yes, exit menu on left button press
 
diff -r 9ee86a19f1fa -r 6bdf80d7276c code_part1/OSTC_code_asm_part1/menu.asm
--- a/code_part1/OSTC_code_asm_part1/menu.asm	Mon May 16 23:52:38 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu.asm	Tue May 17 01:05:04 2011 +0200
@@ -78,7 +78,10 @@
 
 	bra		menu_loop	
 		
-check_switches_menu:							; checks switches
+check_switches_menu:                    ; checks switches
+    btfsc	uart_dump_screen            ; Asked to dump screen contains ?
+	call	dump_screen                 ; Yes!
+
 	btfss	switch_right			
 	bra		check_switches_menu2
 	bsf		menubit3
@@ -424,6 +427,9 @@
 	bcf		switch_left
 	bcf		switch_right
 show_rawdata_loop:
+	btfsc	uart_dump_screen                ; Asked to dump screen contains ?
+	call	dump_screen     			    ; Yes!
+
 	btfsc	switch_left					; Ack?
 	bsf		menubit2
 	btfsc	switch_right				; Ack?
diff -r 9ee86a19f1fa -r 6bdf80d7276c code_part1/OSTC_code_asm_part1/menu_custom.asm
--- a/code_part1/OSTC_code_asm_part1/menu_custom.asm	Mon May 16 23:52:38 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_custom.asm	Tue May 17 01:05:04 2011 +0200
@@ -280,16 +280,16 @@
 	call	PLED_menu_cursor
 
 customfunctions_loop:
-	call	check_switches_logbook
+	call    check_switches_logbook
 
-	btfsc	menubit3
-	bra	customfunctions2		; Move cursor or generate next page
+	btfsc   menubit3
+	bra     customfunctions2		    ; Move cursor or generate next page
 
-	btfsc	menubit2
-	bra	do_customfunction		; call subfunction
+	btfsc   menubit2
+	bra     do_customfunction		    ; call subfunction
 
 	btfsc	divemode
-	goto	restart					; dive started during cf menu
+	goto	restart					    ; dive started during cf menu
 
 	btfsc	onesecupdate
 	call	timeout_surfmode
@@ -297,15 +297,12 @@
 	btfsc	onesecupdate
 	call	set_dive_modes
 
-	bcf		onesecupdate			; end of 1sek. tasks
-
-	btfsc	uart_dump_screen            ; Dumps screen contains ?
-	call	dump_screen     			; Yes!
+	bcf		onesecupdate			    ; end of 1sek. tasks
 
 	btfsc	sleepmode
-	bra	exit_customfunctions
+	bra     exit_customfunctions
 
-	bra	customfunctions_loop
+	bra     customfunctions_loop
 
 customfunctions2:
 	incf	menupos,F
diff -r 9ee86a19f1fa -r 6bdf80d7276c code_part1/OSTC_code_asm_part1/menu_gassetup.asm
--- a/code_part1/OSTC_code_asm_part1/menu_gassetup.asm	Mon May 16 23:52:38 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_gassetup.asm	Tue May 17 01:05:04 2011 +0200
@@ -179,21 +179,21 @@
 	cpfseq	decodata+0
 	goto	menu_gassetup_list
 
-	DISPLAYTEXT	.11			; Exit
-	call	wait_switches		; Waits until switches are released, resets flag if button stays pressed!
+	DISPLAYTEXT	.11                     ; Exit
+	call	wait_switches               ; Waits until switches are released, resets flag if button stays pressed!
 	call	PLED_menu_cursor
 
 gassetup_list_loop:
 	call	check_switches_logbook
 
 	btfsc	menubit3
-	bra		gassetup_list2		; move cursor
+	bra		gassetup_list2              ; move cursor
 
 	btfsc	menubit2
-	bra		do_gassetup_list; call gas-specific submenu
+	bra		do_gassetup_list            ; call gas-specific submenu
 
 	btfsc	divemode
-	goto	restart			; dive started!
+	goto	restart                     ; dive started!
 
 	btfsc	onesecupdate
 	call	timeout_surfmode
@@ -201,7 +201,7 @@
 	btfsc	onesecupdate
 	call	set_dive_modes
 
-	bcf		onesecupdate	; 1 sec. functions done
+	bcf		onesecupdate                ; 1 sec. functions done
 
 	btfsc	sleepmode
 	bra		exit_gassetup_list
@@ -780,12 +780,6 @@
 
 	bcf		onesecupdate	; 1 sec. functions done
 
-	btfsc	uart_dump_screen            ; Dumps screen contains ?
-	call	dump_screen     			; Yes!
-
-	btfsc	sleepmode
-	bra		exit_gassetup
-
 	bra		next_gas_page_loop
 
 next_gas_page2:
diff -r 9ee86a19f1fa -r 6bdf80d7276c code_part1/OSTC_code_asm_part1/menu_logbook.asm
--- a/code_part1/OSTC_code_asm_part1/menu_logbook.asm	Mon May 16 23:52:38 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_logbook.asm	Tue May 17 01:05:04 2011 +0200
@@ -335,7 +335,7 @@
 	addwfc		sim_pressure+1,F
 	movlw		LOW		d'164000'		; 164pixel*1000 height
 	movwf		xC+0
-	movlw		HIGH	d'164000'		; 164pixel*1000 height
+	movlw		HIGH	(d'164000' & h'FFFF') ; 164pixel*1000 height
 	movwf		xC+1
 	movlw		UPPER	d'164000'		; 164pixel*1000 height
 	movwf		xC+2
@@ -1066,6 +1066,10 @@
 	bsf			menubit3
 	btfsc		switch_left
 	bsf			menubit2					; Enter
+
+	btfsc	    uart_dump_screen            ; Dumps screen contains ?
+	call	    dump_screen     			; Yes!
+
 	return
 
 next_logbook3:
diff -r 9ee86a19f1fa -r 6bdf80d7276c code_part1/OSTC_code_asm_part1/simulator.asm
--- a/code_part1/OSTC_code_asm_part1/simulator.asm	Mon May 16 23:52:38 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/simulator.asm	Tue May 17 01:05:04 2011 +0200
@@ -196,6 +196,9 @@
 	bcf		switch_left
 	bcf		switch_right
 simulator_show_decoplan2:
+	btfsc	uart_dump_screen            ; Asked to dump screen contains ?
+	call	dump_screen     		    ; Yes!
+
 	btfss	onesecupdate
 	bra		simulator_show_decoplan3
 
diff -r 9ee86a19f1fa -r 6bdf80d7276c code_part1/OSTC_code_asm_part1/start.asm
--- a/code_part1/OSTC_code_asm_part1/start.asm	Mon May 16 23:52:38 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/start.asm	Tue May 17 01:05:04 2011 +0200
@@ -309,6 +309,9 @@
 	bcf		switch_left
 	bcf		switch_right
 screen1_loop:
+	btfsc	uart_dump_screen                ; Asked to dump screen contains ?
+	call	dump_screen     			    ; Yes!
+
 	btfsc	onesecupdate				; do every second tasks?
 	call	set_dive_modes				; tests if depth>threshold
 	btfsc	onesecupdate				; do every second tasks?
@@ -339,6 +342,9 @@
 	bcf		switch_left
 	bcf		switch_right
 screen3_loop:
+	btfsc	uart_dump_screen                ; Asked to dump screen contains ?
+	call	dump_screen     			    ; Yes!
+
 	btfsc	onesecupdate				; do every second tasks?
 	call	set_dive_modes				; tests if depth>threshold
 	
@@ -356,6 +362,8 @@
 	return
 	bra		screen3_loop				; loop screen
 
+;=============================================================================
+
 first_start:
 	movlw	max_custom_number		; Defined in definitions.asm
 	movwf	EEDATA
diff -r 9ee86a19f1fa -r 6bdf80d7276c code_part1/OSTC_code_asm_part1/surfmode.asm
--- a/code_part1/OSTC_code_asm_part1/surfmode.asm	Mon May 16 23:52:38 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/surfmode.asm	Tue May 17 01:05:04 2011 +0200
@@ -199,6 +199,7 @@
 	goto	uart_115k_bootloader		; Yes!
 	btfsc	uart_reset_battery_stats	; Reset Battery stats?
 	goto	reset_battery_stats			; Yes!
+
 	btfsc	uart_dump_screen            ; Dumps screen contains ?
 	call	dump_screen     			; Yes!