From 934d59d69c080406593eb1edc4dde7d8fe56df6a Mon Sep 17 00:00:00 2001 From: takashicompany Date: Thu, 4 May 2023 01:28:29 +0900 Subject: [PATCH 01/31] baumkuchen --- keyboards/takashicompany/baumkuchen/config.h | 20 +++ keyboards/takashicompany/baumkuchen/info.json | 156 ++++++++++++++++++ .../baumkuchen/keymaps/default/keymap.c | 10 ++ keyboards/takashicompany/baumkuchen/readme.md | 27 +++ keyboards/takashicompany/baumkuchen/rules.mk | 1 + 5 files changed, 214 insertions(+) create mode 100644 keyboards/takashicompany/baumkuchen/config.h create mode 100644 keyboards/takashicompany/baumkuchen/info.json create mode 100644 keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c create mode 100644 keyboards/takashicompany/baumkuchen/readme.md create mode 100644 keyboards/takashicompany/baumkuchen/rules.mk diff --git a/keyboards/takashicompany/baumkuchen/config.h b/keyboards/takashicompany/baumkuchen/config.h new file mode 100644 index 000000000000..16401e39127a --- /dev/null +++ b/keyboards/takashicompany/baumkuchen/config.h @@ -0,0 +1,20 @@ +// Copyright 2023 takashicompany (@takashicompany) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/takashicompany/baumkuchen/info.json b/keyboards/takashicompany/baumkuchen/info.json new file mode 100644 index 000000000000..b709a8b13ad2 --- /dev/null +++ b/keyboards/takashicompany/baumkuchen/info.json @@ -0,0 +1,156 @@ +{ + "manufacturer": "takashicompany", + "keyboard_name": "takashicompany/baumkuchen", + "maintainer": "takashicompany", + "bootloader": "caterina", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "direct": [["B2", "B6", "D4", "C6", "F4", "F5", "D7", "E6", "F6", "F7", "B1", "B3", "B4", "B5", "B5"]] + }, + "processor": "atmega32u4", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0045", + "vid": "0x7463" + }, + "encoder": { + "rotary": [ + {"pin_a": "D1", "pin_b": "D0"} + ] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { + "matrix": [ + 0, + 0 + ], + "x": 3, + "y": 0 + }, + { + "matrix": [ + 0, + 1 + ], + "x": 3, + "y": 0 + }, + { + "matrix": [ + 0, + 2 + ], + "x": 3, + "y": 0 + }, + { + "matrix": [ + 0, + 3 + ], + "x": 3, + "y": 0 + }, + { + "matrix": [ + 0, + 4 + ], + "x": 3, + "y": 1 + }, + { + "matrix": [ + 0, + 5 + ], + "x": 3, + "y": 1 + }, + { + "matrix": [ + 0, + 6 + ], + "x": 3, + "y": 1 + }, + { + "matrix": [ + 0, + 7 + ], + "x": 3, + "y": 1 + }, + { + "matrix": [ + 0, + 8 + ], + "x": 3, + "y": 2 + }, + { + "matrix": [ + 0, + 9 + ], + "x": 3, + "y": 2 + }, + { + "matrix": [ + 0, + 10 + ], + "x": 3, + "y": 2 + }, + { + "matrix": [ + 0, + 11 + ], + "x": 3, + "y": 2 + }, + { + "matrix": [ + 0, + 12 + ], + "x": 3, + "y": 2 + }, + { + "matrix": [ + 0, + 13 + ], + "x": 4.5, + "y": 3.75 + }, + { + "matrix": [ + 0, + 14 + ], + "x": 5.5, + "y": 3.75 + } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c new file mode 100644 index 000000000000..79d6d72bb103 --- /dev/null +++ b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c @@ -0,0 +1,10 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, + KC_A, KC_S, KC_D, KC_F, + KC_Z, KC_X, KC_C, KC_V, KC_B, + KC_1, KC_2 + ) +}; diff --git a/keyboards/takashicompany/baumkuchen/readme.md b/keyboards/takashicompany/baumkuchen/readme.md new file mode 100644 index 000000000000..5885c0567894 --- /dev/null +++ b/keyboards/takashicompany/baumkuchen/readme.md @@ -0,0 +1,27 @@ +# takashicompany/baumkuchen + +![takashicompany/baumkuchen](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/baumkuchen:default + +Flashing example for this keyboard: + + make takashicompany/baumkuchen: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 diff --git a/keyboards/takashicompany/baumkuchen/rules.mk b/keyboards/takashicompany/baumkuchen/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/takashicompany/baumkuchen/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 6fd26bc7ba51a73b0933d1a8ab8db9d832205db8 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sat, 6 May 2023 19:20:23 +0900 Subject: [PATCH 02/31] fix --- keyboards/takashicompany/baumkuchen/config.h | 2 +- .../baumkuchen/keymaps/default/config.h | 9 ++++ .../baumkuchen/keymaps/default/keymap.c | 44 ++++++++++++++++++- keyboards/takashicompany/baumkuchen/rules.mk | 1 + 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 keyboards/takashicompany/baumkuchen/keymaps/default/config.h diff --git a/keyboards/takashicompany/baumkuchen/config.h b/keyboards/takashicompany/baumkuchen/config.h index 16401e39127a..9acfa3e89e21 100644 --- a/keyboards/takashicompany/baumkuchen/config.h +++ b/keyboards/takashicompany/baumkuchen/config.h @@ -17,4 +17,4 @@ /* disable action features */ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT +//#define NO_ACTION_ONESHOT \ No newline at end of file diff --git a/keyboards/takashicompany/baumkuchen/keymaps/default/config.h b/keyboards/takashicompany/baumkuchen/keymaps/default/config.h new file mode 100644 index 000000000000..b7e0619c2a86 --- /dev/null +++ b/keyboards/takashicompany/baumkuchen/keymaps/default/config.h @@ -0,0 +1,9 @@ +// Copyright 2023 takashicompany (@takashicompany) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +// #define DYNAMIC_KEYMAP_LAYER_COUNT 7 + +#define ENCODERS_CW_KEY { { 0, 13 }} +#define ENCODERS_CCW_KEY { { 0, 14 }} diff --git a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c index 79d6d72bb103..e2087f1cffd6 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c @@ -5,6 +5,48 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_Q, KC_W, KC_E, KC_R, KC_A, KC_S, KC_D, KC_F, KC_Z, KC_X, KC_C, KC_V, KC_B, - KC_1, KC_2 + KC_N, KC_M ) }; + + +//------------------------------------------------------------------------------ +// Rotary Encoder +//------------------------------------------------------------------------------ +static uint8_t encoder_state[NUM_ENCODERS] = {0}; +static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY; +static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY; + +void encoder_action_unregister(void) { + for (int index = 0; index < NUM_ENCODERS; ++index) { + if (encoder_state[index]) { + keyevent_t encoder_event = (keyevent_t) { + .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], + .pressed = false, + .time = (timer_read() | 1) + }; + encoder_state[index] = 0; + action_exec(encoder_event); + } + } +} + +void encoder_action_register(uint8_t index, bool clockwise) { + keyevent_t encoder_event = (keyevent_t) { + .key = clockwise ? encoder_cw[index] : encoder_ccw[index], + .pressed = true, + .time = (timer_read() | 1) + }; + encoder_state[index] = (clockwise ^ 1) | (clockwise << 1); + action_exec(encoder_event); +} + +void matrix_scan_kb(void) { + encoder_action_unregister(); + matrix_scan_user(); +} + +bool encoder_update_user(uint8_t index, bool clockwise) { + encoder_action_register(index, clockwise); + return true; +} \ No newline at end of file diff --git a/keyboards/takashicompany/baumkuchen/rules.mk b/keyboards/takashicompany/baumkuchen/rules.mk index 6e7633bfe015..33e0a2208f39 100644 --- a/keyboards/takashicompany/baumkuchen/rules.mk +++ b/keyboards/takashicompany/baumkuchen/rules.mk @@ -1 +1,2 @@ # This file intentionally left blank +ENCODER_ENABLE = yes \ No newline at end of file From 479f3807f9c9fca671e5386953ec2629ab538af5 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sat, 6 May 2023 20:21:26 +0900 Subject: [PATCH 03/31] =?UTF-8?q?=E4=B8=80=E6=97=A6=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboards/takashicompany/baumkuchen/info.json | 19 ++++++++++++++++++- .../baumkuchen/keymaps/default/config.h | 4 ++-- .../baumkuchen/keymaps/default/keymap.c | 14 +++++++++++++- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/keyboards/takashicompany/baumkuchen/info.json b/keyboards/takashicompany/baumkuchen/info.json index b709a8b13ad2..a3c162d50586 100644 --- a/keyboards/takashicompany/baumkuchen/info.json +++ b/keyboards/takashicompany/baumkuchen/info.json @@ -10,7 +10,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgblight": true }, "matrix_pins": { "direct": [["B2", "B6", "D4", "C6", "F4", "F5", "D7", "E6", "F6", "F7", "B1", "B3", "B4", "B5", "B5"]] @@ -27,6 +28,22 @@ {"pin_a": "D1", "pin_b": "D0"} ] }, + "rgblight": { + "led_count": 6, + "pin": "D3", + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/baumkuchen/keymaps/default/config.h b/keyboards/takashicompany/baumkuchen/keymaps/default/config.h index b7e0619c2a86..e53708077e1b 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/default/config.h +++ b/keyboards/takashicompany/baumkuchen/keymaps/default/config.h @@ -5,5 +5,5 @@ // #define DYNAMIC_KEYMAP_LAYER_COUNT 7 -#define ENCODERS_CW_KEY { { 0, 13 }} -#define ENCODERS_CCW_KEY { { 0, 14 }} +// #define ENCODERS_CW_KEY { { 0, 13 }} +// #define ENCODERS_CCW_KEY { { 0, 14 }} diff --git a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c index e2087f1cffd6..bbc13d2c1da9 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c @@ -9,7 +9,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; +bool encoder_update_user(uint8_t index, bool clockwise) { + + if (clockwise) { + tap_code(KC_N); + } else { + tap_code(KC_M); + } + return true; +} + +/* //------------------------------------------------------------------------------ // Rotary Encoder //------------------------------------------------------------------------------ @@ -49,4 +60,5 @@ void matrix_scan_kb(void) { bool encoder_update_user(uint8_t index, bool clockwise) { encoder_action_register(index, clockwise); return true; -} \ No newline at end of file +} +*/ \ No newline at end of file From 269b866dc1f5d3a379f05273c9e1ea308fc6fe4d Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sat, 6 May 2023 23:19:52 +0900 Subject: [PATCH 04/31] via --- .../baumkuchen/keymaps/via/config.h | 9 ++++ .../baumkuchen/keymaps/via/keymap.c | 51 +++++++++++++++++++ .../baumkuchen/keymaps/via/rules.mk | 2 + 3 files changed, 62 insertions(+) create mode 100644 keyboards/takashicompany/baumkuchen/keymaps/via/config.h create mode 100644 keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c create mode 100644 keyboards/takashicompany/baumkuchen/keymaps/via/rules.mk diff --git a/keyboards/takashicompany/baumkuchen/keymaps/via/config.h b/keyboards/takashicompany/baumkuchen/keymaps/via/config.h new file mode 100644 index 000000000000..039919d43c47 --- /dev/null +++ b/keyboards/takashicompany/baumkuchen/keymaps/via/config.h @@ -0,0 +1,9 @@ +// Copyright 2023 takashicompany (@takashicompany) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 24 + +#define ENCODERS_CW_KEY { { 13, 0 }} +#define ENCODERS_CCW_KEY { { 14, 0 }} diff --git a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c new file mode 100644 index 000000000000..59440eb337f7 --- /dev/null +++ b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c @@ -0,0 +1,51 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, + KC_A, KC_S, KC_D, KC_F, + KC_Z, KC_X, KC_C, KC_V, KC_B, + KC_N, KC_M + ) +}; + +//------------------------------------------------------------------------------ +// Rotary Encoder +//------------------------------------------------------------------------------ +static uint8_t encoder_state[NUM_ENCODERS] = {0}; +static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY; +static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY; + +void encoder_action_unregister(void) { + for (int index = 0; index < NUM_ENCODERS; ++index) { + if (encoder_state[index]) { + keyevent_t encoder_event = (keyevent_t) { + .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], + .pressed = false, + .time = (timer_read() | 1) + }; + encoder_state[index] = 0; + action_exec(encoder_event); + } + } +} + +void encoder_action_register(uint8_t index, bool clockwise) { + keyevent_t encoder_event = (keyevent_t) { + .key = clockwise ? encoder_cw[index] : encoder_ccw[index], + .pressed = true, + .time = (timer_read() | 1) + }; + encoder_state[index] = (clockwise ^ 1) | (clockwise << 1); + action_exec(encoder_event); +} + +void matrix_scan_kb(void) { + encoder_action_unregister(); + matrix_scan_user(); +} + +bool encoder_update_user(uint8_t index, bool clockwise) { + encoder_action_register(index, clockwise); + return true; +} diff --git a/keyboards/takashicompany/baumkuchen/keymaps/via/rules.mk b/keyboards/takashicompany/baumkuchen/keymaps/via/rules.mk new file mode 100644 index 000000000000..86dbb82cb49d --- /dev/null +++ b/keyboards/takashicompany/baumkuchen/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +# This file intentionally left blank +VIA_ENABLE = yes \ No newline at end of file From 95b243e6dd7d81c31c8ae791327f80628a6eca7b Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sat, 6 May 2023 23:20:01 +0900 Subject: [PATCH 05/31] fix configs --- keyboards/takashicompany/baumkuchen/config.h | 20 -------- .../baumkuchen/keymaps/default/config.h | 9 ---- .../baumkuchen/keymaps/default/keymap.c | 49 ++----------------- 3 files changed, 3 insertions(+), 75 deletions(-) delete mode 100644 keyboards/takashicompany/baumkuchen/config.h delete mode 100644 keyboards/takashicompany/baumkuchen/keymaps/default/config.h diff --git a/keyboards/takashicompany/baumkuchen/config.h b/keyboards/takashicompany/baumkuchen/config.h deleted file mode 100644 index 9acfa3e89e21..000000000000 --- a/keyboards/takashicompany/baumkuchen/config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2023 takashicompany (@takashicompany) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT \ No newline at end of file diff --git a/keyboards/takashicompany/baumkuchen/keymaps/default/config.h b/keyboards/takashicompany/baumkuchen/keymaps/default/config.h deleted file mode 100644 index e53708077e1b..000000000000 --- a/keyboards/takashicompany/baumkuchen/keymaps/default/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2023 takashicompany (@takashicompany) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -// #define DYNAMIC_KEYMAP_LAYER_COUNT 7 - -// #define ENCODERS_CW_KEY { { 0, 13 }} -// #define ENCODERS_CCW_KEY { { 0, 14 }} diff --git a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c index bbc13d2c1da9..52f403a81f4f 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c @@ -12,53 +12,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool encoder_update_user(uint8_t index, bool clockwise) { if (clockwise) { - tap_code(KC_N); + tap_code(KC_MS_WH_DOWN); } else { - tap_code(KC_M); + tap_code(KC_MS_WH_UP); } return true; -} - -/* -//------------------------------------------------------------------------------ -// Rotary Encoder -//------------------------------------------------------------------------------ -static uint8_t encoder_state[NUM_ENCODERS] = {0}; -static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY; -static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY; - -void encoder_action_unregister(void) { - for (int index = 0; index < NUM_ENCODERS; ++index) { - if (encoder_state[index]) { - keyevent_t encoder_event = (keyevent_t) { - .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], - .pressed = false, - .time = (timer_read() | 1) - }; - encoder_state[index] = 0; - action_exec(encoder_event); - } - } -} - -void encoder_action_register(uint8_t index, bool clockwise) { - keyevent_t encoder_event = (keyevent_t) { - .key = clockwise ? encoder_cw[index] : encoder_ccw[index], - .pressed = true, - .time = (timer_read() | 1) - }; - encoder_state[index] = (clockwise ^ 1) | (clockwise << 1); - action_exec(encoder_event); -} - -void matrix_scan_kb(void) { - encoder_action_unregister(); - matrix_scan_user(); -} - -bool encoder_update_user(uint8_t index, bool clockwise) { - encoder_action_register(index, clockwise); - return true; -} -*/ \ No newline at end of file +} \ No newline at end of file From 1731c8b5c884bf977b2841b25fe5e55f7e434d89 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 7 May 2023 02:14:42 +0900 Subject: [PATCH 06/31] =?UTF-8?q?=E3=82=82=E3=82=8D=E3=82=82=E3=82=8D?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baumkuchen/keymaps/default/keymap.c | 14 ++++++++---- .../baumkuchen/keymaps/via/keymap.c | 22 +++++++++++++++---- .../takashicompany/spreadwriter/rules.mk | 4 ++-- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c index 52f403a81f4f..1ab45e4269b7 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c @@ -4,17 +4,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_Q, KC_W, KC_E, KC_R, KC_A, KC_S, KC_D, KC_F, - KC_Z, KC_X, KC_C, KC_V, KC_B, - KC_N, KC_M + KC_Z, KC_X, KC_C, LT(1, KC_V), KC_B, + KC_NO, KC_NO + ), + [1] = LAYOUT( + RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS ) }; bool encoder_update_user(uint8_t index, bool clockwise) { if (clockwise) { - tap_code(KC_MS_WH_DOWN); + tap_code(KC_WH_D); } else { - tap_code(KC_MS_WH_UP); + tap_code(KC_WH_U); } return true; diff --git a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c index 59440eb337f7..b6727f8bc349 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c @@ -2,10 +2,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_Q, KC_W, KC_E, KC_R, - KC_A, KC_S, KC_D, KC_F, - KC_Z, KC_X, KC_C, KC_V, KC_B, - KC_N, KC_M + LT(1, KC_ESC), KC_Q, KC_W, KC_E, + KC_TAB, KC_A, KC_S, KC_D, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, + KC_WH_U, KC_WH_D + ), + + [1] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, MO(0), KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [2] = LAYOUT( + RGB_TOG, RGB_MOD, KC_TRNS, QK_BOOT, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS ) }; diff --git a/keyboards/takashicompany/spreadwriter/rules.mk b/keyboards/takashicompany/spreadwriter/rules.mk index 248f19320f0e..70845c6b7cca 100644 --- a/keyboards/takashicompany/spreadwriter/rules.mk +++ b/keyboards/takashicompany/spreadwriter/rules.mk @@ -1,2 +1,2 @@ -ENCODER_ENABLE = yes -RGBLIGHT_ENABLE = yes \ No newline at end of file +# ENCODER_ENABLE = yes +# RGBLIGHT_ENABLE = yes \ No newline at end of file From 7fa18da6d7c4164d59e7b1d3f80ec27f2f54881c Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 7 May 2023 12:44:13 +0900 Subject: [PATCH 07/31] update keyboard name --- keyboards/takashicompany/baumkuchen/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/takashicompany/baumkuchen/info.json b/keyboards/takashicompany/baumkuchen/info.json index a3c162d50586..ba037e532ebe 100644 --- a/keyboards/takashicompany/baumkuchen/info.json +++ b/keyboards/takashicompany/baumkuchen/info.json @@ -1,6 +1,6 @@ { "manufacturer": "takashicompany", - "keyboard_name": "takashicompany/baumkuchen", + "keyboard_name": "Baumkuchen", "maintainer": "takashicompany", "bootloader": "caterina", "diode_direction": "COL2ROW", From 3482cc00d72be71d6c8868e98422ea1d3a05d4f0 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 7 May 2023 15:54:48 +0900 Subject: [PATCH 08/31] for test --- .../baumkuchen/keymaps/test/keymap.c | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c diff --git a/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c new file mode 100644 index 000000000000..d908c80f3bfb --- /dev/null +++ b/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c @@ -0,0 +1,28 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, + KC_A, KC_S, KC_D, KC_F, + KC_Z, KC_X, KC_C, KC_V, KC_B, + KC_NO, KC_NO + ) +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + + rgblight_toggle(); // for test + + return true; +} + +bool encoder_update_user(uint8_t index, bool clockwise) { + + if (clockwise) { + tap_code(KC_1); + } else { + tap_code(KC_2); + } + + return true; +} \ No newline at end of file From 80299913964161535beab9e8458f2d6cdb252b76 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 7 May 2023 16:18:59 +0900 Subject: [PATCH 09/31] pressed --- keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c index d908c80f3bfb..9b489fb765f7 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c @@ -11,7 +11,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { - rgblight_toggle(); // for test + if (record->event.pressed) { + rgblight_toggle(); // for test + } return true; } From 22c67c32339bfa7a09e2f04e1ba68ac722fb6a8f Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 7 May 2023 17:43:02 +0900 Subject: [PATCH 10/31] readme --- keyboards/takashicompany/baumkuchen/readme.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/keyboards/takashicompany/baumkuchen/readme.md b/keyboards/takashicompany/baumkuchen/readme.md index 5885c0567894..adc3f2e00642 100644 --- a/keyboards/takashicompany/baumkuchen/readme.md +++ b/keyboards/takashicompany/baumkuchen/readme.md @@ -1,12 +1,16 @@ -# takashicompany/baumkuchen +# Baumkuchen -![takashicompany/baumkuchen](imgur.com image replace me!) +![takashicompany/baumkuchen](https://i.imgur.com/NS39x44h.png) -*A short description of the keyboard/project* +Baumkuchen is a 13-key macropad with a radial key layout. +The board can be used as a circuit or as a switch plate by cutting out the keyswitch Pro Micro part. +It is compatible with Cherry MX compatible keyswitches, and a rotary encoder can be optionally installed. +LEDs can also be mounted to make it glow. +The board is reversible, allowing you to choose the arrangement of keys and Pro Micro according to your usage style. * 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: Baumkuchen PCB, Pro Micro +* Hardware Availability: https://github.com/takashicompany/baumkuchen Make example for this keyboard (after setting up your build environment): From 6f6a773694bfe78dc0a0776f2f32ec3c0fa80bcd Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 7 May 2023 17:48:37 +0900 Subject: [PATCH 11/31] fix license --- keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c | 3 +++ keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c | 3 +++ keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c index 1ab45e4269b7..7fa22a32206d 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 takashicompany (@takashicompany) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c index 9b489fb765f7..1e28e7e47445 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 takashicompany (@takashicompany) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c index b6727f8bc349..91b4c0191134 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 takashicompany (@takashicompany) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 24bfd594056edd8fb4a38dfb0f98731142aeb847 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 7 May 2023 17:49:34 +0900 Subject: [PATCH 12/31] fix comment out. this is mistake --- keyboards/takashicompany/spreadwriter/rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/takashicompany/spreadwriter/rules.mk b/keyboards/takashicompany/spreadwriter/rules.mk index 70845c6b7cca..248f19320f0e 100644 --- a/keyboards/takashicompany/spreadwriter/rules.mk +++ b/keyboards/takashicompany/spreadwriter/rules.mk @@ -1,2 +1,2 @@ -# ENCODER_ENABLE = yes -# RGBLIGHT_ENABLE = yes \ No newline at end of file +ENCODER_ENABLE = yes +RGBLIGHT_ENABLE = yes \ No newline at end of file From 94e3e020f5fe05f66e5148b7943e56c8aaa07412 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Mon, 8 May 2023 17:56:29 +0900 Subject: [PATCH 13/31] Update keyboards/takashicompany/baumkuchen/rules.mk Co-authored-by: Joel Challis --- keyboards/takashicompany/baumkuchen/rules.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/takashicompany/baumkuchen/rules.mk b/keyboards/takashicompany/baumkuchen/rules.mk index 33e0a2208f39..7ff128fa692e 100644 --- a/keyboards/takashicompany/baumkuchen/rules.mk +++ b/keyboards/takashicompany/baumkuchen/rules.mk @@ -1,2 +1 @@ -# This file intentionally left blank -ENCODER_ENABLE = yes \ No newline at end of file +# This file intentionally left blank \ No newline at end of file From 3ee33d07fc296ceb34e4de3e41e6f59955b6f52a Mon Sep 17 00:00:00 2001 From: takashicompany Date: Mon, 8 May 2023 17:56:38 +0900 Subject: [PATCH 14/31] Update keyboards/takashicompany/baumkuchen/keymaps/via/rules.mk Co-authored-by: Joel Challis --- keyboards/takashicompany/baumkuchen/keymaps/via/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/takashicompany/baumkuchen/keymaps/via/rules.mk b/keyboards/takashicompany/baumkuchen/keymaps/via/rules.mk index 86dbb82cb49d..036bd6d1c3ec 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/via/rules.mk +++ b/keyboards/takashicompany/baumkuchen/keymaps/via/rules.mk @@ -1,2 +1 @@ -# This file intentionally left blank VIA_ENABLE = yes \ No newline at end of file From c384939e77e9aa5d93849903a54ead7e27490dcb Mon Sep 17 00:00:00 2001 From: takashicompany Date: Mon, 8 May 2023 23:01:18 +0900 Subject: [PATCH 15/31] Update keyboards/takashicompany/baumkuchen/info.json Co-authored-by: Joel Challis --- keyboards/takashicompany/baumkuchen/info.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/takashicompany/baumkuchen/info.json b/keyboards/takashicompany/baumkuchen/info.json index ba037e532ebe..625575c476fa 100644 --- a/keyboards/takashicompany/baumkuchen/info.json +++ b/keyboards/takashicompany/baumkuchen/info.json @@ -11,7 +11,8 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgblight": true + "rgblight": true, + "encoder", true }, "matrix_pins": { "direct": [["B2", "B6", "D4", "C6", "F4", "F5", "D7", "E6", "F6", "F7", "B1", "B3", "B4", "B5", "B5"]] From b023b8fd2bccbaa05f2090f3d4504389ca9b2b2a Mon Sep 17 00:00:00 2001 From: takashicompany Date: Mon, 8 May 2023 23:22:34 +0900 Subject: [PATCH 16/31] fix json --- keyboards/takashicompany/baumkuchen/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/takashicompany/baumkuchen/info.json b/keyboards/takashicompany/baumkuchen/info.json index 625575c476fa..4f5ced75246d 100644 --- a/keyboards/takashicompany/baumkuchen/info.json +++ b/keyboards/takashicompany/baumkuchen/info.json @@ -12,7 +12,7 @@ "mousekey": true, "nkro": true, "rgblight": true, - "encoder", true + "encoder": true }, "matrix_pins": { "direct": [["B2", "B6", "D4", "C6", "F4", "F5", "D7", "E6", "F6", "F7", "B1", "B3", "B4", "B5", "B5"]] From 4ad51624a42120d8cec98038698f6c55cde40938 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Mon, 8 May 2023 23:22:47 +0900 Subject: [PATCH 17/31] keymap --- .../baumkuchen/keymaps/via/config.h | 2 +- .../baumkuchen/keymaps/via/keymap.c | 185 ++++++++++++++++++ 2 files changed, 186 insertions(+), 1 deletion(-) diff --git a/keyboards/takashicompany/baumkuchen/keymaps/via/config.h b/keyboards/takashicompany/baumkuchen/keymaps/via/config.h index 039919d43c47..2a71b44f9454 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/via/config.h +++ b/keyboards/takashicompany/baumkuchen/keymaps/via/config.h @@ -3,7 +3,7 @@ #pragma once -#define DYNAMIC_KEYMAP_LAYER_COUNT 24 +#define DYNAMIC_KEYMAP_LAYER_COUNT 29 #define ENCODERS_CW_KEY { { 13, 0 }} #define ENCODERS_CCW_KEY { { 14, 0 }} diff --git a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c index 91b4c0191134..b5d92cbeb1ff 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c @@ -4,6 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( LT(1, KC_ESC), KC_Q, KC_W, KC_E, KC_TAB, KC_A, KC_S, KC_D, @@ -23,7 +24,191 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS + ), + + [3] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [4] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [5] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [6] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [7] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [8] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [9] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [10] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [11] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [12] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [13] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [14] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [15] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [16] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [17] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [18] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [19] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [20] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [21] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [22] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [23] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [24] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [25] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [26] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + + [27] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS + ), + + [28] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS ) + }; //------------------------------------------------------------------------------ From 55f62ac60f4b497e50f680bc872406d186ecf063 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Mon, 8 May 2023 23:45:46 +0900 Subject: [PATCH 18/31] encoder update kb --- .../takashicompany/baumkuchen/baumkuchen.c | 19 +++++++++++++++++++ .../takashicompany/baumkuchen/baumkuchen.h | 3 +++ .../baumkuchen/keymaps/default/keymap.c | 11 ----------- .../baumkuchen/keymaps/test/keymap.c | 2 +- .../baumkuchen/keymaps/via/keymap.c | 4 ++-- 5 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 keyboards/takashicompany/baumkuchen/baumkuchen.c create mode 100644 keyboards/takashicompany/baumkuchen/baumkuchen.h diff --git a/keyboards/takashicompany/baumkuchen/baumkuchen.c b/keyboards/takashicompany/baumkuchen/baumkuchen.c new file mode 100644 index 000000000000..e562aaac3142 --- /dev/null +++ b/keyboards/takashicompany/baumkuchen/baumkuchen.c @@ -0,0 +1,19 @@ +// Copyright 2023 takashicompany (@takashicompany) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "baumkuchen.h" + +bool encoder_update_kb(uint8_t index, bool clockwise) { + + if (!encoder_update_user(index, clockwise)) { + return false; + } + + if (clockwise) { + tap_code(KC_WH_D); + } else { + tap_code(KC_WH_U); + } + + return true; +} \ No newline at end of file diff --git a/keyboards/takashicompany/baumkuchen/baumkuchen.h b/keyboards/takashicompany/baumkuchen/baumkuchen.h new file mode 100644 index 000000000000..99b0ccee21b5 --- /dev/null +++ b/keyboards/takashicompany/baumkuchen/baumkuchen.h @@ -0,0 +1,3 @@ +#pragma once + +#include "quantum.h" \ No newline at end of file diff --git a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c index 7fa22a32206d..35aaaeba9bf1 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c @@ -17,14 +17,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS ) }; - -bool encoder_update_user(uint8_t index, bool clockwise) { - - if (clockwise) { - tap_code(KC_WH_D); - } else { - tap_code(KC_WH_U); - } - - return true; -} \ No newline at end of file diff --git a/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c index 1e28e7e47445..393d07efb70d 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c @@ -29,5 +29,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) { tap_code(KC_2); } - return true; + return false; } \ No newline at end of file diff --git a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c index b5d92cbeb1ff..c952ee1e314e 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - + [0] = LAYOUT( LT(1, KC_ESC), KC_Q, KC_W, KC_E, KC_TAB, KC_A, KC_S, KC_D, @@ -249,5 +249,5 @@ void matrix_scan_kb(void) { bool encoder_update_user(uint8_t index, bool clockwise) { encoder_action_register(index, clockwise); - return true; + return false; } From c8c0cb490267d6940809e9c84ec15a950ad97c30 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Mon, 8 May 2023 23:46:19 +0900 Subject: [PATCH 19/31] fix end line --- keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c index 35aaaeba9bf1..7ea01cbd5d30 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/default/keymap.c @@ -16,4 +16,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) -}; +}; \ No newline at end of file From cb7612d04de4ec7bc9196d463712b4396667c30d Mon Sep 17 00:00:00 2001 From: takashicompany Date: Mon, 8 May 2023 23:54:09 +0900 Subject: [PATCH 20/31] fix mo --- keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c index c952ee1e314e..cefabd81672f 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, MO(0), KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS,KC_TRNS ), From 08ea938db708300c6374da467aa1d9fe5901e78a Mon Sep 17 00:00:00 2001 From: takashicompany Date: Tue, 9 May 2023 00:00:42 +0900 Subject: [PATCH 21/31] remove via rotary encoder --- .../baumkuchen/keymaps/via/config.h | 3 -- .../baumkuchen/keymaps/via/keymap.c | 41 ------------------- 2 files changed, 44 deletions(-) diff --git a/keyboards/takashicompany/baumkuchen/keymaps/via/config.h b/keyboards/takashicompany/baumkuchen/keymaps/via/config.h index 2a71b44f9454..1017b9cb4bdf 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/via/config.h +++ b/keyboards/takashicompany/baumkuchen/keymaps/via/config.h @@ -4,6 +4,3 @@ #pragma once #define DYNAMIC_KEYMAP_LAYER_COUNT 29 - -#define ENCODERS_CW_KEY { { 13, 0 }} -#define ENCODERS_CCW_KEY { { 14, 0 }} diff --git a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c index cefabd81672f..1b5d680e8de0 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c @@ -210,44 +210,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -//------------------------------------------------------------------------------ -// Rotary Encoder -//------------------------------------------------------------------------------ -static uint8_t encoder_state[NUM_ENCODERS] = {0}; -static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY; -static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY; - -void encoder_action_unregister(void) { - for (int index = 0; index < NUM_ENCODERS; ++index) { - if (encoder_state[index]) { - keyevent_t encoder_event = (keyevent_t) { - .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], - .pressed = false, - .time = (timer_read() | 1) - }; - encoder_state[index] = 0; - action_exec(encoder_event); - } - } -} - -void encoder_action_register(uint8_t index, bool clockwise) { - keyevent_t encoder_event = (keyevent_t) { - .key = clockwise ? encoder_cw[index] : encoder_ccw[index], - .pressed = true, - .time = (timer_read() | 1) - }; - encoder_state[index] = (clockwise ^ 1) | (clockwise << 1); - action_exec(encoder_event); -} - -void matrix_scan_kb(void) { - encoder_action_unregister(); - matrix_scan_user(); -} - -bool encoder_update_user(uint8_t index, bool clockwise) { - encoder_action_register(index, clockwise); - return false; -} From 26887e208dd3cc81e9f62d34d871821631ea22c4 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Tue, 9 May 2023 00:11:59 +0900 Subject: [PATCH 22/31] format json --- keyboards/takashicompany/baumkuchen/info.json | 174 ++++-------------- 1 file changed, 37 insertions(+), 137 deletions(-) diff --git a/keyboards/takashicompany/baumkuchen/info.json b/keyboards/takashicompany/baumkuchen/info.json index 4f5ced75246d..c5fd8137db44 100644 --- a/keyboards/takashicompany/baumkuchen/info.json +++ b/keyboards/takashicompany/baumkuchen/info.json @@ -4,34 +4,31 @@ "maintainer": "takashicompany", "bootloader": "caterina", "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, - "rgblight": true, - "encoder": true + "rgblight": true }, "matrix_pins": { - "direct": [["B2", "B6", "D4", "C6", "F4", "F5", "D7", "E6", "F6", "F7", "B1", "B3", "B4", "B5", "B5"]] - }, - "processor": "atmega32u4", - "url": "", - "usb": { - "device_version": "1.0.0", - "pid": "0x0045", - "vid": "0x7463" - }, - "encoder": { - "rotary": [ - {"pin_a": "D1", "pin_b": "D0"} + "direct": [ + ["B2", "B6", "D4", "C6", "F4", "F5", "D7", "E6", "F6", "F7", "B1", "B3", "B4", "B5", "B5"] ] }, + "processor": "atmega32u4", "rgblight": { - "led_count": 6, - "pin": "D3", "animations": { "alternating": true, "breathing": true, @@ -43,131 +40,34 @@ "snake": true, "static_gradient": true, "twinkle": true - } + }, + "led_count": 6, + "pin": "D3" + }, + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0045", + "vid": "0x7463" }, "layouts": { "LAYOUT": { "layout": [ - { - "matrix": [ - 0, - 0 - ], - "x": 3, - "y": 0 - }, - { - "matrix": [ - 0, - 1 - ], - "x": 3, - "y": 0 - }, - { - "matrix": [ - 0, - 2 - ], - "x": 3, - "y": 0 - }, - { - "matrix": [ - 0, - 3 - ], - "x": 3, - "y": 0 - }, - { - "matrix": [ - 0, - 4 - ], - "x": 3, - "y": 1 - }, - { - "matrix": [ - 0, - 5 - ], - "x": 3, - "y": 1 - }, - { - "matrix": [ - 0, - 6 - ], - "x": 3, - "y": 1 - }, - { - "matrix": [ - 0, - 7 - ], - "x": 3, - "y": 1 - }, - { - "matrix": [ - 0, - 8 - ], - "x": 3, - "y": 2 - }, - { - "matrix": [ - 0, - 9 - ], - "x": 3, - "y": 2 - }, - { - "matrix": [ - 0, - 10 - ], - "x": 3, - "y": 2 - }, - { - "matrix": [ - 0, - 11 - ], - "x": 3, - "y": 2 - }, - { - "matrix": [ - 0, - 12 - ], - "x": 3, - "y": 2 - }, - { - "matrix": [ - 0, - 13 - ], - "x": 4.5, - "y": 3.75 - }, - { - "matrix": [ - 0, - 14 - ], - "x": 5.5, - "y": 3.75 - } + { "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": 0, "y": 1 }, + { "matrix": [0, 5], "x": 1, "y": 1 }, + { "matrix": [0, 6], "x": 2, "y": 1 }, + { "matrix": [0, 7], "x": 3, "y": 1 }, + { "matrix": [0, 8], "x": 0, "y": 2 }, + { "matrix": [0, 9], "x": 1, "y": 2 }, + { "matrix": [0, 10], "x": 2, "y": 2 }, + { "matrix": [0, 11], "x": 3, "y": 2 }, + { "matrix": [0, 12], "x": 4, "y": 2 }, + { "matrix": [0, 13], "x": 3.5, "y": 3.25 }, + { "matrix": [0, 14], "x": 4.5, "y": 3.25 } ] } } From 7023ca1110e47fc6d8585312b5d79f7c13e66ba7 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Tue, 9 May 2023 00:16:13 +0900 Subject: [PATCH 23/31] license --- keyboards/takashicompany/baumkuchen/baumkuchen.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/takashicompany/baumkuchen/baumkuchen.h b/keyboards/takashicompany/baumkuchen/baumkuchen.h index 99b0ccee21b5..2fb7a9a1f0de 100644 --- a/keyboards/takashicompany/baumkuchen/baumkuchen.h +++ b/keyboards/takashicompany/baumkuchen/baumkuchen.h @@ -1,3 +1,6 @@ +// Copyright 2023 takashicompany (@takashicompany) +// SPDX-License-Identifier: GPL-2.0-or-later + #pragma once #include "quantum.h" \ No newline at end of file From af595bf2379de228aba77433315dd5a837175ba7 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Tue, 9 May 2023 00:21:42 +0900 Subject: [PATCH 24/31] Update keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c Co-authored-by: Joel Challis --- .../baumkuchen/keymaps/via/keymap.c | 184 ------------------ 1 file changed, 184 deletions(-) diff --git a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c index 1b5d680e8de0..1e4624ca8832 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/via/keymap.c @@ -24,189 +24,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS - ), - - [3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [4] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [5] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [6] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [7] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [8] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [9] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [10] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [11] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [12] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [13] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [14] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [15] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [16] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [17] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [18] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [19] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [20] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [21] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [22] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [23] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [24] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [25] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [26] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - - [27] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS - ), - - [28] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS ) - }; From 3e721dd088c364d68b6fabac546c2175e09d8139 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Tue, 9 May 2023 00:34:05 +0900 Subject: [PATCH 25/31] Update keyboards/takashicompany/baumkuchen/info.json Co-authored-by: Joel Challis --- keyboards/takashicompany/baumkuchen/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/takashicompany/baumkuchen/info.json b/keyboards/takashicompany/baumkuchen/info.json index c5fd8137db44..52cb1e361184 100644 --- a/keyboards/takashicompany/baumkuchen/info.json +++ b/keyboards/takashicompany/baumkuchen/info.json @@ -2,7 +2,7 @@ "manufacturer": "takashicompany", "keyboard_name": "Baumkuchen", "maintainer": "takashicompany", - "bootloader": "caterina", + "development_board": "promicro", "diode_direction": "COL2ROW", "encoder": { "rotary": [ From 16e21f54388a2ba380ea1a0e259526fdfa32e257 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Tue, 9 May 2023 00:35:10 +0900 Subject: [PATCH 26/31] Update keyboards/takashicompany/baumkuchen/info.json Co-authored-by: Joel Challis --- keyboards/takashicompany/baumkuchen/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/takashicompany/baumkuchen/info.json b/keyboards/takashicompany/baumkuchen/info.json index 52cb1e361184..c4d4754662d9 100644 --- a/keyboards/takashicompany/baumkuchen/info.json +++ b/keyboards/takashicompany/baumkuchen/info.json @@ -27,7 +27,6 @@ ["B2", "B6", "D4", "C6", "F4", "F5", "D7", "E6", "F6", "F7", "B1", "B3", "B4", "B5", "B5"] ] }, - "processor": "atmega32u4", "rgblight": { "animations": { "alternating": true, From 7a412ca01ea31e0d7338edf4008abcbef143b981 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Tue, 9 May 2023 00:37:09 +0900 Subject: [PATCH 27/31] delete baumkuchen.h --- keyboards/takashicompany/baumkuchen/baumkuchen.c | 2 +- keyboards/takashicompany/baumkuchen/baumkuchen.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 keyboards/takashicompany/baumkuchen/baumkuchen.h diff --git a/keyboards/takashicompany/baumkuchen/baumkuchen.c b/keyboards/takashicompany/baumkuchen/baumkuchen.c index e562aaac3142..7d4f26b73e83 100644 --- a/keyboards/takashicompany/baumkuchen/baumkuchen.c +++ b/keyboards/takashicompany/baumkuchen/baumkuchen.c @@ -1,7 +1,7 @@ // Copyright 2023 takashicompany (@takashicompany) // SPDX-License-Identifier: GPL-2.0-or-later -#include "baumkuchen.h" +#include "quantum.h" bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/takashicompany/baumkuchen/baumkuchen.h b/keyboards/takashicompany/baumkuchen/baumkuchen.h deleted file mode 100644 index 2fb7a9a1f0de..000000000000 --- a/keyboards/takashicompany/baumkuchen/baumkuchen.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2023 takashicompany (@takashicompany) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" \ No newline at end of file From 4aaa3fca970538bfc2124a1495e442dae6f66b25 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Mon, 15 May 2023 00:05:59 +0900 Subject: [PATCH 28/31] Update keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c index 393d07efb70d..863619afaa1a 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { - rgblight_toggle(); // for test + rgblight_toggle_neeeprom(); // for test } return true; From 92771c196af701673675a9551ede1b53f1dfe6fc Mon Sep 17 00:00:00 2001 From: takashicompany Date: Mon, 15 May 2023 00:07:33 +0900 Subject: [PATCH 29/31] rename --- .../baumkuchen/keymaps/{test => build_test}/keymap.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/takashicompany/baumkuchen/keymaps/{test => build_test}/keymap.c (100%) diff --git a/keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/build_test/keymap.c similarity index 100% rename from keyboards/takashicompany/baumkuchen/keymaps/test/keymap.c rename to keyboards/takashicompany/baumkuchen/keymaps/build_test/keymap.c From df4242e5b802035c36f875e60998f66c5e312fd8 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Mon, 15 May 2023 00:17:56 +0900 Subject: [PATCH 30/31] Fix typo. --- .../takashicompany/baumkuchen/keymaps/build_test/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/takashicompany/baumkuchen/keymaps/build_test/keymap.c b/keyboards/takashicompany/baumkuchen/keymaps/build_test/keymap.c index 863619afaa1a..b99d3a3592b4 100644 --- a/keyboards/takashicompany/baumkuchen/keymaps/build_test/keymap.c +++ b/keyboards/takashicompany/baumkuchen/keymaps/build_test/keymap.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { - rgblight_toggle_neeeprom(); // for test + rgblight_toggle_noeeprom(); // for test } return true; @@ -30,4 +30,4 @@ bool encoder_update_user(uint8_t index, bool clockwise) { } return false; -} \ No newline at end of file +} From cf32281039959b8740c75f66d74df3620e4a638a Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 16 Jun 2023 02:25:21 +0900 Subject: [PATCH 31/31] Update keyboards/takashicompany/baumkuchen/info.json Co-authored-by: Drashna Jaelre --- keyboards/takashicompany/baumkuchen/info.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/takashicompany/baumkuchen/info.json b/keyboards/takashicompany/baumkuchen/info.json index c4d4754662d9..e2318348827d 100644 --- a/keyboards/takashicompany/baumkuchen/info.json +++ b/keyboards/takashicompany/baumkuchen/info.json @@ -41,6 +41,8 @@ "twinkle": true }, "led_count": 6, + }, + "ws2812": { "pin": "D3" }, "url": "",