From: ian <ian>
Date: Fri, 20 Aug 2004 01:17:30 +0000 (+0000)
Subject: debugged.  oc still weird
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=60838eb505c4c2c738f76216e290d6c7cda4a51c;p=trains.git

debugged.  oc still weird
---

diff --git a/iwjpictest/copybits.asm b/iwjpictest/copybits.asm
index 26086bc..45c695d 100644
--- a/iwjpictest/copybits.asm
+++ b/iwjpictest/copybits.asm
@@ -32,9 +32,9 @@ start
 	bcf		TRISA, 0, 0	; enable flasher output
 	movlw		0x07 		; turn off A-to-D so we get
 	movwf		ADCON1, 0	;  digital inputs on RA0-3 (AN0-3)
-	bcf		TRISD, 4, 0	; enable output D
-	movlw		0xe0		; enable outputs E,F,G
-	movwf		TRISC, 0	;  (RC5-7)
+	bcf		TRISA, 6, 0	; enable output D
+	movlw		0xf8		; enable outputs E,F,G
+	movwf		TRISC, 0	;  (RC0-2)
 
 loop
 	btg		LATA, 0, 0
@@ -72,10 +72,10 @@ copybit macro sreg, sbitno, dreg, dbitvals
 	copybit		PORTB, 0, PORTA, 0x20		; A data
 	copybit		PORTB, 0, PORTE, 0x01		; A data
 
-	copybit		PORTA, 6, PORTD, 0x10		; D
-	copybit		PORTC, 0, PORTC, 0x80		; E
-	copybiti	PORTC, 1, PORTC, 0x40		; F
-	copybiti	PORTC, 2, PORTC, 0x20		; G
+	copybit		PORTD, 4, PORTA, 0x40		; D
+	copybit		PORTC, 7, PORTC, 0x01		; E
+	copybiti	PORTC, 6, PORTC, 0x02		; F
+	copybiti	PORTC, 5, PORTC, 0x04		; G
 						; 12 x copybit @6 = 48cy
 
 	decfsz		COUNTINNER, 1, 0	; 1 cycle
diff --git a/iwjpictest/flasher.asm b/iwjpictest/flasher.asm
index 26086bc..45c695d 100644
--- a/iwjpictest/flasher.asm
+++ b/iwjpictest/flasher.asm
@@ -32,9 +32,9 @@ start
 	bcf		TRISA, 0, 0	; enable flasher output
 	movlw		0x07 		; turn off A-to-D so we get
 	movwf		ADCON1, 0	;  digital inputs on RA0-3 (AN0-3)
-	bcf		TRISD, 4, 0	; enable output D
-	movlw		0xe0		; enable outputs E,F,G
-	movwf		TRISC, 0	;  (RC5-7)
+	bcf		TRISA, 6, 0	; enable output D
+	movlw		0xf8		; enable outputs E,F,G
+	movwf		TRISC, 0	;  (RC0-2)
 
 loop
 	btg		LATA, 0, 0
@@ -72,10 +72,10 @@ copybit macro sreg, sbitno, dreg, dbitvals
 	copybit		PORTB, 0, PORTA, 0x20		; A data
 	copybit		PORTB, 0, PORTE, 0x01		; A data
 
-	copybit		PORTA, 6, PORTD, 0x10		; D
-	copybit		PORTC, 0, PORTC, 0x80		; E
-	copybiti	PORTC, 1, PORTC, 0x40		; F
-	copybiti	PORTC, 2, PORTC, 0x20		; G
+	copybit		PORTD, 4, PORTA, 0x40		; D
+	copybit		PORTC, 7, PORTC, 0x01		; E
+	copybiti	PORTC, 6, PORTC, 0x02		; F
+	copybiti	PORTC, 5, PORTC, 0x04		; G
 						; 12 x copybit @6 = 48cy
 
 	decfsz		COUNTINNER, 1, 0	; 1 cycle
diff --git a/iwjpictest/serialloop.asm b/iwjpictest/serialloop.asm
index 26086bc..45c695d 100644
--- a/iwjpictest/serialloop.asm
+++ b/iwjpictest/serialloop.asm
@@ -32,9 +32,9 @@ start
 	bcf		TRISA, 0, 0	; enable flasher output
 	movlw		0x07 		; turn off A-to-D so we get
 	movwf		ADCON1, 0	;  digital inputs on RA0-3 (AN0-3)
-	bcf		TRISD, 4, 0	; enable output D
-	movlw		0xe0		; enable outputs E,F,G
-	movwf		TRISC, 0	;  (RC5-7)
+	bcf		TRISA, 6, 0	; enable output D
+	movlw		0xf8		; enable outputs E,F,G
+	movwf		TRISC, 0	;  (RC0-2)
 
 loop
 	btg		LATA, 0, 0
@@ -72,10 +72,10 @@ copybit macro sreg, sbitno, dreg, dbitvals
 	copybit		PORTB, 0, PORTA, 0x20		; A data
 	copybit		PORTB, 0, PORTE, 0x01		; A data
 
-	copybit		PORTA, 6, PORTD, 0x10		; D
-	copybit		PORTC, 0, PORTC, 0x80		; E
-	copybiti	PORTC, 1, PORTC, 0x40		; F
-	copybiti	PORTC, 2, PORTC, 0x20		; G
+	copybit		PORTD, 4, PORTA, 0x40		; D
+	copybit		PORTC, 7, PORTC, 0x01		; E
+	copybiti	PORTC, 6, PORTC, 0x02		; F
+	copybiti	PORTC, 5, PORTC, 0x04		; G
 						; 12 x copybit @6 = 48cy
 
 	decfsz		COUNTINNER, 1, 0	; 1 cycle