From 49ce65f6981eeb973ddfe5dfd9c0e823adb3a58d Mon Sep 17 00:00:00 2001
From: Adam Mckaig <adam.mckaig@gmail.com>
Date: Fri, 19 Jun 2020 16:50:25 -0400
Subject: [PATCH 1/4] Ignore build artifacts

These are derived from `make clean` in tmp_core/rules.mk
---
 .gitignore | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8c6f3b6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+/*.hex
+/*.eep
+/*.cof
+/*.elf
+/*.map
+/*.sym
+/*.lss
+/.dep
+/obj_kc60_lufa

From 806a54b651dd033c98388158d40f8eb9c9821880 Mon Sep 17 00:00:00 2001
From: Adam Mckaig <adam.mckaig@gmail.com>
Date: Fri, 19 Jun 2020 16:51:09 -0400
Subject: [PATCH 2/4] Update tmk_core to upstream master (as of 2020-06-19)

Note that the upstream repo has added a couple fof submodules of its
own since fb1fb12. We must init those with --recurse before the build
will work.

See: https://github.com/tmk/tmk_keyboard/tree/7cf3060a6dbfe57909668833cb3edb702b0899bb
---
 README.md | 2 +-
 tmk_core  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2a9355b..65b4e65 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ DIY compact keyboard by Massdrop.
 ## Build
 Move to this directory then just run `make` like:
 
-    $ git submodule update tmk_core
+    $ git submodule update --init --recursive
     $ make
 
 Use `make -f Makefile.pjrc` if you want to use PJRC stack but I find no reason to do so now.
diff --git a/tmk_core b/tmk_core
index fb1fb12..7cf3060 160000
--- a/tmk_core
+++ b/tmk_core
@@ -1 +1 @@
-Subproject commit fb1fb122a5971723f374cd737b7cc0aefd470af3
+Subproject commit 7cf3060a6dbfe57909668833cb3edb702b0899bb

From b629cd69ff10f022bc07cbe54020705bcea51c27 Mon Sep 17 00:00:00 2001
From: Adam Mckaig <adam.mckaig@gmail.com>
Date: Fri, 19 Jun 2020 17:07:39 -0400
Subject: [PATCH 3/4] Update KC60 files from upstream GH60

It appears that these files (Makefile, keymap_common, matrix, led) were
originally copied from tmk_core/keyboard/gh60. I've re-copied these from
upstream at 7cf3060 to bring them up to date. They don't yet include the
patches previously applied, so won't actually work until the next
commit. I did this deliberately, so we can see the patch.
---
 Makefile         |   7 +--
 keymap_common.c  |  30 ----------
 keymap_common.h  |   9 +--
 keymap_default.c |   2 +-
 keymap_spacefn.c |   2 +-
 matrix.c         | 144 ++++++++++++++++-------------------------------
 6 files changed, 54 insertions(+), 140 deletions(-)
 delete mode 100644 keymap_common.c

diff --git a/Makefile b/Makefile
index eaa179f..68a446c 100644
--- a/Makefile
+++ b/Makefile
@@ -48,8 +48,7 @@ TMK_DIR = ./tmk_core/tmk_core
 TARGET_DIR = .
 
 # project specific files
-SRC =	keymap_common.c \
-	matrix.c \
+SRC =	matrix.c \
 	led.c
 
 ifdef KEYMAP
@@ -119,8 +118,8 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
 #CONSOLE_ENABLE = yes	# Console for debug(+400)
 #COMMAND_ENABLE = yes    # Commands for debug and configuration
 #SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes	    # USB Nkey Rollover - not yet supported in LUFA
-#BACKLIGHT_ENABLE = yes
+NKRO_ENABLE = yes	# USB Nkey Rollover
+
 
 # Optimize size but this may cause error "relocation truncated to fit"
 #EXTRALDFLAGS = -Wl,--relax
diff --git a/keymap_common.c b/keymap_common.c
deleted file mode 100644
index fdb1769..0000000
--- a/keymap_common.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "keymap_common.h"
-
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) };
-}
diff --git a/keymap_common.h b/keymap_common.h
index c9423df..9ac5722 100644
--- a/keymap_common.h
+++ b/keymap_common.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "action.h"
 #include "action_macro.h"
@@ -30,11 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 
 
-extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-extern const uint16_t fn_actions[];
-
-
-/* KC60 keymap definition macro
+/* GH60 keymap definition macro
  * K2C, K31 and  K3C are extra keys for ISO
  */
 #define KEYMAP( \
