Mercurial > public > mk2

diff code_part1/OSTC_code_asm_part1/start.asm @ 12:588a969a0cae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
1.53 beta rc
author heinrichsweikamp
date Wed, 24 Mar 2010 20:26:09 +0100
parents 3cf8af30b36e
children 6d1177291d38
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/start.asm	Mon Mar 22 08:22:57 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/start.asm	Wed Mar 24 20:26:09 2010 +0100
@@ -155,22 +155,26 @@
 	write_int_eeprom	d'92'		; Store number of CF used in this firmware
 
 restart_1:
-	GETCUSTOM15	.31
-	movlw	LOW		.666
-	cpfseq	lo
-	bra		restart_2			; Not equal!
-	movlw	HIGH	.666
-	cpfseq	hi
-	bra		restart_2			; Not equal!
-	bra		restart_3			; Skip screen....
+	btfss	pressure_refresh 		; Wait for pressure sensor...
+	bra		restart_1				; loop until pressure and temp stable
 
-restart_2:
-	btfsc	show_startup_screen			; Show start screen?
-	call	startup_screen1				;1/2
-	btfsc	show_startup_screen			; Show start screen?	
-	call	startup_screen2				;2/2
-
-restart_3:
+;	call	startup_screen3				;splash screen
+;	GETCUSTOM15	.31
+;	movlw	LOW		.666
+;	cpfseq	lo
+;	bra		restart_2			; Not equal!
+;	movlw	HIGH	.666
+;	cpfseq	hi
+;	bra		restart_2			; Not equal!
+;	bra		restart_3			; Skip screen....
+;
+;restart_2:
+;	btfsc	show_startup_screen			; Show start screen?
+;	call	startup_screen1				;1/2
+;	btfsc	show_startup_screen			; Show start screen?	
+;	call	startup_screen2				;2/2
+;
+;restart_3:
 	clrf	flag1					; clear all flags
 	clrf	flag2
 	clrf	flag3