From a04add8bf60d349ffc794803d9dbf459a211b058 Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Tue, 21 Jan 2025 22:13:44 +1300 Subject: [PATCH 01/20] Add lily58 koca to keyboards --- keyboards/lily58_koca/board.h | 6 + keyboards/lily58_koca/config.h | 10 ++ keyboards/lily58_koca/halconf.h | 3 + keyboards/lily58_koca/keyboard.json | 126 ++++++++++++++++++ .../lily58_koca/keymaps/default/keymap.c | 110 +++++++++++++++ .../lily58_koca/keymaps/default/rules.mk | 3 + keyboards/lily58_koca/mcuconf.h | 9 ++ keyboards/lily58_koca/readme.md | 27 ++++ 8 files changed, 294 insertions(+) create mode 100644 keyboards/lily58_koca/board.h create mode 100644 keyboards/lily58_koca/config.h create mode 100644 keyboards/lily58_koca/halconf.h create mode 100644 keyboards/lily58_koca/keyboard.json create mode 100644 keyboards/lily58_koca/keymaps/default/keymap.c create mode 100644 keyboards/lily58_koca/keymaps/default/rules.mk create mode 100644 keyboards/lily58_koca/mcuconf.h create mode 100644 keyboards/lily58_koca/readme.md diff --git a/keyboards/lily58_koca/board.h b/keyboards/lily58_koca/board.h new file mode 100644 index 000000000000..b47deb853347 --- /dev/null +++ b/keyboards/lily58_koca/board.h @@ -0,0 +1,6 @@ +#pragma once + +#include_next "board.h" + +#undef STM32_HSECLK +#define STM32_HSECLK 12000000 \ No newline at end of file diff --git a/keyboards/lily58_koca/config.h b/keyboards/lily58_koca/config.h new file mode 100644 index 000000000000..98cdfad8df05 --- /dev/null +++ b/keyboards/lily58_koca/config.h @@ -0,0 +1,10 @@ +#define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. +#define SERIAL_USART_TX_PIN C10 // USART TX pin +#define SERIAL_USART_RX_PIN C11 // USART RX pin +#define SERIAL_USART_DRIVER SD3 +#define USART3_PARTIALREMAP + +#define SPLIT_HAND_PIN C15 + +// #define MATRIX_ROW_PINS { C12 } +// #define MATRIX_COL_PINS { C7 } \ No newline at end of file diff --git a/keyboards/lily58_koca/halconf.h b/keyboards/lily58_koca/halconf.h new file mode 100644 index 000000000000..0bd60d996e36 --- /dev/null +++ b/keyboards/lily58_koca/halconf.h @@ -0,0 +1,3 @@ +#pragma once +#define HAL_USE_SERIAL TRUE +#include_next \ No newline at end of file diff --git a/keyboards/lily58_koca/keyboard.json b/keyboards/lily58_koca/keyboard.json new file mode 100644 index 000000000000..596b0f86d017 --- /dev/null +++ b/keyboards/lily58_koca/keyboard.json @@ -0,0 +1,126 @@ +{ + "manufacturer": "oxnh", + "keyboard_name": "lil58_koca", + "maintainer": "oxnh", + "bootloader": "stm32duino", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": [ + "A10", "A9", "A8", "C9", "C8", "C7", + "B2", "B13", "B12", "B14", "B15", "C6", + "A6", "A7", "C4", "C5", "B0", "B1", + "B5", + "A0", "A1", "A2", "A3", "A4", "A5", + "C14", "C13", "B7", "B6" + ], + "rows": ["C12"] + }, + "split": { + "enabled": true, + "matrix_pins": { + "right": { + "cols": [ + "A10", "A9", "A8", "C9", "C8", "C7", + "B2", "B13", "B12", "B14", "B15", "C6", + "A6", "A7", "C4", "C5", "B0", "B1", + "C14", + "A0", "A1", "A2", "A3", "A4", "A5", + "C13", "B7", "B6", "B5" + ], + "rows": ["C12"] + } + } + }, + "processor": "STM32F103", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x5106", + "vid": "0x4C17" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [0, 6], "x": 0, "y": 1.5}, + {"matrix": [0, 7], "x": 1, "y": 1.375}, + {"matrix": [0, 8], "x": 2, "y": 1.125}, + {"matrix": [0, 9], "x": 3, "y": 1}, + {"matrix": [0, 10], "x": 4, "y": 1.125}, + {"matrix": [0, 11], "x": 5, "y": 1.25}, + + {"matrix": [0, 12], "x": 0, "y": 2.5}, + {"matrix": [0, 13], "x": 1, "y": 2.375}, + {"matrix": [0, 14], "x": 2, "y": 2.125}, + {"matrix": [0, 15], "x": 3, "y": 2}, + {"matrix": [0, 16], "x": 4, "y": 2.125}, + {"matrix": [0, 17], "x": 5, "y": 2.25}, + + {"matrix": [0, 18], "x": 6, "y": 2.75}, + + {"matrix": [0, 19], "x": 0, "y": 3.5}, + {"matrix": [0, 20], "x": 1, "y": 3.375}, + {"matrix": [0, 21], "x": 2, "y": 3.125}, + {"matrix": [0, 22], "x": 3, "y": 3}, + {"matrix": [0, 23], "x": 4, "y": 3.125}, + {"matrix": [0, 24], "x": 5, "y": 3.25}, + + {"matrix": [0, 25], "x": 2.5, "y": 4.15}, + {"matrix": [0, 26], "x": 3.5, "y": 4.15}, + {"matrix": [0, 27], "x": 4.5, "y": 4.25}, + {"matrix": [0, 28], "x": 6, "y": 4.25, "h": 1.5}, + + + + {"matrix": [1, 0], "x": 10, "y": 0.25}, + {"matrix": [1, 1], "x": 11, "y": 0.125}, + {"matrix": [1, 2], "x": 12, "y": 0}, + {"matrix": [1, 3], "x": 13, "y": 0.125}, + {"matrix": [1, 4], "x": 14, "y": 0.375}, + {"matrix": [1, 5], "x": 15, "y": 0.5}, + + {"matrix": [1, 6], "x": 10, "y": 1.25}, + {"matrix": [1, 7], "x": 11, "y": 1.125}, + {"matrix": [1, 8], "x": 12, "y": 1}, + {"matrix": [1, 9], "x": 13, "y": 1.125}, + {"matrix": [1, 10], "x": 14, "y": 1.375}, + {"matrix": [1, 11], "x": 15, "y": 1.5}, + + {"matrix": [1, 12], "x": 10, "y": 2.25}, + {"matrix": [1, 13], "x": 11, "y": 2.125}, + {"matrix": [1, 14], "x": 12, "y": 2}, + {"matrix": [1, 15], "x": 13, "y": 2.125}, + {"matrix": [1, 16], "x": 14, "y": 2.375}, + {"matrix": [1, 17], "x": 15, "y": 2.5}, + + {"matrix": [1, 18], "x": 9, "y": 2.75}, + + {"matrix": [1, 19], "x": 10, "y": 3.25}, + {"matrix": [1, 20], "x": 11, "y": 3.125}, + {"matrix": [1, 21], "x": 12, "y": 3}, + {"matrix": [1, 22], "x": 13, "y": 3.125}, + {"matrix": [1, 23], "x": 14, "y": 3.375}, + {"matrix": [1, 24], "x": 15, "y": 3.5}, + + {"matrix": [1, 25], "x": 9, "y": 4.25, "h": 1.5}, + {"matrix": [1, 26], "x": 10.5, "y": 4.25}, + {"matrix": [1, 27], "x": 11.5, "y": 4.15}, + {"matrix": [1, 28], "x": 12.5, "y": 4.15} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/lily58_koca/keymaps/default/keymap.c b/keyboards/lily58_koca/keymaps/default/keymap.c new file mode 100644 index 000000000000..8e607f99ec3e --- /dev/null +++ b/keyboards/lily58_koca/keymaps/default/keymap.c @@ -0,0 +1,110 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum layer_number { + _QWERTY = 0, + _LOWER, + _RAISE, + _ADJUST, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* QWERTY + * ,-----------------------------------------. ,-----------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ` | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | - | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |LCTRL | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / |RShift| + * `-----------------------------------------/ / \ \-----------------------------------------' + * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + [_QWERTY] = LAYOUT( + // Left + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LBRC, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, + KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC, + + // Right + KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, + KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_RBRC, + KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_ENT, MO(_RAISE), KC_BSPC, KC_RGUI + ), + + /* LOWER + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ` | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | ~ | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * | | | | | | |-------| |-------| | _ | + | { | } | | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + [_LOWER] = LAYOUT( + // Left + _______, _______, _______, _______, _______, _______, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, + _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, + + // Right + _______, _______, _______, _______, _______, _______, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, + _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______ + ), + + /* RAISE + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | F1 | F2 | F3 | F4 | F5 | F6 |-------. ,-------| | Left | Down | Up |Right | | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * | F7 | F8 | F9 | F10 | F11 | F12 |-------| |-------| + | - | = | [ | ] | \ | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + [_RAISE] = LAYOUT( + // Left + _______, _______, _______, _______, _______, _______, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + _______, + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + _______, _______, _______, _______, + + // Right + _______, _______, _______, _______, _______, _______, + KC_6, KC_7, KC_8, KC_9, KC_0, _______, + XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, + _______, + KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, _______, _______, _______ + ) +}; diff --git a/keyboards/lily58_koca/keymaps/default/rules.mk b/keyboards/lily58_koca/keymaps/default/rules.mk new file mode 100644 index 000000000000..f1dbc61d2d4f --- /dev/null +++ b/keyboards/lily58_koca/keymaps/default/rules.mk @@ -0,0 +1,3 @@ +SERIAL_DRIVER = usart +SPLIT_KEYBOARD = yes +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/lily58_koca/mcuconf.h b/keyboards/lily58_koca/mcuconf.h new file mode 100644 index 000000000000..cbbf9fd5ab86 --- /dev/null +++ b/keyboards/lily58_koca/mcuconf.h @@ -0,0 +1,9 @@ +#pragma once + +#include_next + +#undef STM32_SERIAL_USE_USART3 +#define STM32_SERIAL_USE_USART3 TRUE + +#undef STM32_PLLMUL_VALUE +#define STM32_PLLMUL_VALUE 6 \ No newline at end of file diff --git a/keyboards/lily58_koca/readme.md b/keyboards/lily58_koca/readme.md new file mode 100644 index 000000000000..8bd619113d00 --- /dev/null +++ b/keyboards/lily58_koca/readme.md @@ -0,0 +1,27 @@ +# lil58_koca + +![lil58_koca](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [oxnh](https://github.com/oxnh) +* 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 lil58_koca:default + +Flashing example for this keyboard: + + make lil58_koca:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 775d69de205aca715fb2363358619b71eb739f98 Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Tue, 21 Jan 2025 22:35:25 +1300 Subject: [PATCH 02/20] update lily58_koca readme --- keyboards/lily58_koca/config.h | 3 +++ keyboards/lily58_koca/keyboard.json | 2 +- keyboards/lily58_koca/readme.md | 21 ++++++++++----------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/keyboards/lily58_koca/config.h b/keyboards/lily58_koca/config.h index 98cdfad8df05..710c1bf15756 100644 --- a/keyboards/lily58_koca/config.h +++ b/keyboards/lily58_koca/config.h @@ -4,6 +4,9 @@ #define SERIAL_USART_DRIVER SD3 #define USART3_PARTIALREMAP +#define BOOTMAGIC_ROW 0 +#define BOOTMAGIC_COLUMN 0 + #define SPLIT_HAND_PIN C15 // #define MATRIX_ROW_PINS { C12 } diff --git a/keyboards/lily58_koca/keyboard.json b/keyboards/lily58_koca/keyboard.json index 596b0f86d017..8296ec02f833 100644 --- a/keyboards/lily58_koca/keyboard.json +++ b/keyboards/lily58_koca/keyboard.json @@ -1,6 +1,6 @@ { "manufacturer": "oxnh", - "keyboard_name": "lil58_koca", + "keyboard_name": "lily58_koca", "maintainer": "oxnh", "bootloader": "stm32duino", "diode_direction": "COL2ROW", diff --git a/keyboards/lily58_koca/readme.md b/keyboards/lily58_koca/readme.md index 8bd619113d00..49b36dc969cf 100644 --- a/keyboards/lily58_koca/readme.md +++ b/keyboards/lily58_koca/readme.md @@ -1,27 +1,26 @@ -# lil58_koca +# lily58_koca -![lil58_koca](imgur.com image replace me!) +![lily58_koca](https://imgur.com/a/lily58-koca-pcb-Tdd002a) -*A short description of the keyboard/project* +A Lily58 variant featuring SMT components. Powered by an STM32F103 MCU and utilizing direct wiring. -* Keyboard Maintainer: [oxnh](https://github.com/oxnh) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Keyboard Maintainer: [oxnh](https://github.com/Hardware7253) +* Hardware Supported: Lily58 Koca PCBs (v1 & v2) +* Hardware Availability: Coming Soon! Make example for this keyboard (after setting up your build environment): - make lil58_koca:default + make lily58_koca:default Flashing example for this keyboard: - make lil58_koca:default:flash + make lily58_koca: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: +Enter the bootloader in 2 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 +* **Bootmagic reset**: Hold down the escaoe key and plug in the keyboard * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From d0433b7c26b632d7a560f15447a8fc7125a47dfb Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Tue, 21 Jan 2025 23:14:26 +1300 Subject: [PATCH 03/20] PR checklist changes --- keyboards/lily58_koca/keyboard.json | 37 ++++------------------------- keyboards/lily58_koca/readme.md | 6 ++--- 2 files changed, 8 insertions(+), 35 deletions(-) diff --git a/keyboards/lily58_koca/keyboard.json b/keyboards/lily58_koca/keyboard.json index 8296ec02f833..d26f4ad640cd 100644 --- a/keyboards/lily58_koca/keyboard.json +++ b/keyboards/lily58_koca/keyboard.json @@ -13,34 +13,20 @@ "nkro": true }, "matrix_pins": { - "cols": [ - "A10", "A9", "A8", "C9", "C8", "C7", - "B2", "B13", "B12", "B14", "B15", "C6", - "A6", "A7", "C4", "C5", "B0", "B1", - "B5", - "A0", "A1", "A2", "A3", "A4", "A5", - "C14", "C13", "B7", "B6" - ], + "cols": ["A10", "A9", "A8", "C9", "C8", "C7", "B2", "B13", "B12", "B14", "B15", "C6", "A6", "A7", "C4", "C5", "B0", "B1", "B5", "A0", "A1", "A2", "A3", "A4", "A5", "C14", "C13", "B7", "B6"], "rows": ["C12"] }, + "processor": "STM32F103", "split": { "enabled": true, "matrix_pins": { "right": { - "cols": [ - "A10", "A9", "A8", "C9", "C8", "C7", - "B2", "B13", "B12", "B14", "B15", "C6", - "A6", "A7", "C4", "C5", "B0", "B1", - "C14", - "A0", "A1", "A2", "A3", "A4", "A5", - "C13", "B7", "B6", "B5" - ], + "cols": ["A10", "A9", "A8", "C9", "C8", "C7", "B2", "B13", "B12", "B14", "B15", "C6", "A6", "A7", "C4", "C5", "B0", "B1", "C14", "A0", "A1", "A2", "A3", "A4", "A5", "C13", "B7", "B6", "B5"], "rows": ["C12"] } } }, - "processor": "STM32F103", - "url": "", + "url": "https://github.com/Hardware7253/Lily58_Koca", "usb": { "device_version": "1.0.0", "pid": "0x5106", @@ -55,72 +41,59 @@ {"matrix": [0, 3], "x": 3, "y": 0}, {"matrix": [0, 4], "x": 4, "y": 0.125}, {"matrix": [0, 5], "x": 5, "y": 0.25}, - {"matrix": [0, 6], "x": 0, "y": 1.5}, {"matrix": [0, 7], "x": 1, "y": 1.375}, {"matrix": [0, 8], "x": 2, "y": 1.125}, {"matrix": [0, 9], "x": 3, "y": 1}, {"matrix": [0, 10], "x": 4, "y": 1.125}, {"matrix": [0, 11], "x": 5, "y": 1.25}, - {"matrix": [0, 12], "x": 0, "y": 2.5}, {"matrix": [0, 13], "x": 1, "y": 2.375}, {"matrix": [0, 14], "x": 2, "y": 2.125}, {"matrix": [0, 15], "x": 3, "y": 2}, {"matrix": [0, 16], "x": 4, "y": 2.125}, {"matrix": [0, 17], "x": 5, "y": 2.25}, - {"matrix": [0, 18], "x": 6, "y": 2.75}, - {"matrix": [0, 19], "x": 0, "y": 3.5}, {"matrix": [0, 20], "x": 1, "y": 3.375}, {"matrix": [0, 21], "x": 2, "y": 3.125}, {"matrix": [0, 22], "x": 3, "y": 3}, {"matrix": [0, 23], "x": 4, "y": 3.125}, {"matrix": [0, 24], "x": 5, "y": 3.25}, - {"matrix": [0, 25], "x": 2.5, "y": 4.15}, {"matrix": [0, 26], "x": 3.5, "y": 4.15}, {"matrix": [0, 27], "x": 4.5, "y": 4.25}, {"matrix": [0, 28], "x": 6, "y": 4.25, "h": 1.5}, - - - {"matrix": [1, 0], "x": 10, "y": 0.25}, {"matrix": [1, 1], "x": 11, "y": 0.125}, {"matrix": [1, 2], "x": 12, "y": 0}, {"matrix": [1, 3], "x": 13, "y": 0.125}, {"matrix": [1, 4], "x": 14, "y": 0.375}, {"matrix": [1, 5], "x": 15, "y": 0.5}, - {"matrix": [1, 6], "x": 10, "y": 1.25}, {"matrix": [1, 7], "x": 11, "y": 1.125}, {"matrix": [1, 8], "x": 12, "y": 1}, {"matrix": [1, 9], "x": 13, "y": 1.125}, {"matrix": [1, 10], "x": 14, "y": 1.375}, {"matrix": [1, 11], "x": 15, "y": 1.5}, - {"matrix": [1, 12], "x": 10, "y": 2.25}, {"matrix": [1, 13], "x": 11, "y": 2.125}, {"matrix": [1, 14], "x": 12, "y": 2}, {"matrix": [1, 15], "x": 13, "y": 2.125}, {"matrix": [1, 16], "x": 14, "y": 2.375}, {"matrix": [1, 17], "x": 15, "y": 2.5}, - {"matrix": [1, 18], "x": 9, "y": 2.75}, - {"matrix": [1, 19], "x": 10, "y": 3.25}, {"matrix": [1, 20], "x": 11, "y": 3.125}, {"matrix": [1, 21], "x": 12, "y": 3}, {"matrix": [1, 22], "x": 13, "y": 3.125}, {"matrix": [1, 23], "x": 14, "y": 3.375}, {"matrix": [1, 24], "x": 15, "y": 3.5}, - {"matrix": [1, 25], "x": 9, "y": 4.25, "h": 1.5}, {"matrix": [1, 26], "x": 10.5, "y": 4.25}, {"matrix": [1, 27], "x": 11.5, "y": 4.15}, {"matrix": [1, 28], "x": 12.5, "y": 4.15} - ] + ] } } } \ No newline at end of file diff --git a/keyboards/lily58_koca/readme.md b/keyboards/lily58_koca/readme.md index 49b36dc969cf..04d4ef5dea05 100644 --- a/keyboards/lily58_koca/readme.md +++ b/keyboards/lily58_koca/readme.md @@ -2,11 +2,11 @@ ![lily58_koca](https://imgur.com/a/lily58-koca-pcb-Tdd002a) -A Lily58 variant featuring SMT components. Powered by an STM32F103 MCU and utilizing direct wiring. +A Lily58 variant featuring SMT components. Powered by an STM32F103 MCU and utilizing direct wiring. Vendor coming soon. * Keyboard Maintainer: [oxnh](https://github.com/Hardware7253) * Hardware Supported: Lily58 Koca PCBs (v1 & v2) -* Hardware Availability: Coming Soon! +* Hardware Availability: (https://github.com/Hardware7253/Lily58_Koca) Make example for this keyboard (after setting up your build environment): @@ -23,4 +23,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 2 ways: * **Bootmagic reset**: Hold down the escaoe key 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 +* **Physical reset button**: Briefly press the button on the back of the PCB From 764a59bb6b83df599be283368389ff8a662ced97 Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Tue, 21 Jan 2025 23:30:16 +1300 Subject: [PATCH 04/20] add license headers --- keyboards/lily58_koca/board.h | 4 +++- keyboards/lily58_koca/config.h | 2 ++ keyboards/lily58_koca/halconf.h | 2 ++ keyboards/lily58_koca/keymaps/default/keymap.c | 4 ++-- keyboards/lily58_koca/mcuconf.h | 2 ++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/keyboards/lily58_koca/board.h b/keyboards/lily58_koca/board.h index b47deb853347..88e9f13b008c 100644 --- a/keyboards/lily58_koca/board.h +++ b/keyboards/lily58_koca/board.h @@ -1,6 +1,8 @@ +/* Copyright 2025 oxnh */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include_next "board.h" +#include_next #undef STM32_HSECLK #define STM32_HSECLK 12000000 \ No newline at end of file diff --git a/keyboards/lily58_koca/config.h b/keyboards/lily58_koca/config.h index 710c1bf15756..ff848c1c036b 100644 --- a/keyboards/lily58_koca/config.h +++ b/keyboards/lily58_koca/config.h @@ -1,3 +1,5 @@ +/* Copyright 2025 oxnh */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. #define SERIAL_USART_TX_PIN C10 // USART TX pin #define SERIAL_USART_RX_PIN C11 // USART RX pin diff --git a/keyboards/lily58_koca/halconf.h b/keyboards/lily58_koca/halconf.h index 0bd60d996e36..2a39fd39412c 100644 --- a/keyboards/lily58_koca/halconf.h +++ b/keyboards/lily58_koca/halconf.h @@ -1,3 +1,5 @@ +/* Copyright 2025 oxnh */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once #define HAL_USE_SERIAL TRUE #include_next \ No newline at end of file diff --git a/keyboards/lily58_koca/keymaps/default/keymap.c b/keyboards/lily58_koca/keymaps/default/keymap.c index 8e607f99ec3e..1466c332600b 100644 --- a/keyboards/lily58_koca/keymaps/default/keymap.c +++ b/keyboards/lily58_koca/keymaps/default/keymap.c @@ -1,5 +1,5 @@ -// Copyright 2023 QMK -// SPDX-License-Identifier: GPL-2.0-or-later +/* Copyright 2025 oxnh */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include QMK_KEYBOARD_H diff --git a/keyboards/lily58_koca/mcuconf.h b/keyboards/lily58_koca/mcuconf.h index cbbf9fd5ab86..a77a02760b99 100644 --- a/keyboards/lily58_koca/mcuconf.h +++ b/keyboards/lily58_koca/mcuconf.h @@ -1,3 +1,5 @@ +/* Copyright 2025 oxnh */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once #include_next From 33ddb18c4ba3f5ff6526ea53808e0eba26a6527d Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Tue, 21 Jan 2025 23:33:08 +1300 Subject: [PATCH 05/20] Update keyboards/lily58_koca/config.h Co-authored-by: Ryan --- keyboards/lily58_koca/config.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/keyboards/lily58_koca/config.h b/keyboards/lily58_koca/config.h index ff848c1c036b..0475e61c7a66 100644 --- a/keyboards/lily58_koca/config.h +++ b/keyboards/lily58_koca/config.h @@ -6,10 +6,4 @@ #define SERIAL_USART_DRIVER SD3 #define USART3_PARTIALREMAP -#define BOOTMAGIC_ROW 0 -#define BOOTMAGIC_COLUMN 0 - -#define SPLIT_HAND_PIN C15 - -// #define MATRIX_ROW_PINS { C12 } -// #define MATRIX_COL_PINS { C7 } \ No newline at end of file +#define SPLIT_HAND_PIN C15 \ No newline at end of file From 0719c209c436e8d2a88cd986a25e626825d093a7 Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Tue, 21 Jan 2025 23:34:09 +1300 Subject: [PATCH 06/20] Update keyboards/lily58_koca/config.h Co-authored-by: Ryan --- keyboards/lily58_koca/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/lily58_koca/config.h b/keyboards/lily58_koca/config.h index 0475e61c7a66..eb98f1d86809 100644 --- a/keyboards/lily58_koca/config.h +++ b/keyboards/lily58_koca/config.h @@ -1,5 +1,7 @@ /* Copyright 2025 oxnh */ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#pragma once + #define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. #define SERIAL_USART_TX_PIN C10 // USART TX pin #define SERIAL_USART_RX_PIN C11 // USART RX pin From 96cd5e309d40fdd34dd943f3542ede8d6ba5b0ae Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Tue, 21 Jan 2025 23:35:53 +1300 Subject: [PATCH 07/20] Update keyboards/lily58_koca/readme.md Co-authored-by: Ryan --- keyboards/lily58_koca/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/lily58_koca/readme.md b/keyboards/lily58_koca/readme.md index 04d4ef5dea05..4aa4e0c58ed3 100644 --- a/keyboards/lily58_koca/readme.md +++ b/keyboards/lily58_koca/readme.md @@ -1,6 +1,6 @@ # lily58_koca -![lily58_koca](https://imgur.com/a/lily58-koca-pcb-Tdd002a) +![lily58_koca](https://i.imgur.com/loOGjGq.jpeg) A Lily58 variant featuring SMT components. Powered by an STM32F103 MCU and utilizing direct wiring. Vendor coming soon. From ea7ce8bdd3a16236d514bc7ea8d86aa5c20bb5a9 Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Tue, 21 Jan 2025 23:36:21 +1300 Subject: [PATCH 08/20] Update keyboards/lily58_koca/readme.md Co-authored-by: Ryan --- keyboards/lily58_koca/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/lily58_koca/readme.md b/keyboards/lily58_koca/readme.md index 4aa4e0c58ed3..b31538023fec 100644 --- a/keyboards/lily58_koca/readme.md +++ b/keyboards/lily58_koca/readme.md @@ -6,7 +6,7 @@ A Lily58 variant featuring SMT components. Powered by an STM32F103 MCU and utili * Keyboard Maintainer: [oxnh](https://github.com/Hardware7253) * Hardware Supported: Lily58 Koca PCBs (v1 & v2) -* Hardware Availability: (https://github.com/Hardware7253/Lily58_Koca) +* Hardware Availability: (https://github.com/Hardware7253/Lily58_Koca) Make example for this keyboard (after setting up your build environment): From 66fe8de4c842fee5a42dd55904b5e8bdcc75c007 Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Tue, 21 Jan 2025 23:37:49 +1300 Subject: [PATCH 09/20] Update keyboards/lily58_koca/halconf.h Co-authored-by: Ryan --- keyboards/lily58_koca/halconf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/lily58_koca/halconf.h b/keyboards/lily58_koca/halconf.h index 2a39fd39412c..a546d1a6b22b 100644 --- a/keyboards/lily58_koca/halconf.h +++ b/keyboards/lily58_koca/halconf.h @@ -1,5 +1,7 @@ /* Copyright 2025 oxnh */ /* SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once + #define HAL_USE_SERIAL TRUE + #include_next \ No newline at end of file From ad22670d3aea54bbd3fad371d22a4b9a58731b06 Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Tue, 21 Jan 2025 23:54:58 +1300 Subject: [PATCH 10/20] Update keyboards/lily58_koca/keyboard.json Co-authored-by: Ryan --- keyboards/lily58_koca/keyboard.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/lily58_koca/keyboard.json b/keyboards/lily58_koca/keyboard.json index d26f4ad640cd..3b20388248ed 100644 --- a/keyboards/lily58_koca/keyboard.json +++ b/keyboards/lily58_koca/keyboard.json @@ -23,6 +23,9 @@ "right": { "cols": ["A10", "A9", "A8", "C9", "C8", "C7", "B2", "B13", "B12", "B14", "B15", "C6", "A6", "A7", "C4", "C5", "B0", "B1", "C14", "A0", "A1", "A2", "A3", "A4", "A5", "C13", "B7", "B6", "B5"], "rows": ["C12"] + }, + "serial": { + "driver": "usart" } } }, From b8001221c1e4fa0768d0cc97763d4ecc784509bc Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Tue, 21 Jan 2025 23:56:37 +1300 Subject: [PATCH 11/20] Update readme.md --- keyboards/lily58_koca/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/lily58_koca/readme.md b/keyboards/lily58_koca/readme.md index b31538023fec..c11b9eb171a0 100644 --- a/keyboards/lily58_koca/readme.md +++ b/keyboards/lily58_koca/readme.md @@ -22,5 +22,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 2 ways: -* **Bootmagic reset**: Hold down the escaoe key and plug in the keyboard +* **Bootmagic reset**: Hold down the escape key and plug in the keyboard * **Physical reset button**: Briefly press the button on the back of the PCB From dafbb5c672ac1d32955fbe17f4a6065a2de77892 Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Tue, 21 Jan 2025 23:59:36 +1300 Subject: [PATCH 12/20] Delete keyboards/lily58_koca/keymaps/default/rules.mk --- keyboards/lily58_koca/keymaps/default/rules.mk | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 keyboards/lily58_koca/keymaps/default/rules.mk diff --git a/keyboards/lily58_koca/keymaps/default/rules.mk b/keyboards/lily58_koca/keymaps/default/rules.mk deleted file mode 100644 index f1dbc61d2d4f..000000000000 --- a/keyboards/lily58_koca/keymaps/default/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -SERIAL_DRIVER = usart -SPLIT_KEYBOARD = yes -VIA_ENABLE = yes \ No newline at end of file From 70b1d824e7eaf0cf0f773d40094f9ee64157b610 Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Wed, 22 Jan 2025 00:05:40 +1300 Subject: [PATCH 13/20] Update keyboard.json --- keyboards/lily58_koca/keyboard.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/lily58_koca/keyboard.json b/keyboards/lily58_koca/keyboard.json index 3b20388248ed..e6482baabc89 100644 --- a/keyboards/lily58_koca/keyboard.json +++ b/keyboards/lily58_koca/keyboard.json @@ -23,10 +23,10 @@ "right": { "cols": ["A10", "A9", "A8", "C9", "C8", "C7", "B2", "B13", "B12", "B14", "B15", "C6", "A6", "A7", "C4", "C5", "B0", "B1", "C14", "A0", "A1", "A2", "A3", "A4", "A5", "C13", "B7", "B6", "B5"], "rows": ["C12"] - }, - "serial": { - "driver": "usart" } + }, + "serial": { + "driver": "usart" } }, "url": "https://github.com/Hardware7253/Lily58_Koca", @@ -99,4 +99,4 @@ ] } } -} \ No newline at end of file +} From 4b9d0ff6248b704aa0e480e641faaa66bef3a0ce Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:39:38 +1300 Subject: [PATCH 14/20] Fixed layout Fixed layout so that is compatible with original lily58 keymaps --- keyboards/lily58_koca/keyboard.json | 62 +++---- .../lily58_koca/keymaps/default/keymap.c | 158 +++++++----------- 2 files changed, 95 insertions(+), 125 deletions(-) diff --git a/keyboards/lily58_koca/keyboard.json b/keyboards/lily58_koca/keyboard.json index e6482baabc89..fa5aef63684e 100644 --- a/keyboards/lily58_koca/keyboard.json +++ b/keyboards/lily58_koca/keyboard.json @@ -25,8 +25,8 @@ "rows": ["C12"] } }, - "serial": { - "driver": "usart" + "serial": { + "driver": "usart" } }, "url": "https://github.com/Hardware7253/Lily58_Koca", @@ -38,62 +38,62 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 0], "x": 0, "y": 0.45}, {"matrix": [0, 1], "x": 1, "y": 0.375}, {"matrix": [0, 2], "x": 2, "y": 0.125}, {"matrix": [0, 3], "x": 3, "y": 0}, {"matrix": [0, 4], "x": 4, "y": 0.125}, {"matrix": [0, 5], "x": 5, "y": 0.25}, - {"matrix": [0, 6], "x": 0, "y": 1.5}, - {"matrix": [0, 7], "x": 1, "y": 1.375}, - {"matrix": [0, 8], "x": 2, "y": 1.125}, - {"matrix": [0, 9], "x": 3, "y": 1}, - {"matrix": [0, 10], "x": 4, "y": 1.125}, - {"matrix": [0, 11], "x": 5, "y": 1.25}, - {"matrix": [0, 12], "x": 0, "y": 2.5}, - {"matrix": [0, 13], "x": 1, "y": 2.375}, - {"matrix": [0, 14], "x": 2, "y": 2.125}, - {"matrix": [0, 15], "x": 3, "y": 2}, - {"matrix": [0, 16], "x": 4, "y": 2.125}, - {"matrix": [0, 17], "x": 5, "y": 2.25}, - {"matrix": [0, 18], "x": 6, "y": 2.75}, - {"matrix": [0, 19], "x": 0, "y": 3.5}, - {"matrix": [0, 20], "x": 1, "y": 3.375}, - {"matrix": [0, 21], "x": 2, "y": 3.125}, - {"matrix": [0, 22], "x": 3, "y": 3}, - {"matrix": [0, 23], "x": 4, "y": 3.125}, - {"matrix": [0, 24], "x": 5, "y": 3.25}, - {"matrix": [0, 25], "x": 2.5, "y": 4.15}, - {"matrix": [0, 26], "x": 3.5, "y": 4.15}, - {"matrix": [0, 27], "x": 4.5, "y": 4.25}, - {"matrix": [0, 28], "x": 6, "y": 4.25, "h": 1.5}, {"matrix": [1, 0], "x": 10, "y": 0.25}, {"matrix": [1, 1], "x": 11, "y": 0.125}, {"matrix": [1, 2], "x": 12, "y": 0}, {"matrix": [1, 3], "x": 13, "y": 0.125}, {"matrix": [1, 4], "x": 14, "y": 0.375}, - {"matrix": [1, 5], "x": 15, "y": 0.5}, + {"matrix": [1, 5], "x": 15, "y": 0.45}, + {"matrix": [0, 6], "x": 0, "y": 1.45}, + {"matrix": [0, 7], "x": 1, "y": 1.375}, + {"matrix": [0, 8], "x": 2, "y": 1.125}, + {"matrix": [0, 9], "x": 3, "y": 1}, + {"matrix": [0, 10], "x": 4, "y": 1.125}, + {"matrix": [0, 11], "x": 5, "y": 1.25}, {"matrix": [1, 6], "x": 10, "y": 1.25}, {"matrix": [1, 7], "x": 11, "y": 1.125}, {"matrix": [1, 8], "x": 12, "y": 1}, {"matrix": [1, 9], "x": 13, "y": 1.125}, {"matrix": [1, 10], "x": 14, "y": 1.375}, - {"matrix": [1, 11], "x": 15, "y": 1.5}, + {"matrix": [1, 11], "x": 15, "y": 1.45}, + {"matrix": [0, 12], "x": 0, "y": 2.45}, + {"matrix": [0, 13], "x": 1, "y": 2.375}, + {"matrix": [0, 14], "x": 2, "y": 2.125}, + {"matrix": [0, 15], "x": 3, "y": 2}, + {"matrix": [0, 16], "x": 4, "y": 2.125}, + {"matrix": [0, 17], "x": 5, "y": 2.25}, {"matrix": [1, 12], "x": 10, "y": 2.25}, {"matrix": [1, 13], "x": 11, "y": 2.125}, {"matrix": [1, 14], "x": 12, "y": 2}, {"matrix": [1, 15], "x": 13, "y": 2.125}, {"matrix": [1, 16], "x": 14, "y": 2.375}, - {"matrix": [1, 17], "x": 15, "y": 2.5}, + {"matrix": [1, 17], "x": 15, "y": 2.45}, + {"matrix": [0, 19], "x": 0, "y": 3.45}, + {"matrix": [0, 20], "x": 1, "y": 3.375}, + {"matrix": [0, 21], "x": 2, "y": 3.125}, + {"matrix": [0, 22], "x": 3, "y": 3}, + {"matrix": [0, 23], "x": 4, "y": 3.125}, + {"matrix": [0, 24], "x": 5, "y": 3.25}, + {"matrix": [0, 18], "x": 6, "y": 2.75}, {"matrix": [1, 18], "x": 9, "y": 2.75}, {"matrix": [1, 19], "x": 10, "y": 3.25}, {"matrix": [1, 20], "x": 11, "y": 3.125}, {"matrix": [1, 21], "x": 12, "y": 3}, {"matrix": [1, 22], "x": 13, "y": 3.125}, {"matrix": [1, 23], "x": 14, "y": 3.375}, - {"matrix": [1, 24], "x": 15, "y": 3.5}, + {"matrix": [1, 24], "x": 15, "y": 3.45}, + {"matrix": [0, 25], "x": 2.5, "y": 4.15}, + {"matrix": [0, 26], "x": 3.5, "y": 4.15}, + {"matrix": [0, 27], "x": 4.5, "y": 4.25}, + {"matrix": [0, 28], "x": 6, "y": 4.25, "h": 1.5}, {"matrix": [1, 25], "x": 9, "y": 4.25, "h": 1.5}, - {"matrix": [1, 26], "x": 10.5, "y": 4.25}, + {"matrix": [1, 26], "x": 10.45, "y": 4.25}, {"matrix": [1, 27], "x": 11.5, "y": 4.15}, {"matrix": [1, 28], "x": 12.5, "y": 4.15} ] diff --git a/keyboards/lily58_koca/keymaps/default/keymap.c b/keyboards/lily58_koca/keymaps/default/keymap.c index 1466c332600b..4468430d46aa 100644 --- a/keyboards/lily58_koca/keymaps/default/keymap.c +++ b/keyboards/lily58_koca/keymaps/default/keymap.c @@ -12,99 +12,69 @@ enum layer_number { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* QWERTY - * ,-----------------------------------------. ,-----------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ` | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Tab | Q | W | E | R | T | | Y | U | I | O | P | - | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |LCTRL | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' | - * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| - * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / |RShift| - * `-----------------------------------------/ / \ \-----------------------------------------' - * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | - * | | | |/ / \ \ | | | | - * `----------------------------' '------''--------------------' - */ - [_QWERTY] = LAYOUT( - // Left - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, - KC_LBRC, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, - KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC, + /* QWERTY + * ,-----------------------------------------. ,-----------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ` | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | - | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |LCTRL | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / |RShift| + * `-----------------------------------------/ / \ \-----------------------------------------' + * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ - // Right - KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, - KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, - KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_RBRC, - KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_ENT, MO(_RAISE), KC_BSPC, KC_RGUI - ), + [_QWERTY] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC, KC_ENT, MO(_RAISE), KC_BSPC, KC_RGUI + ), + /* LOWER + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ` | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | ~ | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * | | | | | | |-------| |-------| | _ | + | { | } | | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + [_LOWER] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, _______, _______, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD, + _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + /* RAISE + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | F1 | F2 | F3 | F4 | F5 | F6 |-------. ,-------| | Left | Down | Up |Right | | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * | F7 | F8 | F9 | F10 | F11 | F12 |-------| |-------| + | - | = | [ | ] | \ | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ - /* LOWER - * ,-----------------------------------------. ,-----------------------------------------. - * | | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | ` | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | ~ | - * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| - * | | | | | | |-------| |-------| | _ | + | { | } | | | - * `-----------------------------------------/ / \ \-----------------------------------------' - * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | - * | | | |/ / \ \ | | | | - * `----------------------------' '------''--------------------' - */ - [_LOWER] = LAYOUT( - // Left - _______, _______, _______, _______, _______, _______, - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, - KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, - _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, - - // Right - _______, _______, _______, _______, _______, _______, - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, - KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, - _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______ - ), - - /* RAISE - * ,-----------------------------------------. ,-----------------------------------------. - * | | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | F1 | F2 | F3 | F4 | F5 | F6 |-------. ,-------| | Left | Down | Up |Right | | - * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| - * | F7 | F8 | F9 | F10 | F11 | F12 |-------| |-------| + | - | = | [ | ] | \ | - * `-----------------------------------------/ / \ \-----------------------------------------' - * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | - * | | | |/ / \ \ | | | | - * `----------------------------' '------''--------------------' - */ - [_RAISE] = LAYOUT( - // Left - _______, _______, _______, _______, _______, _______, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, - _______, - KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, _______, _______, _______, - - // Right - _______, _______, _______, _______, _______, _______, - KC_6, KC_7, KC_8, KC_9, KC_0, _______, - XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, - _______, - KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - _______, _______, _______, _______ - ) -}; + [_RAISE] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; \ No newline at end of file From 9505c69e0de409db50564c9106033c2282140eb8 Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:57:56 +1300 Subject: [PATCH 15/20] Update readme.md Redirect users of original Lily58 --- keyboards/lily58_koca/readme.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/keyboards/lily58_koca/readme.md b/keyboards/lily58_koca/readme.md index c11b9eb171a0..88a6275202a9 100644 --- a/keyboards/lily58_koca/readme.md +++ b/keyboards/lily58_koca/readme.md @@ -1,8 +1,8 @@ -# lily58_koca +# Lily58 Koca ![lily58_koca](https://i.imgur.com/loOGjGq.jpeg) -A Lily58 variant featuring SMT components. Powered by an STM32F103 MCU and utilizing direct wiring. Vendor coming soon. +A Lily58 variant featuring SMT components, powered by an STM32F103 MCU and utilizing direct wiring. If you have a Lily58 with a soldered dev board (e.g., pro micro), please visit the original [Lily58](/keyboards/lily58) directory. * Keyboard Maintainer: [oxnh](https://github.com/Hardware7253) * Hardware Supported: Lily58 Koca PCBs (v1 & v2) @@ -20,7 +20,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to ## Bootloader -Enter the bootloader in 2 ways: +Enter the bootloader: -* **Bootmagic reset**: Hold down the escape key and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB +* **Physical reset button**: Briefly press the button on the back of the PCB before or during uploading firmware From 57a5053cc3dd3e0380c25cb3a5acebda7c0319e7 Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Wed, 22 Jan 2025 12:08:37 +1300 Subject: [PATCH 16/20] Rename lily58_koca to koca Avoid confusion for original lily58 users --- keyboards/{lily58_koca => koca}/board.h | 0 keyboards/{lily58_koca => koca}/config.h | 0 keyboards/{lily58_koca => koca}/halconf.h | 0 keyboards/{lily58_koca => koca}/keyboard.json | 2 +- keyboards/{lily58_koca => koca}/keymaps/default/keymap.c | 0 keyboards/{lily58_koca => koca}/mcuconf.h | 0 keyboards/{lily58_koca => koca}/readme.md | 4 ++-- 7 files changed, 3 insertions(+), 3 deletions(-) rename keyboards/{lily58_koca => koca}/board.h (100%) rename keyboards/{lily58_koca => koca}/config.h (100%) rename keyboards/{lily58_koca => koca}/halconf.h (100%) rename keyboards/{lily58_koca => koca}/keyboard.json (99%) rename keyboards/{lily58_koca => koca}/keymaps/default/keymap.c (100%) rename keyboards/{lily58_koca => koca}/mcuconf.h (100%) rename keyboards/{lily58_koca => koca}/readme.md (94%) diff --git a/keyboards/lily58_koca/board.h b/keyboards/koca/board.h similarity index 100% rename from keyboards/lily58_koca/board.h rename to keyboards/koca/board.h diff --git a/keyboards/lily58_koca/config.h b/keyboards/koca/config.h similarity index 100% rename from keyboards/lily58_koca/config.h rename to keyboards/koca/config.h diff --git a/keyboards/lily58_koca/halconf.h b/keyboards/koca/halconf.h similarity index 100% rename from keyboards/lily58_koca/halconf.h rename to keyboards/koca/halconf.h diff --git a/keyboards/lily58_koca/keyboard.json b/keyboards/koca/keyboard.json similarity index 99% rename from keyboards/lily58_koca/keyboard.json rename to keyboards/koca/keyboard.json index fa5aef63684e..b373be31bea9 100644 --- a/keyboards/lily58_koca/keyboard.json +++ b/keyboards/koca/keyboard.json @@ -1,6 +1,6 @@ { "manufacturer": "oxnh", - "keyboard_name": "lily58_koca", + "keyboard_name": "koca", "maintainer": "oxnh", "bootloader": "stm32duino", "diode_direction": "COL2ROW", diff --git a/keyboards/lily58_koca/keymaps/default/keymap.c b/keyboards/koca/keymaps/default/keymap.c similarity index 100% rename from keyboards/lily58_koca/keymaps/default/keymap.c rename to keyboards/koca/keymaps/default/keymap.c diff --git a/keyboards/lily58_koca/mcuconf.h b/keyboards/koca/mcuconf.h similarity index 100% rename from keyboards/lily58_koca/mcuconf.h rename to keyboards/koca/mcuconf.h diff --git a/keyboards/lily58_koca/readme.md b/keyboards/koca/readme.md similarity index 94% rename from keyboards/lily58_koca/readme.md rename to keyboards/koca/readme.md index 88a6275202a9..010b4e0b15f7 100644 --- a/keyboards/lily58_koca/readme.md +++ b/keyboards/koca/readme.md @@ -10,11 +10,11 @@ A Lily58 variant featuring SMT components, powered by an STM32F103 MCU and utili Make example for this keyboard (after setting up your build environment): - make lily58_koca:default + make koca:default Flashing example for this keyboard: - make lily58_koca:default:flash + make koca: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). From 4e952b1716b996b799a9ced63ca4ee190db316dd Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:30:55 +1300 Subject: [PATCH 17/20] Apply suggestions from code review Co-authored-by: Drashna Jaelre --- keyboards/koca/board.h | 2 +- keyboards/koca/config.h | 2 +- keyboards/koca/halconf.h | 2 +- keyboards/koca/keyboard.json | 2 -- keyboards/koca/keymaps/default/keymap.c | 2 +- keyboards/koca/mcuconf.h | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/keyboards/koca/board.h b/keyboards/koca/board.h index 88e9f13b008c..d9de50c2b856 100644 --- a/keyboards/koca/board.h +++ b/keyboards/koca/board.h @@ -5,4 +5,4 @@ #include_next #undef STM32_HSECLK -#define STM32_HSECLK 12000000 \ No newline at end of file +#define STM32_HSECLK 12000000U diff --git a/keyboards/koca/config.h b/keyboards/koca/config.h index eb98f1d86809..e00c7c9ef541 100644 --- a/keyboards/koca/config.h +++ b/keyboards/koca/config.h @@ -8,4 +8,4 @@ #define SERIAL_USART_DRIVER SD3 #define USART3_PARTIALREMAP -#define SPLIT_HAND_PIN C15 \ No newline at end of file +#define SPLIT_HAND_PIN C15 diff --git a/keyboards/koca/halconf.h b/keyboards/koca/halconf.h index a546d1a6b22b..79853fe70d62 100644 --- a/keyboards/koca/halconf.h +++ b/keyboards/koca/halconf.h @@ -4,4 +4,4 @@ #define HAL_USE_SERIAL TRUE -#include_next \ No newline at end of file +#include_next diff --git a/keyboards/koca/keyboard.json b/keyboards/koca/keyboard.json index b373be31bea9..6ef051d615e4 100644 --- a/keyboards/koca/keyboard.json +++ b/keyboards/koca/keyboard.json @@ -6,8 +6,6 @@ "diode_direction": "COL2ROW", "features": { "bootmagic": true, - "command": false, - "console": false, "extrakey": true, "mousekey": true, "nkro": true diff --git a/keyboards/koca/keymaps/default/keymap.c b/keyboards/koca/keymaps/default/keymap.c index 4468430d46aa..4ff8f14ca2db 100644 --- a/keyboards/koca/keymaps/default/keymap.c +++ b/keyboards/koca/keymaps/default/keymap.c @@ -77,4 +77,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______ ) -}; \ No newline at end of file +}; diff --git a/keyboards/koca/mcuconf.h b/keyboards/koca/mcuconf.h index a77a02760b99..3270d5f7788c 100644 --- a/keyboards/koca/mcuconf.h +++ b/keyboards/koca/mcuconf.h @@ -8,4 +8,4 @@ #define STM32_SERIAL_USE_USART3 TRUE #undef STM32_PLLMUL_VALUE -#define STM32_PLLMUL_VALUE 6 \ No newline at end of file +#define STM32_PLLMUL_VALUE 6 From 37916b85293d3e62d7d7448d5323ad1cc10202c3 Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:40:17 +1300 Subject: [PATCH 18/20] Change tabs to spaces in keymap.c --- keyboards/koca/keymaps/default/keymap.c | 130 ++++++++++++------------ 1 file changed, 64 insertions(+), 66 deletions(-) diff --git a/keyboards/koca/keymaps/default/keymap.c b/keyboards/koca/keymaps/default/keymap.c index 4ff8f14ca2db..b571cadda84d 100644 --- a/keyboards/koca/keymaps/default/keymap.c +++ b/keyboards/koca/keymaps/default/keymap.c @@ -11,70 +11,68 @@ enum layer_number { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* QWERTY - * ,-----------------------------------------. ,-----------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ` | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Tab | Q | W | E | R | T | | Y | U | I | O | P | - | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |LCTRL | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' | - * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| - * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / |RShift| - * `-----------------------------------------/ / \ \-----------------------------------------' - * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | - * | | | |/ / \ \ | | | | - * `----------------------------' '------''--------------------' - */ - - [_QWERTY] = LAYOUT( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC, KC_ENT, MO(_RAISE), KC_BSPC, KC_RGUI - ), - /* LOWER - * ,-----------------------------------------. ,-----------------------------------------. - * | | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | ` | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | ~ | - * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| - * | | | | | | |-------| |-------| | _ | + | { | } | | | - * `-----------------------------------------/ / \ \-----------------------------------------' - * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | - * | | | |/ / \ \ | | | | - * `----------------------------' '------''--------------------' - */ - [_LOWER] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, _______, _______, - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD, - _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - _______, _______, _______, _______, _______, _______, _______, _______ - ), - /* RAISE - * ,-----------------------------------------. ,-----------------------------------------. - * | | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | F1 | F2 | F3 | F4 | F5 | F6 |-------. ,-------| | Left | Down | Up |Right | | - * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| - * | F7 | F8 | F9 | F10 | F11 | F12 |-------| |-------| + | - | = | [ | ] | \ | - * `-----------------------------------------/ / \ \-----------------------------------------' - * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | - * | | | |/ / \ \ | | | | - * `----------------------------' '------''--------------------' - */ - - [_RAISE] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, - KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - _______, _______, _______, _______, _______, _______, _______, _______ - ) + /* QWERTY + * ,-----------------------------------------. ,-----------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ` | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | - | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |LCTRL | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / |RShift| + * `-----------------------------------------/ / \ \-----------------------------------------' + * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + [_QWERTY] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC, KC_ENT, MO(_RAISE), KC_BSPC, KC_RGUI + ), + /* LOWER + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ` | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | ~ | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * | | | | | | |-------| |-------| | _ | + | { | } | | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + [_LOWER] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, _______, _______, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD, + _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + /* RAISE + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | F1 | F2 | F3 | F4 | F5 | F6 |-------. ,-------| | Left | Down | Up |Right | | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * | F7 | F8 | F9 | F10 | F11 | F12 |-------| |-------| + | - | = | [ | ] | \ | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + + [_RAISE] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, _______, _______, _______, _______, _______, _______, _______ + ) }; From d9310331f13badff566bcf7e036cf67934f9d1b0 Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Wed, 29 Jan 2025 19:25:31 +1300 Subject: [PATCH 19/20] switch to direct matrix --- keyboards/koca/keyboard.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/keyboards/koca/keyboard.json b/keyboards/koca/keyboard.json index 6ef051d615e4..ec6a47406df7 100644 --- a/keyboards/koca/keyboard.json +++ b/keyboards/koca/keyboard.json @@ -11,16 +11,14 @@ "nkro": true }, "matrix_pins": { - "cols": ["A10", "A9", "A8", "C9", "C8", "C7", "B2", "B13", "B12", "B14", "B15", "C6", "A6", "A7", "C4", "C5", "B0", "B1", "B5", "A0", "A1", "A2", "A3", "A4", "A5", "C14", "C13", "B7", "B6"], - "rows": ["C12"] + "direct": [["A10", "A9", "A8", "C9", "C8", "C7", "B2", "B13", "B12", "B14", "B15", "C6", "A6", "A7", "C4", "C5", "B0", "B1", "B5", "A0", "A1", "A2", "A3", "A4", "A5", "C14", "C13", "B7", "B6"]] }, "processor": "STM32F103", "split": { "enabled": true, "matrix_pins": { "right": { - "cols": ["A10", "A9", "A8", "C9", "C8", "C7", "B2", "B13", "B12", "B14", "B15", "C6", "A6", "A7", "C4", "C5", "B0", "B1", "C14", "A0", "A1", "A2", "A3", "A4", "A5", "C13", "B7", "B6", "B5"], - "rows": ["C12"] + "direct": [["A10", "A9", "A8", "C9", "C8", "C7", "B2", "B13", "B12", "B14", "B15", "C6", "A6", "A7", "C4", "C5", "B0", "B1", "C14", "A0", "A1", "A2", "A3", "A4", "A5", "C13", "B7", "B6", "B5"]] } }, "serial": { From 814518ecc1f86aa588375bfb348e610a26ca48c6 Mon Sep 17 00:00:00 2001 From: oxnh <77563973+Hardware7253@users.noreply.github.com> Date: Wed, 5 Feb 2025 00:56:42 +1300 Subject: [PATCH 20/20] Update readme.md Change supported revs. This won't generate additional questions for old revs because their design files can only be found through the keyboards old git commits. The current design iteration and all future revs will be wired properly for a direct matrix. --- keyboards/koca/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/koca/readme.md b/keyboards/koca/readme.md index 010b4e0b15f7..2e8ef07effd4 100644 --- a/keyboards/koca/readme.md +++ b/keyboards/koca/readme.md @@ -5,7 +5,7 @@ A Lily58 variant featuring SMT components, powered by an STM32F103 MCU and utilizing direct wiring. If you have a Lily58 with a soldered dev board (e.g., pro micro), please visit the original [Lily58](/keyboards/lily58) directory. * Keyboard Maintainer: [oxnh](https://github.com/Hardware7253) -* Hardware Supported: Lily58 Koca PCBs (v1 & v2) +* Hardware Supported: Lily58 Koca PCBs (v3 and up) * Hardware Availability: (https://github.com/Hardware7253/Lily58_Koca) Make example for this keyboard (after setting up your build environment):