@@ -51,7 +46,7 @@ extern const uint16_t fn_actions[];
     { KC_##K40, KC_##K41, KC_##K42, KC_NO,    KC_NO,    KC_##K45, KC_NO,    KC_NO,    KC_NO,    KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D }  \
 }
 
-/* ANSI valiant. No extra keys for ISO */
+/* ANSI variant. No extra keys for ISO */
 #define KEYMAP_ANSI( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
diff --git a/keymap_default.c b/keymap_default.c
index da005fd..3403924 100644
--- a/keymap_default.c
+++ b/keymap_default.c
@@ -62,7 +62,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /*
  * Fn action definition
  */
-const uint16_t PROGMEM fn_actions[] = {
+const action_t PROGMEM fn_actions[] = {
     [0] = ACTION_LAYER_MOMENTARY(1),    	/* Monentary layout 1 */
     [1] = ACTION_LAYER_TOGGLE(1),            	/* Toggle layout */
     [2] = ACTION_MODS_KEY(MOD_LSFT, KC_DEL),    /* Cut  */
diff --git a/keymap_spacefn.c b/keymap_spacefn.c
index 6e1e898..b15995e 100644
--- a/keymap_spacefn.c
+++ b/keymap_spacefn.c
@@ -62,7 +62,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /*
  * Fn action definition
  */
-const uint16_t PROGMEM fn_actions[] = {
+const action_t PROGMEM fn_actions[] = {
     [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE),    /* SpaceFn layout 1 */
     [1] = ACTION_LAYER_MOMENTARY(1),            /* Momentary layout 1 */
     [2] = ACTION_MODS_KEY(MOD_LSFT, KC_DEL),    /* Cut  */
diff --git a/matrix.c b/matrix.c
index aee299a..716caf0 100644
--- a/matrix.c
+++ b/matrix.c
@@ -25,13 +25,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "print.h"
 #include "debug.h"
 #include "util.h"
+#include "timer.h"
 #include "matrix.h"
 
 
 #ifndef DEBOUNCE
-#   define DEBOUNCE	5
+#   define DEBOUNCE 5
 #endif
-static uint8_t debouncing = DEBOUNCE;
+static bool debouncing = false;
+static uint16_t debouncing_time = 0;
+
 
 /* matrix state(1:on, 0:off) */
 static matrix_row_t matrix[MATRIX_ROWS];
@@ -43,24 +46,8 @@ static void unselect_rows(void);
 static void select_row(uint8_t row);
 
 
-inline
-uint8_t matrix_rows(void)
-{
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
-    return MATRIX_COLS;
-}
-
 void matrix_init(void)
 {
-    // disable JTAG
-    MCUCR = (1<<JTD);
-    MCUCR = (1<<JTD);
-
     // initialize row and col
     unselect_rows();
     init_cols();
@@ -76,119 +63,82 @@ uint8_t matrix_scan(void)
 {
     for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
         select_row(i);
-        _delay_us(30);  // without this wait read unstable value.
+        _delay_us(1);  // delay for settling
         matrix_row_t cols = read_cols();
         if (matrix_debouncing[i] != cols) {
-            matrix_debouncing[i] = cols;
             if (debouncing) {
-                debug("bounce!: "); debug_hex(debouncing); debug("\n");
+                dprintf("bounce: %d %d@%02X\n", timer_elapsed(debouncing_time), i, matrix_debouncing[i]^cols);
             }
-            debouncing = DEBOUNCE;
+            matrix_debouncing[i] = cols;
+            debouncing = true;
+            debouncing_time = timer_read();
         }
         unselect_rows();
     }
 
-    if (debouncing) {
-        if (--debouncing) {
-            _delay_ms(1);
-        } else {
-            for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-                matrix[i] = matrix_debouncing[i];
-            }
+    if (debouncing && timer_elapsed(debouncing_time) >= DEBOUNCE) {
+        for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+            matrix[i] = matrix_debouncing[i];
         }
+        debouncing = false;
     }
 
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
 inline
 matrix_row_t matrix_get_row(uint8_t row)
 {
     return matrix[row];
 }
 
-void matrix_print(void)
-{
-    print("\nr/c 0123456789ABCDEF\n");
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
 /* Column pin configuration
  * col: 0   1   2   3   4   5   6   7   8   9   10  11  12  13
- * pin: F1  F0  E6  D7  D6  D4  C7  C6  B7  B5  B4  B3  B1  B0  (Rev.BLE)
+ * pin: F0  F1  E6  C7  C6  B6  D4  B1  B0  B5  B4  D7  D6  B3  (Rev.A)
+ * pin:                                 B7                      (Rev.B)
  */
 static void  init_cols(void)
 {
-
     // Input with pull-up(DDR:0, PORT:1)
-    DDRF  &= ~(1<<PF1 | 1<<PF0);
-    PORTF |=  (1<<PF1 | 1<<PF0);
-    DDRE  &= ~(1<<PE6);
-    PORTE |=  (1<<PE6);
-    DDRD  &= ~(1<<PD7 | 1<<PD6 | 1<<PD4);
-    PORTD |=  (1<<PD7 | 1<<PD6 | 1<<PD4);
-    DDRC  &= ~(1<<PC7 | 1<<PC6);
-    PORTC |=  (1<<PC7 | 1<<PC6);
-    DDRB  &= ~(1<<PB7 | 1<<PB5 | 1<<PB4 | 1<<PB3 | 1<<PB1 | 1<<PB0);
-    PORTB |=  (1<<PB7 | 1<<PB5 | 1<<PB4 | 1<<PB3 | 1<<PB1 | 1<<PB0);
-
+    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);
 }
 
 static matrix_row_t read_cols(void)
 {
-    return (PINF&(1<<PF0) ? 0 : (1<<0)) |
-           (PINF&(1<<PF1) ? 0 : (1<<1)) |
-           (PINE&(1<<PE6) ? 0 : (1<<2)) |
-           (PINC&(1<<PC7) ? 0 : (1<<3)) |
-           (PINC&(1<<PC6) ? 0 : (1<<4)) |
-           (PINB&(1<<PB7) ? 0 : (1<<5)) |
-           (PIND&(1<<PD4) ? 0 : (1<<6)) |
-           (PINB&(1<<PB1) ? 0 : (1<<7)) |
-           (PINB&(1<<PB0) ? 0 : (1<<8)) |
-           (PINB&(1<<PB5) ? 0 : (1<<9)) |
-           (PINB&(1<<PB4) ? 0 : (1<<10)) |
-           (PIND&(1<<PD7) ? 0 : (1<<11)) |
-           (PIND&(1<<PD6) ? 0 : (1<<12)) |
-           (PINB&(1<<PB3) ? 0 : (1<<13));
+    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));
 }
 
 /* Row pin configuration
  * row: 0   1   2   3   4
- * pin: D0  D1  F6  F7  D5
+ * pin: D0  D1  D2  D3  D5
  */
 static void unselect_rows(void)
 {
     // Hi-Z(DDR:0, PORT:0) to unselect
-    DDRD  &= ~(1<<PD0 | 1<<PD1 | 1<<PD5);
-    PORTD &= ~(1<<PD0 | 1<<PD1 | 1<<PD5);
-
-    DDRF  &= ~(1<<PF6 | 1<<PF7);
-    PORTF &= ~(1<<PF6 | 1<<PF7);
+    DDRD  &= ~0b00101111;
+    PORTD &= ~0b00101111;
 }
 
 static void select_row(uint8_t row)
@@ -204,12 +154,12 @@ static void select_row(uint8_t row)
             PORTD &= ~(1<<1);
             break;
         case 2:
-            DDRF  |= (1<<6);
-            PORTF &= ~(1<<6);
+            DDRD  |= (1<<2);
+            PORTD &= ~(1<<2);
             break;
         case 3:
-            DDRF  |= (1<<7);
-            PORTF &= ~(1<<7);
+            DDRD  |= (1<<3);
+            PORTD &= ~(1<<3);
             break;
         case 4:
             DDRD  |= (1<<5);

From 4d2caa37b17230db33d695799fdaba1c6f1eb547 Mon Sep 17 00:00:00 2001
From: Adam Mckaig <adam.mckaig@gmail.com>
Date: Fri, 19 Jun 2020 17:17:26 -0400
Subject: [PATCH 4/4] Re-apply KC60 patch

This was derived from @jpec's work in:
https://github.com/jpec/kc60/commit/92b6ec101d9ad8f733e3b483d6cea1448896ca9c
---
 Makefile        |  1 +
 keymap_common.h |  2 +-
 matrix.c        | 74 +++++++++++++++++++++++++------------------------
 3 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Makefile b/Makefile
index 68a446c..e58a5ce 100644
--- a/Makefile
+++ b/Makefile
@@ -119,6 +119,7 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
 #COMMAND_ENABLE = yes    # Commands for debug and configuration
 #SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes	# USB Nkey Rollover
+#BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 
 # Optimize size but this may cause error "relocation truncated to fit"
diff --git a/keymap_common.h b/keymap_common.h
index 9ac5722..5f4352b 100644
--- a/keymap_common.h
+++ b/keymap_common.h
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 
 
-/* GH60 keymap definition macro
+/* KC60 keymap definition macro
  * K2C, K31 and  K3C are extra keys for ISO
  */
 #define KEYMAP( \
diff --git a/matrix.c b/matrix.c
index 716caf0..de64f07 100644
--- a/matrix.c
+++ b/matrix.c
@@ -48,6 +48,10 @@ static void select_row(uint8_t row);
 
 void matrix_init(void)
 {
+    // disable JTAG
+    MCUCR = (1<<JTD);
+    MCUCR = (1<<JTD);
+
     // initialize row and col
     unselect_rows();
     init_cols();
@@ -94,56 +98,54 @@ matrix_row_t matrix_get_row(uint8_t row)
 
 /* 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)
+ * pin: F1  F0  E6  D7  D6  D4  C7  C6  B7  B5  B4  B3  B1  B0
  */
 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  &= ~(1<<PF1 | 1<<PF0);
+    PORTF |=  (1<<PF1 | 1<<PF0);
+    DDRE  &= ~(1<<PE6);
+    PORTE |=  (1<<PE6);
+    DDRD  &= ~(1<<PD7 | 1<<PD6 | 1<<PD4);
+    PORTD |=  (1<<PD7 | 1<<PD6 | 1<<PD4);
+    DDRC  &= ~(1<<PC7 | 1<<PC6);
+    PORTC |=  (1<<PC7 | 1<<PC6);
+    DDRB  &= ~(1<<PB7 | 1<<PB5 | 1<<PB4 | 1<<PB3 | 1<<PB1 | 1<<PB0);
+    PORTB |=  (1<<PB7 | 1<<PB5 | 1<<PB4 | 1<<PB3 | 1<<PB1 | 1<<PB0);
 }
 
 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<<PF0) ? 0 : (1<<0)) |
+           (PINF&(1<<PF1) ? 0 : (1<<1)) |
+           (PINE&(1<<PE6) ? 0 : (1<<2)) |
+           (PINC&(1<<PC7) ? 0 : (1<<3)) |
+           (PINC&(1<<PC6) ? 0 : (1<<4)) |
+           (PINB&(1<<PB7) ? 0 : (1<<5)) |
+           (PIND&(1<<PD4) ? 0 : (1<<6)) |
+           (PINB&(1<<PB1) ? 0 : (1<<7)) |
+           (PINB&(1<<PB0) ? 0 : (1<<8)) |
+           (PINB&(1<<PB5) ? 0 : (1<<9)) |
+           (PINB&(1<<PB4) ? 0 : (1<<10)) |
+           (PIND&(1<<PD7) ? 0 : (1<<11)) |
+           (PIND&(1<<PD6) ? 0 : (1<<12)) |
+           (PINB&(1<<PB3) ? 0 : (1<<13));
 }
 
 /* Row pin configuration
  * row: 0   1   2   3   4
- * pin: D0  D1  D2  D3  D5
+ * pin: D0  D1  F6  F7  D5
  */
 static void unselect_rows(void)
 {
-    // Hi-Z(DDR:0, PORT:0) to unselect
-    DDRD  &= ~0b00101111;
-    PORTD &= ~0b00101111;
+    DDRD  &= ~(1<<PD0 | 1<<PD1 | 1<<PD5);
+    PORTD &= ~(1<<PD0 | 1<<PD1 | 1<<PD5);
+    DDRF  &= ~(1<<PF6 | 1<<PF7);
+    PORTF &= ~(1<<PF6 | 1<<PF7);
 }
 
 static void select_row(uint8_t row)
 {
-    // Output low(DDR:1, PORT:0) to select
     switch (row) {
         case 0:
             DDRD  |= (1<<0);
@@ -154,12 +156,12 @@ static void select_row(uint8_t row)
             PORTD &= ~(1<<1);
             break;
         case 2:
-            DDRD  |= (1<<2);
-            PORTD &= ~(1<<2);
+            DDRF  |= (1<<6);
+            PORTF &= ~(1<<6);
             break;
         case 3:
-            DDRD  |= (1<<3);
-            PORTD &= ~(1<<3);
+            DDRF  |= (1<<7);
+            PORTF &= ~(1<<7);
             break;
         case 4:
             DDRD  |= (1<<5);