Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

1 files changed, 18 insertions, 0 deletions

diff --git a/keyboards/40percentclub/nano/keymaps/default/keymap.c b/keyboards/40percentclub/nano/keymaps/default/keymap.c
new file mode 100644
index 0000000000..9ce282a28a
--- /dev/null
+++ b/keyboards/40percentclub/nano/keymaps/default/keymap.c
@@ -0,0 +1,18 @@
+#include QMK_KEYBOARD_H
+
+#define _MAIN 0
+#define _FN 1
+
+#define KC_X0 LT(_FN, KC_ESC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_MAIN] = LAYOUT(
+     KC_VOLU, KC_MPLY, KC_MPRV, KC_PGUP,
+     KC_VOLD, KC_MUTE, KC_MNXT, KC_PGDN
+  ),
+
+  [_FN] = LAYOUT(
+     KC_F,    _______, RGB_HUI, _______,
+     RGB_TOG, RGB_MOD, RGB_HUD, _______
+  )
+};