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

2 files changed, 43 insertions, 0 deletions

diff --git a/keyboards/capsunlocked/cu7/keymaps/default/keymap.c b/keyboards/capsunlocked/cu7/keymaps/default/keymap.c
new file mode 100644
index 0000000000..66ee4f7a90
--- /dev/null
+++ b/keyboards/capsunlocked/cu7/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/*
+Copyright 2021 CapsUnlocked
+
+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] = LAYOUT(
+             MO(1),
+    KC_1,    KC_2,    KC_3,
+    KC_4,    KC_5,    KC_6
+  ),
+  [1] = LAYOUT(
+             _______,
+    RGB_MOD, KC_UP,   RESET,
+    KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+};
+
+// Volume up/down on the encoder
+bool encoder_update_user(uint8_t index, bool clockwise) {
+  if (clockwise) {
+    tap_code_delay(KC_VOLU, 10);
+  }
+  else {
+    tap_code_delay(KC_VOLD, 10);
+  }
+
+  return true;
+}
diff --git a/keyboards/capsunlocked/cu7/keymaps/default/readme.md b/keyboards/capsunlocked/cu7/keymaps/default/readme.md
new file mode 100644
index 0000000000..e612368574
--- /dev/null
+++ b/keyboards/capsunlocked/cu7/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for CU7
\ No newline at end of file