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/handwired/numbrero/keymaps/default/keymap.c b/keyboards/handwired/numbrero/keymaps/default/keymap.c
new file mode 100644
index 0000000000..903ed8d88c
--- /dev/null
+++ b/keyboards/handwired/numbrero/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	LAYOUT_numbrero_numpad(
+		KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+		KC_TRNS, KC_P7,   KC_P8,   KC_P9,
+		KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+		KC_TRNS, KC_P1,   KC_P2,   KC_P3,
+		         KC_P0,            KC_PDOT, KC_PENT),
+
+	LAYOUT_numbrero_ortho(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+
+};
+
+void matrix_init_user(void) {
+}
+
+void matrix_scan_user(void) {
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+	return true;
+}