From 739d14215c4312cd6351b4cb2207cce19204196a Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 1 Sep 2024 00:01:59 +0900 Subject: [PATCH 1/8] jourkey --- .../takashicompany/jourkey/keyboard.json | 48 +++++++++++++++++++ .../jourkey/keymaps/default/keymap.c | 24 ++++++++++ keyboards/takashicompany/jourkey/readme.md | 27 +++++++++++ 3 files changed, 99 insertions(+) create mode 100644 keyboards/takashicompany/jourkey/keyboard.json create mode 100644 keyboards/takashicompany/jourkey/keymaps/default/keymap.c create mode 100644 keyboards/takashicompany/jourkey/readme.md diff --git a/keyboards/takashicompany/jourkey/keyboard.json b/keyboards/takashicompany/jourkey/keyboard.json new file mode 100644 index 00000000000..0983c2bef91 --- /dev/null +++ b/keyboards/takashicompany/jourkey/keyboard.json @@ -0,0 +1,48 @@ +{ + "manufacturer": "takashicompany", + "keyboard_name": "takashicompany/jourkey", + "maintainer": "takashicompany", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["C2", "C2", "C2", "C2"], + "rows": ["D1", "D1", "D1", "D1"] + }, + "processor": "atmega32u4", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/takashicompany/jourkey/keymaps/default/keymap.c b/keyboards/takashicompany/jourkey/keymaps/default/keymap.c new file mode 100644 index 00000000000..a0c5b3bd6cf --- /dev/null +++ b/keyboards/takashicompany/jourkey/keymaps/default/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┐ + * │ 7 │ 8 │ 9 │ / │ + * ├───┼───┼───┼───┤ + * │ 4 │ 5 │ 6 │ * │ + * ├───┼───┼───┼───┤ + * │ 1 │ 2 │ 3 │ - │ + * ├───┼───┼───┼───┤ + * │ 0 │ . │Ent│ + │ + * └───┴───┴───┴───┘ + */ + [0] = LAYOUT( + KC_P7, KC_P8, KC_P9, KC_PSLS, + KC_P4, KC_P5, KC_P6, KC_PAST, + KC_P1, KC_P2, KC_P3, KC_PMNS, + KC_P0, KC_PDOT, KC_PENT, KC_PPLS + ) +}; diff --git a/keyboards/takashicompany/jourkey/readme.md b/keyboards/takashicompany/jourkey/readme.md new file mode 100644 index 00000000000..adbac064892 --- /dev/null +++ b/keyboards/takashicompany/jourkey/readme.md @@ -0,0 +1,27 @@ +# takashicompany/jourkey + +![takashicompany/jourkey](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [takashicompany](https://github.com/takashicompany) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make takashicompany/jourkey:default + +Flashing example for this keyboard: + + make takashicompany/jourkey: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 From 072e2b0224db403b1d94834b4bdadf0fff177e74 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 1 Sep 2024 15:28:03 +0900 Subject: [PATCH 2/8] rotary encoder --- .../takashicompany/jourkey/keyboard.json | 157 +++++++++++++++--- .../jourkey/keymaps/default/keymap.c | 13 +- .../jourkey/keymaps/default/rules.mk | 1 + 3 files changed, 144 insertions(+), 27 deletions(-) create mode 100644 keyboards/takashicompany/jourkey/keymaps/default/rules.mk diff --git a/keyboards/takashicompany/jourkey/keyboard.json b/keyboards/takashicompany/jourkey/keyboard.json index 0983c2bef91..6c0cd1393b2 100644 --- a/keyboards/takashicompany/jourkey/keyboard.json +++ b/keyboards/takashicompany/jourkey/keyboard.json @@ -1,47 +1,158 @@ { "manufacturer": "takashicompany", - "keyboard_name": "takashicompany/jourkey", + "keyboard_name": "Jourkey", "maintainer": "takashicompany", - "bootloader": "atmel-dfu", + "development_board": "promicro", "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + { + "pin_a": "D1", + "pin_b": "D0" + } + ] + }, "features": { "bootmagic": true, "command": false, "console": false, + "encoder": true, "extrakey": true, "mousekey": true, "nkro": true }, "matrix_pins": { - "cols": ["C2", "C2", "C2", "C2"], - "rows": ["D1", "D1", "D1", "D1"] + "direct": [ + [ + "D4", + "C6", + "D7", + "E6", + "B4", + "F5", + "F6", + "F7", + "B5", + "B1", + "B3", + "B2", + "B6" + ] + ] }, - "processor": "atmega32u4", "url": "", "usb": { "device_version": "1.0.0", - "pid": "0x0000", - "vid": "0xFEED" + "pid": "0x0062", + "vid": "0x7463" }, "layouts": { "LAYOUT": { "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": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3} + { + "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": 0, + "y": 1 + }, + { + "matrix": [ + 0, + 6 + ], + "x": 1.5, + "y": 1 + }, + { + "matrix": [ + 0, + 7 + ], + "x": 2.5, + "y": 1 + }, + { + "matrix": [ + 0, + 8 + ], + "x": 3.5, + "y": 1 + }, + { + "matrix": [ + 0, + 9 + ], + "x": 0, + "y": 2 + }, + { + "matrix": [ + 0, + 10 + ], + "x": 1.75, + "y": 2 + }, + { + "matrix": [ + 0, + 11 + ], + "x": 2.75, + "y": 2 + }, + { + "matrix": [ + 0, + 12 + ], + "x": 3.75, + "y": 2 + } ] } } diff --git a/keyboards/takashicompany/jourkey/keymaps/default/keymap.c b/keyboards/takashicompany/jourkey/keymaps/default/keymap.c index a0c5b3bd6cf..de128f735a0 100644 --- a/keyboards/takashicompany/jourkey/keymaps/default/keymap.c +++ b/keyboards/takashicompany/jourkey/keymaps/default/keymap.c @@ -16,9 +16,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └───┴───┴───┴───┘ */ [0] = LAYOUT( - KC_P7, KC_P8, KC_P9, KC_PSLS, - KC_P4, KC_P5, KC_P6, KC_PAST, - KC_P1, KC_P2, KC_P3, KC_PMNS, - KC_P0, KC_PDOT, KC_PENT, KC_PPLS + KC_1, KC_2, KC_3, KC_4, KC_5, + KC_6, KC_7, KC_8, KC_9, + KC_0, KC_A, KC_B, KC_C ) }; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_X, KC_Y) } +}; +#endif diff --git a/keyboards/takashicompany/jourkey/keymaps/default/rules.mk b/keyboards/takashicompany/jourkey/keymaps/default/rules.mk new file mode 100644 index 00000000000..a40474b4d5c --- /dev/null +++ b/keyboards/takashicompany/jourkey/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file From 272b5074944bf4bbd52348485d4e697661df7703 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Thu, 12 Sep 2024 15:17:33 +0900 Subject: [PATCH 3/8] fix keymap --- .../jourkey/keymaps/default/keymap.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/keyboards/takashicompany/jourkey/keymaps/default/keymap.c b/keyboards/takashicompany/jourkey/keymaps/default/keymap.c index de128f735a0..fa642bc6e2e 100644 --- a/keyboards/takashicompany/jourkey/keymaps/default/keymap.c +++ b/keyboards/takashicompany/jourkey/keymaps/default/keymap.c @@ -4,26 +4,15 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ┌───┬───┬───┬───┐ - * │ 7 │ 8 │ 9 │ / │ - * ├───┼───┼───┼───┤ - * │ 4 │ 5 │ 6 │ * │ - * ├───┼───┼───┼───┤ - * │ 1 │ 2 │ 3 │ - │ - * ├───┼───┼───┼───┤ - * │ 0 │ . │Ent│ + │ - * └───┴───┴───┴───┘ - */ [0] = LAYOUT( - KC_1, KC_2, KC_3, KC_4, KC_5, - KC_6, KC_7, KC_8, KC_9, - KC_0, KC_A, KC_B, KC_C + KC_ESC, KC_1, KC_2, KC_3, KC_4, + KC_TAB, KC_Q, KC_W, KC_ENT, + KC_LCTL, KC_A, KC_S, KC_RSFT ) }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = { ENCODER_CCW_CW(KC_X, KC_Y) } + [0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) } }; #endif From a8ad50fb6d4dfed8e4f803c26dfe5c91ccc8b133 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Thu, 19 Sep 2024 02:02:52 +0900 Subject: [PATCH 4/8] jourkey --- keyboards/takashicompany/jourkey/readme.md | 26 +++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/keyboards/takashicompany/jourkey/readme.md b/keyboards/takashicompany/jourkey/readme.md index adbac064892..14a2f90a8ab 100644 --- a/keyboards/takashicompany/jourkey/readme.md +++ b/keyboards/takashicompany/jourkey/readme.md @@ -1,12 +1,28 @@ -# takashicompany/jourkey +# Joukey -![takashicompany/jourkey](imgur.com image replace me!) +![takashicompany/jourkey](https://i.imgur.com/pCrTbKnh.jpeg) -*A short description of the keyboard/project* +Jourkey was designed as “a keyboard for taking pictures with scenery while traveling. + +The layout is like a smaller version of a traditional keyboard. +Decorate it with your favorite keycaps and case to make it your travel companion. + +Of course, it can also be used as a macro pad. +Both layouts with and without ISO-Enter are supported. + +--- + +Jourkeyは「旅先で景色と写真を撮るためのキーボード」としてデザインされました。 + +従来のキーボードを小さくしたようなレイアウトです。 +お気に入りのキーキャップやケースでデコレーションして貴方の旅のお供になります。 + +もちろん、マクロパッドとして使用することも可能です。 +ISO-Enterを採用/非採用した両方のレイアウトに対応しています。 * Keyboard Maintainer: [takashicompany](https://github.com/takashicompany) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Hardware Supported: Jourkey PCB, Pro Micro +* Hardware Availability: https://github.com/takashicompany/jourkey Make example for this keyboard (after setting up your build environment): From c730a45e181ebb93da84e1e56a13cfeb2d7e43a1 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Thu, 19 Sep 2024 02:11:20 +0900 Subject: [PATCH 5/8] format json --- .../takashicompany/jourkey/keyboard.json | 138 ++---------------- 1 file changed, 15 insertions(+), 123 deletions(-) diff --git a/keyboards/takashicompany/jourkey/keyboard.json b/keyboards/takashicompany/jourkey/keyboard.json index 6c0cd1393b2..39c2aed2025 100644 --- a/keyboards/takashicompany/jourkey/keyboard.json +++ b/keyboards/takashicompany/jourkey/keyboard.json @@ -6,10 +6,7 @@ "diode_direction": "COL2ROW", "encoder": { "rotary": [ - { - "pin_a": "D1", - "pin_b": "D0" - } + {"pin_a": "D1", "pin_b": "D0"} ] }, "features": { @@ -23,21 +20,7 @@ }, "matrix_pins": { "direct": [ - [ - "D4", - "C6", - "D7", - "E6", - "B4", - "F5", - "F6", - "F7", - "B5", - "B1", - "B3", - "B2", - "B6" - ] + ["D4", "C6", "D7", "E6", "B4", "F5", "F6", "F7", "B5", "B1", "B3", "B2", "B6"] ] }, "url": "", @@ -49,110 +32,19 @@ "layouts": { "LAYOUT": { "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": 0, - "y": 1 - }, - { - "matrix": [ - 0, - 6 - ], - "x": 1.5, - "y": 1 - }, - { - "matrix": [ - 0, - 7 - ], - "x": 2.5, - "y": 1 - }, - { - "matrix": [ - 0, - 8 - ], - "x": 3.5, - "y": 1 - }, - { - "matrix": [ - 0, - 9 - ], - "x": 0, - "y": 2 - }, - { - "matrix": [ - 0, - 10 - ], - "x": 1.75, - "y": 2 - }, - { - "matrix": [ - 0, - 11 - ], - "x": 2.75, - "y": 2 - }, - { - "matrix": [ - 0, - 12 - ], - "x": 3.75, - "y": 2 - } + {"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": 0, "y": 1}, + {"matrix": [0, 6], "x": 1.5, "y": 1}, + {"matrix": [0, 7], "x": 2.5, "y": 1}, + {"matrix": [0, 8], "x": 3.5, "y": 1}, + {"matrix": [0, 9], "x": 0, "y": 2}, + {"matrix": [0, 10], "x": 1.75, "y": 2}, + {"matrix": [0, 11], "x": 2.75, "y": 2}, + {"matrix": [0, 12], "x": 3.75, "y": 2} ] } } From 642e354213b05f8d5dcc7848a9c85ff8886ffb4c Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 4 Oct 2024 14:20:40 +0900 Subject: [PATCH 6/8] Update keyboards/takashicompany/jourkey/readme.md Co-authored-by: Joel Challis --- keyboards/takashicompany/jourkey/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/takashicompany/jourkey/readme.md b/keyboards/takashicompany/jourkey/readme.md index 14a2f90a8ab..460e7556226 100644 --- a/keyboards/takashicompany/jourkey/readme.md +++ b/keyboards/takashicompany/jourkey/readme.md @@ -1,6 +1,6 @@ # Joukey -![takashicompany/jourkey](https://i.imgur.com/pCrTbKnh.jpeg) +![takashicompany/jourkey](https://i.imgur.com/pCrTbKn.jpeg) Jourkey was designed as “a keyboard for taking pictures with scenery while traveling. From 5ee1bff088981aad4bb5081ff2973b2edd87f6ee Mon Sep 17 00:00:00 2001 From: takashicompany Date: Thu, 10 Oct 2024 00:40:15 +0900 Subject: [PATCH 7/8] fix layout --- keyboards/takashicompany/jourkey/keyboard.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/takashicompany/jourkey/keyboard.json b/keyboards/takashicompany/jourkey/keyboard.json index 39c2aed2025..01847cfa53c 100644 --- a/keyboards/takashicompany/jourkey/keyboard.json +++ b/keyboards/takashicompany/jourkey/keyboard.json @@ -37,14 +37,14 @@ {"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": 0, "y": 1}, + {"matrix": [0, 5], "x": 0, "y": 1, "w": 1.5}, {"matrix": [0, 6], "x": 1.5, "y": 1}, {"matrix": [0, 7], "x": 2.5, "y": 1}, - {"matrix": [0, 8], "x": 3.5, "y": 1}, - {"matrix": [0, 9], "x": 0, "y": 2}, + {"matrix": [0, 8], "x": 3.5, "y": 1, "w": 1.5}, + {"matrix": [0, 9], "x": 0, "y": 2, "w":1.75}, {"matrix": [0, 10], "x": 1.75, "y": 2}, {"matrix": [0, 11], "x": 2.75, "y": 2}, - {"matrix": [0, 12], "x": 3.75, "y": 2} + {"matrix": [0, 12], "x": 3.75, "y": 2, "w":1.25} ] } } From f3605e745ab5cf0d84d03743bb16c8a55e6ec585 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Thu, 10 Oct 2024 00:42:19 +0900 Subject: [PATCH 8/8] Update readme.md --- keyboards/takashicompany/jourkey/readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/takashicompany/jourkey/readme.md b/keyboards/takashicompany/jourkey/readme.md index 460e7556226..b76dd7cbb8c 100644 --- a/keyboards/takashicompany/jourkey/readme.md +++ b/keyboards/takashicompany/jourkey/readme.md @@ -8,7 +8,6 @@ The layout is like a smaller version of a traditional keyboard. Decorate it with your favorite keycaps and case to make it your travel companion. Of course, it can also be used as a macro pad. -Both layouts with and without ISO-Enter are supported. --- @@ -18,7 +17,6 @@ Jourkeyは「旅先で景色と写真を撮るためのキーボード」とし お気に入りのキーキャップやケースでデコレーションして貴方の旅のお供になります。 もちろん、マクロパッドとして使用することも可能です。 -ISO-Enterを採用/非採用した両方のレイアウトに対応しています。 * Keyboard Maintainer: [takashicompany](https://github.com/takashicompany) * Hardware Supported: Jourkey PCB, Pro Micro