From fc895bae66a1e272219b33283917422d83e4aefb Mon Sep 17 00:00:00 2001 From: VeyPatch <126267034+VeyPatch@users.noreply.github.com> Date: Mon, 6 Jan 2025 15:39:23 +0100 Subject: [PATCH 1/7] Add Halcyon Lily58 rev2 --- keyboards/splitkb/halcyon/lily58/info.json | 73 ++++++++ .../lily58/keymaps/default/keymap.json | 36 ++++ .../halcyon/lily58/keymaps/default/readme.md | 88 +++++++++ keyboards/splitkb/halcyon/lily58/readme.md | 31 ++++ .../splitkb/halcyon/lily58/rev2/config.h | 32 ++++ .../splitkb/halcyon/lily58/rev2/halconf.h | 14 ++ .../splitkb/halcyon/lily58/rev2/keyboard.json | 174 ++++++++++++++++++ .../splitkb/halcyon/lily58/rev2/mcuconf.h | 14 ++ keyboards/splitkb/halcyon/lily58/rev2/rev2.c | 28 +++ 9 files changed, 490 insertions(+) create mode 100755 keyboards/splitkb/halcyon/lily58/info.json create mode 100644 keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json create mode 100644 keyboards/splitkb/halcyon/lily58/keymaps/default/readme.md create mode 100755 keyboards/splitkb/halcyon/lily58/readme.md create mode 100755 keyboards/splitkb/halcyon/lily58/rev2/config.h create mode 100644 keyboards/splitkb/halcyon/lily58/rev2/halconf.h create mode 100755 keyboards/splitkb/halcyon/lily58/rev2/keyboard.json create mode 100644 keyboards/splitkb/halcyon/lily58/rev2/mcuconf.h create mode 100644 keyboards/splitkb/halcyon/lily58/rev2/rev2.c diff --git a/keyboards/splitkb/halcyon/lily58/info.json b/keyboards/splitkb/halcyon/lily58/info.json new file mode 100755 index 000000000000..178527f838c0 --- /dev/null +++ b/keyboards/splitkb/halcyon/lily58/info.json @@ -0,0 +1,73 @@ +{ + "manufacturer": "splitkb.com", + "maintainer": "splitkb.com", + "url": "https://splitkb.com", + "usb": { + "device_version": "1.0.0", + "vid": "0x8D1D" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "L01", "matrix": [0, 0], "x": 0, "y": 0.5}, + {"label": "L02", "matrix": [0, 1], "x": 1, "y": 0.375}, + {"label": "L03", "matrix": [0, 2], "x": 2, "y": 0.125}, + {"label": "L04", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "L05", "matrix": [0, 4], "x": 4, "y": 0.125}, + {"label": "L06", "matrix": [0, 5], "x": 5, "y": 0.25}, + {"label": "R06", "matrix": [5, 5], "x": 10.5, "y": 0.25}, + {"label": "R05", "matrix": [5, 4], "x": 11.5, "y": 0.125}, + {"label": "R04", "matrix": [5, 3], "x": 12.5, "y": 0}, + {"label": "R03", "matrix": [5, 2], "x": 13.5, "y": 0.125}, + {"label": "R02", "matrix": [5, 1], "x": 14.5, "y": 0.375}, + {"label": "R01", "matrix": [5, 0], "x": 15.5, "y": 0.5}, + {"label": "L07", "matrix": [1, 0], "x": 0, "y": 1.5}, + {"label": "L08", "matrix": [1, 1], "x": 1, "y": 1.375}, + {"label": "L09", "matrix": [1, 2], "x": 2, "y": 1.125}, + {"label": "L10", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "L11", "matrix": [1, 4], "x": 4, "y": 1.125}, + {"label": "L12", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "R12", "matrix": [6, 5], "x": 10.5, "y": 1.25}, + {"label": "R11", "matrix": [6, 4], "x": 11.5, "y": 1.125}, + {"label": "R10", "matrix": [6, 3], "x": 12.5, "y": 1}, + {"label": "R09", "matrix": [6, 2], "x": 13.5, "y": 1.125}, + {"label": "R08", "matrix": [6, 1], "x": 14.5, "y": 1.375}, + {"label": "R07", "matrix": [6, 0], "x": 15.5, "y": 1.5}, + {"label": "L13", "matrix": [2, 0], "x": 0, "y": 2.5}, + {"label": "L14", "matrix": [2, 1], "x": 1, "y": 2.375}, + {"label": "L15", "matrix": [2, 2], "x": 2, "y": 2.125}, + {"label": "L16", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "L17", "matrix": [2, 4], "x": 4, "y": 2.125}, + {"label": "L18", "matrix": [2, 5], "x": 5, "y": 2.25}, + {"label": "R18", "matrix": [7, 5], "x": 10.5, "y": 2.25}, + {"label": "R17", "matrix": [7, 4], "x": 11.5, "y": 2.125}, + {"label": "R16", "matrix": [7, 3], "x": 12.5, "y": 2}, + {"label": "R15", "matrix": [7, 2], "x": 13.5, "y": 2.125}, + {"label": "R14", "matrix": [7, 1], "x": 14.5, "y": 2.375}, + {"label": "R13", "matrix": [7, 0], "x": 15.5, "y": 2.5}, + {"label": "L20", "matrix": [3, 0], "x": 0, "y": 3.5}, + {"label": "L21", "matrix": [3, 1], "x": 1, "y": 3.375}, + {"label": "L22", "matrix": [3, 2], "x": 2, "y": 3.125}, + {"label": "L23", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "L24", "matrix": [3, 4], "x": 4, "y": 3.125}, + {"label": "L25", "matrix": [3, 5], "x": 5, "y": 3.25}, + {"label": "L19", "matrix": [4, 1], "x": 6, "y": 2.75}, + {"label": "R19", "matrix": [9, 1], "x": 9.5, "y": 2.75}, + {"label": "R25", "matrix": [8, 5], "x": 10.5, "y": 3.25}, + {"label": "R24", "matrix": [8, 4], "x": 11.5, "y": 3.125}, + {"label": "R23", "matrix": [8, 3], "x": 12.5, "y": 3}, + {"label": "R22", "matrix": [8, 2], "x": 13.5, "y": 3.125}, + {"label": "R21", "matrix": [8, 1], "x": 14.5, "y": 3.375}, + {"label": "R20", "matrix": [8, 0], "x": 15.5, "y": 3.5}, + {"label": "L26", "matrix": [4, 2], "x": 2.5, "y": 4.15}, + {"label": "L27", "matrix": [4, 3], "x": 3.5, "y": 4.15}, + {"label": "L28", "matrix": [4, 4], "x": 4.5, "y": 4.25}, + {"label": "L29", "matrix": [4, 5], "x": 6, "y": 4.25}, + {"label": "R29", "matrix": [9, 5], "x": 9.5, "y": 4.25}, + {"label": "R28", "matrix": [9, 4], "x": 11, "y": 4.25}, + {"label": "R27", "matrix": [9, 3], "x": 12, "y": 4.15}, + {"label": "R26", "matrix": [9, 2], "x": 13, "y": 4.15} + ] + } + } +} diff --git a/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json b/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json new file mode 100644 index 000000000000..84f14ed4ccac --- /dev/null +++ b/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json @@ -0,0 +1,36 @@ +{ + "keyboard": "splitkb/halcyon/lily58/rev2", + "keymap": "default", + "version": 1, + "layout": "LAYOUT", + "layers": [ + [ + "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(1)" , "KC_SPC" , "KC_ENT" , "MO(2)" , "KC_BSPC", "KC_RGUI" + ], + [ + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "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", + "_______", "_______", "_______", "_______", "_______", "MO(3)" , "_______", "_______" + ], + [ + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "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", + "_______", "_______", "MO(3)" , "_______", "_______", "_______", "_______", "_______" + ], + [ + "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", + "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", + "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "RM_TOGG", "RM_HUEU", "RM_SATU", "RM_VALU", + "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "RM_NEXT", "RM_HUED", "RM_SATD", "RM_VALD", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" + ] + ] +} diff --git a/keyboards/splitkb/halcyon/lily58/keymaps/default/readme.md b/keyboards/splitkb/halcyon/lily58/keymaps/default/readme.md new file mode 100644 index 000000000000..4710e2f8fdd2 --- /dev/null +++ b/keyboards/splitkb/halcyon/lily58/keymaps/default/readme.md @@ -0,0 +1,88 @@ +# Halcyon Lily58's Default Keymap +_This keymap is a copy of the [Lily58 default keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/lily58/keymaps/default), with slight modifications._ + +A simple default keymap for the Halcyon Lily58 +============================================= + +Keymaps in general are quite personal, so it is difficult to come up with a default that will suit every user. We hope this keymap serves as a good starting point for your own - although it should be fairly usable out-of-the-box. + +What do all these layers do? +---------------------------- + +### Layer 0: Base layer + +![Layer 0](https://i.imgur.com/sq8Rql7h.png) + +This is where your basic letters live. + +The homing thumb fingers are used to access the different layers. + +* The homing left thumb finger gives access to the Symbols (or lower) layer +* The homing right thumb finger gives access to the Navigation (or raise) layer +* Pressing both homing thumb fingers gives access to the Adjust layer + +### Layer 1: Lower + +![Layer 1](https://i.imgur.com/baSE2OJh.png) + +The Lower layer gives access to the F keys on the second row, and shifted number keys on the home row. It also provides some shifted symbol keys. + +### Layer 2: Raise + +![Layer 2](https://i.imgur.com/CRnDa6Nh.png) + +The Raise layer gives access the arrow keys on the right hand, in addition to some unshifted symbols. The left hand provides an alternative set of F keys, while the second row provides an alternative set of number keys. + +### Layer 3: Adjust + +![Layer 3](https://i.imgur.com/QbCiTcyh.png) + +The Adjust layer exposes RGB adjustment keys on the right hand. + +Where is the keymap.c? +---------------------- + +The keymap.c file is not published to the repository. It is generated from `keymap.json` by the build system. + +This avoids duplicating information and allow users to edit their keymap from the QMK Configurator web interface. + +How do I edit and update the keymap? +------------------------------------ + +The `keymap.json` file is generated from the QMK Configurator interface and formatted for better readability in the context of the Ferris keyboard. + +To edit it, you may: +* Edit it directly from a text editor. +* Edit it from the QMK Configurator. + +If you decide to use the latter workflow, here are the steps to follow: + +* From the [QMK Configurator](https://config.qmk.fm/#/splitkb/halcyon/lily58/rev2/LAYOUT), hit the "import QMK keymap json file" button (it has a drawing with an up arrow on it). +* Browse to the location of your keymap (for example, `/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json`) +* Perform any modification to the keymap in the web UI +* Export the keymap to your downloads folder, by hitting the "Export QMK keymap json file" button (it has a drawing with a down arrow on it) +* Replace your original keymap with the one you just downloaded + +_**Note:** At the time of writing (the 24th of October 2022), not every feature used in the default keymap is supported by the QMK Configurator. You cannot yet upload the default `keymap.json` due to a file format mismatch - use the "Load Default" button to load the default keymap instead. Additionally, custom configuration options are still being worked on: if your keymap depends on them, please compile your firmware offline for now._ + +I want to do more than the JSON format supports! +------------------------------------------------- + +While the `json` format is easy to use, it does lack certain functionality - most notably custom OLED or encoder behaviour. + +To add this, you need to convert it to the `c` format. Do keep in mind that this is generally a one-way operation. + +First, from the root of your qmk repo, move to your keymap folder + +```bash +cd ./keymaps/splitkb/halcyon/lily58/my_personal_keymap +``` + +Next, convert your `keymap.json` to a `keymap.c` + +```bash +qmk json2c -o keymap.c keymap.json +``` + +You can add custom C code to the newly generated `keymap.c` file. Do note that you have to use **either** a C file **or** a JSON file - you cannot do both! +**If a JSON file is present, the C file is ignored.** diff --git a/keyboards/splitkb/halcyon/lily58/readme.md b/keyboards/splitkb/halcyon/lily58/readme.md new file mode 100755 index 000000000000..5799253b2520 --- /dev/null +++ b/keyboards/splitkb/halcyon/lily58/readme.md @@ -0,0 +1,31 @@ +# Halcyon Lily58 + +![splitkb/halcyon/lily58](TODO) + +The Halcyon Lily58 rev2 is the second Lily58 revision and the fourth keyboard in our Halcyon range. Similar to Aurora, all keyboards in the series share the same feature set. The key highlights: + +- Halcyon keyboards come preassembled! You won't need a soldering iron. +- You'll be able to install [VIK](https://github.com/sadekbaroudi/vik) modules. +- It'll come fully documented, which includes the unboxing, assembly (with only a screwdriver), first installation and some advanced use cases. +- Both the connection to the host device as well as the interconnect between the keyboard halves use USB C. +- The controller has full ESD protection on all USB C ports, as well as all switch matrix GPIO! +- The controller is interchangable. If part of your keyboard ever breaks, we can replace just the bits that need replacing. + +* Keyboard Maintainer: [splitkb.com](https://github.com/splitkb.com) +* Hardware Availability: [splitkb.com](https://splitkb.com). + +Make example for this keyboard (after setting up your build environment): + + make splitkb/halcyon/lily58/rev2:default + +The keyboard can be flashed by copying the resulting `.uf2` file onto the `RPI-RP2` flash drive. + +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: + +* **Reset button**: Double-tap the reset button at the top of the controller, right above the USB-C port. +* **Bootloader reset**: Hold down the "Boot" button and plug in the keyboard. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. diff --git a/keyboards/splitkb/halcyon/lily58/rev2/config.h b/keyboards/splitkb/halcyon/lily58/rev2/config.h new file mode 100755 index 000000000000..c09744f9238b --- /dev/null +++ b/keyboards/splitkb/halcyon/lily58/rev2/config.h @@ -0,0 +1,32 @@ +// Copyright 2024 splitkb.com (support@splitkb.com) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +// Make it easier to enter the bootloader +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U + +// UART1, communication between the two halves +#define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. +#define SERIAL_USART_TX_PIN GP28 // USART TX pin +#define SERIAL_USART_RX_PIN GP29 // USART RX pin +#define SERIAL_PIO_USE_PIO1 // Use PIO1 as PIO0 is used for WS2812 driver + +// VBUS detection +#define USB_VBUS_PIN GP1 + +//// VIK + +// GPIO1 = GP27 +// GPIO2 = GP26 +// CS = GP13 + +#define I2C_DRIVER I2C0 +#define I2C1_SDA_PIN GP16 +#define I2C1_SCL_PIN GP17 + +#define SPI_DRIVER SPID1 +#define SPI_SCK_PIN GP14 +#define SPI_MOSI_PIN GP15 +#define SPI_MISO_PIN GP12 \ No newline at end of file diff --git a/keyboards/splitkb/halcyon/lily58/rev2/halconf.h b/keyboards/splitkb/halcyon/lily58/rev2/halconf.h new file mode 100644 index 000000000000..1050ebf3130e --- /dev/null +++ b/keyboards/splitkb/halcyon/lily58/rev2/halconf.h @@ -0,0 +1,14 @@ +// Copyright 2024 splitkb.com (support@splitkb.com) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +//// VIK + +#define HAL_USE_I2C TRUE + +#define HAL_USE_SPI TRUE +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD + +#include_next \ No newline at end of file diff --git a/keyboards/splitkb/halcyon/lily58/rev2/keyboard.json b/keyboards/splitkb/halcyon/lily58/rev2/keyboard.json new file mode 100755 index 000000000000..c81040e898a6 --- /dev/null +++ b/keyboards/splitkb/halcyon/lily58/rev2/keyboard.json @@ -0,0 +1,174 @@ +{ + "keyboard_name": "Halcyon Lily58 rev2", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "GP23", "pin_b": "GP22", "resolution": 2} + ] + }, + "features": { + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["GP8", "GP11", "GP7", "GP6", "GP5", "GP10"], + "rows": ["GP19", "GP20", "GP25", "GP4", "GP9"] + }, + "processor": "RP2040", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_color": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "default": { + "animation": "cycle_left_right" + }, + "driver": "ws2812", + "layout": [ + {"x": 51, "y": 13, "flags": 2}, + {"x": 22, "y": 18, "flags": 2}, + {"x": 22, "y": 53, "flags": 2}, + {"x": 58, "y": 60, "flags": 2}, + {"x": 87, "y": 56, "flags": 2}, + {"matrix": [0, 0], "x": 0, "y": 8, "flags": 4}, + {"matrix": [0, 1], "x": 14, "y": 6, "flags": 4}, + {"matrix": [0, 2], "x": 29, "y": 2, "flags": 4}, + {"matrix": [0, 3], "x": 43, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 58, "y": 2, "flags": 4}, + {"matrix": [0, 5], "x": 72, "y": 4, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 23, "flags": 4}, + {"matrix": [1, 1], "x": 14, "y": 21, "flags": 4}, + {"matrix": [1, 2], "x": 29, "y": 17, "flags": 4}, + {"matrix": [1, 3], "x": 43, "y": 15, "flags": 4}, + {"matrix": [1, 4], "x": 58, "y": 17, "flags": 4}, + {"matrix": [1, 5], "x": 72, "y": 19, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 38, "flags": 4}, + {"matrix": [2, 1], "x": 14, "y": 36, "flags": 4}, + {"matrix": [2, 2], "x": 29, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 43, "y": 30, "flags": 4}, + {"matrix": [2, 4], "x": 58, "y": 32, "flags": 4}, + {"matrix": [2, 5], "x": 72, "y": 34, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 53, "flags": 4}, + {"matrix": [3, 1], "x": 14, "y": 51, "flags": 4}, + {"matrix": [3, 2], "x": 29, "y": 47, "flags": 4}, + {"matrix": [3, 3], "x": 43, "y": 45, "flags": 4}, + {"matrix": [3, 4], "x": 58, "y": 47, "flags": 4}, + {"matrix": [3, 5], "x": 72, "y": 49, "flags": 4}, + {"matrix": [4, 1], "x": 87, "y": 41, "flags": 4}, + {"matrix": [4, 2], "x": 36, "y": 62, "flags": 4}, + {"matrix": [4, 3], "x": 51, "y": 62, "flags": 4}, + {"matrix": [4, 4], "x": 65, "y": 64, "flags": 4}, + {"matrix": [4, 5], "x": 87, "y": 64, "flags": 4}, + {"x": 173, "y": 13, "flags": 2}, + {"x": 202, "y": 18, "flags": 2}, + {"x": 202, "y": 53, "flags": 2}, + {"x": 166, "y": 60, "flags": 2}, + {"x": 137, "y": 56, "flags": 2}, + {"matrix": [5, 5], "x": 152, "y": 4, "flags": 4}, + {"matrix": [5, 4], "x": 166, "y": 2, "flags": 4}, + {"matrix": [5, 3], "x": 181, "y": 0, "flags": 4}, + {"matrix": [5, 2], "x": 195, "y": 2, "flags": 4}, + {"matrix": [5, 1], "x": 210, "y": 6, "flags": 4}, + {"matrix": [5, 0], "x": 224, "y": 8, "flags": 4}, + {"matrix": [6, 5], "x": 152, "y": 19, "flags": 4}, + {"matrix": [6, 4], "x": 166, "y": 17, "flags": 4}, + {"matrix": [6, 3], "x": 181, "y": 15, "flags": 4}, + {"matrix": [6, 2], "x": 195, "y": 17, "flags": 4}, + {"matrix": [6, 1], "x": 210, "y": 21, "flags": 4}, + {"matrix": [6, 0], "x": 224, "y": 23, "flags": 4}, + {"matrix": [7, 5], "x": 152, "y": 34, "flags": 4}, + {"matrix": [7, 4], "x": 166, "y": 32, "flags": 4}, + {"matrix": [7, 3], "x": 181, "y": 30, "flags": 4}, + {"matrix": [7, 2], "x": 195, "y": 32, "flags": 4}, + {"matrix": [7, 1], "x": 210, "y": 36, "flags": 4}, + {"matrix": [7, 0], "x": 224, "y": 38, "flags": 4}, + {"matrix": [9, 1], "x": 137, "y": 41, "flags": 4}, + {"matrix": [8, 5], "x": 152, "y": 49, "flags": 4}, + {"matrix": [8, 4], "x": 166, "y": 47, "flags": 4}, + {"matrix": [8, 3], "x": 181, "y": 45, "flags": 4}, + {"matrix": [8, 2], "x": 195, "y": 47, "flags": 4}, + {"matrix": [8, 1], "x": 210, "y": 51, "flags": 4}, + {"matrix": [8, 0], "x": 224, "y": 53, "flags": 4}, + {"matrix": [9, 5], "x": 137, "y": 64, "flags": 4}, + {"matrix": [9, 4], "x": 159, "y": 64, "flags": 4}, + {"matrix": [9, 3], "x": 173, "y": 62, "flags": 4}, + {"matrix": [9, 2], "x": 188, "y": 62, "flags": 4} + ], + "max_brightness": 128, + "sleep": true, + "split_count": [34, 34] + }, + "split": { + "enabled": true, + "handedness": { + "pin": "GP24" + }, + "matrix_pins": { + "right": { + "cols": ["GP4", "GP9", "GP10", "GP5", "GP6", "GP8"], + "rows": ["GP19", "GP20", "GP25", "GP7", "GP11"] + } + }, + "serial": { + "driver": "vendor" + }, + "transport": { + "sync": { + "matrix_state": true + } + } + }, + "usb": { + "pid": "0xEA1D" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP3" + } +} diff --git a/keyboards/splitkb/halcyon/lily58/rev2/mcuconf.h b/keyboards/splitkb/halcyon/lily58/rev2/mcuconf.h new file mode 100644 index 000000000000..6792b923f10d --- /dev/null +++ b/keyboards/splitkb/halcyon/lily58/rev2/mcuconf.h @@ -0,0 +1,14 @@ +// Copyright 2024 splitkb.com (support@splitkb.com) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +//// VIK + +#undef RP_I2C_USE_I2C0 +#define RP_I2C_USE_I2C0 TRUE + +#undef RP_SPI_USE_SPI1 +#define RP_SPI_USE_SPI1 TRUE \ No newline at end of file diff --git a/keyboards/splitkb/halcyon/lily58/rev2/rev2.c b/keyboards/splitkb/halcyon/lily58/rev2/rev2.c new file mode 100644 index 000000000000..27671b9d7ce9 --- /dev/null +++ b/keyboards/splitkb/halcyon/lily58/rev2/rev2.c @@ -0,0 +1,28 @@ +// Copyright 2024 splitkb.com (support@splitkb.com) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "quantum.h" + +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { + return false; + } + if (index == 0) { + // Volume control + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } else if (index == 1) { + // Page up/Page down + if (clockwise) { + tap_code(KC_PGDN); + } else { + tap_code(KC_PGUP); + } + } + return false; +} +#endif From 0c7ea338d0b2a301c34f2feb5fa4042a969788ed Mon Sep 17 00:00:00 2001 From: VeyPatch <126267034+VeyPatch@users.noreply.github.com> Date: Tue, 7 Jan 2025 10:40:06 +0100 Subject: [PATCH 2/7] Add reset in keymap --- keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json b/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json index 84f14ed4ccac..90547e6a71a8 100644 --- a/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json +++ b/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json @@ -26,7 +26,7 @@ "_______", "_______", "MO(3)" , "_______", "_______", "_______", "_______", "_______" ], [ - "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", + "QK_BOOT", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "RM_TOGG", "RM_HUEU", "RM_SATU", "RM_VALU", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "RM_NEXT", "RM_HUED", "RM_SATD", "RM_VALD", From fcf4c06cbb24cbf051e3321c11c7612406643820 Mon Sep 17 00:00:00 2001 From: VeyPatch <126267034+VeyPatch@users.noreply.github.com> Date: Tue, 7 Jan 2025 10:40:20 +0100 Subject: [PATCH 3/7] Add encoder map --- .../splitkb/halcyon/lily58/keymaps/default/keymap.json | 6 ++++++ keyboards/splitkb/halcyon/lily58/keymaps/default/rules.mk | 1 + 2 files changed, 7 insertions(+) create mode 100644 keyboards/splitkb/halcyon/lily58/keymaps/default/rules.mk diff --git a/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json b/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json index 90547e6a71a8..fd668e6f7533 100644 --- a/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json +++ b/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json @@ -32,5 +32,11 @@ "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "RM_NEXT", "RM_HUED", "RM_SATD", "RM_VALD", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" ] + ], + "encoders": [ + [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"}], + [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"}], + [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"}], + [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"}] ] } diff --git a/keyboards/splitkb/halcyon/lily58/keymaps/default/rules.mk b/keyboards/splitkb/halcyon/lily58/keymaps/default/rules.mk new file mode 100644 index 000000000000..ee325681483f --- /dev/null +++ b/keyboards/splitkb/halcyon/lily58/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes From 5d2cdcb8594160d8eb6c20c8dcc73559a5eead7e Mon Sep 17 00:00:00 2001 From: VeyPatch <126267034+VeyPatch@users.noreply.github.com> Date: Tue, 7 Jan 2025 10:40:34 +0100 Subject: [PATCH 4/7] Update line endings and copyright year --- keyboards/splitkb/halcyon/lily58/rev2/config.h | 4 ++-- keyboards/splitkb/halcyon/lily58/rev2/halconf.h | 4 ++-- keyboards/splitkb/halcyon/lily58/rev2/mcuconf.h | 4 ++-- keyboards/splitkb/halcyon/lily58/rev2/rev2.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/splitkb/halcyon/lily58/rev2/config.h b/keyboards/splitkb/halcyon/lily58/rev2/config.h index c09744f9238b..b5cd6f95f29b 100755 --- a/keyboards/splitkb/halcyon/lily58/rev2/config.h +++ b/keyboards/splitkb/halcyon/lily58/rev2/config.h @@ -1,4 +1,4 @@ -// Copyright 2024 splitkb.com (support@splitkb.com) +// Copyright 2025 splitkb.com (support@splitkb.com) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -29,4 +29,4 @@ #define SPI_DRIVER SPID1 #define SPI_SCK_PIN GP14 #define SPI_MOSI_PIN GP15 -#define SPI_MISO_PIN GP12 \ No newline at end of file +#define SPI_MISO_PIN GP12 diff --git a/keyboards/splitkb/halcyon/lily58/rev2/halconf.h b/keyboards/splitkb/halcyon/lily58/rev2/halconf.h index 1050ebf3130e..fd95e15f8398 100644 --- a/keyboards/splitkb/halcyon/lily58/rev2/halconf.h +++ b/keyboards/splitkb/halcyon/lily58/rev2/halconf.h @@ -1,4 +1,4 @@ -// Copyright 2024 splitkb.com (support@splitkb.com) +// Copyright 2025 splitkb.com (support@splitkb.com) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -11,4 +11,4 @@ #define SPI_USE_WAIT TRUE #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD -#include_next \ No newline at end of file +#include_next diff --git a/keyboards/splitkb/halcyon/lily58/rev2/mcuconf.h b/keyboards/splitkb/halcyon/lily58/rev2/mcuconf.h index 6792b923f10d..126697a4a05d 100644 --- a/keyboards/splitkb/halcyon/lily58/rev2/mcuconf.h +++ b/keyboards/splitkb/halcyon/lily58/rev2/mcuconf.h @@ -1,4 +1,4 @@ -// Copyright 2024 splitkb.com (support@splitkb.com) +// Copyright 2025 splitkb.com (support@splitkb.com) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -11,4 +11,4 @@ #define RP_I2C_USE_I2C0 TRUE #undef RP_SPI_USE_SPI1 -#define RP_SPI_USE_SPI1 TRUE \ No newline at end of file +#define RP_SPI_USE_SPI1 TRUE diff --git a/keyboards/splitkb/halcyon/lily58/rev2/rev2.c b/keyboards/splitkb/halcyon/lily58/rev2/rev2.c index 27671b9d7ce9..e0a64ae9a471 100644 --- a/keyboards/splitkb/halcyon/lily58/rev2/rev2.c +++ b/keyboards/splitkb/halcyon/lily58/rev2/rev2.c @@ -1,4 +1,4 @@ -// Copyright 2024 splitkb.com (support@splitkb.com) +// Copyright 2025 splitkb.com (support@splitkb.com) // SPDX-License-Identifier: GPL-2.0-or-later #include "quantum.h" From fddfe63369cff00f1a7840f045bd5146d83e09f3 Mon Sep 17 00:00:00 2001 From: VeyPatch <126267034+VeyPatch@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:00:24 +0200 Subject: [PATCH 5/7] update readme --- keyboards/splitkb/halcyon/lily58/keymaps/default/readme.md | 2 +- keyboards/splitkb/halcyon/lily58/keymaps/default/rules.mk | 1 - keyboards/splitkb/halcyon/lily58/readme.md | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 keyboards/splitkb/halcyon/lily58/keymaps/default/rules.mk diff --git a/keyboards/splitkb/halcyon/lily58/keymaps/default/readme.md b/keyboards/splitkb/halcyon/lily58/keymaps/default/readme.md index 4710e2f8fdd2..d186641d1c02 100644 --- a/keyboards/splitkb/halcyon/lily58/keymaps/default/readme.md +++ b/keyboards/splitkb/halcyon/lily58/keymaps/default/readme.md @@ -75,7 +75,7 @@ To add this, you need to convert it to the `c` format. Do keep in mind that this First, from the root of your qmk repo, move to your keymap folder ```bash -cd ./keymaps/splitkb/halcyon/lily58/my_personal_keymap +cd ./keyboards/splitkb/halcyon/lily58/keymaps/my_personal_keymap ``` Next, convert your `keymap.json` to a `keymap.c` diff --git a/keyboards/splitkb/halcyon/lily58/keymaps/default/rules.mk b/keyboards/splitkb/halcyon/lily58/keymaps/default/rules.mk deleted file mode 100644 index ee325681483f..000000000000 --- a/keyboards/splitkb/halcyon/lily58/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/splitkb/halcyon/lily58/readme.md b/keyboards/splitkb/halcyon/lily58/readme.md index 5799253b2520..ec200fda15e2 100755 --- a/keyboards/splitkb/halcyon/lily58/readme.md +++ b/keyboards/splitkb/halcyon/lily58/readme.md @@ -1,6 +1,6 @@ # Halcyon Lily58 -![splitkb/halcyon/lily58](TODO) +![splitkb/halcyon/lily58](https://i.imgur.com/q7VIrbz.png) The Halcyon Lily58 rev2 is the second Lily58 revision and the fourth keyboard in our Halcyon range. Similar to Aurora, all keyboards in the series share the same feature set. The key highlights: From bc1cb20b28678c20d839c6cd685af3927df49050 Mon Sep 17 00:00:00 2001 From: VeyPatch <126267034+VeyPatch@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:06:16 +0200 Subject: [PATCH 6/7] Remove invalid RGB Matrix effects (#24977) --- keyboards/splitkb/halcyon/lily58/rev2/keyboard.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/splitkb/halcyon/lily58/rev2/keyboard.json b/keyboards/splitkb/halcyon/lily58/rev2/keyboard.json index c81040e898a6..90d6c008a652 100755 --- a/keyboards/splitkb/halcyon/lily58/rev2/keyboard.json +++ b/keyboards/splitkb/halcyon/lily58/rev2/keyboard.json @@ -52,7 +52,6 @@ "rainbow_moving_chevron": true, "rainbow_pinwheels": true, "raindrops": true, - "solid_color": true, "solid_multisplash": true, "solid_reactive": true, "solid_reactive_cross": true, From 1d746b11e8d78b2a70ca6b3048d2118dbfeb2ae4 Mon Sep 17 00:00:00 2001 From: VeyPatch <126267034+VeyPatch@users.noreply.github.com> Date: Mon, 14 Apr 2025 21:11:36 +0200 Subject: [PATCH 7/7] Requested changes --- .../halcyon/lily58/keymaps/default/keymap.json | 11 ++++++++--- keyboards/splitkb/halcyon/lily58/rev2/keyboard.json | 3 --- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json b/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json index fd668e6f7533..05c4d89bcc7f 100644 --- a/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json +++ b/keyboards/splitkb/halcyon/lily58/keymaps/default/keymap.json @@ -33,10 +33,15 @@ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" ] ], + "config": { + "features": { + "encoder_map": true + } + }, "encoders": [ [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"}], - [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"}], - [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"}], - [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"}] + [{"ccw": "_______", "cw": "_______"}, {"ccw": "_______", "cw": "_______"}], + [{"ccw": "_______", "cw": "_______"}, {"ccw": "_______", "cw": "_______"}], + [{"ccw": "_______", "cw": "_______"}, {"ccw": "_______", "cw": "_______"}] ] } diff --git a/keyboards/splitkb/halcyon/lily58/rev2/keyboard.json b/keyboards/splitkb/halcyon/lily58/rev2/keyboard.json index 90d6c008a652..76bb538388bb 100755 --- a/keyboards/splitkb/halcyon/lily58/rev2/keyboard.json +++ b/keyboards/splitkb/halcyon/lily58/rev2/keyboard.json @@ -65,9 +65,6 @@ "splash": true, "typing_heatmap": true }, - "default": { - "animation": "cycle_left_right" - }, "driver": "ws2812", "layout": [ {"x": 51, "y": 13, "flags": 2},