From b00db683b29851b415766c074449cbd315ec864e Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Mon, 25 Jan 2016 22:59:09 -0800
Subject: [PATCH] More sensible (standard c++) implementation of the keymatrix
 array

---
 KeyboardioFirmware.h   |  3 +--
 KeyboardioFirmware.ino | 10 ----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/KeyboardioFirmware.h b/KeyboardioFirmware.h
index 08119468..50ff53dd 100644
--- a/KeyboardioFirmware.h
+++ b/KeyboardioFirmware.h
@@ -35,7 +35,7 @@ void setup();
 char x;
 char y;
 
-uint8_t matrixState[ROWS][COLS];
+uint8_t matrixState[ROWS][COLS] = {0};
 static const Key keymaps[KEYMAPS][ROWS][COLS] = { KEYMAP_LIST };
 
 byte primary_keymap = 0;
@@ -58,7 +58,6 @@ void setup_output_pins();
 void scan_matrix();
 
 // key matrix
-void setup_matrix();
 void reset_matrix();
 void handle_immediate_action_during_matrix_scan(Key keymapEntry, byte matrixStateEntry);
 
diff --git a/KeyboardioFirmware.ino b/KeyboardioFirmware.ino
index 44b4c688..2c1164fc 100644
--- a/KeyboardioFirmware.ino
+++ b/KeyboardioFirmware.ino
@@ -31,15 +31,6 @@ int left_initted = 0;
 
 
 
-void setup_matrix() {
-    //blank out the matrix.
-    for (byte col = 0; col < COLS; col++) {
-        for (byte row = 0; row < ROWS; row++) {
-            matrixState[row][col] = 0;
-        }
-    }
-}
-
 
 void set_keymap(Key keymapEntry, byte matrixStateEntry) {
     if (keymapEntry.flags & SWITCH_TO_KEYMAP) {
@@ -151,7 +142,6 @@ void setup() {
     Mouse.begin();
     setup_leds();
     led_bootup();
-    setup_matrix();
     setup_pins();
     rightsx1509.fetchPinStates();