From fd27aa5c8bfeb5a5a0bbbdef60d0a337b54391a8 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sat, 11 Feb 2023 15:29:52 +0900 Subject: [PATCH 01/33] start miniDivide --- keyboards/takashicompany/minidivide/config.h | 55 +++++++++++++++ keyboards/takashicompany/minidivide/info.json | 22 ++++++ .../minidivide/keymaps/default/keymap.c | 67 +++++++++++++++++++ .../takashicompany/minidivide/minidivide.c | 4 ++ .../takashicompany/minidivide/minidivide.h | 32 +++++++++ keyboards/takashicompany/minidivide/readme.md | 27 ++++++++ keyboards/takashicompany/minidivide/rules.mk | 3 + 7 files changed, 210 insertions(+) create mode 100644 keyboards/takashicompany/minidivide/config.h create mode 100644 keyboards/takashicompany/minidivide/info.json create mode 100644 keyboards/takashicompany/minidivide/keymaps/default/keymap.c create mode 100644 keyboards/takashicompany/minidivide/minidivide.c create mode 100644 keyboards/takashicompany/minidivide/minidivide.h create mode 100644 keyboards/takashicompany/minidivide/readme.md create mode 100644 keyboards/takashicompany/minidivide/rules.mk diff --git a/keyboards/takashicompany/minidivide/config.h b/keyboards/takashicompany/minidivide/config.h new file mode 100644 index 000000000000..0ea7604f2121 --- /dev/null +++ b/keyboards/takashicompany/minidivide/config.h @@ -0,0 +1,55 @@ +// Copyright 2023 takashicompany (@takashicompany) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define MATRIX_ROWS 8 +#define MATRIX_COLS 5 + +#define MATRIX_ROW_PINS { F4, F5, F6, F7 } +#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 } +#define MATRIX_ROW_PINS_RIGHT { F4, F5, F6, F7 } +#define MATRIX_COL_PINS_RIGHT { B4, E6, D7, C6, D4 } + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +#define SOFT_SERIAL_PIN D2 + +#define RGB_DI_PIN D3 +#ifdef RGB_DI_PIN +# define RGBLED_NUM 10 +# define RGBLED_SPLIT { 5, 5 } +# define RGBLIGHT_HUE_STEP 8 +# define RGBLIGHT_SAT_STEP 8 +# define RGBLIGHT_VAL_STEP 8 +# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE +#endif + + +/* + * 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/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json new file mode 100644 index 000000000000..8fa216acbf2e --- /dev/null +++ b/keyboards/takashicompany/minidivide/info.json @@ -0,0 +1,22 @@ +{ + "manufacturer": "takashicompany", + "keyboard_name": "takashicompany/minidivide", + "maintainer": "takashicompany", + "bootloader": "caterina", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "processor": "atmega32u4", + "url": "", + "usb": { + "vid": "0x7463", + "pid": "0x0037", + "device_version": "0.0.1" + } +} \ No newline at end of file diff --git a/keyboards/takashicompany/minidivide/keymaps/default/keymap.c b/keyboards/takashicompany/minidivide/keymaps/default/keymap.c new file mode 100644 index 000000000000..b0bf219c3a80 --- /dev/null +++ b/keyboards/takashicompany/minidivide/keymaps/default/keymap.c @@ -0,0 +1,67 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + LAYOUT( + LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, + LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, + KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_PGUP, KC_PGDN + ), + + LAYOUT( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, + LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + LAYOUT( + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), + KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), + KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + LAYOUT( + LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, + LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, + KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LNG1), KC_PGUP, KC_PGDN + ), + + LAYOUT( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3, + LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + LAYOUT( + KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, + KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, + KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + LAYOUT( + KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, + KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, + KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + LAYOUT( + KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, MO(8), MO(9), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + LAYOUT( + RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, DF(0), DF(3), + RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/takashicompany/minidivide/minidivide.c b/keyboards/takashicompany/minidivide/minidivide.c new file mode 100644 index 000000000000..823381543ea6 --- /dev/null +++ b/keyboards/takashicompany/minidivide/minidivide.c @@ -0,0 +1,4 @@ +// Copyright 2023 takashicompany (@takashicompany) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "minidivide.h" \ No newline at end of file diff --git a/keyboards/takashicompany/minidivide/minidivide.h b/keyboards/takashicompany/minidivide/minidivide.h new file mode 100644 index 000000000000..a8375d6d2da1 --- /dev/null +++ b/keyboards/takashicompany/minidivide/minidivide.h @@ -0,0 +1,32 @@ +// Copyright 2023 takashicompany (@takashicompany) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#include "quantum.h" + +#define XXX KC_NO + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT( \ + l01, l02, l03, l04, l05, r01, r02, r03, r04, r05, \ + l06, l07, l08, l09, l10, r06, r07, r08, r09, r10, \ + l11, l12, l13, l14, l15, r11, r12, r13, r14, r15, \ + l16, l17, l18, l19, r16, r17, r18, r19 \ +) { \ + { l01, l02, l03, l04, l05 }, \ + { l06, l07, l08, l09, l10 }, \ + { l11, l12, l13, l14, l15 }, \ + { XXX, l16, l17, l18, l19 }, \ + { r01, r02, r03, r04, r05 }, \ + { r06, r07, r08, r09, r10 }, \ + { r11, r12, r13, r14, r15 }, \ + { r16, r17, r18, r19, XXX } \ +} + diff --git a/keyboards/takashicompany/minidivide/readme.md b/keyboards/takashicompany/minidivide/readme.md new file mode 100644 index 000000000000..c07ad4f84124 --- /dev/null +++ b/keyboards/takashicompany/minidivide/readme.md @@ -0,0 +1,27 @@ +# takashicompany/minidivide + +![takashicompany/minidivide](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/minidivide:default + +Flashing example for this keyboard: + + make takashicompany/minidivide: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/minidivide/rules.mk b/keyboards/takashicompany/minidivide/rules.mk new file mode 100644 index 000000000000..df7bd551d052 --- /dev/null +++ b/keyboards/takashicompany/minidivide/rules.mk @@ -0,0 +1,3 @@ +# This file intentionally left blank +SPLIT_KEYBOARD = yes +RGBLIGHT_ENABLE = yes \ No newline at end of file From 8e65adc326295bc76535b9b66d6e60ce1c769bb4 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 17 Feb 2023 16:47:37 +0900 Subject: [PATCH 02/33] via --- .../minidivide/keymaps/via/config.h | 5 ++ .../minidivide/keymaps/via/keymap.c | 76 +++++++++++++++++++ .../minidivide/keymaps/via/rules.mk | 1 + 3 files changed, 82 insertions(+) create mode 100644 keyboards/takashicompany/minidivide/keymaps/via/config.h create mode 100644 keyboards/takashicompany/minidivide/keymaps/via/keymap.c create mode 100644 keyboards/takashicompany/minidivide/keymaps/via/rules.mk diff --git a/keyboards/takashicompany/minidivide/keymaps/via/config.h b/keyboards/takashicompany/minidivide/keymaps/via/config.h new file mode 100644 index 000000000000..f357dce30324 --- /dev/null +++ b/keyboards/takashicompany/minidivide/keymaps/via/config.h @@ -0,0 +1,5 @@ +// Copyright 2022 takashicompany (@takashicompany) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 10 \ No newline at end of file diff --git a/keyboards/takashicompany/minidivide/keymaps/via/keymap.c b/keyboards/takashicompany/minidivide/keymaps/via/keymap.c new file mode 100644 index 000000000000..d78a5bbf17de --- /dev/null +++ b/keyboards/takashicompany/minidivide/keymaps/via/keymap.c @@ -0,0 +1,76 @@ +// Copyright 2022 takashicompany (@takashicompany) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + LAYOUT( + LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, + LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, + KC_LCTL, KC_LGUI, LALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LANG1), KC_PGUP, KC_PGDN + ), + + LAYOUT( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_RO, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, + LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + LAYOUT( + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_JYEN), + KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), + KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + LAYOUT( + LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, + LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, + KC_LCTL, KC_LGUI, LALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LANG1), KC_PGUP, KC_PGDN + ), + + LAYOUT( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_JYEN, + LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + LAYOUT( + KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, + KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, + KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + LAYOUT( + KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, + KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, + KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_TRNS, KC_NO, KC_LANG1, KC_NO, KC_NO, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + LAYOUT( + KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, MO(8), MO(9), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + LAYOUT( + RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, DF(0), DF(3), + RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + 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, 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, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/takashicompany/minidivide/keymaps/via/rules.mk b/keyboards/takashicompany/minidivide/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/takashicompany/minidivide/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file From 68ee353a784696ab998218858b0451c344366641 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 17 Feb 2023 16:48:44 +0900 Subject: [PATCH 03/33] fix keymap --- .../minidivide/keymaps/default/keymap.c | 4 +-- .../minidivide/keymaps/via/keymap.c | 33 +++++++------------ 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/keyboards/takashicompany/minidivide/keymaps/default/keymap.c b/keyboards/takashicompany/minidivide/keymaps/default/keymap.c index b0bf219c3a80..7d3d741e863b 100644 --- a/keyboards/takashicompany/minidivide/keymaps/default/keymap.c +++ b/keyboards/takashicompany/minidivide/keymaps/default/keymap.c @@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, - KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_PGUP, KC_PGDN + KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_RGUI, KC_RCTL ), LAYOUT( @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, - KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LNG1), KC_PGUP, KC_PGDN + KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LNG1), KC_RGUI, KC_RCTL ), LAYOUT( diff --git a/keyboards/takashicompany/minidivide/keymaps/via/keymap.c b/keyboards/takashicompany/minidivide/keymaps/via/keymap.c index d78a5bbf17de..7d3d741e863b 100644 --- a/keyboards/takashicompany/minidivide/keymaps/via/keymap.c +++ b/keyboards/takashicompany/minidivide/keymaps/via/keymap.c @@ -1,6 +1,3 @@ -// Copyright 2022 takashicompany (@takashicompany) -// SPDX-License-Identifier: GPL-2.0-or-later - #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -9,20 +6,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, - KC_LCTL, KC_LGUI, LALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LANG1), KC_PGUP, KC_PGDN + KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_RGUI, KC_RCTL ), LAYOUT( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_RO, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, - LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), + LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, + LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), LAYOUT( - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_JYEN), - KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_RO), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_JYEN), - KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), + KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), + KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), @@ -30,27 +27,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, - KC_LCTL, KC_LGUI, LALT_T(KC_LANG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LANG1), KC_PGUP, KC_PGDN + KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LNG1), KC_RGUI, KC_RCTL ), LAYOUT( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_JYEN, + KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3, LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), LAYOUT( - KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, - KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, - KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_LSFT, KC_SPC, KC_LANG1, KC_TRNS, KC_TRNS, KC_DEL, + KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, + KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, + KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), LAYOUT( KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, - KC_LSFT, KC_LGUI, KC_LALT, KC_LANG2, KC_TRNS, KC_NO, KC_LANG1, KC_NO, KC_NO, KC_DEL, + KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), @@ -66,11 +63,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - 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, 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, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; \ No newline at end of file From e059fc83d4640fcdcb0c33f4e99c13fb4ea38ae1 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 17 Feb 2023 18:08:14 +0900 Subject: [PATCH 04/33] readme --- keyboards/takashicompany/minidivide/info.json | 236 +++++++++++++++++- keyboards/takashicompany/minidivide/readme.md | 26 +- 2 files changed, 256 insertions(+), 6 deletions(-) diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index 8fa216acbf2e..e5e3bb9a95a7 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -1,6 +1,6 @@ { "manufacturer": "takashicompany", - "keyboard_name": "takashicompany/minidivide", + "keyboard_name": "miniDivide", "maintainer": "takashicompany", "bootloader": "caterina", "diode_direction": "COL2ROW", @@ -18,5 +18,239 @@ "vid": "0x7463", "pid": "0x0037", "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { + "x": 1.68, + "y": 0, + "w": 0.84, + "h": 0.84 + }, + { + "x": 7.98, + "y": 0, + "w": 0.84, + "h": 0.84 + }, + { + "x": 0.84, + "y": 0.21, + "w": 0.84, + "h": 0.84 + }, + { + "x": 2.52, + "y": 0.21, + "w": 0.84, + "h": 0.84 + }, + { + "x": 7.14, + "y": 0.21, + "w": 0.84, + "h": 0.84 + }, + { + "x": 8.82, + "y": 0.21, + "w": 0.84, + "h": 0.84 + }, + { + "x": 0, + "y": 0.42, + "w": 0.84, + "h": 0.84 + }, + { + "x": 3.36, + "y": 0.42, + "w": 0.84, + "h": 0.84 + }, + { + "x": 6.3, + "y": 0.42, + "w": 0.84, + "h": 0.84 + }, + { + "x": 9.66, + "y": 0.42, + "w": 0.84, + "h": 0.84 + }, + { + "x": 1.68, + "y": 0.84, + "w": 0.84, + "h": 0.84 + }, + { + "x": 7.98, + "y": 0.84, + "w": 0.84, + "h": 0.84 + }, + { + "x": 0.84, + "y": 1.05, + "w": 0.84, + "h": 0.84 + }, + { + "x": 2.52, + "y": 1.05, + "w": 0.84, + "h": 0.84 + }, + { + "x": 7.14, + "y": 1.05, + "w": 0.84, + "h": 0.84 + }, + { + "x": 8.82, + "y": 1.05, + "w": 0.84, + "h": 0.84 + }, + { + "x": 0, + "y": 1.26, + "w": 0.84, + "h": 0.84 + }, + { + "x": 3.36, + "y": 1.26, + "w": 0.84, + "h": 0.84 + }, + { + "x": 6.3, + "y": 1.26, + "w": 0.84, + "h": 0.84 + }, + { + "x": 9.66, + "y": 1.26, + "w": 0.84, + "h": 0.84 + }, + { + "x": 1.68, + "y": 1.68, + "w": 0.84, + "h": 0.84 + }, + { + "x": 7.98, + "y": 1.68, + "w": 0.84, + "h": 0.84 + }, + { + "x": 0.84, + "y": 1.89, + "w": 0.84, + "h": 0.84 + }, + { + "x": 2.52, + "y": 1.89, + "w": 0.84, + "h": 0.84 + }, + { + "x": 7.14, + "y": 1.89, + "w": 0.84, + "h": 0.84 + }, + { + "x": 8.82, + "y": 1.89, + "w": 0.84, + "h": 0.84 + }, + { + "x": 0, + "y": 2.1, + "w": 0.84, + "h": 0.84 + }, + { + "x": 3.36, + "y": 2.1, + "w": 0.84, + "h": 0.84 + }, + { + "x": 6.3, + "y": 2.1, + "w": 0.84, + "h": 0.84 + }, + { + "x": 9.66, + "y": 2.1, + "w": 0.84, + "h": 0.84 + }, + { + "x": 0.42, + "y": -4.25, + "w": 0.84, + "h": 0.84 + }, + { + "x": 1.26, + "y": -4.25, + "w": 0.84, + "h": 0.84 + }, + { + "x": 2.1, + "y": -4.25, + "w": 0.84, + "h": 0.84 + }, + { + "x": 2.94, + "y": -4.25, + "w": 0.84, + "h": 0.84 + }, + { + "x": 6.72, + "y": -4.25, + "w": 0.84, + "h": 0.84 + }, + { + "x": -3.78, + "y": -10.6, + "w": 0.84, + "h": 0.84 + }, + { + "x": -2.94, + "y": -10.6, + "w": 0.84, + "h": 0.84 + }, + { + "x": -2.1, + "y": -10.6, + "w": 0.84, + "h": 0.84 + } + ] + } } } \ No newline at end of file diff --git a/keyboards/takashicompany/minidivide/readme.md b/keyboards/takashicompany/minidivide/readme.md index c07ad4f84124..de49c2892b48 100644 --- a/keyboards/takashicompany/minidivide/readme.md +++ b/keyboards/takashicompany/minidivide/readme.md @@ -1,12 +1,28 @@ -# takashicompany/minidivide +# miniDivide -![takashicompany/minidivide](imgur.com image replace me!) +![miniDivide](https://i.imgur.com/x91x9yjh.jpg) -*A short description of the keyboard/project* +miniDivide is a split keyboard with 0.8u (16mm) key pitch. +The size of a single key is 80% of that of a conventional keyboard key. +Although the key size is more compact than usual, it has the advantage of requiring minimal finger movement. +The number of keys is 19 keys for one hand and 38 keys for two hands. + +It is small and thin, making it easy to carry around. +The option to mount a coin cell battery on the PCB is available so that the BLE Micro Pro can be installed. +OLED can also be mounted. + +miniDivideは0.8u(16mm)キーピッチの分割型のキーボードです。 +一つのキーの大きさが従来のキーボードのキーと比較すると80%のサイズとなっています。 +通常よりコンパクトなキーサイズですが、指の動きが最小限で済むという強みがあります。 +キー数は片手で19キー、両手で38キーとなります。 + +小さく、薄いので持ち運びにも便利です。 +またBLE Micro Proを搭載できるよう、コイン電池をPCBに搭載するオプションが可能です。 +OLEDも搭載できます。 * 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: PCB, Pro Micro +* Hardware Availability: https://github.com/takashicompany/minidivide Make example for this keyboard (after setting up your build environment): From 382cd00f053d4dcd59677bda5893daf6dd3a2d57 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 17 Feb 2023 19:03:04 +0900 Subject: [PATCH 05/33] info.json --- keyboards/takashicompany/minidivide/info.json | 70 ++++++++++++++----- 1 file changed, 54 insertions(+), 16 deletions(-) diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index e5e3bb9a95a7..f6d2ce777545 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -23,230 +23,268 @@ "LAYOUT": { "layout": [ { + "label": "0,2", "x": 1.68, "y": 0, "w": 0.84, "h": 0.84 }, { + "label": "4,2", "x": 7.98, "y": 0, "w": 0.84, "h": 0.84 }, { + "label": "0,1", "x": 0.84, "y": 0.21, "w": 0.84, "h": 0.84 }, { + "label": "0,3", "x": 2.52, "y": 0.21, "w": 0.84, "h": 0.84 }, { + "label": "4,1", "x": 7.14, "y": 0.21, "w": 0.84, "h": 0.84 }, { + "label": "4,3", "x": 8.82, "y": 0.21, "w": 0.84, "h": 0.84 }, { + "label": "0,0", "x": 0, "y": 0.42, "w": 0.84, "h": 0.84 }, { + "label": "0,4", "x": 3.36, "y": 0.42, "w": 0.84, "h": 0.84 }, { + "label": "4,0", "x": 6.3, "y": 0.42, "w": 0.84, "h": 0.84 }, { + "label": "4,4", "x": 9.66, "y": 0.42, "w": 0.84, "h": 0.84 }, { + "label": "1,2", "x": 1.68, "y": 0.84, "w": 0.84, "h": 0.84 }, { + "label": "5,2", "x": 7.98, "y": 0.84, "w": 0.84, "h": 0.84 }, { + "label": "1,1", "x": 0.84, "y": 1.05, "w": 0.84, "h": 0.84 }, { + "label": "1,3", "x": 2.52, "y": 1.05, "w": 0.84, "h": 0.84 }, { + "label": "5,1", "x": 7.14, "y": 1.05, "w": 0.84, "h": 0.84 }, { + "label": "5,3", "x": 8.82, "y": 1.05, "w": 0.84, "h": 0.84 }, { + "label": "1,0", "x": 0, "y": 1.26, "w": 0.84, "h": 0.84 }, { + "label": "1,4", "x": 3.36, "y": 1.26, "w": 0.84, "h": 0.84 }, { + "label": "5,0", "x": 6.3, "y": 1.26, "w": 0.84, "h": 0.84 }, { + "label": "5,4", "x": 9.66, "y": 1.26, "w": 0.84, "h": 0.84 }, { + "label": "2,2", "x": 1.68, "y": 1.68, "w": 0.84, "h": 0.84 }, { + "label": "6,2", "x": 7.98, "y": 1.68, "w": 0.84, "h": 0.84 }, { + "label": "2,1", "x": 0.84, "y": 1.89, "w": 0.84, "h": 0.84 }, { + "label": "2,3", "x": 2.52, "y": 1.89, "w": 0.84, "h": 0.84 }, { + "label": "6,1", "x": 7.14, "y": 1.89, "w": 0.84, "h": 0.84 }, { + "label": "6,3", "x": 8.82, "y": 1.89, "w": 0.84, "h": 0.84 }, { + "label": "2,0", "x": 0, "y": 2.1, "w": 0.84, "h": 0.84 }, { + "label": "2,4", "x": 3.36, "y": 2.1, "w": 0.84, "h": 0.84 }, { + "label": "6,0", "x": 6.3, "y": 2.1, "w": 0.84, "h": 0.84 }, { + "label": "6,4", "x": 9.66, "y": 2.1, "w": 0.84, "h": 0.84 }, { - "x": 0.42, - "y": -4.25, + "label": "3,2", + "x": 2.52, + "y": 3.15, "w": 0.84, "h": 0.84 }, { - "x": 1.26, - "y": -4.25, + "label": "3,3", + "x": 3.36, + "y": 3.15, "w": 0.84, "h": 0.84 }, { - "x": 2.1, - "y": -4.25, + "label": "3,4", + "x": 4.2, + "y": 3.15, "w": 0.84, "h": 0.84 }, { - "x": 2.94, - "y": -4.25, + "label": "7,1", + "x": 6.3, + "y": 3.15, "w": 0.84, "h": 0.84 }, { - "x": 6.72, - "y": -4.25, + "label": "7,2", + "x": 7.14, + "y": 3.15, "w": 0.84, "h": 0.84 }, { - "x": -3.78, - "y": -10.6, + "label": "7,3", + "x": 7.98, + "y": 3.15, "w": 0.84, "h": 0.84 }, { - "x": -2.94, - "y": -10.6, + "label": "3,1", + "x": 1.68, + "y": 3.15, "w": 0.84, "h": 0.84 }, { - "x": -2.1, - "y": -10.6, + "label": "7,0", + "x": 5.46, + "y": 3.15, "w": 0.84, "h": 0.84 } From 38d98bcf6506569343c1beb10827e7da40f75a03 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 17 Feb 2023 19:13:44 +0900 Subject: [PATCH 06/33] add license --- keyboards/takashicompany/minidivide/keymaps/default/keymap.c | 3 +++ keyboards/takashicompany/minidivide/keymaps/via/keymap.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/keyboards/takashicompany/minidivide/keymaps/default/keymap.c b/keyboards/takashicompany/minidivide/keymaps/default/keymap.c index 7d3d741e863b..9b37fe84c138 100644 --- a/keyboards/takashicompany/minidivide/keymaps/default/keymap.c +++ b/keyboards/takashicompany/minidivide/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/minidivide/keymaps/via/keymap.c b/keyboards/takashicompany/minidivide/keymaps/via/keymap.c index 7d3d741e863b..9b37fe84c138 100644 --- a/keyboards/takashicompany/minidivide/keymaps/via/keymap.c +++ b/keyboards/takashicompany/minidivide/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 19fe7d05b2e0c9bb3e315e4e6e57b9b9b1598fb9 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 19 Feb 2023 02:32:17 +0900 Subject: [PATCH 07/33] Update keyboards/takashicompany/minidivide/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/takashicompany/minidivide/config.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/keyboards/takashicompany/minidivide/config.h b/keyboards/takashicompany/minidivide/config.h index 0ea7604f2121..3bc5608b3fa4 100644 --- a/keyboards/takashicompany/minidivide/config.h +++ b/keyboards/takashicompany/minidivide/config.h @@ -3,19 +3,10 @@ #pragma once -#define MATRIX_ROWS 8 -#define MATRIX_COLS 5 - #define MATRIX_ROW_PINS { F4, F5, F6, F7 } #define MATRIX_COL_PINS { D4, C6, D7, E6, B4 } #define MATRIX_ROW_PINS_RIGHT { F4, F5, F6, F7 } #define MATRIX_COL_PINS_RIGHT { B4, E6, D7, C6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define SOFT_SERIAL_PIN D2 - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 10 From 72131ede0ada088092c56cc96fd3397d3a681649 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 19 Feb 2023 02:32:28 +0900 Subject: [PATCH 08/33] Update keyboards/takashicompany/minidivide/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/takashicompany/minidivide/info.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index f6d2ce777545..4314f7ac6c71 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -19,6 +19,10 @@ "pid": "0x0037", "device_version": "0.0.1" }, + "split": { + "enabled": true, + "soft_serial_pin": "D2" + }, "layouts": { "LAYOUT": { "layout": [ From 4fcdf2373e8f73fb032bee09c588a0e8448157d3 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 19 Feb 2023 02:32:39 +0900 Subject: [PATCH 09/33] Update keyboards/takashicompany/minidivide/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/takashicompany/minidivide/info.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index 4314f7ac6c71..57db3b92af05 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -10,7 +10,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgblight": true }, "processor": "atmega32u4", "url": "", From 3cf290c0d3bdaa016ee39bf8fd919903ccb2b2f0 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 19 Feb 2023 02:32:51 +0900 Subject: [PATCH 10/33] Update keyboards/takashicompany/minidivide/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- .../minidivide/keymaps/default/keymap.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/keyboards/takashicompany/minidivide/keymaps/default/keymap.c b/keyboards/takashicompany/minidivide/keymaps/default/keymap.c index 9b37fe84c138..38b954f38da1 100644 --- a/keyboards/takashicompany/minidivide/keymaps/default/keymap.c +++ b/keyboards/takashicompany/minidivide/keymaps/default/keymap.c @@ -5,63 +5,63 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - LAYOUT( + [0] = LAYOUT( LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_RGUI, KC_RCTL ), - LAYOUT( + [1] = LAYOUT( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - LAYOUT( + [2] = LAYOUT( KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - LAYOUT( + [3] = LAYOUT( LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LNG1), KC_RGUI, KC_RCTL ), - LAYOUT( + [4] = LAYOUT( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3, LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - LAYOUT( + [5] = LAYOUT( KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - LAYOUT( + [6] = LAYOUT( KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - LAYOUT( + [7] = LAYOUT( KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, MO(8), MO(9), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - LAYOUT( + [8] = LAYOUT( RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, DF(0), DF(3), RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, From e142275378d99fbae38a35153ef6b8c2e234fc8d Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 19 Feb 2023 02:33:08 +0900 Subject: [PATCH 11/33] Update keyboards/takashicompany/minidivide/keymaps/via/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- .../minidivide/keymaps/via/keymap.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/keyboards/takashicompany/minidivide/keymaps/via/keymap.c b/keyboards/takashicompany/minidivide/keymaps/via/keymap.c index 9b37fe84c138..38b954f38da1 100644 --- a/keyboards/takashicompany/minidivide/keymaps/via/keymap.c +++ b/keyboards/takashicompany/minidivide/keymaps/via/keymap.c @@ -5,63 +5,63 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - LAYOUT( + [0] = LAYOUT( LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_RGUI, KC_RCTL ), - LAYOUT( + [1] = LAYOUT( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3, LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - LAYOUT( + [2] = LAYOUT( KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3), KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - LAYOUT( + [3] = LAYOUT( LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(5, KC_SPC), LT(4, KC_LNG1), KC_RGUI, KC_RCTL ), - LAYOUT( + [4] = LAYOUT( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3, LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - LAYOUT( + [5] = LAYOUT( KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - LAYOUT( + [6] = LAYOUT( KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - LAYOUT( + [7] = LAYOUT( KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, MO(8), MO(9), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - LAYOUT( + [8] = LAYOUT( RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, DF(0), DF(3), RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, From 2eae4bad692ca8f14f4dbf58b8f1c2ff78b7c4c4 Mon Sep 17 00:00:00 2001 From: jack <0x6a73@protonmail.com> Date: Sat, 18 Feb 2023 10:50:11 -0700 Subject: [PATCH 12/33] Update keyboards/takashicompany/minidivide/rules.mk --- keyboards/takashicompany/minidivide/rules.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/takashicompany/minidivide/rules.mk b/keyboards/takashicompany/minidivide/rules.mk index df7bd551d052..7ff128fa692e 100644 --- a/keyboards/takashicompany/minidivide/rules.mk +++ b/keyboards/takashicompany/minidivide/rules.mk @@ -1,3 +1 @@ -# This file intentionally left blank -SPLIT_KEYBOARD = yes -RGBLIGHT_ENABLE = yes \ No newline at end of file +# This file intentionally left blank \ No newline at end of file From a964024705e01010ef289889677e43d857e29949 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sun, 26 Feb 2023 18:17:37 +0900 Subject: [PATCH 13/33] add oled --- .../takashicompany/minidivide/minidivide.c | 44 ++++++++++++++++++- keyboards/takashicompany/minidivide/rules.mk | 5 ++- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/keyboards/takashicompany/minidivide/minidivide.c b/keyboards/takashicompany/minidivide/minidivide.c index 823381543ea6..815c619d8136 100644 --- a/keyboards/takashicompany/minidivide/minidivide.c +++ b/keyboards/takashicompany/minidivide/minidivide.c @@ -1,4 +1,46 @@ // Copyright 2023 takashicompany (@takashicompany) // SPDX-License-Identifier: GPL-2.0-or-later -#include "minidivide.h" \ No newline at end of file +#include "minidivide.h" + +#ifdef OLED_ENABLE + +oled_rotation_t oled_init_kb(oled_rotation_t rotation) { + return OLED_ROTATION_270; +} + +//Variable that stores the number of times the key was pressed +static uint16_t press_count = 0; + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + + // Increment the counter when a key is pressed + if (record->event.pressed) { + press_count++; + } + + return process_record_user(keycode, record); +} + +bool oled_task_kb(void) { + + if (!oled_task_user()) { return false; } + + oled_write_ln_P(PSTR("mini"), false); + oled_write_ln_P(PSTR("Divide"), false); + + oled_set_cursor(0, 5); + + oled_write_ln_P(PSTR("Layer"), false); + oled_write_ln(get_u8_str(get_highest_layer(layer_state), ' '), false); + + oled_write_ln_P(PSTR(" "), false); + oled_write_ln_P(PSTR(" "), false); + + oled_write_ln_P(PSTR("Count"), false); + oled_write_ln(get_u16_str(press_count, ' '), false); + + return false; + +} +#endif \ No newline at end of file diff --git a/keyboards/takashicompany/minidivide/rules.mk b/keyboards/takashicompany/minidivide/rules.mk index 7ff128fa692e..0870b85478c1 100644 --- a/keyboards/takashicompany/minidivide/rules.mk +++ b/keyboards/takashicompany/minidivide/rules.mk @@ -1 +1,4 @@ -# This file intentionally left blank \ No newline at end of file +# This file intentionally left blank + +LTO_ENABLE = yes +OLED_ENABLE = yes \ No newline at end of file From a5bc84613981dcc21b1e11c9a40c5846bfb07cf1 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Wed, 19 Apr 2023 01:41:10 +0900 Subject: [PATCH 14/33] Update keyboards/takashicompany/minidivide/config.h Co-authored-by: Ryan --- keyboards/takashicompany/minidivide/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/takashicompany/minidivide/config.h b/keyboards/takashicompany/minidivide/config.h index 3bc5608b3fa4..44e7988853c9 100644 --- a/keyboards/takashicompany/minidivide/config.h +++ b/keyboards/takashicompany/minidivide/config.h @@ -8,7 +8,6 @@ #define MATRIX_ROW_PINS_RIGHT { F4, F5, F6, F7 } #define MATRIX_COL_PINS_RIGHT { B4, E6, D7, C6, D4 } #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 10 # define RGBLED_SPLIT { 5, 5 } # define RGBLIGHT_HUE_STEP 8 From 00570dbd84d86a34e2cf807c93c5e51dd4eb037c Mon Sep 17 00:00:00 2001 From: takashicompany Date: Wed, 19 Apr 2023 01:41:19 +0900 Subject: [PATCH 15/33] Update keyboards/takashicompany/minidivide/config.h Co-authored-by: Ryan --- keyboards/takashicompany/minidivide/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/takashicompany/minidivide/config.h b/keyboards/takashicompany/minidivide/config.h index 44e7988853c9..ba292cf2c6a9 100644 --- a/keyboards/takashicompany/minidivide/config.h +++ b/keyboards/takashicompany/minidivide/config.h @@ -25,7 +25,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* From 9b3187ce959a8db6f65f68ed9558c7955bdd38a4 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Mon, 8 May 2023 00:22:33 +0900 Subject: [PATCH 16/33] fix json --- keyboards/takashicompany/minidivide/info.json | 402 ++++++++++-------- 1 file changed, 220 insertions(+), 182 deletions(-) diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index 57db3b92af05..6440ca939a53 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -28,270 +28,308 @@ "LAYOUT": { "layout": [ { - "label": "0,2", - "x": 1.68, - "y": 0, - "w": 0.84, - "h": 0.84 + "matrix": [ + 0, + 0 + ], + "x": 0, + "y": 0.42 }, { - "label": "4,2", - "x": 7.98, - "y": 0, - "w": 0.84, - "h": 0.84 + "matrix": [ + 0, + 1 + ], + "x": 0.84, + "y": 0.21 }, { - "label": "0,1", - "x": 0.84, - "y": 0.21, - "w": 0.84, - "h": 0.84 + "matrix": [ + 0, + 2 + ], + "x": 1.68, + "y": 0 }, { - "label": "0,3", + "matrix": [ + 0, + 3 + ], "x": 2.52, - "y": 0.21, - "w": 0.84, - "h": 0.84 + "y": 0.21 }, { - "label": "4,1", - "x": 7.14, - "y": 0.21, - "w": 0.84, - "h": 0.84 + "matrix": [ + 0, + 4 + ], + "x": 3.36, + "y": 0.42 }, { - "label": "4,3", - "x": 8.82, - "y": 0.21, - "w": 0.84, - "h": 0.84 + "matrix": [ + 4, + 0 + ], + "x": 6.3, + "y": 0.42 }, { - "label": "0,0", - "x": 0, - "y": 0.42, - "w": 0.84, - "h": 0.84 + "matrix": [ + 4, + 1 + ], + "x": 7.14, + "y": 0.21 }, { - "label": "0,4", - "x": 3.36, - "y": 0.42, - "w": 0.84, - "h": 0.84 + "matrix": [ + 4, + 2 + ], + "x": 7.98, + "y": 0 }, { - "label": "4,0", - "x": 6.3, - "y": 0.42, - "w": 0.84, - "h": 0.84 + "matrix": [ + 4, + 3 + ], + "x": 8.82, + "y": 0.21 }, { - "label": "4,4", + "matrix": [ + 4, + 4 + ], "x": 9.66, - "y": 0.42, - "w": 0.84, - "h": 0.84 + "y": 0.42 }, { - "label": "1,2", - "x": 1.68, - "y": 0.84, - "w": 0.84, - "h": 0.84 + "matrix": [ + 1, + 0 + ], + "x": 0, + "y": 1.26 }, { - "label": "5,2", - "x": 7.98, - "y": 0.84, - "w": 0.84, - "h": 0.84 + "matrix": [ + 1, + 1 + ], + "x": 0.84, + "y": 1.05 }, { - "label": "1,1", - "x": 0.84, - "y": 1.05, - "w": 0.84, - "h": 0.84 + "matrix": [ + 1, + 2 + ], + "x": 1.68, + "y": 0.8400001 }, { - "label": "1,3", + "matrix": [ + 1, + 3 + ], "x": 2.52, - "y": 1.05, - "w": 0.84, - "h": 0.84 + "y": 1.05 }, { - "label": "5,1", - "x": 7.14, - "y": 1.05, - "w": 0.84, - "h": 0.84 + "matrix": [ + 1, + 4 + ], + "x": 3.36, + "y": 1.26 }, { - "label": "5,3", - "x": 8.82, - "y": 1.05, - "w": 0.84, - "h": 0.84 + "matrix": [ + 5, + 0 + ], + "x": 6.3, + "y": 1.26 }, { - "label": "1,0", - "x": 0, - "y": 1.26, - "w": 0.84, - "h": 0.84 + "matrix": [ + 5, + 1 + ], + "x": 7.14, + "y": 1.05 }, { - "label": "1,4", - "x": 3.36, - "y": 1.26, - "w": 0.84, - "h": 0.84 + "matrix": [ + 5, + 2 + ], + "x": 7.98, + "y": 0.8400001 }, { - "label": "5,0", - "x": 6.3, - "y": 1.26, - "w": 0.84, - "h": 0.84 + "matrix": [ + 5, + 3 + ], + "x": 8.82, + "y": 1.05 }, { - "label": "5,4", + "matrix": [ + 5, + 4 + ], "x": 9.66, - "y": 1.26, - "w": 0.84, - "h": 0.84 + "y": 1.26 }, { - "label": "2,2", - "x": 1.68, - "y": 1.68, - "w": 0.84, - "h": 0.84 + "matrix": [ + 2, + 0 + ], + "x": 0, + "y": 2.10 }, { - "label": "6,2", - "x": 7.98, - "y": 1.68, - "w": 0.84, - "h": 0.84 + "matrix": [ + 2, + 1 + ], + "x": 0.84, + "y": 1.89 }, { - "label": "2,1", - "x": 0.84, - "y": 1.89, - "w": 0.84, - "h": 0.84 + "matrix": [ + 2, + 2 + ], + "x": 1.68, + "y": 1.68 }, { - "label": "2,3", + "matrix": [ + 2, + 3 + ], "x": 2.52, - "y": 1.89, - "w": 0.84, - "h": 0.84 + "y": 1.89 }, { - "label": "6,1", - "x": 7.14, - "y": 1.89, - "w": 0.84, - "h": 0.84 + "matrix": [ + 2, + 4 + ], + "x": 3.36, + "y": 2.10 }, { - "label": "6,3", - "x": 8.82, - "y": 1.89, - "w": 0.84, - "h": 0.84 + "matrix": [ + 6, + 0 + ], + "x": 6.3, + "y": 2.10 }, { - "label": "2,0", - "x": 0, - "y": 2.1, - "w": 0.84, - "h": 0.84 + "matrix": [ + 6, + 1 + ], + "x": 7.14, + "y": 1.89 }, { - "label": "2,4", - "x": 3.36, - "y": 2.1, - "w": 0.84, - "h": 0.84 + "matrix": [ + 6, + 2 + ], + "x": 7.98, + "y": 1.68 }, { - "label": "6,0", - "x": 6.3, - "y": 2.1, - "w": 0.84, - "h": 0.84 + "matrix": [ + 6, + 3 + ], + "x": 8.82, + "y": 1.89 }, { - "label": "6,4", + "matrix": [ + 6, + 4 + ], "x": 9.66, - "y": 2.1, - "w": 0.84, - "h": 0.84 + "y": 2.10 + }, + { + "matrix": [ + 3, + 1 + ], + "x": 1.68, + "y": 3.15 }, { - "label": "3,2", + "matrix": [ + 3, + 2 + ], "x": 2.52, - "y": 3.15, - "w": 0.84, - "h": 0.84 + "y": 3.15 }, { - "label": "3,3", + "matrix": [ + 3, + 3 + ], "x": 3.36, - "y": 3.15, - "w": 0.84, - "h": 0.84 + "y": 3.15 }, { - "label": "3,4", + "matrix": [ + 3, + 4 + ], "x": 4.2, - "y": 3.15, - "w": 0.84, - "h": 0.84 + "y": 3.15 }, { - "label": "7,1", + "matrix": [ + 7, + 0 + ], + "x": 5.46, + "y": 3.15 + }, + { + "matrix": [ + 7, + 1 + ], "x": 6.3, - "y": 3.15, - "w": 0.84, - "h": 0.84 + "y": 3.15 }, { - "label": "7,2", + "matrix": [ + 7, + 2 + ], "x": 7.14, - "y": 3.15, - "w": 0.84, - "h": 0.84 + "y": 3.15 }, { - "label": "7,3", + "matrix": [ + 7, + 3 + ], "x": 7.98, - "y": 3.15, - "w": 0.84, - "h": 0.84 - }, - { - "label": "3,1", - "x": 1.68, - "y": 3.15, - "w": 0.84, - "h": 0.84 - }, - { - "label": "7,0", - "x": 5.46, - "y": 3.15, - "w": 0.84, - "h": 0.84 + "y": 3.15 } ] } From 8c9fde62b6563d28a1aed0159f9515633ca8412b Mon Sep 17 00:00:00 2001 From: takashicompany Date: Mon, 8 May 2023 00:27:47 +0900 Subject: [PATCH 17/33] remove LAYOUT define --- .../takashicompany/minidivide/minidivide.h | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/keyboards/takashicompany/minidivide/minidivide.h b/keyboards/takashicompany/minidivide/minidivide.h index a8375d6d2da1..18748ccf042c 100644 --- a/keyboards/takashicompany/minidivide/minidivide.h +++ b/keyboards/takashicompany/minidivide/minidivide.h @@ -3,30 +3,3 @@ #pragma once #include "quantum.h" - -#define XXX KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - l01, l02, l03, l04, l05, r01, r02, r03, r04, r05, \ - l06, l07, l08, l09, l10, r06, r07, r08, r09, r10, \ - l11, l12, l13, l14, l15, r11, r12, r13, r14, r15, \ - l16, l17, l18, l19, r16, r17, r18, r19 \ -) { \ - { l01, l02, l03, l04, l05 }, \ - { l06, l07, l08, l09, l10 }, \ - { l11, l12, l13, l14, l15 }, \ - { XXX, l16, l17, l18, l19 }, \ - { r01, r02, r03, r04, r05 }, \ - { r06, r07, r08, r09, r10 }, \ - { r11, r12, r13, r14, r15 }, \ - { r16, r17, r18, r19, XXX } \ -} - From 337013dabe982a4825cd6dcbf0a06c5dc67d28a2 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Tue, 9 May 2023 12:12:31 +0900 Subject: [PATCH 18/33] Update keyboards/takashicompany/minidivide/minidivide.c Co-authored-by: Ryan --- keyboards/takashicompany/minidivide/minidivide.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/takashicompany/minidivide/minidivide.c b/keyboards/takashicompany/minidivide/minidivide.c index 815c619d8136..6fcbed80db4b 100644 --- a/keyboards/takashicompany/minidivide/minidivide.c +++ b/keyboards/takashicompany/minidivide/minidivide.c @@ -1,7 +1,7 @@ // Copyright 2023 takashicompany (@takashicompany) // SPDX-License-Identifier: GPL-2.0-or-later -#include "minidivide.h" +#include "quantum.h" #ifdef OLED_ENABLE From 5985b1cb0656ac438f70474e80c71b0e9598a35e Mon Sep 17 00:00:00 2001 From: takashicompany Date: Tue, 9 May 2023 12:13:29 +0900 Subject: [PATCH 19/33] Delete minidivide.h --- keyboards/takashicompany/minidivide/minidivide.h | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 keyboards/takashicompany/minidivide/minidivide.h diff --git a/keyboards/takashicompany/minidivide/minidivide.h b/keyboards/takashicompany/minidivide/minidivide.h deleted file mode 100644 index 18748ccf042c..000000000000 --- a/keyboards/takashicompany/minidivide/minidivide.h +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2023 takashicompany (@takashicompany) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include "quantum.h" From d18fce114e53102ae547e64ed9c6a3f98951c8a5 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Thu, 11 May 2023 00:04:58 +0900 Subject: [PATCH 20/33] format json --- keyboards/takashicompany/minidivide/info.json | 354 +++--------------- 1 file changed, 44 insertions(+), 310 deletions(-) diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index 6440ca939a53..7a200609ae77 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -14,323 +14,57 @@ "rgblight": true }, "processor": "atmega32u4", - "url": "", - "usb": { - "vid": "0x7463", - "pid": "0x0037", - "device_version": "0.0.1" - }, "split": { "enabled": true, "soft_serial_pin": "D2" }, + "url": "", + "usb": { + "device_version": "0.0.1", + "pid": "0x0037", + "vid": "0x7463" + }, "layouts": { "LAYOUT": { "layout": [ - { - "matrix": [ - 0, - 0 - ], - "x": 0, - "y": 0.42 - }, - { - "matrix": [ - 0, - 1 - ], - "x": 0.84, - "y": 0.21 - }, - { - "matrix": [ - 0, - 2 - ], - "x": 1.68, - "y": 0 - }, - { - "matrix": [ - 0, - 3 - ], - "x": 2.52, - "y": 0.21 - }, - { - "matrix": [ - 0, - 4 - ], - "x": 3.36, - "y": 0.42 - }, - { - "matrix": [ - 4, - 0 - ], - "x": 6.3, - "y": 0.42 - }, - { - "matrix": [ - 4, - 1 - ], - "x": 7.14, - "y": 0.21 - }, - { - "matrix": [ - 4, - 2 - ], - "x": 7.98, - "y": 0 - }, - { - "matrix": [ - 4, - 3 - ], - "x": 8.82, - "y": 0.21 - }, - { - "matrix": [ - 4, - 4 - ], - "x": 9.66, - "y": 0.42 - }, - { - "matrix": [ - 1, - 0 - ], - "x": 0, - "y": 1.26 - }, - { - "matrix": [ - 1, - 1 - ], - "x": 0.84, - "y": 1.05 - }, - { - "matrix": [ - 1, - 2 - ], - "x": 1.68, - "y": 0.8400001 - }, - { - "matrix": [ - 1, - 3 - ], - "x": 2.52, - "y": 1.05 - }, - { - "matrix": [ - 1, - 4 - ], - "x": 3.36, - "y": 1.26 - }, - { - "matrix": [ - 5, - 0 - ], - "x": 6.3, - "y": 1.26 - }, - { - "matrix": [ - 5, - 1 - ], - "x": 7.14, - "y": 1.05 - }, - { - "matrix": [ - 5, - 2 - ], - "x": 7.98, - "y": 0.8400001 - }, - { - "matrix": [ - 5, - 3 - ], - "x": 8.82, - "y": 1.05 - }, - { - "matrix": [ - 5, - 4 - ], - "x": 9.66, - "y": 1.26 - }, - { - "matrix": [ - 2, - 0 - ], - "x": 0, - "y": 2.10 - }, - { - "matrix": [ - 2, - 1 - ], - "x": 0.84, - "y": 1.89 - }, - { - "matrix": [ - 2, - 2 - ], - "x": 1.68, - "y": 1.68 - }, - { - "matrix": [ - 2, - 3 - ], - "x": 2.52, - "y": 1.89 - }, - { - "matrix": [ - 2, - 4 - ], - "x": 3.36, - "y": 2.10 - }, - { - "matrix": [ - 6, - 0 - ], - "x": 6.3, - "y": 2.10 - }, - { - "matrix": [ - 6, - 1 - ], - "x": 7.14, - "y": 1.89 - }, - { - "matrix": [ - 6, - 2 - ], - "x": 7.98, - "y": 1.68 - }, - { - "matrix": [ - 6, - 3 - ], - "x": 8.82, - "y": 1.89 - }, - { - "matrix": [ - 6, - 4 - ], - "x": 9.66, - "y": 2.10 - }, - { - "matrix": [ - 3, - 1 - ], - "x": 1.68, - "y": 3.15 - }, - { - "matrix": [ - 3, - 2 - ], - "x": 2.52, - "y": 3.15 - }, - { - "matrix": [ - 3, - 3 - ], - "x": 3.36, - "y": 3.15 - }, - { - "matrix": [ - 3, - 4 - ], - "x": 4.2, - "y": 3.15 - }, - { - "matrix": [ - 7, - 0 - ], - "x": 5.46, - "y": 3.15 - }, - { - "matrix": [ - 7, - 1 - ], - "x": 6.3, - "y": 3.15 - }, - { - "matrix": [ - 7, - 2 - ], - "x": 7.14, - "y": 3.15 - }, - { - "matrix": [ - 7, - 3 - ], - "x": 7.98, - "y": 3.15 - } + { "matrix": [0, 0], "x": 0, "y": 0.42 }, + { "matrix": [0, 1], "x": 0.84, "y": 0.21 }, + { "matrix": [0, 2], "x": 1.68, "y": 0 }, + { "matrix": [0, 3], "x": 2.52, "y": 0.21 }, + { "matrix": [0, 4], "x": 3.36, "y": 0.42 }, + { "matrix": [4, 0], "x": 6.3, "y": 0.42 }, + { "matrix": [4, 1], "x": 7.14, "y": 0.21 }, + { "matrix": [4, 2], "x": 7.98, "y": 0 }, + { "matrix": [4, 3], "x": 8.82, "y": 0.21 }, + { "matrix": [4, 4], "x": 9.66, "y": 0.42 }, + { "matrix": [1, 0], "x": 0, "y": 1.26 }, + { "matrix": [1, 1], "x": 0.84, "y": 1.05 }, + { "matrix": [1, 2], "x": 1.68, "y": 0.84 }, + { "matrix": [1, 3], "x": 2.52, "y": 1.05 }, + { "matrix": [1, 4], "x": 3.36, "y": 1.26 }, + { "matrix": [5, 0], "x": 6.3, "y": 1.26 }, + { "matrix": [5, 1], "x": 7.14, "y": 1.05 }, + { "matrix": [5, 2], "x": 7.98, "y": 0.84 }, + { "matrix": [5, 3], "x": 8.82, "y": 1.05 }, + { "matrix": [5, 4], "x": 9.66, "y": 1.26 }, + { "matrix": [2, 0], "x": 0, "y": 2.1 }, + { "matrix": [2, 1], "x": 0.84, "y": 1.89 }, + { "matrix": [2, 2], "x": 1.68, "y": 1.68 }, + { "matrix": [2, 3], "x": 2.52, "y": 1.89 }, + { "matrix": [2, 4], "x": 3.36, "y": 2.1 }, + { "matrix": [6, 0], "x": 6.3, "y": 2.1 }, + { "matrix": [6, 1], "x": 7.14, "y": 1.89 }, + { "matrix": [6, 2], "x": 7.98, "y": 1.68 }, + { "matrix": [6, 3], "x": 8.82, "y": 1.89 }, + { "matrix": [6, 4], "x": 9.66, "y": 2.1 }, + { "matrix": [3, 1], "x": 1.68, "y": 3.15 }, + { "matrix": [3, 2], "x": 2.52, "y": 3.15 }, + { "matrix": [3, 3], "x": 3.36, "y": 3.15 }, + { "matrix": [3, 4], "x": 4.2, "y": 3.15 }, + { "matrix": [7, 0], "x": 5.46, "y": 3.15 }, + { "matrix": [7, 1], "x": 6.3, "y": 3.15 }, + { "matrix": [7, 2], "x": 7.14, "y": 3.15 }, + { "matrix": [7, 3], "x": 7.98, "y": 3.15 } ] } } From d304a16e1420a654618c5c72e601e282f71f1087 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 12 May 2023 03:13:52 +0900 Subject: [PATCH 21/33] Update keyboards/takashicompany/minidivide/rules.mk Co-authored-by: Joel Challis --- keyboards/takashicompany/minidivide/rules.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/takashicompany/minidivide/rules.mk b/keyboards/takashicompany/minidivide/rules.mk index 0870b85478c1..7ff128fa692e 100644 --- a/keyboards/takashicompany/minidivide/rules.mk +++ b/keyboards/takashicompany/minidivide/rules.mk @@ -1,4 +1 @@ -# This file intentionally left blank - -LTO_ENABLE = yes -OLED_ENABLE = yes \ No newline at end of file +# This file intentionally left blank \ No newline at end of file From d81f8fdd893345696f06f9b4c745b32cd0c10329 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 12 May 2023 03:14:17 +0900 Subject: [PATCH 22/33] Update keyboards/takashicompany/minidivide/info.json Co-authored-by: Joel Challis --- keyboards/takashicompany/minidivide/info.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index 7a200609ae77..51b07f75cfc6 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -11,7 +11,8 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgblight": true + "rgblight": true, + "oled": true }, "processor": "atmega32u4", "split": { From 5d34e9d9d65b0a52273173602241b51fd884e411 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 12 May 2023 03:14:30 +0900 Subject: [PATCH 23/33] Update keyboards/takashicompany/minidivide/info.json Co-authored-by: Joel Challis --- keyboards/takashicompany/minidivide/info.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index 51b07f75cfc6..25fabee8ecad 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -2,7 +2,10 @@ "manufacturer": "takashicompany", "keyboard_name": "miniDivide", "maintainer": "takashicompany", - "bootloader": "caterina", + "build": { + "lto": true + }, + "development_board": "promicro", "diode_direction": "COL2ROW", "features": { "bootmagic": true, From a9a91e9dba38a160d2985a012ff458bfce88505d Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 12 May 2023 03:14:38 +0900 Subject: [PATCH 24/33] Update keyboards/takashicompany/minidivide/info.json Co-authored-by: Joel Challis --- keyboards/takashicompany/minidivide/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index 25fabee8ecad..29e13f6fe797 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -17,7 +17,6 @@ "rgblight": true, "oled": true }, - "processor": "atmega32u4", "split": { "enabled": true, "soft_serial_pin": "D2" From 6ef86448e15a16b0fe9a5ad9617ff12908ac6425 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 16 Jun 2023 01:05:46 +0900 Subject: [PATCH 25/33] fix led --- keyboards/takashicompany/minidivide/config.h | 1 - keyboards/takashicompany/minidivide/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/takashicompany/minidivide/config.h b/keyboards/takashicompany/minidivide/config.h index ba292cf2c6a9..d7628f959272 100644 --- a/keyboards/takashicompany/minidivide/config.h +++ b/keyboards/takashicompany/minidivide/config.h @@ -7,7 +7,6 @@ #define MATRIX_COL_PINS { D4, C6, D7, E6, B4 } #define MATRIX_ROW_PINS_RIGHT { F4, F5, F6, F7 } #define MATRIX_COL_PINS_RIGHT { B4, E6, D7, C6, D4 } -#define RGB_DI_PIN D3 # define RGBLED_NUM 10 # define RGBLED_SPLIT { 5, 5 } # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index 29e13f6fe797..e461af0d6ec9 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -27,6 +27,9 @@ "pid": "0x0037", "vid": "0x7463" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ From 947a88a086c4872f62890c3187ceeee270990b79 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 23 Jun 2023 10:32:05 +0900 Subject: [PATCH 26/33] Update keyboards/takashicompany/minidivide/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/takashicompany/minidivide/config.h | 34 -------------------- 1 file changed, 34 deletions(-) diff --git a/keyboards/takashicompany/minidivide/config.h b/keyboards/takashicompany/minidivide/config.h index d7628f959272..88184e7fe9d0 100644 --- a/keyboards/takashicompany/minidivide/config.h +++ b/keyboards/takashicompany/minidivide/config.h @@ -7,37 +7,3 @@ #define MATRIX_COL_PINS { D4, C6, D7, E6, B4 } #define MATRIX_ROW_PINS_RIGHT { F4, F5, F6, F7 } #define MATRIX_COL_PINS_RIGHT { B4, E6, D7, C6, D4 } -# define RGBLED_NUM 10 -# define RGBLED_SPLIT { 5, 5 } -# define RGBLIGHT_HUE_STEP 8 -# define RGBLIGHT_SAT_STEP 8 -# define RGBLIGHT_VAL_STEP 8 -# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - - -/* - * 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 From f477fe1a69d33f3fd7973ded984b350a164ca56a Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 23 Jun 2023 10:32:30 +0900 Subject: [PATCH 27/33] Update keyboards/takashicompany/minidivide/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/takashicompany/minidivide/info.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index e461af0d6ec9..152c1ea19a26 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -30,6 +30,23 @@ "ws2812": { "pin": "D3" }, + "rgblight": { + "led_count": 10, + "split_count": [5, 5], + "sleep": true, + "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": [ From 2135919d94aa37fe05714b67361e7d0e65065b56 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Fri, 23 Jun 2023 10:32:44 +0900 Subject: [PATCH 28/33] Update keyboards/takashicompany/minidivide/minidivide.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/takashicompany/minidivide/minidivide.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/takashicompany/minidivide/minidivide.c b/keyboards/takashicompany/minidivide/minidivide.c index 6fcbed80db4b..abdb91fc47e8 100644 --- a/keyboards/takashicompany/minidivide/minidivide.c +++ b/keyboards/takashicompany/minidivide/minidivide.c @@ -13,7 +13,9 @@ oled_rotation_t oled_init_kb(oled_rotation_t rotation) { static uint16_t press_count = 0; bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - + if (!process_record_user(keycode, record)) { + return false; + } // Increment the counter when a key is pressed if (record->event.pressed) { press_count++; From 9fe7598e488338d986d9327bf9e8850be6a65706 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sat, 1 Jul 2023 16:34:41 +0900 Subject: [PATCH 29/33] Execute qmk info -f json -kb takashicompany/minidivide --- keyboards/takashicompany/minidivide/info.json | 128 ++++++++++-------- 1 file changed, 72 insertions(+), 56 deletions(-) diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index 152c1ea19a26..1395dd72c66b 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -2,6 +2,7 @@ "manufacturer": "takashicompany", "keyboard_name": "miniDivide", "maintainer": "takashicompany", + "bootloader": "caterina", "build": { "lto": true }, @@ -14,26 +15,16 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgblight": true, - "oled": true + "oled": true, + "rgblight": true }, - "split": { - "enabled": true, - "soft_serial_pin": "D2" - }, - "url": "", - "usb": { - "device_version": "0.0.1", - "pid": "0x0037", - "vid": "0x7463" - }, - "ws2812": { - "pin": "D3" + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4"], + "rows": ["F4", "F5", "F6", "F7"] }, + "pin_compatible": "promicro", + "processor": "atmega32u4", "rgblight": { - "led_count": 10, - "split_count": [5, 5], - "sleep": true, "animations": { "alternating": true, "breathing": true, @@ -45,50 +36,75 @@ "snake": true, "static_gradient": true, "twinkle": true + }, + "led_count": 10, + "sleep": true, + "split_count": [5, 5] + }, + "split": { + "enabled": true, + "matrix_pins": { + "right": { + "cols": ["B4", "E6", "D7", "C6", "D4"], + "rows": ["F4", "F5", "F6", "F7"] + } + }, + "soft_serial_pin": "D2", + "transport": { + "protocol": "serial" } }, + "url": "", + "usb": { + "device_version": "0.0.1", + "pid": "0x0037", + "vid": "0x7463" + }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0.42 }, - { "matrix": [0, 1], "x": 0.84, "y": 0.21 }, - { "matrix": [0, 2], "x": 1.68, "y": 0 }, - { "matrix": [0, 3], "x": 2.52, "y": 0.21 }, - { "matrix": [0, 4], "x": 3.36, "y": 0.42 }, - { "matrix": [4, 0], "x": 6.3, "y": 0.42 }, - { "matrix": [4, 1], "x": 7.14, "y": 0.21 }, - { "matrix": [4, 2], "x": 7.98, "y": 0 }, - { "matrix": [4, 3], "x": 8.82, "y": 0.21 }, - { "matrix": [4, 4], "x": 9.66, "y": 0.42 }, - { "matrix": [1, 0], "x": 0, "y": 1.26 }, - { "matrix": [1, 1], "x": 0.84, "y": 1.05 }, - { "matrix": [1, 2], "x": 1.68, "y": 0.84 }, - { "matrix": [1, 3], "x": 2.52, "y": 1.05 }, - { "matrix": [1, 4], "x": 3.36, "y": 1.26 }, - { "matrix": [5, 0], "x": 6.3, "y": 1.26 }, - { "matrix": [5, 1], "x": 7.14, "y": 1.05 }, - { "matrix": [5, 2], "x": 7.98, "y": 0.84 }, - { "matrix": [5, 3], "x": 8.82, "y": 1.05 }, - { "matrix": [5, 4], "x": 9.66, "y": 1.26 }, - { "matrix": [2, 0], "x": 0, "y": 2.1 }, - { "matrix": [2, 1], "x": 0.84, "y": 1.89 }, - { "matrix": [2, 2], "x": 1.68, "y": 1.68 }, - { "matrix": [2, 3], "x": 2.52, "y": 1.89 }, - { "matrix": [2, 4], "x": 3.36, "y": 2.1 }, - { "matrix": [6, 0], "x": 6.3, "y": 2.1 }, - { "matrix": [6, 1], "x": 7.14, "y": 1.89 }, - { "matrix": [6, 2], "x": 7.98, "y": 1.68 }, - { "matrix": [6, 3], "x": 8.82, "y": 1.89 }, - { "matrix": [6, 4], "x": 9.66, "y": 2.1 }, - { "matrix": [3, 1], "x": 1.68, "y": 3.15 }, - { "matrix": [3, 2], "x": 2.52, "y": 3.15 }, - { "matrix": [3, 3], "x": 3.36, "y": 3.15 }, - { "matrix": [3, 4], "x": 4.2, "y": 3.15 }, - { "matrix": [7, 0], "x": 5.46, "y": 3.15 }, - { "matrix": [7, 1], "x": 6.3, "y": 3.15 }, - { "matrix": [7, 2], "x": 7.14, "y": 3.15 }, - { "matrix": [7, 3], "x": 7.98, "y": 3.15 } + {"matrix": [0, 0], "x": 0, "y": 0.42}, + {"matrix": [0, 1], "x": 0.84, "y": 0.21}, + {"matrix": [0, 2], "x": 1.68, "y": 0}, + {"matrix": [0, 3], "x": 2.52, "y": 0.21}, + {"matrix": [0, 4], "x": 3.36, "y": 0.42}, + {"matrix": [4, 0], "x": 6.3, "y": 0.42}, + {"matrix": [4, 1], "x": 7.14, "y": 0.21}, + {"matrix": [4, 2], "x": 7.98, "y": 0}, + {"matrix": [4, 3], "x": 8.82, "y": 0.21}, + {"matrix": [4, 4], "x": 9.66, "y": 0.42}, + {"matrix": [1, 0], "x": 0, "y": 1.26}, + {"matrix": [1, 1], "x": 0.84, "y": 1.05}, + {"matrix": [1, 2], "x": 1.68, "y": 0.84}, + {"matrix": [1, 3], "x": 2.52, "y": 1.05}, + {"matrix": [1, 4], "x": 3.36, "y": 1.26}, + {"matrix": [5, 0], "x": 6.3, "y": 1.26}, + {"matrix": [5, 1], "x": 7.14, "y": 1.05}, + {"matrix": [5, 2], "x": 7.98, "y": 0.84}, + {"matrix": [5, 3], "x": 8.82, "y": 1.05}, + {"matrix": [5, 4], "x": 9.66, "y": 1.26}, + {"matrix": [2, 0], "x": 0, "y": 2.1}, + {"matrix": [2, 1], "x": 0.84, "y": 1.89}, + {"matrix": [2, 2], "x": 1.68, "y": 1.68}, + {"matrix": [2, 3], "x": 2.52, "y": 1.89}, + {"matrix": [2, 4], "x": 3.36, "y": 2.1}, + {"matrix": [6, 0], "x": 6.3, "y": 2.1}, + {"matrix": [6, 1], "x": 7.14, "y": 1.89}, + {"matrix": [6, 2], "x": 7.98, "y": 1.68}, + {"matrix": [6, 3], "x": 8.82, "y": 1.89}, + {"matrix": [6, 4], "x": 9.66, "y": 2.1}, + {"matrix": [3, 1], "x": 1.68, "y": 3.15}, + {"matrix": [3, 2], "x": 2.52, "y": 3.15}, + {"matrix": [3, 3], "x": 3.36, "y": 3.15}, + {"matrix": [3, 4], "x": 4.2, "y": 3.15}, + {"matrix": [7, 0], "x": 5.46, "y": 3.15}, + {"matrix": [7, 1], "x": 6.3, "y": 3.15}, + {"matrix": [7, 2], "x": 7.14, "y": 3.15}, + {"matrix": [7, 3], "x": 7.98, "y": 3.15} ] } } -} \ No newline at end of file +} From 22960cb2090f2b15f5c4016bf00daa3aac1976f6 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sat, 1 Jul 2023 16:39:33 +0900 Subject: [PATCH 30/33] Delete config.h --- keyboards/takashicompany/minidivide/config.h | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 keyboards/takashicompany/minidivide/config.h diff --git a/keyboards/takashicompany/minidivide/config.h b/keyboards/takashicompany/minidivide/config.h deleted file mode 100644 index 88184e7fe9d0..000000000000 --- a/keyboards/takashicompany/minidivide/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2023 takashicompany (@takashicompany) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_ROW_PINS_RIGHT { F4, F5, F6, F7 } -#define MATRIX_COL_PINS_RIGHT { B4, E6, D7, C6, D4 } From 8d45f1652d726896f565eeaa5526f10063c9c9e8 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sat, 8 Jul 2023 01:31:26 +0900 Subject: [PATCH 31/33] Update keyboards/takashicompany/minidivide/info.json Co-authored-by: Drashna Jaelre --- keyboards/takashicompany/minidivide/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index 1395dd72c66b..1a74b8b2ec30 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -2,7 +2,6 @@ "manufacturer": "takashicompany", "keyboard_name": "miniDivide", "maintainer": "takashicompany", - "bootloader": "caterina", "build": { "lto": true }, From acd4c4b5179e052a7a17b6825918e43350fae9f5 Mon Sep 17 00:00:00 2001 From: takashicompany Date: Sat, 8 Jul 2023 01:31:36 +0900 Subject: [PATCH 32/33] Update keyboards/takashicompany/minidivide/info.json Co-authored-by: Drashna Jaelre --- keyboards/takashicompany/minidivide/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index 1a74b8b2ec30..c3b3039fd964 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -22,7 +22,6 @@ "rows": ["F4", "F5", "F6", "F7"] }, "pin_compatible": "promicro", - "processor": "atmega32u4", "rgblight": { "animations": { "alternating": true, From e4623b73db48bcf436979548ccd72cda07c659e0 Mon Sep 17 00:00:00 2001 From: jack <0x6a73@protonmail.com> Date: Wed, 12 Jul 2023 09:16:34 -0600 Subject: [PATCH 33/33] Update keyboards/takashicompany/minidivide/info.json --- keyboards/takashicompany/minidivide/info.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/info.json index c3b3039fd964..2234cd9b39e6 100644 --- a/keyboards/takashicompany/minidivide/info.json +++ b/keyboards/takashicompany/minidivide/info.json @@ -47,10 +47,7 @@ "rows": ["F4", "F5", "F6", "F7"] } }, - "soft_serial_pin": "D2", - "transport": { - "protocol": "serial" - } + "soft_serial_pin": "D2" }, "url": "", "usb": {