diff options
| -rw-r--r-- | keyboards/kibou/harbour/info.json | 221 | ||||
| -rw-r--r-- | keyboards/kibou/harbour/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/kibou/harbour/keymaps/via/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/kibou/harbour/matrix_diagram.md | 36 | ||||
| -rw-r--r-- | keyboards/kibou/harbour/readme.md | 2 |
5 files changed, 190 insertions, 73 deletions
diff --git a/keyboards/kibou/harbour/info.json b/keyboards/kibou/harbour/info.json index ae5fe10d68..a5417e1ae5 100644 --- a/keyboards/kibou/harbour/info.json +++ b/keyboards/kibou/harbour/info.json @@ -1,7 +1,7 @@ { "manufacturer": "kibou", "keyboard_name": "harbour", - "maintainer": "kibou", + "maintainer": "FanXingStudio", "bootloader": "stm32-dfu", "diode_direction": "ROW2COL", "features": { @@ -26,77 +26,158 @@ "indicators": { "caps_lock": "C8" }, + "layout_aliases": { + "LAYOUT": "LAYOUT_65_ansi_blocker_tsangan_split_bs" + }, "layouts": { - "LAYOUT": { + "LAYOUT_65_ansi_blocker_tsangan_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 1.5, "y": 4}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker_wkl_split_bs": { "layout": [ - { "matrix": [0,0], "x": 0, "y": 0 }, - { "matrix": [0,1], "x": 1, "y": 0 }, - { "matrix": [0,2], "x": 2, "y": 0 }, - { "matrix": [0,3], "x": 3, "y": 0 }, - { "matrix": [0,4], "x": 4, "y": 0 }, - { "matrix": [0,5], "x": 5, "y": 0 }, - { "matrix": [0,6], "x": 6, "y": 0 }, - { "matrix": [0,7], "x": 7, "y": 0 }, - { "matrix": [0,8], "x": 8, "y": 0 }, - { "matrix": [0,9], "x": 9, "y": 0 }, - { "matrix": [0,10], "x": 10, "y": 0 }, - { "matrix": [0,11], "x": 11, "y": 0 }, - { "matrix": [0,12], "x": 12, "y": 0 }, - { "matrix": [0,13], "x": 13, "y": 0 }, - { "matrix": [0,14], "x": 14, "y": 0 }, - { "matrix": [0,15], "x": 15, "y": 0 }, - { "matrix": [1,0], "x": 0, "y": 1, "w": 1.5 }, - { "matrix": [1,2], "x": 1.5, "y": 1 }, - { "matrix": [1,3], "x": 2.5, "y": 1 }, - { "matrix": [1,4], "x": 3.5, "y": 1 }, - { "matrix": [1,5], "x": 4.5, "y": 1 }, - { "matrix": [1,6], "x": 5.5, "y": 1 }, - { "matrix": [1,7], "x": 6.5, "y": 1 }, - { "matrix": [1,8], "x": 7.5, "y": 1 }, - { "matrix": [1,9], "x": 8.5, "y": 1 }, - { "matrix": [1,10], "x": 9.5, "y": 1 }, - { "matrix": [1,11], "x": 10.5, "y": 1 }, - { "matrix": [1,12], "x": 11.5, "y": 1 }, - { "matrix": [1,13], "x": 12.5, "y": 1 }, - { "matrix": [1,14], "x": 13.5, "y": 1, "w": 1.5 }, - { "matrix": [1,15], "x": 15, "y": 1 }, - { "matrix": [2,0], "x": 0, "y": 2, "w": 1.75 }, - { "matrix": [2,2], "x": 1.75, "y": 2 }, - { "matrix": [2,3], "x": 2.75, "y": 2 }, - { "matrix": [2,4], "x": 3.75, "y": 2 }, - { "matrix": [2,5], "x": 4.75, "y": 2 }, - { "matrix": [2,6], "x": 5.75, "y": 2 }, - { "matrix": [2,7], "x": 6.75, "y": 2 }, - { "matrix": [2,8], "x": 7.75, "y": 2 }, - { "matrix": [2,9], "x": 8.75, "y": 2 }, - { "matrix": [2,10], "x": 9.75, "y": 2 }, - { "matrix": [2,11], "x": 10.75, "y": 2 }, - { "matrix": [2,12], "x": 11.75, "y": 2 }, - { "matrix": [2,14], "x": 12.75, "y": 2, "w": 2.25 }, - { "matrix": [2,15], "x": 15, "y": 2 }, - { "matrix": [3,0], "x": 0, "y": 3, "w": 2.25 }, - { "matrix": [3,2], "x": 2.25, "y": 3 }, - { "matrix": [3,3], "x": 3.25, "y": 3 }, - { "matrix": [3,4], "x": 4.25, "y": 3 }, - { "matrix": [3,5], "x": 5.25, "y": 3 }, - { "matrix": [3,6], "x": 6.25, "y": 3 }, - { "matrix": [3,7], "x": 7.25, "y": 3 }, - { "matrix": [3,8], "x": 8.25, "y": 3 }, - { "matrix": [3,9], "x": 9.25, "y": 3 }, - { "matrix": [3,10], "x": 10.25, "y": 3 }, - { "matrix": [3,11], "x": 11.25, "y": 3 }, - { "matrix": [3,13], "x": 12.25, "y": 3, "w": 1.75 }, - { "matrix": [3,14], "x": 14, "y": 3 }, - { "matrix": [3,15], "x": 15, "y": 3 }, - { "matrix": [4,0], "x": 0, "y": 4, "w": 1.5 }, - { "matrix": [4,2], "x": 1.5, "y": 4 }, - { "matrix": [4,3], "x": 2.5, "y": 4, "w": 1.5 }, - { "matrix": [4,7], "x": 4, "y": 4, "w": 7 }, - { "matrix": [4,11], "x": 11, "y": 4, "w": 1.75 }, - { "matrix": [4,13], "x": 13, "y": 4 }, - { "matrix": [4,14], "x": 14, "y": 4 }, - { "matrix": [4,15], "x": 15, "y": 4 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 2.25, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] } } -}
\ No newline at end of file +} diff --git a/keyboards/kibou/harbour/keymaps/default/keymap.c b/keyboards/kibou/harbour/keymaps/default/keymap.c index 7586fc24e0..a949c5dc4d 100644 --- a/keyboards/kibou/harbour/keymaps/default/keymap.c +++ b/keyboards/kibou/harbour/keymaps/default/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_65_ansi_blocker_tsangan_split_bs( KC_ESC, KC_1, 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_DEL, 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_INS, 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_PGUP, diff --git a/keyboards/kibou/harbour/keymaps/via/keymap.c b/keyboards/kibou/harbour/keymaps/via/keymap.c index 7586fc24e0..a949c5dc4d 100644 --- a/keyboards/kibou/harbour/keymaps/via/keymap.c +++ b/keyboards/kibou/harbour/keymaps/via/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_65_ansi_blocker_tsangan_split_bs( KC_ESC, KC_1, 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_DEL, 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_INS, 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_PGUP, diff --git a/keyboards/kibou/harbour/matrix_diagram.md b/keyboards/kibou/harbour/matrix_diagram.md new file mode 100644 index 0000000000..1f5097d93d --- /dev/null +++ b/keyboards/kibou/harbour/matrix_diagram.md @@ -0,0 +1,36 @@ +# Matrix Diagram for Kibou Harbour + +According to the GB runner, the PCB supports ISO layout, but the +supplied plate does not.[^1][^2] + +Product renders and GB runner comments both show support for split +Backspace,[^3] but no switch matrix data is currently available. + +\- @noroadsleft, 23 June, 2023 + +``` + ┌───────┐ + 2u Backspace │?? │ + └───────┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ ┌─────┐ +│10 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐?? │ ISO Enter +│20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E │2F │ │?? │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘ +│30 │?? │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │3F │ +├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤ +│40 │42 │43 │47 │4B │ │4D │4E │4F │ +└─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘ +┌────────┐ +│30 │ 2.25u LShift +└────────┘ +┌─────┬──┬─────┬───────────────────────────┬─────┐ +│40 │ │43 │47 │4B │ Blocker WKL +└─────┘ └─────┴───────────────────────────┴─────┘ +``` + +[^1]: [Geekhack Interest Check, Original Post](https://geekhack.org/index.php?topic=111146.msg3012509#msg3012509) +[^2]: [Reddit Interest Check](https://www.reddit.com/r/MechanicalKeyboards/comments/lgyv5p/ic_harbour_%E6%B8%AF%E5%8F%A3_a_65_gasket_mounted_board_designed/gmudnjb/) +[^3]: [Geekhack Interest Check, reply #102](https://geekhack.org/index.php?topic=111146.msg3022822#msg3022822) diff --git a/keyboards/kibou/harbour/readme.md b/keyboards/kibou/harbour/readme.md index f957e31795..31ac8dbd83 100644 --- a/keyboards/kibou/harbour/readme.md +++ b/keyboards/kibou/harbour/readme.md @@ -1,6 +1,6 @@ # harbour -* Keyboard Maintainer: [kibou](https://kibou.store/) +* Keyboard Maintainer: [FanXingStudio](https://github.com/FanXingStudio) * Hardware Supported: harbour PCBs, STM32F401 * Hardware Availability: https://kibou.store/ |