X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=keyboard%2Fplanck%2Fmatrix.c;h=e3926caecee9ccb4900b1c7cf27f05b9d9c0c890;hb=65680819df13585a563296f008be1a4b0ee8045a;hp=38d35e3e07d50dd164e8dbbbbe26991441d8a6ec;hpb=a54da1b92663606f5e5c18bc1eaec30c06847da1;p=qmk_firmware.git

diff --git a/keyboard/planck/matrix.c b/keyboard/planck/matrix.c
index 38d35e3e0..e3926caec 100644
--- a/keyboard/planck/matrix.c
+++ b/keyboard/planck/matrix.c
@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
+#include "backlight.h" // TODO fix this dependency 
 
 
 #ifndef DEBOUNCE
@@ -57,6 +58,13 @@ uint8_t matrix_cols(void)
 
 void matrix_init(void)
 {
+    // To use PORTF disable JTAG with writing JTD bit twice within four cycles.
+    MCUCR |= (1<<JTD);
+    MCUCR |= (1<<JTD);
+
+    // TODO fix this dependency 
+    backlight_init_ports();
+    
     // initialize row and col
     unselect_rows();
     init_cols();
@@ -134,10 +142,19 @@ uint8_t matrix_key_count(void)
     return count;
 }
 
+//
+// Planck PCB Rev 1 Pin Assignments
+//
+// Column: 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11
+// Pin:    F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7
+//
+
 static void init_cols(void)
 {
-    DDRB &= ~(1<<6 | 1<<5 | 1<<4);
-    PORTB |= (1<<6 | 1<<5 | 1<<4);
+    DDRB &= ~(1<<4 | 1<<0);
+    PORTB |= (1<<4 | 1<<0);
+    DDRC &= ~(1<<7);
+    PORTC |= (1<<7);
     DDRD &= ~(1<<7 | 1<<6 | 1<<4);
     PORTD |= (1<<7 | 1<<6 | 1<<4);
     DDRF &= ~(1<<0 | 1<<1 | 1<<4 | 1<<5 | 1<<6 | 1<<7);
@@ -147,46 +164,55 @@ static void init_cols(void)
 
 static matrix_row_t read_cols(void)
 {
-  return (PIND&(1<<4) ? 0 : (1<<0)) |
-         (PIND&(1<<6) ? 0 : (1<<1)) |
-         (PIND&(1<<7) ? 0 : (1<<2)) |
-         (PINB&(1<<4) ? 0 : (1<<3)) |
-         (PINB&(1<<5) ? 0 : (1<<4)) |
-         (PINB&(1<<6) ? 0 : (1<<5)) |
-         (PINF&(1<<7) ? 0 : (1<<6)) |
-         (PINF&(1<<6) ? 0 : (1<<7)) |
-         (PINF&(1<<5) ? 0 : (1<<8)) |
-         (PINF&(1<<4) ? 0 : (1<<9)) |
-         (PINF&(1<<1) ? 0 : (1<<10)) |
-         (PINF&(1<<0) ? 0 : (1<<11));
+  return (PINF&(1<<1) ? 0 : (1<<0)) |
+         (PINF&(1<<0) ? 0 : (1<<1)) |
+         (PINB&(1<<0) ? 0 : (1<<2)) |
+         (PINC&(1<<7) ? 0 : (1<<3)) |
+         (PINF&(1<<4) ? 0 : (1<<4)) |
+         (PINF&(1<<5) ? 0 : (1<<5)) |
+         (PINF&(1<<6) ? 0 : (1<<6)) |
+         (PINF&(1<<7) ? 0 : (1<<7)) |
+         (PIND&(1<<4) ? 0 : (1<<8)) |
+         (PIND&(1<<6) ? 0 : (1<<9)) |
+         (PINB&(1<<4) ? 0 : (1<<10)) |
+         (PIND&(1<<7) ? 0 : (1<<11));
          
 }
 
 static void unselect_rows(void)
 {
-    DDRB &= ~(1<<0 | 1<<1 | 1<<2 | 1<<3);
-    PORTB |= (1<<0 | 1<<1 | 1<<2 | 1<<3);
+    DDRB &= ~(1<<5 | 1<<6);
+    PORTB |= (1<<5 | 1<<6);
+    DDRD &= ~(1<<0 | 1<<5);
+    PORTD |= (1<<0 | 1<<5);
     
 }
 
+//
+// Planck PCB Rev 1 Pin Assignments
+//
+// Row: 0,  1,  2,  3
+// Pin: D0, D5, B5, B6
+//
+
 static void select_row(uint8_t row)
 {
     switch (row) {
         case 0:
-            DDRB  |= (1<<0);
-            PORTB &= ~(1<<0);
+            DDRD  |= (1<<0);
+            PORTD &= ~(1<<0);
             break;
         case 1:
-            DDRB  |= (1<<1);
-            PORTB &= ~(1<<1);
+            DDRD  |= (1<<5);
+            PORTD &= ~(1<<5);
             break;
         case 2:
-            DDRB  |= (1<<2);
-            PORTB &= ~(1<<2);
+            DDRB  |= (1<<5);
+            PORTB &= ~(1<<5);
             break;
         case 3:
-            DDRB  |= (1<<3);
-            PORTB &= ~(1<<3);
+            DDRB  |= (1<<6);
+            PORTB &= ~(1<<6);
             break;
         
     }