Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support for Okayu #22077

Merged
merged 33 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7387d89
add support for Okayu
MaiTheSan Sep 19, 2023
68df511
Update keyboards/sawnsprojects/okayu/halconf.h
MaiTheSan Sep 19, 2023
eae7050
Update keyboards/sawnsprojects/okayu/rules.mk
MaiTheSan Sep 19, 2023
a6d82e2
Update keyboards/sawnsprojects/okayu/halconf.h
MaiTheSan Sep 19, 2023
74918b5
Update keyboards/sawnsprojects/okayu/stm32f072/config.h
MaiTheSan Sep 19, 2023
f542829
Update keyboards/sawnsprojects/okayu/stm32f072/mcuconf.h
MaiTheSan Sep 19, 2023
0f4c092
Update keyboards/sawnsprojects/okayu/stm32f103/mcuconf.h
MaiTheSan Sep 19, 2023
3b75408
Update keyboards/sawnsprojects/okayu/stm32f103/mcuconf.h
MaiTheSan Sep 19, 2023
40e1169
Update keyboards/sawnsprojects/okayu/stm32f303/config.h
MaiTheSan Sep 19, 2023
0339e04
Update keyboards/sawnsprojects/okayu/stm32f303/mcuconf.h
MaiTheSan Sep 19, 2023
3f4640e
Update keyboards/sawnsprojects/okayu/stm32f303/mcuconf.h
MaiTheSan Sep 19, 2023
aa44e10
Update info.json
MaiTheSan Sep 19, 2023
eac6fcf
Update info.json
MaiTheSan Sep 19, 2023
f576e83
Update info.json
MaiTheSan Sep 19, 2023
46f3e69
Update keyboards/sawnsprojects/okayu/stm32f072/mcuconf.h
MaiTheSan Sep 20, 2023
0fe57a2
Update keyboards/sawnsprojects/okayu/stm32f103/config.h
MaiTheSan Sep 20, 2023
833eb78
Update keyboards/sawnsprojects/okayu/stm32f103/info.json
MaiTheSan Sep 20, 2023
dd91972
Update keyboards/sawnsprojects/okayu/info.json
MaiTheSan Sep 20, 2023
f47d423
Update keyboards/sawnsprojects/okayu/info.json
MaiTheSan Sep 20, 2023
6a3f5e1
Update keyboards/sawnsprojects/okayu/info.json
MaiTheSan Sep 20, 2023
f23efda
Update keyboards/sawnsprojects/okayu/info.json
MaiTheSan Sep 20, 2023
424ea0b
Update keyboards/sawnsprojects/okayu/info.json
MaiTheSan Sep 20, 2023
96d4a86
Update keyboards/sawnsprojects/okayu/info.json
MaiTheSan Sep 20, 2023
faa9e52
Update info.json
MaiTheSan Sep 20, 2023
d9ba2a4
Small Change
MaiTheSan Sep 24, 2023
44425a4
Update keyboards/sawnsprojects/okayu/keymaps/via/keymap.c
MaiTheSan Sep 27, 2023
a1e3a29
Update keyboards/sawnsprojects/okayu/keymaps/via/keymap.c
MaiTheSan Sep 27, 2023
840de70
Update keyboards/sawnsprojects/okayu/info.json
MaiTheSan Sep 27, 2023
f8a1864
a
MaiTheSan Sep 27, 2023
a920c27
Merge branch 'okayu' of https://github.com/MaiTheSan/qmk_firmware int…
MaiTheSan Sep 27, 2023
3688e3d
Update config.h
MaiTheSan Oct 5, 2023
0d396d1
Update config.h
MaiTheSan Oct 5, 2023
07db4dc
Update config.h
MaiTheSan Oct 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions keyboards/sawnsprojects/okayu/halconf.h
Original file line number Diff line number Diff line change
@@ -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>
766 changes: 766 additions & 0 deletions keyboards/sawnsprojects/okayu/info.json

Large diffs are not rendered by default.

42 changes: 42 additions & 0 deletions keyboards/sawnsprojects/okayu/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -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, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______)

};
42 changes: 42 additions & 0 deletions keyboards/sawnsprojects/okayu/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
@@ -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, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______)

};
1 change: 1 addition & 0 deletions keyboards/sawnsprojects/okayu/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
27 changes: 27 additions & 0 deletions keyboards/sawnsprojects/okayu/readme.md
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions keyboards/sawnsprojects/okayu/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DEFAULT_FOLDER = sawnsprojects/okayu/stm32f072
8 changes: 8 additions & 0 deletions keyboards/sawnsprojects/okayu/stm32f072/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Copyright 2023 MaiTheSan
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#define WS2812_SPI SPID1 // default: SPID1
#define WS2812_SPI_MOSI_PAL_MODE 5 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
#define WS2812_SPI_SCK_PIN B13 // Required for F072, may be for others -- SCK pin, see the respective datasheet for the appropriate values for your MCU. default: unspecified
#define WS2812_SPI_SCK_PAL_MODE 5 // SCK pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
MaiTheSan marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 4 additions & 0 deletions keyboards/sawnsprojects/okayu/stm32f072/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"processor": "STM32F072",
"bootloader": "stm32-dfu",
}
8 changes: 8 additions & 0 deletions keyboards/sawnsprojects/okayu/stm32f072/mcuconf.h
Original file line number Diff line number Diff line change
@@ -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
Empty file.
8 changes: 8 additions & 0 deletions keyboards/sawnsprojects/okayu/stm32f103/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Copyright 2023 MaiTheSan
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#define WS2812_SPI SPID2 // default: SPID1
#define WS2812_SPI_MOSI_PAL_MODE 5 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
#define WS2812_SPI_SCK_PIN B13 // Required for F072, may be for others -- SCK pin, see the respective datasheet for the appropriate values for your MCU. default: unspecified
#define WS2812_SPI_SCK_PAL_MODE 5 // SCK pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
MaiTheSan marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions keyboards/sawnsprojects/okayu/stm32f103/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"development_board": "bluepill"
}
8 changes: 8 additions & 0 deletions keyboards/sawnsprojects/okayu/stm32f103/mcuconf.h
Original file line number Diff line number Diff line change
@@ -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
Empty file.
8 changes: 8 additions & 0 deletions keyboards/sawnsprojects/okayu/stm32f303/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Copyright 2023 MaiTheSan
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#define WS2812_SPI SPID1 // default: SPID1
#define WS2812_SPI_MOSI_PAL_MODE 5 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
#define WS2812_SPI_SCK_PIN B13 // Required for F072, may be for others -- SCK pin, see the respective datasheet for the appropriate values for your MCU. default: unspecified
#define WS2812_SPI_SCK_PAL_MODE 5 // SCK pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
MaiTheSan marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 4 additions & 0 deletions keyboards/sawnsprojects/okayu/stm32f303/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"processor": "STM32F303",
"bootloader": "stm32-dfu"
}
8 changes: 8 additions & 0 deletions keyboards/sawnsprojects/okayu/stm32f303/mcuconf.h
Original file line number Diff line number Diff line change
@@ -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
Empty file.