Merge remote-tracking branch 'origin/master' into develop

6 files changed, 141 insertions, 0 deletions

diff --git a/keyboards/pegasus/keymaps/default/config.h b/keyboards/pegasus/keymaps/default/config.h
new file mode 100644
index 0000000000..d76c709440
--- /dev/null
+++ b/keyboards/pegasus/keymaps/default/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 melonbred
+ *
+ * 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
+
+// place overrides here
+#define TAPPING_TERM 175
diff --git a/keyboards/pegasus/keymaps/default/keymap.c b/keyboards/pegasus/keymaps/default/keymap.c
new file mode 100644
index 0000000000..fb2cb061ff
--- /dev/null
+++ b/keyboards/pegasus/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2020 melonbred
+ *
+ * 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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _LAYER1,
+    _LAYER2
+
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_default(
+        KC_ESC,        KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,          KC_U, KC_I,    KC_O,    KC_P,    KC_BSPC,
+        CTL_T(KC_TAB), KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H,          KC_J, KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT,       KC_Z,    KC_X,    KC_C, KC_V, KC_B, KC_N,          KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+        MO(_LAYER2),   KC_LALT,                      LT(_LAYER1, KC_SPC),                KC_RALT,          KC_RGUI
+    ),
+
+    [_LAYER1] = LAYOUT_default(
+        KC_GRV,  KC_QUOT, _______, KC_UP,   _______, _______, _______, _______, KC_7, KC_8, KC_9,    KC_DEL,
+        KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_PSLS, KC_PMNS, KC_4, KC_5, KC_6,    KC_ENT,
+        KC_LSFT, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_PAST, KC_PPLS, KC_1, KC_2, KC_3,    KC_RSFT,
+        _______, _______,                            _______,                         KC_0,          KC_PDOT
+    ),
+
+    [_LAYER2] = LAYOUT_default(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, XXXXXXX, KC_RALT, KC_RCTL, KC_DEL,  KC_VOLD,
+        _______, XXXXXXX,                            XXXXXXX,                            XXXXXXX,          KC_MPLY
+    ),
+};
+
+
+
diff --git a/keyboards/pegasus/keymaps/default/readme.md b/keyboards/pegasus/keymaps/default/readme.md
new file mode 100644
index 0000000000..170cc76269
--- /dev/null
+++ b/keyboards/pegasus/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for pegasus
diff --git a/keyboards/pegasus/keymaps/split/config.h b/keyboards/pegasus/keymaps/split/config.h
new file mode 100644
index 0000000000..d76c709440
--- /dev/null
+++ b/keyboards/pegasus/keymaps/split/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 melonbred
+ *
+ * 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
+
+// place overrides here
+#define TAPPING_TERM 175
diff --git a/keyboards/pegasus/keymaps/split/keymap.c b/keyboards/pegasus/keymaps/split/keymap.c
new file mode 100644
index 0000000000..964cfa2df7
--- /dev/null
+++ b/keyboards/pegasus/keymaps/split/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2020 melonbred
+ *
+ * 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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _LAYER1,
+    _LAYER2
+
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_split(
+        KC_ESC,        KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,                KC_U,   KC_I,    KC_O,    KC_P,    KC_BSPC,
+        CTL_T(KC_TAB), KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,                KC_J,   KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,                KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+        MO(_LAYER2),   KC_LALT, KC_LCTL,          KC_SPC,         LT(_LAYER1, KC_SPC),         KC_RCTL, KC_RALT,          KC_RGUI
+    ),
+
+    [_LAYER1] = LAYOUT_split(
+        KC_GRV,  KC_QUOT, _______, KC_UP,   _______, _______, _______, _______, KC_7,    KC_8, KC_9,    KC_DEL,
+        KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_PSLS, KC_PMNS, KC_4,    KC_5, KC_6,    KC_ENT,
+        KC_LSFT, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_PAST, KC_PPLS, KC_1,    KC_2, KC_3,    KC_RSFT,
+        _______, _______, _______,          _______,          _______,          _______, KC_0,          KC_PDOT
+    ),
+
+    [_LAYER2] = LAYOUT_split(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, XXXXXXX, KC_RALT, KC_RCTL, KC_DEL,  KC_VOLD,
+        _______, XXXXXXX, XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX, XXXXXXX,          KC_MPLY
+    ),
+};
+
diff --git a/keyboards/pegasus/keymaps/split/readme.md b/keyboards/pegasus/keymaps/split/readme.md
new file mode 100644
index 0000000000..170cc76269
--- /dev/null
+++ b/keyboards/pegasus/keymaps/split/readme.md
@@ -0,0 +1 @@
+# The default keymap for pegasus