Firmware's pinout fits to the documentation

Author: guiben

keyboard/ergomod/matrix.c

@@ -135,52 +135,47 @@ uint8_t matrix_key_count(void)
 }
 
 /* Column pin configuration
- * col: 0   1   2   3   4   5   6   7   8   9   10  11  12  13
- * pin: F0  F1  E6  C7  C6  B6  D4  B1  B0  B5  B4  D7  D6  B3  (Rev.A)
- * pin:                                 B7                      (Rev.B)
+ *  col: 0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+ *  pin: F0 F1 F2 F3 F4 F5 F6 F7 C0 C1 C2 C3 C4 C5 C6 C7
  */
 static void  init_cols(void)
 {
     // Input with pull-up(DDR:0, PORT:1)
-    DDRF  &= ~(1<<0 | 1<<1);
-    PORTF |=  (1<<0 | 1<<1);
-    DDRE  &= ~(1<<6);
-    PORTE |=  (1<<6);
-    DDRD  &= ~(1<<7 | 1<<6 | 1<<4);
-    PORTD |=  (1<<7 | 1<<6 | 1<<4);
-    DDRC  &= ~(1<<7 | 1<<6);
-    PORTC |=  (1<<7 | 1<<6);
-    DDRB  &= ~(1<<7 | 1<<6 | 1<< 5 | 1<<4 | 1<<3 | 1<<1 | 1<<0);
-    PORTB |=  (1<<7 | 1<<6 | 1<< 5 | 1<<4 | 1<<3 | 1<<1 | 1<<0);
+    DDRF  &=  0b00000000;
+    PORTF |=  0b11111111;
+    DDRC  &=  0b00000000;
+    PORTC |=  0b11111111;
 }
 
 static matrix_row_t read_cols(void)
 {
-    return (PINF&(1<<0) ? 0 : (1<<0)) |
-           (PINF&(1<<1) ? 0 : (1<<1)) |
-           (PINE&(1<<6) ? 0 : (1<<2)) |
-           (PINC&(1<<7) ? 0 : (1<<3)) |
-           (PINC&(1<<6) ? 0 : (1<<4)) |
-           (PINB&(1<<6) ? 0 : (1<<5)) |
-           (PIND&(1<<4) ? 0 : (1<<6)) |
-           (PINB&(1<<1) ? 0 : (1<<7)) |
-           ((PINB&(1<<0) && PINB&(1<<7)) ? 0 : (1<<8)) |     // Rev.A and B
-           (PINB&(1<<5) ? 0 : (1<<9)) |
-           (PINB&(1<<4) ? 0 : (1<<10)) |
-           (PIND&(1<<7) ? 0 : (1<<11)) |
-           (PIND&(1<<6) ? 0 : (1<<12)) |
-           (PINB&(1<<3) ? 0 : (1<<13));
+    return  (PINF&(1<<0) ? 0 : (1<<0)) |
+            (PINF&(1<<1) ? 0 : (1<<1)) |
+            (PINF&(1<<2) ? 0 : (1<<2)) |
+            (PINF&(1<<3) ? 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)) |
+            (PINC&(1<<0) ? 0 : (1<<8)) |
+            (PINC&(1<<1) ? 0 : (1<<9)) |
+            (PINC&(1<<2) ? 0 : (1<<10)) |
+            (PINC&(1<<3) ? 0 : (1<<11)) |
+            (PINC&(1<<4) ? 0 : (1<<12)) |
+            (PINC&(1<<5) ? 0 : (1<<13)) |
+            (PINC&(1<<6) ? 0 : (1<<14)) |
+            (PINC&(1<<7) ? 0 : (1<<15));
 }
 
 /* Row pin configuration
- * row: 0   1   2   3   4
- * pin: D0  D1  D2  D3  D5
+ *  row: 0  1  2  3  4
+ *  pin: D0 D1 D2 D3 D4
  */
 static void unselect_rows(void)
 {
     // Hi-Z(DDR:0, PORT:0) to unselect
-    DDRD  &= ~0b00101111;
-    PORTD &= ~0b00101111;
+    DDRD  &= ~0b00011111;
+    PORTD &= ~0b00011111;
 }
 
 static void select_row(uint8_t row)
@@ -204,8 +199,8 @@ static void select_row(uint8_t row)
             PORTD &= ~(1<<3);
             break;
         case 4:
-            DDRD  |= (1<<5);
-            PORTD &= ~(1<<5);
+            DDRD  |= (1<<4);
+            PORTD &= ~(1<<4);
             break;
     }
 }