From ce1605ed07920428529a6ba80bd036f3269cd1c3 Mon Sep 17 00:00:00 2001 From: VeyPatch <126267034+VeyPatch@users.noreply.github.com> Date: Tue, 29 Oct 2024 14:54:23 +0100 Subject: [PATCH] Implement requested changes --- .../halcyon/kyria/keymaps/default/keymap.c | 24 +---------------- keyboards/splitkb/halcyon/kyria/readme.md | 9 +++++++ .../splitkb/halcyon/kyria/rev4/keyboard.json | 8 +++--- keyboards/splitkb/halcyon/kyria/rev4/rev4.c | 26 +++++++++++++++++++ 4 files changed, 39 insertions(+), 28 deletions(-) create mode 100644 keyboards/splitkb/halcyon/kyria/rev4/rev4.c diff --git a/keyboards/splitkb/halcyon/kyria/keymaps/default/keymap.c b/keyboards/splitkb/halcyon/kyria/keymaps/default/keymap.c index 60ecf539db5..3db3ac3087d 100755 --- a/keyboards/splitkb/halcyon/kyria/keymaps/default/keymap.c +++ b/keyboards/splitkb/halcyon/kyria/keymaps/default/keymap.c @@ -203,26 +203,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ // ), // -}; - -#ifdef ENCODER_ENABLE -bool encoder_update_user(uint8_t index, bool clockwise) { - - 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 +}; \ No newline at end of file diff --git a/keyboards/splitkb/halcyon/kyria/readme.md b/keyboards/splitkb/halcyon/kyria/readme.md index 20973e2570f..3cb1d7f49b4 100755 --- a/keyboards/splitkb/halcyon/kyria/readme.md +++ b/keyboards/splitkb/halcyon/kyria/readme.md @@ -2,6 +2,15 @@ ![splitkb/halcyon/kyria](https://i.imgur.com/n7WuUs9.jpg) +The Halcyon Kyria rev4 is the fourth Kyria revision and the first 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). diff --git a/keyboards/splitkb/halcyon/kyria/rev4/keyboard.json b/keyboards/splitkb/halcyon/kyria/rev4/keyboard.json index 1d7f1ea9e04..34e5f0041bd 100755 --- a/keyboards/splitkb/halcyon/kyria/rev4/keyboard.json +++ b/keyboards/splitkb/halcyon/kyria/rev4/keyboard.json @@ -1,9 +1,6 @@ { "keyboard_name": "Halcyon Kyria rev4", "bootloader": "rp2040", - "build": { - "lto": true - }, "diode_direction": "COL2ROW", "encoder": { "enabled": true, @@ -156,8 +153,9 @@ "driver": "vendor" }, "transport": { - "watchdog": true, - "watchdog_timeout": 3000 + "sync": { + "matrix_state": true + } } }, "usb": { diff --git a/keyboards/splitkb/halcyon/kyria/rev4/rev4.c b/keyboards/splitkb/halcyon/kyria/rev4/rev4.c new file mode 100644 index 00000000000..90840ae834f --- /dev/null +++ b/keyboards/splitkb/halcyon/kyria/rev4/rev4.c @@ -0,0 +1,26 @@ +// Copyright 2024 splitkb.com (support@splitkb.com) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + + 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