Mercurial > public > mk2

diff code_part1/OSTC_code_asm_part1/menu.asm @ 35:d4f0c097a7fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
preparations for new gaslist
author heinrichsweikamp
date Tue, 25 May 2010 21:42:23 +0200
parents 73014f788032
children 3ab1188651af
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/menu.asm	Tue May 25 18:10:51 2010 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu.asm	Tue May 25 21:42:23 2010 +0200
@@ -24,41 +24,44 @@
 ; ToDo: 
 
 wait_switches:
-;	bsf		LEDg
-	movlw	d'40'
-	btfss	button_delay_done		; Start counting?
-	movlw	d'200'
-	movwf	switch_timeout
-
-wait_switches1:
-	WAITMS	d'5'
-	btfsc	SWITCH2
-	bra		wait_switches2		; Check other switch
-
-	decfsz	switch_timeout,F
-	bra		wait_switches1
-	
-	btfsc	SWITCH2
-	bra		wait_switches3
-	
-	bsf		button_delay_done		; Start counting
-	bsf		switch_left				; Set button flag
-	bcf		switch_right			; only for the other button
-;	bcf		LEDg
-	return
-
-wait_switches2:
-	btfss	SWITCH1
-	bra		wait_switches1		; Wait 
-	
-	; Yes, both switches released before timeout...
-wait_switches3:
 	bcf		switch_left
 	bcf		switch_right
-	bcf		button_delay_done
-	bcf		LED_red
-	return
+return
 
+;	movlw	d'40'
+;	btfss	button_delay_done		; Start counting?
+;	movlw	d'200'
+;	movwf	switch_timeout
+;
+;wait_switches1:
+;	WAITMS	d'5'
+;	btfsc	SWITCH2
+;	bra		wait_switches2		; Check other switch
+;
+;	decfsz	switch_timeout,F
+;	bra		wait_switches1
+;	
+;	btfsc	SWITCH2
+;	bra		wait_switches3
+;	
+;	bsf		button_delay_done		; Start counting
+;	bsf		switch_left				; Set button flag
+;	bcf		switch_right			; only for the other button
+;;	bcf		LEDg
+;	return
+;
+;wait_switches2:
+;	btfss	SWITCH1
+;	bra		wait_switches1		; Wait 
+;	
+;	; Yes, both switches released before timeout...
+;wait_switches3:
+;	bcf		switch_left
+;	bcf		switch_right
+;	bcf		button_delay_done
+;	bcf		LED_red
+;	return
+;
 menu:
 	bcf		deco_mode_changed			; Clear flag (Description is only showed once)
 	movlw	d'1'