DO NOT USE Merge branch 'master' into debounce_refactor

Merged, however now there are two debounce.h and debounce.c to mess around with and coalesce.
# Conflicts:
#	quantum/matrix.c

1 files changed, 30 insertions, 0 deletions

diff --git a/keyboards/touchpad/keymaps/default/keymap.c b/keyboards/touchpad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..92f772aaa8
--- /dev/null
+++ b/keyboards/touchpad/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+/* Copyright 2018 Jack Humbert <jack.humb@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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = {
+  { KC_A, KC_B, KC_C, KC_D, KC_E, KC_F },
+  { KC_A, KC_B, KC_C, KC_D, KC_E, KC_F },
+  { KC_A, KC_B, KC_C, KC_D, KC_E, KC_F },
+  { KC_A, KC_B, KC_C, KC_D, KC_E, KC_F },
+  { KC_A, KC_B, KC_C, KC_D, KC_E, KC_F },
+  { KC_A, KC_B, KC_C, KC_D, KC_E, KC_F }
+}
+
+};