Merge upstream master

2 files changed, 74 insertions, 0 deletions

diff --git a/keyboards/catch22/config.h b/keyboards/catch22/config.h
new file mode 100644
index 0000000000..9014e810c2
--- /dev/null
+++ b/keyboards/catch22/config.h
@@ -0,0 +1,53 @@
+/*
+Copyright 2018 QMK Contributors
+
+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/>.
+*/
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 5
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
+#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+// #define DEBOUNCE 0
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+    false \
+)
+
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN F6
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 6
+#endif
diff --git a/keyboards/catch22/keymaps/default/keymap.c b/keyboards/catch22/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b17edcedbe
--- /dev/null
+++ b/keyboards/catch22/keymaps/default/keymap.c
@@ -0,0 +1,21 @@
+#include QMK_KEYBOARD_H
+
+#define _BASE 0
+#define _FN   1
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BASE] = LAYOUT( /* Base */
+           KC_NUM,  KC_PSLS,  KC_PAST,  KC_BSPC,
+           KC_P7,   KC_P8,    KC_P9,    KC_PEQL,
+  MO(_FN), KC_P4,   KC_P5,    KC_P6,    KC_PPLS,
+  KC_PENT, KC_P1,   KC_P2,    KC_P3,    KC_PMNS,
+           KC_SPC,  KC_P0,    KC_PDOT,  KC_TAB
+),
+[_FN] = LAYOUT(
+           RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUI,
+           _______, _______, _______, _______,
+  _______, _______, _______, _______, _______,
+  KC_2,    _______, _______, _______, _______,
+           _______, _______, _______, _______
+),
+};