Merge remote-tracking branch 'upstream/master'

1 files changed, 45 insertions, 0 deletions

diff --git a/keyboards/ivy/keymaps/default/keymap.c b/keyboards/ivy/keymaps/default/keymap.c
new file mode 100644
index 000000000..c250fbdf8
--- /dev/null
+++ b/keyboards/ivy/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+#include QMK_KEYBOARD_H
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum pad_layers {
+  _L1,
+  _FUNC
+};
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Layer 1
+ * ,------.
+ * |  1   |
+ * |------|
+ * |  2   |
+ * |------|
+ * |  FN  |
+ * `------'
+ */
+[_L1] = LAYOUT( \
+    KC_1, \
+    KC_2, \
+    MO(_FUNC)  \
+),
+
+[_FUNC] = LAYOUT( \
+    CALTDEL, \
+    TSKMGR, \
+    _______ \
+)
+
+};
+
+void matrix_init_user(void) {
+
+}