Remove custom matrix

Author: fauxpark

keyboards/k_type/config.h

@@ -28,6 +28,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 10
 
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D5, D6, D7, C1, C2, C3, C4, C5, C6, C7 }
+#define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, D0, D1, D4 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
@@ -88,5 +105,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
-
-#define KIIBOHD_BOOTLOADER

keyboards/k_type/k_type.h

@@ -22,21 +22,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XXX KC_NO
 
 #define LAYOUT_tkl_ansi( \
-    k00,      k10, k20, k30, k40, k50, k60, k70, k80, k90, k01, k11, k21,      k31, k41, k51, \
-    k61, k71, k81, k91, k02, k12, k22, k32, k42, k52, k62, k72, k82, k03,      k23, k33, k43, \
-    k53, k63, k73, k83, k93, k04, k14, k24, k34, k44, k54, k64, k74, k84,      k05, k15, k25, \
-    k35, k45, k55, k65, k75, k85, k95, k06, k16, k26, k36, k46,      k66, \
-    k86,      k07, k17, k27, k37, k47, k57, k67, k77, k87, k97,      k18,           k38, \
-    k48, k58, k68,                k78,                k88, k98, k09, k19,      k29, k39, k49 \
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12,      k13, k14, k15, \
+    k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30,      k32, k33, k34, \
+    k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48,      k50, k51, k52, \
+    k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64,      k66, \
+    k68,      k70, k71, k72, k73, k74, k75, k76, k77, k78, k79,      k81,           k83, \
+    k84, k85, k86,                k87,                k88, k89, k90, k91,      k92, k93, k94 \
 ) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, XXX, k09 }, \
-    { k10, k11, k12, XXX, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, XXX, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
-    { k50, k51, k52, k53, k54, k55, XXX, k57, k58, XXX }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, XXX }, \
-    { k70, k71, k72, k73, k74, k75, XXX, k77, k78, XXX }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, XXX }, \
-    { k90, k91, XXX, k93, XXX, k95, XXX, k97, k98, XXX } \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, XXX }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
+    { k60, k61, k62, k63, k64, XXX, k66, XXX, k68, XXX }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79 }, \
+    { XXX, k81, XXX, k83, k84, k85, k86, k87, k88, k89 }, \
+    { k90, k91, k92, k93, k94, XXX, XXX, XXX, XXX, XXX } \
 }

keyboards/k_type/matrix.c

@@ -26,12 +26,8 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
-CUSTOM_MATRIX = lite
 
 LAYOUTS = tkl_ansi
 
-# project specific files
-SRC += matrix.c
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

keyboards/k_type/rules.mk

@@ -218,6 +218,8 @@
 #        define B15 PAL_LINE(GPIOB, 15)
 #        define B16 PAL_LINE(GPIOB, 16)
 #        define B17 PAL_LINE(GPIOB, 17)
+#        define B18 PAL_LINE(GPIOB, 18)
+#        define B19 PAL_LINE(GPIOB, 19)
 #        define C0 PAL_LINE(GPIOC, 0)
 #        define C1 PAL_LINE(GPIOC, 1)
 #        define C2 PAL_LINE(GPIOC, 2)