aboutsummaryrefslogtreecommitdiff
path: root/keyboards/crkbd
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/crkbd')
-rw-r--r--keyboards/crkbd/keymaps/armand1m/keymap.c4
-rw-r--r--keyboards/crkbd/keymaps/armand1m/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/curry/rules.mk2
-rw-r--r--keyboards/crkbd/keymaps/default/keymap.c4
-rw-r--r--keyboards/crkbd/keymaps/default/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/devdev/keymap.c140
-rw-r--r--keyboards/crkbd/keymaps/devdev/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/dsanchezseco/keymap.c2
-rw-r--r--keyboards/crkbd/keymaps/dsanchezseco/rules.mk2
-rw-r--r--keyboards/crkbd/keymaps/edvorakjp/oled.c4
-rw-r--r--keyboards/crkbd/keymaps/edvorakjp/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/gotham/keymap.c4
-rw-r--r--keyboards/crkbd/keymaps/gotham/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/kidbrazil/keymap.c4
-rw-r--r--keyboards/crkbd/keymaps/kidbrazil/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/mcrown/rules.mk5
-rw-r--r--keyboards/crkbd/keymaps/ninjonas/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/oled_sample/keymap.c2
-rw-r--r--keyboards/crkbd/keymaps/oled_sample/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/oo/keymap.c4
-rw-r--r--keyboards/crkbd/keymaps/oo/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/rjhilgefort/keymap.c4
-rw-r--r--keyboards/crkbd/keymaps/rjhilgefort/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/rpbaptist/config.h2
-rw-r--r--keyboards/crkbd/keymaps/rpbaptist/keymap.c2
-rw-r--r--keyboards/crkbd/keymaps/rpbaptist/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/snowe/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/soundmonster/keymap.c6
-rw-r--r--keyboards/crkbd/keymaps/soundmonster/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/sulrich/keymap.c4
-rw-r--r--keyboards/crkbd/keymaps/sulrich/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/vayashiko/keymap.c4
-rw-r--r--keyboards/crkbd/keymaps/via/keymap.c4
-rw-r--r--keyboards/crkbd/keymaps/via/rules.mk3
-rw-r--r--keyboards/crkbd/keymaps/xyverz/keymap.c4
-rw-r--r--keyboards/crkbd/keymaps/xyverz/rules.mk3
36 files changed, 136 insertions, 119 deletions
diff --git a/keyboards/crkbd/keymaps/armand1m/keymap.c b/keyboards/crkbd/keymaps/armand1m/keymap.c
index 190cb4cf3..a37862fad 100644
--- a/keyboards/crkbd/keymaps/armand1m/keymap.c
+++ b/keyboards/crkbd/keymaps/armand1m/keymap.c
@@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
67 ), 67 ),
68}; 68};
69 69
70#ifdef OLED_DRIVER_ENABLE 70#ifdef OLED_ENABLE
71oled_rotation_t oled_init_user(oled_rotation_t rotation) { 71oled_rotation_t oled_init_user(oled_rotation_t rotation) {
72 72
73 if (!is_keyboard_master()) { 73 if (!is_keyboard_master()) {
@@ -133,4 +133,4 @@ void oled_render_amsterdam_flag(void) {
133void oled_task_user(void) { 133void oled_task_user(void) {
134 oled_render_amsterdam_flag(); 134 oled_render_amsterdam_flag();
135} 135}
136#endif // OLED_DRIVER_ENABLE 136#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/armand1m/rules.mk b/keyboards/crkbd/keymaps/armand1m/rules.mk
index 9444b88d5..d34d066de 100644
--- a/keyboards/crkbd/keymaps/armand1m/rules.mk
+++ b/keyboards/crkbd/keymaps/armand1m/rules.mk
@@ -1 +1,2 @@
1OLED_DRIVER_ENABLE = yes 1OLED_ENABLE = yes
2OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/curry/rules.mk b/keyboards/crkbd/keymaps/curry/rules.mk
index eb56708fc..fc0e7e192 100644
--- a/keyboards/crkbd/keymaps/curry/rules.mk
+++ b/keyboards/crkbd/keymaps/curry/rules.mk
@@ -10,7 +10,7 @@ COMMAND_ENABLE = no
10RGBLIGHT_ENABLE = no 10RGBLIGHT_ENABLE = no
11RGB_MATRIX_ENABLE = yes 11RGB_MATRIX_ENABLE = yes
12 12
13OLED_DRIVER_ENABLE = yes 13OLED_ENABLE = yes
14 14
15BOOTLOADER = atmel-dfu 15BOOTLOADER = atmel-dfu
16SPLIT_TRANSPORT = mirror 16SPLIT_TRANSPORT = mirror
diff --git a/keyboards/crkbd/keymaps/default/keymap.c b/keyboards/crkbd/keymaps/default/keymap.c
index 0bc459126..88d40ee40 100644
--- a/keyboards/crkbd/keymaps/default/keymap.c
+++ b/keyboards/crkbd/keymaps/default/keymap.c
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
70 ) 70 )
71}; 71};
72 72
73#ifdef OLED_DRIVER_ENABLE 73#ifdef OLED_ENABLE
74oled_rotation_t oled_init_user(oled_rotation_t rotation) { 74oled_rotation_t oled_init_user(oled_rotation_t rotation) {
75 if (!is_keyboard_master()) { 75 if (!is_keyboard_master()) {
76 return OLED_ROTATION_180; // flips the display 180 degrees if offhand 76 return OLED_ROTATION_180; // flips the display 180 degrees if offhand
@@ -172,4 +172,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
172 } 172 }
173 return true; 173 return true;
174} 174}
175#endif // OLED_DRIVER_ENABLE 175#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/default/rules.mk b/keyboards/crkbd/keymaps/default/rules.mk
index 9444b88d5..d34d066de 100644
--- a/keyboards/crkbd/keymaps/default/rules.mk
+++ b/keyboards/crkbd/keymaps/default/rules.mk
@@ -1 +1,2 @@
1OLED_DRIVER_ENABLE = yes 1OLED_ENABLE = yes
2OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/devdev/keymap.c b/keyboards/crkbd/keymaps/devdev/keymap.c
index 4da3fcaa6..aa4d39a25 100644
--- a/keyboards/crkbd/keymaps/devdev/keymap.c
+++ b/keyboards/crkbd/keymaps/devdev/keymap.c
@@ -1,18 +1,18 @@
1/* Copyright 2020 Dane Evans 1/* Copyright 2020 Dane Evans
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 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 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 5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version. 6 * (at your option) any later version.
7 * 7 *
8 * This program is distributed in the hope that it will be useful, 8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details. 11 * GNU General Public License for more details.
12 * 12 *
13 * You should have received a copy of the GNU General Public License 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/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17// CRKBD 17// CRKBD
18 18
@@ -20,12 +20,12 @@
20 20
21 21
22char layer_state_str[24]; 22char layer_state_str[24];
23 23
24 24
25 enum userspace_layers { 25 enum userspace_layers {
26 _DEFAULTS = 0, 26 _DEFAULTS = 0,
27 _COLEMAK = 0, 27 _COLEMAK = 0,
28 _COLEMAKDH, 28 _COLEMAKDH,
29 _QWERTY, 29 _QWERTY,
30 _NUM, 30 _NUM,
31 _SYM, 31 _SYM,
@@ -33,37 +33,37 @@ char layer_state_str[24];
33 _NUMPAD, 33 _NUMPAD,
34 _SWITCH, 34 _SWITCH,
35 _MOVE, 35 _MOVE,
36 36
37}; 37};
38 38
39const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 39const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
40 40
41 // colemak 41 // colemak
42 [_COLEMAK] = LAYOUT( 42 [_COLEMAK] = LAYOUT(
43 //,-----------------------------------------------------. ,-----------------------------------------------------. 43 //,-----------------------------------------------------. ,-----------------------------------------------------.
44 LT(_NUMPAD,KC_TAB), KC_Q, KC_W, KC_F, KC_P, KC_G, LT(_SWITCH,KC_J), KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, 44 LT(_NUMPAD,KC_TAB), KC_Q, KC_W, KC_F, KC_P, KC_G, LT(_SWITCH,KC_J), KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,
45 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 45 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
46 KC_LSFT, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I,LT(_NUMPAD,KC_O),KC_QUOT, 46 KC_LSFT, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I,LT(_NUMPAD,KC_O),KC_QUOT,
47 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 47 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
48 KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, 48 KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
49 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 49 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
50 KC_LGUI, MO(_NUM), KC_SPC, KC_ENT, MO(_SYM), KC_LALT 50 KC_LGUI, MO(_NUM), KC_SPC, KC_ENT, MO(_SYM), KC_LALT
51 //`--------------------------' `--------------------------' 51 //`--------------------------' `--------------------------'
52 ), 52 ),
53 53
54 // colemak DH 54 // colemak DH
55 [_COLEMAKDH] = LAYOUT( 55 [_COLEMAKDH] = LAYOUT(
56 //,-----------------------------------------------------. ,-----------------------------------------------------. 56 //,-----------------------------------------------------. ,-----------------------------------------------------.
57 LT(_NUMPAD,KC_TAB), KC_Q, KC_W, KC_F, KC_P, KC_B, LT(_SWITCH,KC_J), KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, 57 LT(_NUMPAD,KC_TAB), KC_Q, KC_W, KC_F, KC_P, KC_B, LT(_SWITCH,KC_J), KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,
58 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 58 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
59 KC_LSFT, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I,LT(_NUMPAD,KC_O),KC_QUOT, 59 KC_LSFT, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I,LT(_NUMPAD,KC_O),KC_QUOT,
60 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 60 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
61 KC_LCTL, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, 61 KC_LCTL, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
62 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 62 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
63 KC_LGUI, MO(_NUM), KC_SPC, KC_ENT, MO(_SYM), KC_LALT 63 KC_LGUI, MO(_NUM), KC_SPC, KC_ENT, MO(_SYM), KC_LALT
64 //`--------------------------' `--------------------------' 64 //`--------------------------' `--------------------------'
65 ), 65 ),
66 66
67 // qwerty 67 // qwerty
68 [_QWERTY] = LAYOUT( 68 [_QWERTY] = LAYOUT(
69 //,-----------------------------------------------------. ,-----------------------------------------------------. 69 //,-----------------------------------------------------. ,-----------------------------------------------------.
@@ -77,9 +77,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
77 //`--------------------------' `--------------------------' 77 //`--------------------------' `--------------------------'
78 ), 78 ),
79 79
80 80
81 81
82 // numbers - L thumb 82 // numbers - L thumb
83 [_NUM] = LAYOUT( 83 [_NUM] = LAYOUT(
84 //,-----------------------------------------------------. ,-----------------------------------------------------. 84 //,-----------------------------------------------------. ,-----------------------------------------------------.
85 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, 85 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
@@ -91,8 +91,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
91 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_COMMAND), KC_TRNS 91 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_COMMAND), KC_TRNS
92 //`--------------------------' `--------------------------' 92 //`--------------------------' `--------------------------'
93 ), 93 ),
94 94
95 // symbols - R thumb 95 // symbols - R thumb
96 [_SYM] = LAYOUT( 96 [_SYM] = LAYOUT(
97 //,-----------------------------------------------------. ,-----------------------------------------------------. 97 //,-----------------------------------------------------. ,-----------------------------------------------------.
98 KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 98 KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
@@ -104,8 +104,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
104 KC_TRNS, MO(_COMMAND), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 104 KC_TRNS, MO(_COMMAND), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
105 //`--------------------------' `--------------------------' 105 //`--------------------------' `--------------------------'
106 ), 106 ),
107 107
108 // commands - both thumbs 108 // commands - both thumbs
109 [_COMMAND] = LAYOUT( 109 [_COMMAND] = LAYOUT(
110 //,-----------------------------------------------------. ,-----------------------------------------------------. 110 //,-----------------------------------------------------. ,-----------------------------------------------------.
111 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO, 111 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO,
@@ -114,24 +114,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
114 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 114 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
115 RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, DF(2), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 115 RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, DF(2), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
116 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 116 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
117 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 117 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
118 //`--------------------------' `--------------------------' 118 //`--------------------------' `--------------------------'
119 ), 119 ),
120 120
121 // numpad 121 // numpad
122 [_NUMPAD] = LAYOUT( 122 [_NUMPAD] = LAYOUT(
123 //,-----------------------------------------------------. ,-----------------------------------------------------. 123 //,-----------------------------------------------------. ,-----------------------------------------------------.
124 LT(0,KC_NO), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_CIRC, KC_P7, KC_P8, KC_P9, KC_ASTR, KC_BSPC, 124 LT(0,KC_NO), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_CIRC, KC_P7, KC_P8, KC_P9, KC_ASTR, KC_BSPC,
125 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 125 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
126 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MINS, KC_P4, KC_P5, KC_P6, KC_EQL, KC_DEL, 126 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MINS, KC_P4, KC_P5, KC_P6, KC_EQL, KC_DEL,
127 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 127 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
128 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PLUS, KC_P1, KC_P2, KC_P3, KC_SLSH, KC_NO, 128 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PLUS, KC_P1, KC_P2, KC_P3, KC_SLSH, KC_NO,
129 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 129 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
130 OSM(MOD_MEH), KC_NO, KC_TRNS, KC_ENT, KC_P0, KC_PDOT 130 OSM(MOD_MEH), KC_NO, KC_TRNS, KC_ENT, KC_P0, KC_PDOT
131 //`--------------------------' `--------------------------' 131 //`--------------------------' `--------------------------'
132 ), 132 ),
133 133
134 // layer switcher 134 // layer switcher
135 [_SWITCH] = LAYOUT( 135 [_SWITCH] = LAYOUT(
136 //,-----------------------------------------------------. ,-----------------------------------------------------. 136 //,-----------------------------------------------------. ,-----------------------------------------------------.
137 TO(0), TO(1), TO(2), TO(3), TO(4), TO(5), KC_NO, TO(7), KC_NO, KC_NO, KC_NO, RESET, 137 TO(0), TO(1), TO(2), TO(3), TO(4), TO(5), KC_NO, TO(7), KC_NO, KC_NO, KC_NO, RESET,
@@ -139,62 +139,62 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
139 KC_NO, KC_NO, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EEP_RST, 139 KC_NO, KC_NO, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EEP_RST,
140 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 140 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
141 KC_SYSTEM_SLEEP, KC_NO, KC_BRID, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 141 KC_SYSTEM_SLEEP, KC_NO, KC_BRID, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
142 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 142 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
143 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO 143 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
144 //`--------------------------' `--------------------------' 144 //`--------------------------' `--------------------------'
145 145
146 ), 146 ),
147 147
148 // amovement 148 // amovement
149 [_MOVE] = LAYOUT( 149 [_MOVE] = LAYOUT(
150 //,-----------------------------------------------------. ,-----------------------------------------------------. 150 //,-----------------------------------------------------. ,-----------------------------------------------------.
151 LT(0,KC_NO), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_UP, KC_PGUP, KC_NO, KC_NO, KC_NO, 151 LT(0,KC_NO), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_UP, KC_PGUP, KC_NO, KC_NO, KC_NO,
152 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 152 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
153 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_ENT, KC_RGHT, KC_NO, KC_NO, KC_NO, 153 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_ENT, KC_RGHT, KC_NO, KC_NO, KC_NO,
154 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 154 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
155 KC_APP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, KC_DOWN, KC_PGDN, KC_DEL, KC_NO, KC_NO, 155 KC_APP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, KC_DOWN, KC_PGDN, KC_DEL, KC_NO, KC_NO,
156 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 156 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
157 KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO 157 KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO
158 //`--------------------------' `--------------------------' 158 //`--------------------------' `--------------------------'
159 ) 159 )
160 160
161}; 161};
162 162
163 163
164// it appears that these are different to the board numbering. 164// it appears that these are different to the board numbering.
165// when you specify n here, it lightss up n+1 on the board diagram - actually may be an entirely different pattern 165// when you specify n here, it lightss up n+1 on the board diagram - actually may be an entirely different pattern
166 166
167// _QWERTY, 167// _QWERTY,
168// Light on inner column and underglow 168// Light on inner column and underglow
169const rgblight_segment_t PROGMEM layer_qwerty_lights[] = RGBLIGHT_LAYER_SEGMENTS( 169const rgblight_segment_t PROGMEM layer_qwerty_lights[] = RGBLIGHT_LAYER_SEGMENTS(
170 {0, 10, HSV_AZURE} 170 {0, 10, HSV_AZURE}
171); 171);
172 172
173// _COLEMAKDH, 173// _COLEMAKDH,
174// Light on inner column and underglow 174// Light on inner column and underglow
175const rgblight_segment_t PROGMEM layer_colemakdh_lights[] = RGBLIGHT_LAYER_SEGMENTS( 175const rgblight_segment_t PROGMEM layer_colemakdh_lights[] = RGBLIGHT_LAYER_SEGMENTS(
176 {0, 10, HSV_RED} 176 {0, 10, HSV_RED}
177); 177);
178 178
179// _NUM, 179// _NUM,
180// Light on inner column and underglow 180// Light on inner column and underglow
181const rgblight_segment_t PROGMEM layer_num_lights[] = RGBLIGHT_LAYER_SEGMENTS( 181const rgblight_segment_t PROGMEM layer_num_lights[] = RGBLIGHT_LAYER_SEGMENTS(
182 {0, 10, HSV_TEAL} 182 {0, 10, HSV_TEAL}
183); 183);
184// _SYMBOL, 184// _SYMBOL,
185// Light on inner column and underglow 185// Light on inner column and underglow
186const rgblight_segment_t PROGMEM layer_symbol_lights[] = RGBLIGHT_LAYER_SEGMENTS( 186const rgblight_segment_t PROGMEM layer_symbol_lights[] = RGBLIGHT_LAYER_SEGMENTS(
187 {0, 10, HSV_BLUE} 187 {0, 10, HSV_BLUE}
188); 188);
189// _COMMAND, 189// _COMMAND,
190// Light on inner column and underglow 190// Light on inner column and underglow
191const rgblight_segment_t PROGMEM layer_command_lights[] = RGBLIGHT_LAYER_SEGMENTS( 191const rgblight_segment_t PROGMEM layer_command_lights[] = RGBLIGHT_LAYER_SEGMENTS(
192 {0, 10, HSV_PURPLE} 192 {0, 10, HSV_PURPLE}
193); 193);
194 194
195 195
196//_NUMPAD 196//_NUMPAD
197//havent worked out how to do each side individually either 197//havent worked out how to do each side individually either
198const rgblight_segment_t PROGMEM layer_numpad_lights[] = RGBLIGHT_LAYER_SEGMENTS( 198const rgblight_segment_t PROGMEM layer_numpad_lights[] = RGBLIGHT_LAYER_SEGMENTS(
199{0, 10, HSV_ORANGE} 199{0, 10, HSV_ORANGE}
200); 200);
@@ -206,13 +206,13 @@ const rgblight_segment_t PROGMEM layer_numpad_rh_lights[] = RGBLIGHT_LAYER_SEGME
206); 206);
207 207
208// _MOVE, 208// _MOVE,
209// Light on inner column and underglow 209// Light on inner column and underglow
210const rgblight_segment_t PROGMEM layer_move_lights[] = RGBLIGHT_LAYER_SEGMENTS( 210const rgblight_segment_t PROGMEM layer_move_lights[] = RGBLIGHT_LAYER_SEGMENTS(
211 {0, 10, HSV_PINK} 211 {0, 10, HSV_PINK}
212); 212);
213 213
214// _SWITCHER // light up top row 214// _SWITCHER // light up top row
215const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS( 215const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS(
216 {0, 6, HSV_GREEN}, 216 {0, 6, HSV_GREEN},
217 {9, 2, HSV_GREEN}, 217 {9, 2, HSV_GREEN},
218 {17, 2, HSV_GREEN}, 218 {17, 2, HSV_GREEN},
@@ -222,12 +222,12 @@ const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMEN
222 222
223// Now define the array of layers. Later layers take precedence 223// Now define the array of layers. Later layers take precedence
224const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( 224const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
225 layer_qwerty_lights, 225 layer_qwerty_lights,
226 layer_colemakdh_lights, 226 layer_colemakdh_lights,
227 layer_num_lights,// overrides layer 1 227 layer_num_lights,// overrides layer 1
228 layer_symbol_lights, 228 layer_symbol_lights,
229 layer_command_lights, 229 layer_command_lights,
230 layer_numpad_lights, 230 layer_numpad_lights,
231 layer_numpad_rh_lights, 231 layer_numpad_rh_lights,
232 layer_move_lights, 232 layer_move_lights,
233 layer_switcher_lights // Overrides other layers 233 layer_switcher_lights // Overrides other layers
@@ -236,7 +236,7 @@ const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
236void keyboard_post_init_user(void) { 236void keyboard_post_init_user(void) {
237 // Enable the LED layers 237 // Enable the LED layers
238 rgblight_layers = my_rgb_layers; 238 rgblight_layers = my_rgb_layers;
239 rgblight_mode(10);// haven't found a way to set this in a more useful way 239 rgblight_mode(10);// haven't found a way to set this in a more useful way
240 240
241} 241}
242 242
@@ -244,7 +244,7 @@ void keyboard_post_init_user(void) {
244layer_state_t layer_state_set_user(layer_state_t state) { 244layer_state_t layer_state_set_user(layer_state_t state) {
245 rgblight_set_layer_state(0, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY)); 245 rgblight_set_layer_state(0, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY));
246 rgblight_set_layer_state(1, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY)); 246 rgblight_set_layer_state(1, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY));
247 247
248 rgblight_set_layer_state(2, layer_state_cmp(state, _NUM)); 248 rgblight_set_layer_state(2, layer_state_cmp(state, _NUM));
249 rgblight_set_layer_state(3, layer_state_cmp(state, _SYM)); 249 rgblight_set_layer_state(3, layer_state_cmp(state, _SYM));
250 rgblight_set_layer_state(4, layer_state_cmp(state, _COMMAND)); 250 rgblight_set_layer_state(4, layer_state_cmp(state, _COMMAND));
@@ -266,7 +266,7 @@ bool led_update_user(led_t led_state) {
266 266
267 267
268//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h 268//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
269#ifdef OLED_DRIVER_ENABLE 269#ifdef OLED_ENABLE
270oled_rotation_t oled_init_user(oled_rotation_t rotation) { 270oled_rotation_t oled_init_user(oled_rotation_t rotation) {
271 if (!is_keyboard_master()) { 271 if (!is_keyboard_master()) {
272 return OLED_ROTATION_180; // flips the display 180 degrees if offhand 272 return OLED_ROTATION_180; // flips the display 180 degrees if offhand
@@ -288,7 +288,7 @@ const char *read_mode_icon(bool swap);
288 288
289 289
290void oled_render_layer_state(void) { 290void oled_render_layer_state(void) {
291 char string [24]; 291 char string [24];
292 switch (get_highest_layer(default_layer_state|layer_state)) 292 switch (get_highest_layer(default_layer_state|layer_state))
293 { 293 {
294 case _QWERTY: 294 case _QWERTY:
@@ -296,10 +296,10 @@ void oled_render_layer_state(void) {
296 break; 296 break;
297 case _COLEMAK: 297 case _COLEMAK:
298 oled_write_ln_P(PSTR("Layer: COLEMAK"),false); 298 oled_write_ln_P(PSTR("Layer: COLEMAK"),false);
299 break; 299 break;
300 case _COLEMAKDH: 300 case _COLEMAKDH:
301 oled_write_ln_P(PSTR("Layer: COLEMAKDH"),false); 301 oled_write_ln_P(PSTR("Layer: COLEMAKDH"),false);
302 break; 302 break;
303 case _NUM: 303 case _NUM:
304 oled_write_ln_P(PSTR("Layer: Numbers"),false); 304 oled_write_ln_P(PSTR("Layer: Numbers"),false);
305 break; 305 break;
@@ -311,13 +311,13 @@ void oled_render_layer_state(void) {
311 break; 311 break;
312 case _NUMPAD: 312 case _NUMPAD:
313 oled_write_ln_P(PSTR("Layer: Numpad"),false); 313 oled_write_ln_P(PSTR("Layer: Numpad"),false);
314 break; 314 break;
315 case _MOVE: 315 case _MOVE:
316 oled_write_ln_P(PSTR("Layer: Movement"),false); 316 oled_write_ln_P(PSTR("Layer: Movement"),false);
317 break; 317 break;
318 case _SWITCH: 318 case _SWITCH:
319 oled_write_ln_P(PSTR("Layer: Layer Switch"),false); 319 oled_write_ln_P(PSTR("Layer: Layer Switch"),false);
320 break; 320 break;
321 default: 321 default:
322 snprintf(string, sizeof(string), "%ld",layer_state); 322 snprintf(string, sizeof(string), "%ld",layer_state);
323 oled_write_P(PSTR("Layer: Undef-"),false); 323 oled_write_P(PSTR("Layer: Undef-"),false);
@@ -407,4 +407,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
407 } 407 }
408 return true; 408 return true;
409} 409}
410#endif // OLED_DRIVER_ENABLE \ No newline at end of file 410#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/devdev/rules.mk b/keyboards/crkbd/keymaps/devdev/rules.mk
index 58e90c811..4aaf22fd0 100644
--- a/keyboards/crkbd/keymaps/devdev/rules.mk
+++ b/keyboards/crkbd/keymaps/devdev/rules.mk
@@ -1,4 +1,5 @@
1MOUSEKEY_ENABLE = yes 1MOUSEKEY_ENABLE = yes
2EXTRAKEY_ENABLE = yes 2EXTRAKEY_ENABLE = yes
3RGBLIGHT_ENABLE = yes 3RGBLIGHT_ENABLE = yes
4OLED_DRIVER_ENABLE = yes \ No newline at end of file 4OLED_ENABLE = yes
5OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/dsanchezseco/keymap.c b/keyboards/crkbd/keymaps/dsanchezseco/keymap.c
index 6cf593bc3..11690b029 100644
--- a/keyboards/crkbd/keymaps/dsanchezseco/keymap.c
+++ b/keyboards/crkbd/keymaps/dsanchezseco/keymap.c
@@ -75,7 +75,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
75 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); 75 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
76} 76}
77 77
78#ifdef OLED_DRIVER_ENABLE 78#ifdef OLED_ENABLE
79oled_rotation_t oled_init_user(oled_rotation_t rotation) { 79oled_rotation_t oled_init_user(oled_rotation_t rotation) {
80 if (!is_keyboard_left()) 80 if (!is_keyboard_left())
81 return OLED_ROTATION_180; // flips the display 180 to see it from my side 81 return OLED_ROTATION_180; // flips the display 180 to see it from my side
diff --git a/keyboards/crkbd/keymaps/dsanchezseco/rules.mk b/keyboards/crkbd/keymaps/dsanchezseco/rules.mk
index 0de806971..161517dd8 100644
--- a/keyboards/crkbd/keymaps/dsanchezseco/rules.mk
+++ b/keyboards/crkbd/keymaps/dsanchezseco/rules.mk
@@ -3,7 +3,7 @@
3SRC += ./logo_reader.c 3SRC += ./logo_reader.c
4 4
5# enable OLED displays 5# enable OLED displays
6OLED_DRIVER_ENABLE = no 6OLED_ENABLE = no
7 7
8# enable media keys 8# enable media keys
9EXTRAKEY_ENABLE = yes 9EXTRAKEY_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/edvorakjp/oled.c b/keyboards/crkbd/keymaps/edvorakjp/oled.c
index 2e0fed47e..3a3748c69 100644
--- a/keyboards/crkbd/keymaps/edvorakjp/oled.c
+++ b/keyboards/crkbd/keymaps/edvorakjp/oled.c
@@ -2,7 +2,7 @@
2#include <string.h> 2#include <string.h>
3#include "oled.h" 3#include "oled.h"
4 4
5#ifdef OLED_DRIVER_ENABLE 5#ifdef OLED_ENABLE
6void render_host_led_state(void) { oled_write(read_host_led_state(), false); } 6void render_host_led_state(void) { oled_write(read_host_led_state(), false); }
7 7
8void render_layer_state(void) { 8void render_layer_state(void) {
@@ -52,4 +52,4 @@ void oled_task_user(void) {
52 render_logo(); 52 render_logo();
53 } 53 }
54} 54}
55#endif // OLED_DRIVER_ENABLE 55#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/edvorakjp/rules.mk b/keyboards/crkbd/keymaps/edvorakjp/rules.mk
index 1ec910800..1291d50e9 100644
--- a/keyboards/crkbd/keymaps/edvorakjp/rules.mk
+++ b/keyboards/crkbd/keymaps/edvorakjp/rules.mk
@@ -16,7 +16,8 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
16RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. 16RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
17SWAP_HANDS_ENABLE = no # Enable one-hand typing 17SWAP_HANDS_ENABLE = no # Enable one-hand typing
18TAP_DANCE_ENABLE = yes 18TAP_DANCE_ENABLE = yes
19OLED_DRIVER_ENABLE = yes 19OLED_ENABLE = yes
20OLED_DRIVER = SSD1306
20 21
21# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 22# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
22SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 23SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
diff --git a/keyboards/crkbd/keymaps/gotham/keymap.c b/keyboards/crkbd/keymaps/gotham/keymap.c
index 8b864277c..7cf4b7fd5 100644
--- a/keyboards/crkbd/keymaps/gotham/keymap.c
+++ b/keyboards/crkbd/keymaps/gotham/keymap.c
@@ -1,7 +1,7 @@
1#include QMK_KEYBOARD_H 1#include QMK_KEYBOARD_H
2#include "keycodes.h" 2#include "keycodes.h"
3 3
4#ifdef OLED_DRIVER_ENABLE 4#ifdef OLED_ENABLE
5# include "oled.c" 5# include "oled.c"
6#endif 6#endif
7 7
@@ -78,7 +78,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
78#endif 78#endif
79 79
80bool process_record_user(uint16_t keycode, keyrecord_t *record) { 80bool process_record_user(uint16_t keycode, keyrecord_t *record) {
81#ifdef OLED_DRIVER_ENABLE 81#ifdef OLED_ENABLE
82 if (record->event.pressed) { 82 if (record->event.pressed) {
83 oled_timer = timer_read(); 83 oled_timer = timer_read();
84 add_keylog(keycode); 84 add_keylog(keycode);
diff --git a/keyboards/crkbd/keymaps/gotham/rules.mk b/keyboards/crkbd/keymaps/gotham/rules.mk
index eaf8f89fd..48a2c1d72 100644
--- a/keyboards/crkbd/keymaps/gotham/rules.mk
+++ b/keyboards/crkbd/keymaps/gotham/rules.mk
@@ -2,5 +2,6 @@ MOUSEKEY_ENABLE = no
2EXTRAKEY_ENABLE = yes 2EXTRAKEY_ENABLE = yes
3AUDIO_ENABLE = yes 3AUDIO_ENABLE = yes
4RGBLIGHT_ENABLE = yes 4RGBLIGHT_ENABLE = yes
5OLED_DRIVER_ENABLE = yes 5OLED_ENABLE = yes
6OLED_DRIVER = SSD1306
6LTO_ENABLE = yes 7LTO_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/kidbrazil/keymap.c b/keyboards/crkbd/keymaps/kidbrazil/keymap.c
index 952fb669b..7cb08f40d 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/keymap.c
+++ b/keyboards/crkbd/keymaps/kidbrazil/keymap.c
@@ -73,7 +73,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
73 default: 73 default:
74 // Use process_record_keymap to reset timer on all other keypresses to awaken from idle. 74 // Use process_record_keymap to reset timer on all other keypresses to awaken from idle.
75 if (record->event.pressed) { 75 if (record->event.pressed) {
76 #ifdef OLED_DRIVER_ENABLE 76 #ifdef OLED_ENABLE
77 oled_timer = timer_read32(); 77 oled_timer = timer_read32();
78 #endif 78 #endif
79 // Restore LEDs if they are enabled by user 79 // Restore LEDs if they are enabled by user
@@ -125,7 +125,7 @@ void matrix_scan_user(void) {
125 } 125 }
126} 126}
127// [OLED Configuration] ------------------------------------------------------// 127// [OLED Configuration] ------------------------------------------------------//
128#ifdef OLED_DRIVER_ENABLE 128#ifdef OLED_ENABLE
129// Init Oled and Rotate.... 129// Init Oled and Rotate....
130oled_rotation_t oled_init_user(oled_rotation_t rotation) { 130oled_rotation_t oled_init_user(oled_rotation_t rotation) {
131 if (!is_keyboard_master()) 131 if (!is_keyboard_master())
diff --git a/keyboards/crkbd/keymaps/kidbrazil/rules.mk b/keyboards/crkbd/keymaps/kidbrazil/rules.mk
index c58f43c2b..5566a6130 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/rules.mk
+++ b/keyboards/crkbd/keymaps/kidbrazil/rules.mk
@@ -5,7 +5,8 @@ AUDIO_ENABLE = no # Audio output on port C6
5MOUSEKEY_ENABLE = no 5MOUSEKEY_ENABLE = no
6RGBLIGHT_ENABLE = no 6RGBLIGHT_ENABLE = no
7RGB_MATRIX_ENABLE = yes 7RGB_MATRIX_ENABLE = yes
8OLED_DRIVER_ENABLE = yes 8OLED_ENABLE = yes
9OLED_DRIVER = SSD1306
9 10
10# If you want to change the display of OLED, you need to change here 11# If you want to change the display of OLED, you need to change here
11SRC += logo_reader.c \ 12SRC += logo_reader.c \
diff --git a/keyboards/crkbd/keymaps/mcrown/rules.mk b/keyboards/crkbd/keymaps/mcrown/rules.mk
index df09acc6c..922e246ba 100644
--- a/keyboards/crkbd/keymaps/mcrown/rules.mk
+++ b/keyboards/crkbd/keymaps/mcrown/rules.mk
@@ -5,8 +5,9 @@
5# 5#
6MOUSEKEY_ENABLE = no # Mouse keys(+4700) 6MOUSEKEY_ENABLE = no # Mouse keys(+4700)
7EXTRAKEY_ENABLE = no # Audio control and System control(+450) 7EXTRAKEY_ENABLE = no # Audio control and System control(+450)
8RGB_MATRIX_ENABLE = yes # Enable RGB Matrix. 8RGB_MATRIX_ENABLE = yes # Enable RGB Matrix.
9OLED_DRIVER_ENABLE = yes 9OLED_ENABLE = yes
10OLED_DRIVER = SSD1306
10 11
11# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 12# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
12SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 13SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
diff --git a/keyboards/crkbd/keymaps/ninjonas/rules.mk b/keyboards/crkbd/keymaps/ninjonas/rules.mk
index 3c3bf923e..c40a82779 100644
--- a/keyboards/crkbd/keymaps/ninjonas/rules.mk
+++ b/keyboards/crkbd/keymaps/ninjonas/rules.mk
@@ -1,6 +1,7 @@
1RGB_MATRIX_ENABLE = yes 1RGB_MATRIX_ENABLE = yes
2MOUSEKEY_ENABLE = no 2MOUSEKEY_ENABLE = no
3OLED_DRIVER_ENABLE = yes 3OLED_ENABLE = yes
4OLED_DRIVER = SSD1306
4LTO_ENABLE = yes 5LTO_ENABLE = yes
5 6
6# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 7# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/keyboards/crkbd/keymaps/oled_sample/keymap.c b/keyboards/crkbd/keymaps/oled_sample/keymap.c
index b8c3985fb..14b453585 100644
--- a/keyboards/crkbd/keymaps/oled_sample/keymap.c
+++ b/keyboards/crkbd/keymaps/oled_sample/keymap.c
@@ -74,7 +74,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
74} 74}
75 75
76 76
77#ifdef OLED_DRIVER_ENABLE 77#ifdef OLED_ENABLE
78oled_rotation_t oled_init_user(oled_rotation_t rotation) { 78oled_rotation_t oled_init_user(oled_rotation_t rotation) {
79 if (is_keyboard_master()) { 79 if (is_keyboard_master()) {
80 return OLED_ROTATION_270; 80 return OLED_ROTATION_270;
diff --git a/keyboards/crkbd/keymaps/oled_sample/rules.mk b/keyboards/crkbd/keymaps/oled_sample/rules.mk
index fb480bba8..d9db223cf 100644
--- a/keyboards/crkbd/keymaps/oled_sample/rules.mk
+++ b/keyboards/crkbd/keymaps/oled_sample/rules.mk
@@ -4,4 +4,5 @@
4# the appropriate keymap folder that will get included automatically 4# the appropriate keymap folder that will get included automatically
5# 5#
6RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. 6RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
7OLED_DRIVER_ENABLE = yes 7OLED_ENABLE = yes
8OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/oo/keymap.c b/keyboards/crkbd/keymaps/oo/keymap.c
index 17d5788d6..c0416d972 100644
--- a/keyboards/crkbd/keymaps/oo/keymap.c
+++ b/keyboards/crkbd/keymaps/oo/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
60}; 60};
61 61
62 62
63#ifdef OLED_DRIVER_ENABLE 63#ifdef OLED_ENABLE
64#include <stdio.h> 64#include <stdio.h>
65oled_rotation_t oled_init_user(oled_rotation_t rotation) { 65oled_rotation_t oled_init_user(oled_rotation_t rotation) {
66 if (!is_keyboard_master()) { 66 if (!is_keyboard_master()) {
@@ -163,4 +163,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
163 } 163 }
164 return true; 164 return true;
165} 165}
166#endif // OLED_DRIVER_ENABLE 166#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/oo/rules.mk b/keyboards/crkbd/keymaps/oo/rules.mk
index c58266213..d34d066de 100644
--- a/keyboards/crkbd/keymaps/oo/rules.mk
+++ b/keyboards/crkbd/keymaps/oo/rules.mk
@@ -1 +1,2 @@
1OLED_DRIVER_ENABLE = yes 1OLED_ENABLE = yes
2OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/rjhilgefort/keymap.c b/keyboards/crkbd/keymaps/rjhilgefort/keymap.c
index e1e051874..7ca234a0e 100644
--- a/keyboards/crkbd/keymaps/rjhilgefort/keymap.c
+++ b/keyboards/crkbd/keymaps/rjhilgefort/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
103 ) 103 )
104}; 104};
105 105
106#ifdef OLED_DRIVER_ENABLE 106#ifdef OLED_ENABLE
107# include <stdio.h> 107# include <stdio.h>
108 108
109oled_rotation_t oled_init_user(oled_rotation_t rotation) { 109oled_rotation_t oled_init_user(oled_rotation_t rotation) {
@@ -219,4 +219,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
219 } 219 }
220 return true; 220 return true;
221} 221}
222#endif // OLED_DRIVER_ENABLE 222#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/rjhilgefort/rules.mk b/keyboards/crkbd/keymaps/rjhilgefort/rules.mk
index a1b6e79e7..c6c258e25 100644
--- a/keyboards/crkbd/keymaps/rjhilgefort/rules.mk
+++ b/keyboards/crkbd/keymaps/rjhilgefort/rules.mk
@@ -4,4 +4,5 @@ BOOTLOADER = atmel-dfu
4# https://www.reddit.com/r/olkb/comments/9pyc0u/qmk_media_keys_are_not_working/ 4# https://www.reddit.com/r/olkb/comments/9pyc0u/qmk_media_keys_are_not_working/
5EXTRAKEY_ENABLE = yes 5EXTRAKEY_ENABLE = yes
6 6
7OLED_DRIVER_ENABLE = yes 7OLED_ENABLE = yes
8OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h
index 9e5f75c36..3c5222eda 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/config.h
+++ b/keyboards/crkbd/keymaps/rpbaptist/config.h
@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
25/* Select hand configuration */ 25/* Select hand configuration */
26#define EE_HANDS 26#define EE_HANDS
27 27
28#ifdef OLED_DRIVER_ENABLE 28#ifdef OLED_ENABLE
29# undef SSD1306OLED 29# undef SSD1306OLED
30# define OLED_TIMEOUT 600000 30# define OLED_TIMEOUT 600000
31#endif 31#endif
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index 2dafbd2a7..d632e255d 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -180,7 +180,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
180 return state; 180 return state;
181} 181}
182 182
183#ifdef OLED_DRIVER_ENABLE 183#ifdef OLED_ENABLE
184oled_rotation_t oled_init_user(oled_rotation_t rotation) { 184oled_rotation_t oled_init_user(oled_rotation_t rotation) {
185 if (is_keyboard_master()) { 185 if (is_keyboard_master()) {
186 return OLED_ROTATION_270; 186 return OLED_ROTATION_270;
diff --git a/keyboards/crkbd/keymaps/rpbaptist/rules.mk b/keyboards/crkbd/keymaps/rpbaptist/rules.mk
index bac8680c5..2366f669a 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/rules.mk
+++ b/keyboards/crkbd/keymaps/rpbaptist/rules.mk
@@ -28,7 +28,8 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
28 28
29BOOTLOADER = qmk-dfu 29BOOTLOADER = qmk-dfu
30 30
31OLED_DRIVER_ENABLE = yes 31OLED_ENABLE = yes
32OLED_DRIVER = SSD1306
32 33
33ifeq ($(strip $(THEME)), godspeed) 34ifeq ($(strip $(THEME)), godspeed)
34 OPT_DEFS += -DTHEME_GODSPEED 35 OPT_DEFS += -DTHEME_GODSPEED
diff --git a/keyboards/crkbd/keymaps/snowe/rules.mk b/keyboards/crkbd/keymaps/snowe/rules.mk
index c14736e9d..ce3b5928f 100644
--- a/keyboards/crkbd/keymaps/snowe/rules.mk
+++ b/keyboards/crkbd/keymaps/snowe/rules.mk
@@ -13,7 +13,8 @@ UNICODE_ENABLE = no # Unicode
13BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 13BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
14SWAP_HANDS_ENABLE = no # Enable one-hand typing 14SWAP_HANDS_ENABLE = no # Enable one-hand typing
15RGBLIGHT_TWINKLE = no 15RGBLIGHT_TWINKLE = no
16OLED_DRIVER_ENABLE = yes 16OLED_ENABLE = yes
17OLED_DRIVER = SSD1306
17RGB_MATRIX_ENABLE = yes 18RGB_MATRIX_ENABLE = yes
18 19
19OCEAN_DREAM_ENABLE = yes 20OCEAN_DREAM_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/soundmonster/keymap.c b/keyboards/crkbd/keymaps/soundmonster/keymap.c
index 144586969..67cfa78f9 100644
--- a/keyboards/crkbd/keymaps/soundmonster/keymap.c
+++ b/keyboards/crkbd/keymaps/soundmonster/keymap.c
@@ -7,7 +7,7 @@ extern keymap_config_t keymap_config;
7extern rgblight_config_t rgblight_config; 7extern rgblight_config_t rgblight_config;
8#endif 8#endif
9 9
10#ifdef OLED_DRIVER_ENABLE 10#ifdef OLED_ENABLE
11static uint32_t oled_timer = 0; 11static uint32_t oled_timer = 0;
12#endif 12#endif
13 13
@@ -102,7 +102,7 @@ void matrix_init_user(void) {
102 #endif 102 #endif
103} 103}
104 104
105#ifdef OLED_DRIVER_ENABLE 105#ifdef OLED_ENABLE
106oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; } 106oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
107 107
108void render_space(void) { 108void render_space(void) {
@@ -319,7 +319,7 @@ void oled_task_user(void) {
319#endif 319#endif
320bool process_record_user(uint16_t keycode, keyrecord_t *record) { 320bool process_record_user(uint16_t keycode, keyrecord_t *record) {
321 if (record->event.pressed) { 321 if (record->event.pressed) {
322#ifdef OLED_DRIVER_ENABLE 322#ifdef OLED_ENABLE
323 oled_timer = timer_read32(); 323 oled_timer = timer_read32();
324#endif 324#endif
325 // set_timelog(); 325 // set_timelog();
diff --git a/keyboards/crkbd/keymaps/soundmonster/rules.mk b/keyboards/crkbd/keymaps/soundmonster/rules.mk
index a73e6fe02..62971258e 100644
--- a/keyboards/crkbd/keymaps/soundmonster/rules.mk
+++ b/keyboards/crkbd/keymaps/soundmonster/rules.mk
@@ -2,5 +2,6 @@ RGBLIGHT_ENABLE = no
2RGB_MATRIX_ENABLE = yes 2RGB_MATRIX_ENABLE = yes
3MOUSEKEY_ENABLE = no 3MOUSEKEY_ENABLE = no
4NKRO_ENABLE = yes 4NKRO_ENABLE = yes
5OLED_DRIVER_ENABLE = yes 5OLED_ENABLE = yes
6OLED_DRIVER = SSD1306
6 7
diff --git a/keyboards/crkbd/keymaps/sulrich/keymap.c b/keyboards/crkbd/keymaps/sulrich/keymap.c
index 4e75d5bdd..f1cd60c52 100644
--- a/keyboards/crkbd/keymaps/sulrich/keymap.c
+++ b/keyboards/crkbd/keymaps/sulrich/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
57 ) 57 )
58}; 58};
59 59
60#ifdef OLED_DRIVER_ENABLE 60#ifdef OLED_ENABLE
61oled_rotation_t oled_init_user(oled_rotation_t rotation) { 61oled_rotation_t oled_init_user(oled_rotation_t rotation) {
62 if (!is_keyboard_master()) { 62 if (!is_keyboard_master()) {
63 return OLED_ROTATION_180; // flips the display 180 degrees if offhand 63 return OLED_ROTATION_180; // flips the display 180 degrees if offhand
@@ -152,5 +152,5 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
152 } 152 }
153 return true; 153 return true;
154} 154}
155#endif // OLED_DRIVER_ENABLE 155#endif // OLED_ENABLE
156 156
diff --git a/keyboards/crkbd/keymaps/sulrich/rules.mk b/keyboards/crkbd/keymaps/sulrich/rules.mk
index 5ec4f0587..24d83947a 100644
--- a/keyboards/crkbd/keymaps/sulrich/rules.mk
+++ b/keyboards/crkbd/keymaps/sulrich/rules.mk
@@ -1,2 +1,3 @@
1EXTRAKEY_ENABLE = yes 1EXTRAKEY_ENABLE = yes
2OLED_DRIVER_ENABLE = yes 2OLED_ENABLE = yes
3OLED_DRIVER = SSD1306
diff --git a/keyboards/crkbd/keymaps/vayashiko/keymap.c b/keyboards/crkbd/keymaps/vayashiko/keymap.c
index e9befa555..a1a8f7e9f 100644
--- a/keyboards/crkbd/keymaps/vayashiko/keymap.c
+++ b/keyboards/crkbd/keymaps/vayashiko/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
77 ) 77 )
78}; 78};
79 79
80#ifdef OLED_DRIVER_ENABLE 80#ifdef OLED_ENABLE
81oled_rotation_t oled_init_user(oled_rotation_t rotation) { 81oled_rotation_t oled_init_user(oled_rotation_t rotation) {
82 if (!is_master) { 82 if (!is_master) {
83 return OLED_ROTATION_180; // flips the display 180 degrees if offhand 83 return OLED_ROTATION_180; // flips the display 180 degrees if offhand
@@ -179,4 +179,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
179 } 179 }
180 return true; 180 return true;
181} 181}
182#endif // OLED_DRIVER_ENABLE 182#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/via/keymap.c b/keyboards/crkbd/keymaps/via/keymap.c
index 4735255ea..cbaeb93f6 100644
--- a/keyboards/crkbd/keymaps/via/keymap.c
+++ b/keyboards/crkbd/keymaps/via/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
69 ) 69 )
70}; 70};
71 71
72#ifdef OLED_DRIVER_ENABLE 72#ifdef OLED_ENABLE
73#include <stdio.h> 73#include <stdio.h>
74 74
75oled_rotation_t oled_init_user(oled_rotation_t rotation) { 75oled_rotation_t oled_init_user(oled_rotation_t rotation) {
@@ -173,4 +173,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
173 } 173 }
174 return true; 174 return true;
175} 175}
176#endif // OLED_DRIVER_ENABLE 176#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/via/rules.mk b/keyboards/crkbd/keymaps/via/rules.mk
index 93b2afed4..69841c235 100644
--- a/keyboards/crkbd/keymaps/via/rules.mk
+++ b/keyboards/crkbd/keymaps/via/rules.mk
@@ -1,5 +1,6 @@
1MOUSEKEY_ENABLE = no # Mouse keys 1MOUSEKEY_ENABLE = no # Mouse keys
2RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. 2RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
3VIA_ENABLE = yes # Enable VIA 3VIA_ENABLE = yes # Enable VIA
4OLED_DRIVER_ENABLE = yes 4OLED_ENABLE = yes
5OLED_DRIVER = SSD1306
5LTO_ENABLE = yes 6LTO_ENABLE = yes
diff --git a/keyboards/crkbd/keymaps/xyverz/keymap.c b/keyboards/crkbd/keymaps/xyverz/keymap.c
index ff9d258f0..d99d9d6ba 100644
--- a/keyboards/crkbd/keymaps/xyverz/keymap.c
+++ b/keyboards/crkbd/keymaps/xyverz/keymap.c
@@ -100,7 +100,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
100 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); 100 return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
101} 101}
102 102
103#ifdef OLED_DRIVER_ENABLE 103#ifdef OLED_ENABLE
104oled_rotation_t oled_init_user(oled_rotation_t rotation) { 104oled_rotation_t oled_init_user(oled_rotation_t rotation) {
105 if (!is_keyboard_master()) { 105 if (!is_keyboard_master()) {
106 return OLED_ROTATION_180; // flips the display 180 degrees if offhand 106 return OLED_ROTATION_180; // flips the display 180 degrees if offhand
@@ -202,4 +202,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
202 } 202 }
203 return true; 203 return true;
204} 204}
205#endif // OLED_DRIVER_ENABLE 205#endif // OLED_ENABLE
diff --git a/keyboards/crkbd/keymaps/xyverz/rules.mk b/keyboards/crkbd/keymaps/xyverz/rules.mk
index 1d320c0f3..d34d066de 100644
--- a/keyboards/crkbd/keymaps/xyverz/rules.mk
+++ b/keyboards/crkbd/keymaps/xyverz/rules.mk
@@ -1 +1,2 @@
1OLED_DRIVER_ENABLE = yes \ No newline at end of file 1OLED_ENABLE = yes
2OLED_DRIVER = SSD1306
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 12:38:01 +0000