diff options
author | QMK Bot <hello@qmk.fm> | 2021-10-16 02:02:07 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-10-16 02:02:07 +0000 |
commit | a1191495132e924cad12533f11c19ba4b8288b0d (patch) | |
tree | 8b7fe8472fbc0d7229883a93ef91b26129ddc60b /keyboards/splitkb | |
parent | 36fc46ead7e9c3231b1223eb7945152aab705993 (diff) | |
parent | 40badc4413d97226398302fb7a84c83c5c4f03a8 (diff) | |
download | qmk_firmware-a1191495132e924cad12533f11c19ba4b8288b0d.tar.gz qmk_firmware-a1191495132e924cad12533f11c19ba4b8288b0d.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/splitkb')
-rw-r--r-- | keyboards/splitkb/kyria/keymaps/zigotica/config.h | 44 | ||||
-rw-r--r-- | keyboards/splitkb/kyria/keymaps/zigotica/keymap.c | 58 | ||||
-rw-r--r-- | keyboards/splitkb/kyria/keymaps/zigotica/oled.c | 87 | ||||
-rw-r--r-- | keyboards/splitkb/kyria/keymaps/zigotica/oled.h | 18 | ||||
-rw-r--r-- | keyboards/splitkb/kyria/keymaps/zigotica/rules.mk | 10 |
5 files changed, 217 insertions, 0 deletions
diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/config.h b/keyboards/splitkb/kyria/keymaps/zigotica/config.h new file mode 100644 index 000000000..b59e04474 --- /dev/null +++ b/keyboards/splitkb/kyria/keymaps/zigotica/config.h | |||
@@ -0,0 +1,44 @@ | |||
1 | /* Copyright 2020 Sergi Meseguer <zigotica@gmail.com> | ||
2 | |||
3 | This program is free software: you can redistribute it and/or modify | ||
4 | it under the terms of the GNU General Public License as published by | ||
5 | the Free Software Foundation, either version 2 of the License, or | ||
6 | (at your option) any later version. | ||
7 | |||
8 | This program is distributed in the hope that it will be useful, | ||
9 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | GNU General Public License for more details. | ||
12 | |||
13 | You should have received a copy of the GNU General Public License | ||
14 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | |||
17 | #pragma once | ||
18 | |||
19 | #define SPLIT_LAYER_STATE_ENABLE | ||
20 | #define SPLIT_LED_STATE_ENABLE | ||
21 | #define MASTER_RIGHT// EE_HANDS MASTER_RIGHT | ||
22 | |||
23 | // these should work better for homerow modifiers | ||
24 | #define TAPPING_TERM 350 | ||
25 | #define PERMISSIVE_HOLD | ||
26 | #define IGNORE_MOD_TAP_INTERRUPT | ||
27 | #define TAPPING_FORCE_HOLD | ||
28 | |||
29 | #define LEADER_PER_KEY_TIMING | ||
30 | #define LEADER_TIMEOUT 300 | ||
31 | |||
32 | #ifdef OLED_ENABLE | ||
33 | #define OLED_DISPLAY_128X64 | ||
34 | #define OLED_TIMEOUT 10000 | ||
35 | #endif | ||
36 | |||
37 | #ifdef ENCODER_ENABLE | ||
38 | // EC11K encoders have a different resolution than other EC11 encoders. | ||
39 | // When using the default resolution of 4, if you notice your encoder skipping | ||
40 | // every other tick, lower the resolution to 2. | ||
41 | #define ENCODER_RESOLUTION 2 | ||
42 | // Also, flip direction | ||
43 | #define ENCODER_DIRECTION_FLIP | ||
44 | #endif | ||
diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/keymap.c b/keyboards/splitkb/kyria/keymaps/zigotica/keymap.c new file mode 100644 index 000000000..2671f0746 --- /dev/null +++ b/keyboards/splitkb/kyria/keymaps/zigotica/keymap.c | |||
@@ -0,0 +1,58 @@ | |||
1 | /* Copyright 2020 Sergi Meseguer <zigotica@gmail.com> | ||
2 | |||
3 | This program is free software: you can redistribute it and/or modify | ||
4 | it under the terms of the GNU General Public License as published by | ||
5 | the Free Software Foundation, either version 2 of the License, or | ||
6 | (at your option) any later version. | ||
7 | |||
8 | This program is distributed in the hope that it will be useful, | ||
9 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | GNU General Public License for more details. | ||
12 | |||
13 | You should have received a copy of the GNU General Public License | ||
14 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | |||
17 | #include "zigotica.h" | ||
18 | |||
19 | #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) | ||
20 | |||
21 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
22 | |||
23 | [BASE] = LAYOUT_wrapper( | ||
24 | _______, _STENAI_L1, _STENAI_R1, _______, | ||
25 | _______, _STENAI_L2, _STENAI_R2, _______, | ||
26 | _______, _STENAI_L3, _______, _______, _______, _______, _STENAI_R3, _______, | ||
27 | _______, _______, _STENAI_LT, _______, _______, _STENAI_RT, _______, _______ | ||
28 | ), | ||
29 | |||
30 | [_NUM] = LAYOUT_wrapper( | ||
31 | _______, ____NUM_L1, ____NUM_R1, _______, | ||
32 | _______, ____NUM_L2, ____NUM_R2, _______, | ||
33 | _______, ____NUM_L3, _______, _______, _______, _______, ____NUM_R3, _______, | ||
34 | _______, _______, ____NUM_LT, _______, _______, ____NUM_RT, _______, _______ | ||
35 | ), | ||
36 | |||
37 | [_NAV] = LAYOUT_wrapper( | ||
38 | _______, ____NAV_L1, ____NAV_R1, _______, | ||
39 | _______, ____NAV_L2, ____NAV_R2, _______, | ||
40 | _______, ____NAV_L3, _______, _______, _______, _______, ____NAV_R3, _______, | ||
41 | _______, _______, ____NAV_LT, _______, _______, ____NAV_RT, _______, _______ | ||
42 | ), | ||
43 | |||
44 | [_SYM] = LAYOUT_wrapper( | ||
45 | _______, ____SYM_L1, ____SYM_R1, _______, | ||
46 | _______, ____SYM_L2, ____SYM_R2, _______, | ||
47 | _______, ____SYM_L3, _______, _______, _______, _______, ____SYM_R3, _______, | ||
48 | _______, _______, ____SYM_LT, _______, _______, ____SYM_RT, _______, _______ | ||
49 | ), | ||
50 | |||
51 | [_FN] = LAYOUT_wrapper( | ||
52 | _______, ____FN_L1, ____FN_R1, _______, | ||
53 | _______, ____FN_L2, ____FN_R2, _______, | ||
54 | _______, ____FN_L3, _______, _______, _______, _______, ____FN_R3, _______, | ||
55 | _______, _______, ____FN_LT, _______, _______, ____FN_RT, _______, _______ | ||
56 | ), | ||
57 | }; | ||
58 | |||
diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/oled.c b/keyboards/splitkb/kyria/keymaps/zigotica/oled.c new file mode 100644 index 000000000..46bb2c3ce --- /dev/null +++ b/keyboards/splitkb/kyria/keymaps/zigotica/oled.c | |||
@@ -0,0 +1,87 @@ | |||
1 | /* Copyright 2020 Sergi Meseguer <zigotica@gmail.com> | ||
2 | |||
3 | This program is free software: you can redistribute it and/or modify | ||
4 | it under the terms of the GNU General Public License as published by | ||
5 | the Free Software Foundation, either version 2 of the License, or | ||
6 | (at your option) any later version. | ||
7 | |||
8 | This program is distributed in the hope that it will be useful, | ||
9 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | GNU General Public License for more details. | ||
12 | |||
13 | You should have received a copy of the GNU General Public License | ||
14 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | |||
17 | #include "zigotica.h" | ||
18 | |||
19 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | ||
20 | return OLED_ROTATION_180; | ||
21 | } | ||
22 | |||
23 | static void render_kyria_logo(void) { | ||
24 | static const char PROGMEM kyria_logo[] = { | ||
25 | 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, | ||
26 | 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, | ||
27 | 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, | ||
28 | 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, | ||
29 | 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, | ||
30 | 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, | ||
31 | 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, | ||
32 | 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 | ||
33 | }; | ||
34 | oled_write_raw_P(kyria_logo, sizeof(kyria_logo)); | ||
35 | } | ||
36 | |||
37 | static void render_qmk_logo(void) { | ||
38 | static const char PROGMEM qmk_logo[] = { | ||
39 | 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94, | ||
40 | 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4, | ||
41 | 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0}; | ||
42 | |||
43 | oled_write_P(qmk_logo, false); | ||
44 | } | ||
45 | |||
46 | static void render_status(void) { | ||
47 | // QMK Logo and version information | ||
48 | render_qmk_logo(); | ||
49 | oled_write_P(PSTR("Kyria v1.2\n\n"), false); | ||
50 | |||
51 | // Host Keyboard Layer Status | ||
52 | oled_write_P(PSTR("Layer: "), false); | ||
53 | switch (get_highest_layer(layer_state)) { | ||
54 | case BASE: | ||
55 | oled_write_P(PSTR("STENAI\n"), false); | ||
56 | break; | ||
57 | case _NUM: | ||
58 | oled_write_P(PSTR("NUM\n"), false); | ||
59 | break; | ||
60 | case _NAV: | ||
61 | oled_write_P(PSTR("NAV\n"), false); | ||
62 | break; | ||
63 | case _SYM: | ||
64 | oled_write_P(PSTR("SYM\n"), false); | ||
65 | break; | ||
66 | case _FN: | ||
67 | oled_write_P(PSTR("FN\n"), false); | ||
68 | break; | ||
69 | default: | ||
70 | oled_write_P(PSTR("Undef\n"), false); | ||
71 | } | ||
72 | |||
73 | // Host Keyboard LED Status | ||
74 | led_t led_state = host_keyboard_led_state(); | ||
75 | oled_write_P(led_state.num_lock ? PSTR("NUMLCK ") : PSTR(" "), false); | ||
76 | oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR(" "), false); | ||
77 | oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false); | ||
78 | } | ||
79 | |||
80 | void oled_task_user(void) { | ||
81 | if (!is_keyboard_left()) { | ||
82 | render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) | ||
83 | } else { | ||
84 | render_kyria_logo(); | ||
85 | } | ||
86 | } | ||
87 | |||
diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/oled.h b/keyboards/splitkb/kyria/keymaps/zigotica/oled.h new file mode 100644 index 000000000..2422c68f2 --- /dev/null +++ b/keyboards/splitkb/kyria/keymaps/zigotica/oled.h | |||
@@ -0,0 +1,18 @@ | |||
1 | /* Copyright 2020 Sergi Meseguer <zigotica@gmail.com> | ||
2 | |||
3 | This program is free software: you can redistribute it and/or modify | ||
4 | it under the terms of the GNU General Public License as published by | ||
5 | the Free Software Foundation, either version 2 of the License, or | ||
6 | (at your option) any later version. | ||
7 | |||
8 | This program is distributed in the hope that it will be useful, | ||
9 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | GNU General Public License for more details. | ||
12 | |||
13 | You should have received a copy of the GNU General Public License | ||
14 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | |||
17 | #pragma once | ||
18 | #include "zigotica.h" | ||
diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/rules.mk b/keyboards/splitkb/kyria/keymaps/zigotica/rules.mk new file mode 100644 index 000000000..29d98d701 --- /dev/null +++ b/keyboards/splitkb/kyria/keymaps/zigotica/rules.mk | |||
@@ -0,0 +1,10 @@ | |||
1 | OLED_ENABLE = yes | ||
2 | ENCODER_ENABLE = no | ||
3 | RGBLIGHT_ENABLE = no | ||
4 | |||
5 | COMBO_ENABLE = yes | ||
6 | TAP_DANCE_ENABLE = yes | ||
7 | LEADER_ENABLE = no | ||
8 | UNICODE_ENABLE = no | ||
9 | MOUSEKEY_ENABLE = yes | ||
10 | |||