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

2 files changed, 41 insertions, 0 deletions

diff --git a/keyboards/handwired/frankie_macropad/keymaps/default/keymap.c b/keyboards/handwired/frankie_macropad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..02c1002aff
--- /dev/null
+++ b/keyboards/handwired/frankie_macropad/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 Eric Wood
+ *
+ * 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] = {
+    LAYOUT(
+                 KC_HOME, KC_MUTE,
+        KC_BRID, KC_BRIU, KC_NO, KC_NO,
+        KC_MPRV, KC_MPLY, KC_MNXT, KC_NO
+    ),
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_PGUP);
+        } else {
+            tap_code(KC_PGDN);
+        }
+    } else if (index == 1) { /* Second encoder */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+}
diff --git a/keyboards/handwired/frankie_macropad/keymaps/default/readme.md b/keyboards/handwired/frankie_macropad/keymaps/default/readme.md
new file mode 100644
index 0000000000..f29affb872
--- /dev/null
+++ b/keyboards/handwired/frankie_macropad/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for handwired/frankie_macropad