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

3 files changed, 42 insertions, 1 deletions

diff --git a/keyboards/kiwikey/kawii9/keymaps/via/keymap.c b/keyboards/kiwikey/kawii9/keymaps/via/keymap.c
new file mode 100644
index 000000000..4d64978cd
--- /dev/null
+++ b/keyboards/kiwikey/kawii9/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2021 KiwiKey
+ *
+ * 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] = {
+    [0] = LAYOUT_ortho_3x3(
+        KC_MUTE,    KC_VOLD,    KC_VOLU,    // Media volume: Mute - Volume Up - Volume Down
+        KC_MPLY,    KC_MPRV,    KC_MNXT,    // Media track control: Play/Pause - Previous Track - Next Track
+        MO(1),      LCTL(KC_C), LCTL(KC_V)  // FN(1) - Copy - Paste
+    ),
+    [1] = LAYOUT_ortho_3x3(
+        RGB_TOG,    RGB_MODE_REVERSE,    RGB_MODE_FORWARD,
+        _______,    RGB_MODE_BREATHE,    RGB_MODE_RAINBOW,
+        _______,    _______,             RESET
+    ),
+    [2] = LAYOUT_ortho_3x3(
+        _______,    _______,    _______,
+        _______,    _______,    _______,
+        _______,    _______,    _______
+    ),
+    [3] = LAYOUT_ortho_3x3(
+        _______,    _______,    _______,
+        _______,    _______,    _______,
+        _______,    _______,    _______
+    )
+};
diff --git a/keyboards/kiwikey/kawii9/keymaps/via/rules.mk b/keyboards/kiwikey/kawii9/keymaps/via/rules.mk
new file mode 100644
index 000000000..1e5b99807
--- /dev/null
+++ b/keyboards/kiwikey/kawii9/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kiwikey/kawii9/rules.mk b/keyboards/kiwikey/kawii9/rules.mk
index b855c6f45..682c48b12 100644
--- a/keyboards/kiwikey/kawii9/rules.mk
+++ b/keyboards/kiwikey/kawii9/rules.mk
@@ -18,5 +18,6 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = yes      # Enable Bluetooth
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
+NO_USB_STARTUP_CHECK = yes