Move 2nd controller pin to PORTB6

Let's not overlap with the UART RX pin.
darthcloud · Jun 21, 2018 · 9b8448f · 9b8448f
1 parent fa380ab
commit 9b8448f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/firmware/cube64.asm b/firmware/cube64.asm
@@ -41,8 +41,8 @@
 
         #define N64_PIN         PORTB, 4
         #define N64_TRIS        TRISB, 4
-        #define N64_PIN2        PORTB, 5
-        #define N64_TRIS2       TRISB, 5
+        #define N64_PIN2        PORTB, 6
+        #define N64_TRIS2       TRISB, 6
         #define GAMECUBE_PIN    PORTA, 4
         #define GAMECUBE_TRIS   TRISA, 4
         #define N64C_PIN        PORTA, 2
@@ -61,7 +61,7 @@ io_init macro
         clrf    ANSELH, a
         bsf     IOCB, IOCB4, a                   ; Enable interrupt on N64_PIN.
         btfsc   N64_PIN2, a                      ; If 2nd port connected,
-        bsf     IOCB, IOCB5, a                   ; enable interrupt on N64_PIN2.
+        bsf     IOCB, IOCB6, a                   ; enable interrupt on N64_PIN2.
         endm
 
     else

diff --git a/hardware/cube64.pdf b/hardware/cube64.pdf
diff --git a/hardware/cube64.sch b/hardware/cube64.sch
@@ -51,7 +51,7 @@ N 52400 50900 52900 50900 4
 N 52400 50600 52900 50600 4
 C 52800 49500 1 0 0 gnd-1.sym
 N 52900 50900 52900 49800 4
-N 52400 51200 54300 51200 4
+N 52400 51200 54600 51200 4
 N 53500 50200 53500 50000 4
 C 57600 49000 1 0 0 3.3V-plus-1.sym
 C 57700 47200 1 0 0 gnd-1.sym
@@ -432,8 +432,8 @@ CLK
 T 62900 53800 9 10 1 0 0 6 1
 DATA
 N 61900 54300 61000 54300 4
-C 61200 54800 1 0 1 3.3V-plus-1.sym
-N 61000 54300 61000 54800 4
+C 61200 55100 1 0 1 3.3V-plus-1.sym
+N 61000 54300 61000 55100 4
 C 61100 52400 1 0 1 gnd-1.sym
 N 61900 54000 61000 54000 4
 N 61000 54000 61000 52700 4
@@ -799,8 +799,8 @@ N 54300 50000 54300 50300 4
 N 53500 51200 53500 51100 4
 T 61600 44700 9 8 1 0 0 0 1
 Micah Dowty <[email protected]>
-N 54300 51200 54300 53000 4
-N 54300 53000 55000 53000 4
+N 54600 51200 54600 53000 4
+N 54600 53000 55000 53000 4
 C 62200 46500 1 0 1 EMBEDDEDusb-minib.sym
 [
 T 62100 46600 0 1 0 0 0 6 1
@@ -968,9 +968,9 @@ value=1k
 N 60800 51700 61000 51700 4
 N 59900 51700 59700 51700 4
 N 58000 51000 58900 51000 4
-N 58900 51000 58900 55100 4
-N 58900 55100 54300 55100 4
-N 54000 53800 55000 53800 4
+N 58900 51000 58900 55300 4
+N 58900 55300 53900 55300 4
+N 54600 53800 55000 53800 4
 C 50700 52500 1 0 0 connector3-1.sym
 {
 T 50700 53600 5 10 1 1 0 0 1
@@ -985,16 +985,16 @@ GND (Black)
 T 50700 52050 9 10 1 0 0 0 2
 Nintendo 64 plug #2
 (Optional)
-N 52400 54900 54000 54900 4
+N 52400 54900 54600 54900 4
 N 52900 54900 52900 55100 4
-N 54000 53800 54000 54900 4
+N 54600 53800 54600 54900 4
 N 52400 53300 52900 53300 4
 N 52900 53300 52900 54900 4
-N 58000 50600 59300 50600 4
-N 59300 50600 59300 55500 4
+N 58000 50200 59300 50200 4
+N 59300 50200 59300 55500 4
 N 53700 55500 59300 55500 4
-N 52400 54600 54300 54600 4
-N 54300 54600 54300 55100 4
+N 52400 54600 53900 54600 4
+N 53900 54600 53900 55300 4
 N 53700 53000 53700 55500 4
 N 53700 53000 52400 53000 4
 N 52400 54300 53200 54300 4