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

1 files changed, 40 insertions, 0 deletions

diff --git a/keyboards/merge/uc1/keymaps/default/keymap.c b/keyboards/merge/uc1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5a19a9de78
--- /dev/null
+++ b/keyboards/merge/uc1/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 duoshock 
+  * 
+  * 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] = {
+
+/* LAYER 0
+ * ,---------------------------------.
+ * | Encoder |   1   |   2   |   3   |
+ * `---------------------------------'
+ */
+[0] = LAYOUT(
+  KC_MUTE, KC_1, KC_2, KC_3
+),
+};
+
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+}
\ No newline at end of file