aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-01-06 17:50:58 +0000
committerQMK Bot <hello@qmk.fm>2021-01-06 17:50:58 +0000
commit93fe3b6c6611f1c111f6e3ac581d059dd29f6b9e (patch)
tree84ef5d0e7f5884bc464207a18831cbbaf55d3076
parentfc892e8c03428d3643b9a66a60bc0448adaf05a1 (diff)
parent515cea4b787ffc4b043e6569d3b6e67247e06f0f (diff)
downloadqmk_firmware-93fe3b6c6611f1c111f6e3ac581d059dd29f6b9e.tar.gz
qmk_firmware-93fe3b6c6611f1c111f6e3ac581d059dd29f6b9e.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/alps64/keymaps/dbroqua/keymap.c61
-rw-r--r--keyboards/lily58/keymaps/barabas/config.h25
-rw-r--r--keyboards/lily58/keymaps/barabas/keymap.c192
-rw-r--r--keyboards/lily58/keymaps/barabas/readme.md6
-rw-r--r--keyboards/lily58/keymaps/barabas/rules.mk6
5 files changed, 290 insertions, 0 deletions
diff --git a/keyboards/alps64/keymaps/dbroqua/keymap.c b/keyboards/alps64/keymaps/dbroqua/keymap.c
new file mode 100644
index 000000000..164d76f89
--- /dev/null
+++ b/keyboards/alps64/keymaps/dbroqua/keymap.c
@@ -0,0 +1,61 @@
1/* Copyright 2020 Damien Broqua
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 QMK_KEYBOARD_H
18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 /* 0: qwerty
21 * ,-----------------------------------------------------------------------------------------.
22 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | Backspace |
23 * |-----------------------------------------------------------------------------------------+
24 * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ |
25 * |-----------------------------------------------------------------------------------------+
26 * | Caps | A | S | D | F | G | H | J | K | L | ; | ' | Enter |
27 * |-----------------------------------------------------------------------------------------+
28 * | Shift | Z | X | C | V | B | N | M | , | . | / | RShift |
29 * |-----------------------------------------------------------------------------------------+
30 * | Ctrl |LGUI | LAlt | Space | RAlt | FN | RCtrl |
31 * `-----------------------------------------------------------------------------------------'
32 */
33 [0] = LAYOUT_all(
34 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, KC_BSPC,
35 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
36 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
37 KC_LSFT, _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______,
38 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, _______, KC_RALT, MO(1), KC_RCTL
39 ),
40
41 /* FN Layer (Based on Poker 3 FN layout)
42 * ,-----------------------------------------------------------------------------------------.
43 * | Esc | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Delete |
44 * |-----------------------------------------------------------------------------------------+
45 * | | | | | | | Calc| PgUp| Up | PgDn|PrtSc|Scrlk|Pause| |
46 * |-----------------------------------------------------------------------------------------+
47 * | | Vol-| Vol+| Mute| | | Home| Left| Down|Right| Ins | Del | |
48 * |-----------------------------------------------------------------------------------------+
49 * | | App | | | | | End | | | | | |
50 * |-----------------------------------------------------------------------------------------+
51 * | | | | | | | |
52 * `-----------------------------------------------------------------------------------------'
53 */
54 [1] = LAYOUT_all(
55 KC_ESC, 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_DEL,
56 _______, _______, _______, _______, _______, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
57 _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, KC_DEL, _______,
58 _______, _______, KC_APP, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______,
59 _______, _______, _______, _______, _______, _______, _______, _______
60 )
61};
diff --git a/keyboards/lily58/keymaps/barabas/config.h b/keyboards/lily58/keymaps/barabas/config.h
new file mode 100644
index 000000000..c57f19e53
--- /dev/null
+++ b/keyboards/lily58/keymaps/barabas/config.h
@@ -0,0 +1,25 @@
1/*
2This is the c configuration file for the keymap
3
4Copyright 2012 Jun Wako <wakojun@gmail.com>
5Copyright 2015 Jack Humbert
6Copyright 2020 Barabas Raffai
7
8This program is free software: you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by
10the Free Software Foundation, either version 2 of the License, or
11(at your option) any later version.
12
13This program is distributed in the hope that it will be useful,
14but WITHOUT ANY WARRANTY; without even the implied warranty of
15MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16GNU General Public License for more details.
17
18You should have received a copy of the GNU General Public License
19along with this program. If not, see <http://www.gnu.org/licenses/>.
20*/
21
22#pragma once
23
24#define MASTER_LEFT
25#define USE_SERIAL_PD2
diff --git a/keyboards/lily58/keymaps/barabas/keymap.c b/keyboards/lily58/keymaps/barabas/keymap.c
new file mode 100644
index 000000000..ca23a59c2
--- /dev/null
+++ b/keyboards/lily58/keymaps/barabas/keymap.c
@@ -0,0 +1,192 @@
1/*
2Copyright 2020 Barabas Raffai
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17#include QMK_KEYBOARD_H
18
19extern uint8_t is_master;
20
21enum layer_number {
22 _QWERTY = 0,
23 _GAME,
24 _LOWER,
25 _RAISE,
26 _ADJUST,
27};
28
29/* clang-format off */
30const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
31
32/* QWERTY
33 * ,-----------------------------------------. ,-----------------------------------------.
34 * | ESC | | | | | | | | | | | | ` |
35 * |------+------+------+------+------+------| |------+------+------+------+------+------|
36 * | Tab | Q | W | E | R | T | | Y | U | I | O | P | - |
37 * |------+------+------+------+------+------| |------+------+------+------+------+------|
38 * |LCTRL | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' |
39 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
40 * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / |RShift|
41 * `-----------------------------------------/ / \ \-----------------------------------------'
42 * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI |
43 * | | | |/ / \ \ | | | |
44 * `----------------------------' '------''--------------------'
45 */
46
47[_QWERTY] = LAYOUT(
48 KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_GRV,
49 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
50 KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
51 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,
52 KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC, KC_ENT, MO(_RAISE), KC_BSPC, KC_RGUI
53),
54
55 /* game layer adds the number row back */
56
57[_GAME] = LAYOUT(
58 _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
59 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
60 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
61 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
62 _______, _______, _______, _______, _______, _______, _______, _______
63),
64/* LOWER
65 * ,-----------------------------------------. ,-----------------------------------------.
66 * | | | | | | | | | | | | | |
67 * |------+------+------+------+------+------| |------+------+------+------+------+------|
68 * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 |
69 * |------+------+------+------+------+------| |------+------+------+------+------+------|
70 * | ` | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | - |
71 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
72 * | | | | | | |-------| |-------| | _ | + | { | } | | |
73 * `-----------------------------------------/ / \ \-----------------------------------------'
74 * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI |
75 * | | | |/ / \ \ | | | |
76 * `----------------------------' '------''--------------------'
77 */
78[_LOWER] = LAYOUT(
79 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
80 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
81 KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
82 _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
83 _______, _______, _______, _______, _______, _______, _______, _______
84),
85/* RAISE
86 * ,-----------------------------------------. ,-----------------------------------------.
87 * | | | | | | | | | | | | | GAME |
88 * |------+------+------+------+------+------| |------+------+------+------+------+------|
89 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | |
90 * |------+------+------+------+------+------| |------+------+------+------+------+------|
91 * | | | | | | |-------. ,-------| Left | Down | Up |Right | | |
92 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
93 * | | | | | | |-------| |-------| + | - | = | [ | ] | \ |
94 * `-----------------------------------------/ / \ \-----------------------------------------'
95 * | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI |
96 * | | | |/ / \ \ | | | |
97 * `----------------------------' '------''--------------------'
98 */
99
100[_RAISE] = LAYOUT(
101 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG(_GAME),
102 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
103 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX,
104 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
105 _______, _______, _______, _______, _______, _______, _______, _______
106),
107
108[_ADJUST] = LAYOUT( \
109 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
110 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
111 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
112 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
113 _______, _______, _______, _______, _______, _______, _______, _______
114)
115};
116/* clang-format on */
117
118// Setting ADJUST layer RGB back to default
119void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
120 if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
121 layer_on(layer3);
122 } else {
123 layer_off(layer3);
124 }
125}
126
127// SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk
128#ifdef OLED_DRIVER_ENABLE
129
130oled_rotation_t oled_init_user(oled_rotation_t rotation) {
131 if (!is_keyboard_master()) return OLED_ROTATION_180; // flips the display 180 degrees if offhand
132 return rotation;
133}
134
135const char *read_logo(void);
136void set_keylog(uint16_t keycode, keyrecord_t *record);
137const char *read_keylog(void);
138const char *read_keylogs(void);
139
140# define RAISE_MASK (1 << _RAISE)
141# define LOWER_MASK (1 << _LOWER)
142# define GAME_MASK (1 << _GAME)
143void write_layer_state(void) {
144 switch (layer_state & (~GAME_MASK)) {
145 case (RAISE_MASK | LOWER_MASK):
146 oled_write_P(PSTR("Adjust"), false);
147 break;
148 case RAISE_MASK:
149 oled_write_P(PSTR("Raise"), false);
150 break;
151 case LOWER_MASK:
152 oled_write_P(PSTR("Lower"), false);
153 break;
154 case 0:
155 oled_write_P(PSTR("Default"), false);
156 break;
157 default:
158 oled_write_P(PSTR("Undef-"), false);
159 {
160 char s[3];
161 itoa(layer_state, s, 16);
162 oled_write(s, false);
163 }
164 break;
165 }
166
167 if (layer_state & GAME_MASK) {
168 oled_write_P(PSTR(" + Game"), false);
169 }
170
171 oled_advance_page(true);
172}
173
174void oled_task_user(void) {
175 if (is_keyboard_master()) {
176 write_layer_state();
177 oled_write_ln(read_keylog(), false);
178 oled_write_ln(read_keylogs(), false);
179 } else {
180 oled_write(read_logo(), false);
181 }
182}
183#endif // OLED_DRIVER_ENABLE
184
185bool process_record_user(uint16_t keycode, keyrecord_t *record) {
186 if (record->event.pressed) {
187#ifdef OLED_DRIVER_ENABLE
188 set_keylog(keycode, record);
189#endif
190 }
191 return true;
192}
diff --git a/keyboards/lily58/keymaps/barabas/readme.md b/keyboards/lily58/keymaps/barabas/readme.md
new file mode 100644
index 000000000..db87722c0
--- /dev/null
+++ b/keyboards/lily58/keymaps/barabas/readme.md
@@ -0,0 +1,6 @@
1# Barabas' Lily58 Layout
2
3Changes from the default layout:
4- Add a layer to toggle number row. I keep missing when stretching up here,
5 trying to get used to the Raise layer instead.
6- [Vim](https://www.vim.org/) style arrow keys.
diff --git a/keyboards/lily58/keymaps/barabas/rules.mk b/keyboards/lily58/keymaps/barabas/rules.mk
new file mode 100644
index 000000000..8b1d516b7
--- /dev/null
+++ b/keyboards/lily58/keymaps/barabas/rules.mk
@@ -0,0 +1,6 @@
1NKRO_ENABLE = yes
2COMMAND_ENABLE = yes
3
4SRC += ./lib/rgb_state_reader.c \
5 ./lib/logo_reader.c \
6 ./lib/keylogger.c \
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-05 05:20:26 +0000