Skip to content

Commit

Permalink
Add keyboard: takayoshiotake/five_octave (#639)
Browse files Browse the repository at this point in the history 
* Add keyboard: takayoshiotake/five_octave

* Add keyboard: takayoshiotake/five_octave

* Clean vial.json

Co-authored-by: Less/Rikki <[email protected]>

* Clean info.json

Co-authored-by: Less/Rikki <[email protected]>

* Remove the layer with only KC_TRNS, as it is pointless.

Co-authored-by: Less/Rikki <[email protected]>

* Format code: indentation

* Format json: indentation

---------

Co-authored-by: Less/Rikki <[email protected]>
  • Loading branch information
@takayoshiotake @lesshonor
takayoshiotake and lesshonor authored Jan 21, 2024
1 parent e41f2b9 commit 49f5eec
Show file tree
Hide file tree
Showing 8 changed files with 293 additions and 0 deletions.
92 changes: 92 additions & 0 deletions keyboards/takayoshiotake/five_octave/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"keyboard_name": "Five Octave",
"maintainer": "takayoshiotake",
"manufacturer": "takayoshiotake",
"url": "https://github.com/takayoshiotake/five-octave-61-key-keyboard",
"processor": "RP2040",
"bootloader": "rp2040",
"usb": {
"device_version": "1.0.0",
"pid": "0x8CAE",
"vid": "0x1209",
"force_nkro": true
},
"features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP15", "GP14"],
"rows": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22"]
},
"layouts": {
"LAYOUT": {
"layout": [
{ "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
{ "label": "1", "matrix": [0, 2], "x": 1, "y": 0 },
{ "label": "2", "matrix": [0, 3], "x": 2, "y": 0 },
{ "label": "3", "matrix": [0, 4], "x": 3, "y": 0 },
{ "label": "4", "matrix": [0, 5], "x": 4, "y": 0 },
{ "label": "5", "matrix": [0, 6], "x": 5, "y": 0 },
{ "label": "6", "matrix": [0, 7], "x": 6, "y": 0 },
{ "label": "7", "matrix": [4, 0], "x": 7, "y": 0 },
{ "label": "8", "matrix": [4, 1], "x": 8, "y": 0 },
{ "label": "9", "matrix": [4, 2], "x": 9, "y": 0 },
{ "label": "0", "matrix": [4, 3], "x": 10, "y": 0 },
{ "label": "-", "matrix": [4, 4], "x": 11, "y": 0 },
{ "label": "=", "matrix": [4, 5], "x": 12, "y": 0 },
{ "label": "\\", "matrix": [4, 6], "x": 13, "y": 0 },
{ "label": "`", "matrix": [4, 7], "x": 14, "y": 0 },
{ "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
{ "label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1 },
{ "label": "W", "matrix": [1, 4], "x": 2.5, "y": 1 },
{ "label": "E", "matrix": [1, 5], "x": 3.5, "y": 1 },
{ "label": "R", "matrix": [1, 6], "x": 4.5, "y": 1 },
{ "label": "T", "matrix": [1, 7], "x": 5.5, "y": 1 },
{ "label": "Y", "matrix": [5, 0], "x": 6.5, "y": 1 },
{ "label": "U", "matrix": [5, 1], "x": 7.5, "y": 1 },
{ "label": "I", "matrix": [5, 2], "x": 8.5, "y": 1 },
{ "label": "O", "matrix": [5, 3], "x": 9.5, "y": 1 },
{ "label": "P", "matrix": [5, 4], "x": 10.5, "y": 1 },
{ "label": "[", "matrix": [5, 5], "x": 11.5, "y": 1 },
{ "label": "]", "matrix": [5, 6], "x": 12.5, "y": 1 },
{ "label": "BS", "matrix": [5, 7], "w": 1.5, "x": 13.5, "y": 1 },
{ "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
{ "label": "A", "matrix": [2, 3], "x": 1.75, "y": 2 },
{ "label": "S", "matrix": [2, 4], "x": 2.75, "y": 2 },
{ "label": "D", "matrix": [2, 5], "x": 3.75, "y": 2 },
{ "label": "F", "matrix": [2, 6], "x": 4.75, "y": 2 },
{ "label": "G", "matrix": [2, 7], "x": 5.75, "y": 2 },
{ "label": "H", "matrix": [6, 0], "x": 6.75, "y": 2 },
{ "label": "J", "matrix": [6, 1], "x": 7.75, "y": 2 },
{ "label": "K", "matrix": [6, 2], "x": 8.75, "y": 2 },
{ "label": "L", "matrix": [6, 3], "x": 9.75, "y": 2 },
{ "label": ";", "matrix": [6, 4], "x": 10.75, "y": 2 },
{ "label": "'", "matrix": [6, 5], "x": 11.75, "y": 2 },
{ "label": "Return", "matrix": [6, 6], "w": 2.25, "x": 12.75, "y": 2 },
{ "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
{ "label": "Z", "matrix": [2, 1], "x": 2.25, "y": 3 },
{ "label": "X", "matrix": [2, 2], "x": 3.25, "y": 3 },
{ "label": "C", "matrix": [3, 5], "x": 4.25, "y": 3 },
{ "label": "V", "matrix": [3, 6], "x": 5.25, "y": 3 },
{ "label": "B", "matrix": [3, 7], "x": 6.25, "y": 3 },
{ "label": "N", "matrix": [7, 0], "x": 7.25, "y": 3 },
{ "label": "M", "matrix": [7, 1], "x": 8.25, "y": 3 },
{ "label": ",", "matrix": [7, 2], "x": 9.25, "y": 3 },
{ "label": ".", "matrix": [7, 3], "x": 10.25, "y": 3 },
{ "label": "/", "matrix": [7, 4], "x": 11.25, "y": 3 },
{ "label": "RShift", "matrix": [7, 5], "w": 1.75, "x": 12.25, "y": 3 },
{ "label": "Fn", "matrix": [6, 7], "x": 14, "y": 3 },
{ "label": "LCtrl", "matrix": [3, 1], "w": 1.25, "x": 0, "y": 4 },
{ "label": "LOpt", "matrix": [3, 2], "w": 1.25, "x": 1.25, "y": 4 },
{ "label": "LGUI", "matrix": [3, 3], "w": 1.25, "x": 2.5, "y": 4 },
{ "label": "Space", "matrix": [3, 4], "w": 6.25, "x": 3.75, "y": 4 },
{ "label": "RGUI", "matrix": [7, 6], "x": 10, "y": 4 },
{ "label": "ROpt", "matrix": [7, 7], "x": 11, "y": 4 }
]
}
}
}
37 changes: 37 additions & 0 deletions keyboards/takayoshiotake/five_octave/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#include QMK_KEYBOARD_H

#define KC_JAPANESE_EISUU KC_LNG2
#define KC_JAPANESE_KANA KC_LNG1

#define KC_JEIS KC_JAPANESE_EISUU
#define KC_JKAN KC_JAPANESE_KANA

#define LT_L1JE LT(1, KC_JEIS)
#define MT_LCJE MT(MOD_LGUI, KC_JEIS)
#define MT_RCJK MT(MOD_RGUI, KC_JKAN)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, 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_BSLS, KC_GRV,
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_BSPC,
LT_L1JE, 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_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(2),
KC_LCTL, KC_LOPT, MT_LCJE, KC_SPC, MT_RCJK, KC_ROPT
),

[1] = LAYOUT(
_______, 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_HOME, KC_UP, KC_END, KC_PGUP, _______, _______, KC_BSPC, _______, _______, _______, _______, _______, _______,
XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_ENT, KC_JKAN, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX,
_______, _______, _______, _______, _______, _______
),

[2] = LAYOUT(
_______, 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_UP, _______, _______,
KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, XXXXXXX,
_______, _______, _______, _______, _______, _______
)
};
6 changes: 6 additions & 0 deletions keyboards/takayoshiotake/five_octave/keymaps/vial/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#pragma once

#define VIAL_KEYBOARD_UID {0x41, 0x96, 0x22, 0x76, 0xE3, 0xA8, 0x1C, 0xF9}

#define VIAL_UNLOCK_COMBO_ROWS {0, 3}
#define VIAL_UNLOCK_COMBO_COLS {0, 1}
37 changes: 37 additions & 0 deletions keyboards/takayoshiotake/five_octave/keymaps/vial/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#include QMK_KEYBOARD_H

#define KC_JAPANESE_EISUU KC_LNG2
#define KC_JAPANESE_KANA KC_LNG1

#define KC_JEIS KC_JAPANESE_EISUU
#define KC_JKAN KC_JAPANESE_KANA

#define LT_L1JE LT(1, KC_JEIS)
#define MT_LCJE MT(MOD_LGUI, KC_JEIS)
#define MT_RCJK MT(MOD_RGUI, KC_JKAN)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, 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_BSLS, KC_GRV,
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_BSPC,
LT_L1JE, 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_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(2),
KC_LCTL, KC_LOPT, MT_LCJE, KC_SPC, MT_RCJK, KC_ROPT
),

[1] = LAYOUT(
_______, 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_HOME, KC_UP, KC_END, KC_PGUP, _______, _______, KC_BSPC, _______, _______, _______, _______, _______, _______,
XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_ENT, KC_JKAN, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX,
_______, _______, _______, _______, _______, _______
),

[2] = LAYOUT(
_______, 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_UP, _______, _______,
KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, XXXXXXX,
_______, _______, _______, _______, _______, _______
)
};
2 changes: 2 additions & 0 deletions keyboards/takayoshiotake/five_octave/keymaps/vial/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VIA_ENABLE = yes
VIAL_ENABLE = yes
112 changes: 112 additions & 0 deletions keyboards/takayoshiotake/five_octave/keymaps/vial/vial.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
{
"lighting": "none",
"matrix": {
"rows": 8,
"cols": 8
},
"layouts": {
"keymap": [
[
"0,0",
"0,2",
"0,3",
"0,4",
"0,5",
"0,6",
"0,7",
"4,0",
"4,1",
"4,2",
"4,3",
"4,4",
"4,5",
"4,6",
"4,7"
],
[
{
"w": 1.5
},
"1,0",
"1,3",
"1,4",
"1,5",
"1,6",
"1,7",
"5,0",
"5,1",
"5,2",
"5,3",
"5,4",
"5,5",
"5,6",
{
"w": 1.5
},
"5,7"
],
[
{
"w": 1.75
},
"2,0",
"2,3",
"2,4",
"2,5",
"2,6",
"2,7",
"6,0",
"6,1",
"6,2",
"6,3",
"6,4",
"6,5",
{
"w": 2.25
},
"6,6"
],
[
{
"w": 2.25
},
"3,0",
"2,1",
"2,2",
"3,5",
"3,6",
"3,7",
"7,0",
"7,1",
"7,2",
"7,3",
"7,4",
{
"w": 1.75
},
"7,5",
"6,7"
],
[
{
"w": 1.25
},
"3,1",
{
"w": 1.25
},
"3,2",
{
"w": 1.25
},
"3,3",
{
"w": 6.25
},
"3,4",
"7,6",
"7,7"
]
]
}
}
7 changes: 7 additions & 0 deletions keyboards/takayoshiotake/five_octave/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Five Octave

![Five Octave](https://github.com/takayoshiotake/five-octave-61-key-keyboard/blob/main/photos/v2-001.jpg?raw=true)

Vial firmware for the Five Octave 60% keyboard. You can find other information including hardware design in the [GitHub repository](https://github.com/takayoshiotake/five-octave-61-key-keyboard).

Keyboard Maintainer: [takayoshiotake](https://github.com/takayoshiotake)
Empty file added keyboards/takayoshiotake/five_octave/rules.mk
View file
Empty file.

0 comments on commit 49f5eec

Please sign in to comment.