forked from qmk/qmk_firmware
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into develop
- Loading branch information
Showing
17 changed files
with
508 additions
and
113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /* Copyright 2019 Thomas Baart <[email protected]> | ||
| /* Copyright 2022 Thomas Baart <[email protected]> | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
|
|
@@ -26,7 +26,3 @@ | |
|
|
||
| // Lets you roll mod-tap keys | ||
| #define IGNORE_MOD_TAP_INTERRUPT | ||
|
|
||
| // If you are using an Elite C rev3 on the slave side, uncomment the lines below: | ||
| // #define SPLIT_USB_DETECT | ||
| // #define NO_USB_STARTUP_CHECK | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /* Copyright 2019 Thomas Baart <[email protected]> | ||
| /* Copyright 2022 Thomas Baart <[email protected]> | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
|
|
@@ -20,6 +20,9 @@ | |
| #if defined(KEYBOARD_splitkb_kyria_rev1) | ||
| # include "rev1.h" | ||
| #endif | ||
| #if defined(KEYBOARD_splitkb_kyria_rev2) | ||
| # include "rev2.h" | ||
| #endif | ||
|
|
||
| /* This a shortcut to help you visually see your layout. | ||
| * | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /* | ||
| Copyright 2019 Thomas Baart <[email protected]> | ||
| Copyright 2022 Thomas Baart <[email protected]> | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
|
|
@@ -21,8 +21,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. | |
| #define VENDOR_ID 0x8D1D | ||
| #define PRODUCT_ID 0x9D9D | ||
| #define DEVICE_VER 0x0001 | ||
| #define MANUFACTURER splitKB | ||
| #define PRODUCT Kyria | ||
| #define MANUFACTURER splitkb | ||
| #define PRODUCT Kyria rev1 | ||
|
|
||
| /* key matrix size */ | ||
| /* Rows are doubled up */ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /* Copyright 2019 Thomas Baart <[email protected]> | ||
| /* Copyright 2022 Thomas Baart <[email protected]> | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
|
|
@@ -31,7 +31,13 @@ __attribute__ ((weak)) const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATR | |
| #endif | ||
|
|
||
| #ifdef RGB_MATRIX_ENABLE | ||
| /* Map physical under glow LEDs for RGB matrix support */ | ||
| /* Map physical under glow LEDs for RGB matrix support | ||
| * | ||
| * 09, 05, xx, xx, 04, xx, xx, 14, xx, xx, 15, 19, | ||
| * xx, xx, xx, xx, xx, 03, 13, xx, xx, xx, xx, xx, | ||
| * 08, 06, 07, xx, xx, xx, 00, xx, xx, 10, xx, xx, xx, 17, 16, 18, | ||
| * xx, 02, 01, xx, xx, xx, xx, 11, 12, xx | ||
| */ | ||
| led_config_t g_led_config = { { | ||
| // Key Matrix to LED Index | ||
| { NO_LED, NO_LED, NO_LED, 4, NO_LED, NO_LED, 5, 9 }, | ||
|
|
@@ -54,101 +60,3 @@ led_config_t g_led_config = { { | |
| LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL | ||
| } }; | ||
| #endif | ||
|
|
||
| #ifdef OLED_ENABLE | ||
| oled_rotation_t oled_init_kb(oled_rotation_t rotation) { | ||
| return OLED_ROTATION_180; | ||
| } | ||
|
|
||
| bool oled_task_kb(void) { | ||
| if (!oled_task_user()) { | ||
| return false; | ||
| } | ||
| if (is_keyboard_master()) { | ||
| // QMK Logo and version information | ||
| // clang-format off | ||
| static const char PROGMEM qmk_logo[] = { | ||
| 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94, | ||
| 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4, | ||
| 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0}; | ||
| // clang-format on | ||
|
|
||
| oled_write_P(qmk_logo, false); | ||
| oled_write_P(PSTR("Kyria rev1.0\n\n"), false); | ||
|
|
||
| // Host Keyboard Layer Status | ||
| oled_write_P(PSTR("Layer: "), false); | ||
| switch (get_highest_layer(layer_state | default_layer_state)) { | ||
| case 0: | ||
| oled_write_P(PSTR("QWERTY\n"), false); | ||
| break; | ||
| case 1: | ||
| oled_write_P(PSTR("Dvorak\n"), false); | ||
| break; | ||
| case 2: | ||
| oled_write_P(PSTR("Colemak-DH\n"), false); | ||
| break; | ||
| case 3: | ||
| oled_write_P(PSTR("Nav\n"), false); | ||
| break; | ||
| case 4: | ||
| oled_write_P(PSTR("Sym\n"), false); | ||
| break; | ||
| case 5: | ||
| oled_write_P(PSTR("Function\n"), false); | ||
| break; | ||
| case 6: | ||
| oled_write_P(PSTR("Adjust\n"), false); | ||
| break; | ||
| default: | ||
| oled_write_P(PSTR("Undefined\n"), false); | ||
| } | ||
|
|
||
| // Host Keyboard LED Status | ||
| led_t led_usb_state = host_keyboard_led_state(); | ||
| oled_write_P(led_usb_state.num_lock ? PSTR("NUMLCK ") : PSTR(" "), false); | ||
| oled_write_P(led_usb_state.caps_lock ? PSTR("CAPLCK ") : PSTR(" "), false); | ||
| oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); | ||
| } else { | ||
| // clang-format off | ||
| static const char PROGMEM kyria_logo[] = { | ||
| 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
| 0, 0, 0, 0, 0, 0, 0,192,224,240,124, 62, 31, 15, 7, 3, 1,128,192,224,240,120, 56, 60, 28, 30, 14, 14, 7, 7,135,231,127, 31,255,255, 31,127,231,135, 7, 7, 14, 14, 30, 28, 60, 56,120,240,224,192,128, 1, 3, 7, 15, 31, 62,124,240,224,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
| 0, 0, 0, 0,240,252,255, 31, 7, 1, 0, 0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135, 1, 0, 0,255,255, 0, 0, 1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192, 0, 0, 1, 7, 31,255,252,240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
| 0, 0, 0,255,255,255, 0, 0, 0, 0, 0,254,255,255, 1, 1, 7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30, 7, 1, 1,255,255,254, 0, 0, 0, 0, 0,255,255,255, 0, 0, 0, 0,255,255, 0, 0,192,192, 48, 48, 0, 0,240,240, 0, 0, 0, 0, 0, 0,240,240, 0, 0,240,240,192,192, 48, 48, 48, 48,192,192, 0, 0, 48, 48,243,243, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48,192,192, 0, 0, 0, 0, 0, | ||
| 0, 0, 0,255,255,255, 0, 0, 0, 0, 0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31, 7,255,255, 7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127, 0, 0, 0, 0, 0,255,255,255, 0, 0, 0, 0, 63, 63, 3, 3, 12, 12, 48, 48, 0, 0, 0, 0, 51, 51, 51, 51, 51, 51, 15, 15, 0, 0, 63, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 63, 63, 48, 48, 0, 0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63, 0, 0, 0, 0, 0, | ||
| 0, 0, 0, 0, 15, 63,255,248,224,128, 0, 0, 3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128, 0, 0,255,255, 0, 0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15, 3, 0, 0,128,224,248,255, 63, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
| 0, 0, 0, 0, 0, 0, 0, 3, 7, 15, 62,124,248,240,224,192,128, 1, 3, 7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15, 7, 3, 1,128,192,224,240,248,124, 62, 15, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
| 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 3, 7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15, 7, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 | ||
| }; | ||
| // clang-format on | ||
| oled_write_raw_P(kyria_logo, sizeof(kyria_logo)); | ||
| } | ||
| return false; | ||
| } | ||
| #endif | ||
|
|
||
| #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 true; | ||
| } | ||
| #endif | ||
Oops, something went wrong.