Merge branch 'qmk-master'

2 files changed, 36 insertions, 0 deletions

diff --git a/keyboards/bm16s/keymaps/default/keymap.c b/keyboards/bm16s/keymaps/default/keymap.c
new file mode 100755
index 0000000000..9dd697a0d9
--- /dev/null
+++ b/keyboards/bm16s/keymaps/default/keymap.c
@@ -0,0 +1,16 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_ortho_4x4(
+		KC_KP_7, KC_KP_8, KC_KP_9, MO(1),   \
+		KC_KP_4, KC_KP_5, KC_KP_6, KC_PMNS, \
+		KC_KP_1, KC_KP_2, KC_KP_3, KC_PPLS, \
+		KC_KP_0, KC_PDOT, KC_PCMM, KC_PENT  \
+	),
+	[1] = LAYOUT_ortho_4x4(
+		RESET,   BL_STEP, _______, KC_VOLU, \
+		BL_TOGG, BL_DEC,  BL_INC,  KC_VOLD, \
+		RGB_TOG, RGB_MOD, RGB_HUI, KC_MUTE, \
+		RGB_SAI, RGB_SAD, RGB_HUD, _______  \
+	),
+};
\ No newline at end of file
diff --git a/keyboards/bm16s/keymaps/media/keymap.c b/keyboards/bm16s/keymaps/media/keymap.c
new file mode 100755
index 0000000000..082879320a
--- /dev/null
+++ b/keyboards/bm16s/keymaps/media/keymap.c
@@ -0,0 +1,20 @@
+#include QMK_KEYBOARD_H
+
+#define RGB_BRU RGB_VAI
+#define RGB_BRD RGB_VAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_ortho_4x4(
+		KC_BRIU, _______, _______, KC_VOLU, \
+		KC_BRID, _______, _______, KC_VOLD, \
+		_______, _______, _______, KC_MUTE, \
+		KC_MPRV, KC_MPLY, KC_MNXT, MO(1)    \
+	),
+	[1] = LAYOUT_ortho_4x4(
+		RESET,    _______, _______, _______, \
+		RGB_SPD,  RGB_BRU, RGB_SPI, _______, \
+		RGB_RMOD, RGB_BRD, RGB_MOD, _______, \
+		RGB_TOG,  _______, _______, _______  \
+	),
+};
\ No newline at end of file