Mercurial > public > mk2

diff code_part1/OSTC_code_asm_part1/wait.asm @ 485:e83f883c96b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
quick fix for wrong wait routines
author heinrichsweikamp
date Sat, 15 Oct 2011 13:45:15 +0200
parents 42acd9316f7a
children c7b663939737
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/wait.asm	Thu Oct 13 09:54:21 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/wait.asm	Sat Oct 15 13:45:15 2011 +0200
@@ -20,10 +20,22 @@
 ; ==========================================================
 ; 	WAIT 10 MICROSECONDS  -  16 MHZ
 ; ==========================================================
+
+	IFDEF	SPEED_16MHz
 WAIT10US 	macro	wait_temp
 			movlw	wait_temp
 			call	WAIT10USX
 			endm
+	ENDIF
+
+	IFDEF	SPEED_32MHz
+WAIT10US 	macro	wait_temp
+			movlw	wait_temp
+			call	WAIT10USX
+			movlw	wait_temp
+			call	WAIT10USX
+			endm
+	ENDIF
 
 WAIT10USX	movwf	wait_temp
 			goto	JumpIn10us
@@ -71,10 +83,22 @@
 ; ==========================================================
 ; 	WAIT 1 MILLISECOND  -  16 MHZ
 ; ==========================================================
+	IFDEF	SPEED_16MHz
 WAITMS		macro	waitms_temp
 			movlw	waitms_temp
 			call WAITMSX
 			endm
+	ENDIF
+
+	IFDEF	SPEED_32MHz
+WAITMS		macro	waitms_temp
+			movlw	waitms_temp
+			call WAITMSX
+			movlw	waitms_temp
+			call WAITMSX
+			endm
+	ENDIF
+
 WAITMSX		movwf	waitms_temp
 			goto	JumpInMSX
 WAITMSX2	nop