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

3 files changed, 50 insertions, 5 deletions

diff --git a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c
index 7d1acce308..caa6b4aafc 100644
--- a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c
+++ b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c
@@ -18,17 +18,27 @@
 // Defines names for use in layer keycodes and the keymap
 enum layer_names {
     _BASE,
-    _FN
+    _FN1,
+    _FN2,
+    _FN3
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-        KC_DEL,  KC_HOME, LT(_FN,KC_END),
+        KC_DEL,  KC_HOME, LT(_FN1,KC_END),
         KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE
     ),
-    [_FN] = LAYOUT(
-        KC_1,    KC_UP,   _______,
-        KC_LEFT, KC_DOWN, KC_RGHT, _______
+    [_FN1] = LAYOUT(
+        RESET,    KC_UP,   _______,
+        KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO
+    ),
+    [_FN2] = LAYOUT(
+        _______,    _______,   _______,
+        _______, _______, _______, _______
+    ),
+    [_FN3] = LAYOUT(
+        _______,    _______,   _______,
+        _______, _______, _______, _______
     )
 };
diff --git a/keyboards/kiwikeebs/macro/keymaps/via/keymap.c b/keyboards/kiwikeebs/macro/keymaps/via/keymap.c
new file mode 100644
index 0000000000..56dffdbd93
--- /dev/null
+++ b/keyboards/kiwikeebs/macro/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 KiwiKeebs
+ *
+ * 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,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_DEL,  KC_HOME, LT(_FN,KC_END),
+        KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE
+    ),
+    [_FN] = LAYOUT(
+        RESET,    KC_UP,   _______,
+        KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO
+    )
+};
diff --git a/keyboards/kiwikeebs/macro/keymaps/via/rules.mk b/keyboards/kiwikeebs/macro/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/kiwikeebs/macro/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes