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

keyboards/sawnsprojects/okayu/halconf.h

@@ -0,0 +1,9 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+#include_next <halconf.h>

keyboards/sawnsprojects/okayu/keymaps/default/keymap.c

@@ -0,0 +1,42 @@
+// Copyright 2023 MaiTheSan (@maithesan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum {
+    _BL,
+    _FL,
+    _AL,
+    _CL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BL] = LAYOUT_all(
+    QK_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
+    KC_CAPS, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
+    KC_LSFT, KC_NO,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  TG(_AL),
+    KC_LCTL, KC_LGUI, KC_LALT,       KC_SPACE,             MO(_FL), KC_RALT, KC_RGUI, KC_RCTL),
+
+[_FL] = LAYOUT_all(
+    KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+    BL_TOGG, BL_UP,    BL_DOWN, BL_STEP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______,
+    VK_TOGG, _______,  RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+    _______, _______,  _______,       MO(_CL),                               _______, _______, _______, _______),
+
+[_AL] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______,
+    _______, _______, _______,       _______,                               _______, KC_LEFT, KC_DOWN, KC_RIGHT),
+
+[_CL] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______,       _______,                               _______, _______, _______, _______)
+
+ };

keyboards/sawnsprojects/okayu/keymaps/via/keymap.c

@@ -0,0 +1,42 @@
+// Copyright 2023 MaiTheSan (@maithesan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum {
+    _BL,
+    _FL,
+    _AL,
+    _CL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BL] = LAYOUT_all(
+    QK_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
+    KC_CAPS, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,
+    KC_LSFT, KC_NO,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  TG(_AL),
+    KC_LCTL, KC_LGUI, KC_LALT,       KC_SPACE,             MO(_FL), KC_RALT, KC_RGUI, KC_RCTL),
+
+[_FL] = LAYOUT_all(
+    KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_DEL,
+    BL_TOGG, BL_UP,    BL_DOWN, BL_STEP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______,
+    VK_TOGG, _______,  RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+    _______, _______,  _______,       MO(_CL),                               _______, _______, _______, _______),
+
+[_AL] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______,
+    _______, _______, _______,       _______,                               _______, KC_LEFT, KC_DOWN, KC_RIGHT),
+
+[_CL] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+    _______, _______, _______,       _______,                               _______, _______, _______, _______)
+
+ };

keyboards/sawnsprojects/okayu/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/sawnsprojects/okayu/readme.md

@@ -0,0 +1,27 @@
+# Okayu
+
+![Okayu](https://i.imgur.com/pRnRHl8h.png)
+
+A Wibu 60% keyboard PCB Design by inspire of Nekomata Okayu and can fit many keyboard case
+
+* Keyboard Maintainer: [Mai The San](https://github.com/maithesan)
+* Hardware Supported: Several 60% keyboard (RE60, Krush60, Unikorn, Tinyneko, Bakeneko60...)
+* Hardware Availability: NuxrosKB, Salane Discord
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sawnsprojects/okayu:default
+
+Flashing example for this keyboard:
+
+    make sawnsprojects/okayu:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/sawnsprojects/okayu/rules.mk

@@ -0,0 +1 @@
+DEFAULT_FOLDER = sawnsprojects/okayu/stm32f072

keyboards/sawnsprojects/okayu/stm32f072/config.h

@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define WS2812_SPI SPID1
+#define WS2812_SPI_MOSI_PAL_MODE 5
+#define WS2812_SPI_SCK_PIN B13
+#define WS2812_SPI_SCK_PAL_MODE 5

keyboards/sawnsprojects/okayu/stm32f072/info.json

@@ -0,0 +1,4 @@
+{
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+}

keyboards/sawnsprojects/okayu/stm32f072/mcuconf.h

@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE

keyboards/sawnsprojects/okayu/stm32f103/config.h

@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define WS2812_SPI SPID2
+#define WS2812_SPI_MOSI_PAL_MODE 5 
+#define WS2812_SPI_SCK_PIN B13
+#define WS2812_SPI_SCK_PAL_MODE 5

keyboards/sawnsprojects/okayu/stm32f103/info.json

@@ -0,0 +1,3 @@
+{
+    "development_board": "bluepill"
+}

keyboards/sawnsprojects/okayu/stm32f103/mcuconf.h

@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 TRUE

keyboards/sawnsprojects/okayu/stm32f303/config.h

@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define WS2812_SPI SPID1
+#define WS2812_SPI_MOSI_PAL_MODE 5
+#define WS2812_SPI_SCK_PIN B13
+#define WS2812_SPI_SCK_PAL_MODE 5

keyboards/sawnsprojects/okayu/stm32f303/info.json

@@ -0,0 +1,4 @@
+{
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu"
+}

keyboards/sawnsprojects/okayu/stm32f303/mcuconf.h

@@ -0,0 +1,8 @@
+// Copyright 2023 MaiTheSan
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE