aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2018-11-26 16:45:24 -0800
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-11-26 16:45:24 -0800
commitecd21b44a8efd5c7241ebf48c65fc7b30134865f (patch)
tree6fd84ca4bc241d9dbbe8ea3b81a7c8341b80ecc3 /keyboards
parentedb6c98fd23ab102069037f3dbfbd46c6067e86a (diff)
downloadqmk_firmware-ecd21b44a8efd5c7241ebf48c65fc7b30134865f.tar.gz
qmk_firmware-ecd21b44a8efd5c7241ebf48c65fc7b30134865f.zip
Update to drashna userspace and keymaps (#4459)
* Fix reversed bool check in layer_state_set * Add Quefrency 65 for a friend * Add Ergodox EZ Glow keymap * Add RGB Matrix Code * Further changes to rgb matrix ErgoDox EZ * Update bjohnson keymaps * Fix CRKBD display * Overhaul to corne keyboard * Narrow scope for keylogger * Minor layout tweaks to Corne Keyboard * additional CRKBD tweaks * Minor tweaks to CRKBD * Add all characters for keylogger * Ergodox EZ Glow overhaul * Fix Ergodox EZ Glow layer colors * Increase Tapping Term for Corne Keyboard * Fix unicode-ish * Revert some changes * Add layer specific lighting effects * Some minor tweaks to ergodox glow config * revert changes to ergodox files * Update Glow readme * Add more tapping term defines * Fix changes * Fix ergodox keymap * Hopefully fix sleeping * Disable layer indications if rgb matrix is disabled * Add support for sleeping and rgb layer change toggle to ergodox ez glow * Make RGB Layer Indication Great Again * Make Unicode Great Again * Remove placeholder define Co-Authored-By: drashna <drashna@live.com> * Remove placeholder define Co-Authored-By: drashna <drashna@live.com> * Remove old EEPROM Reset keycode
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/crkbd/keymaps/drashna/config.h7
-rw-r--r--keyboards/crkbd/keymaps/drashna/keymap.c153
-rw-r--r--keyboards/crkbd/keymaps/drashna/rules.mk8
-rw-r--r--keyboards/iris/keymaps/drashna/keymap.c2
-rw-r--r--keyboards/iris/keymaps/drashna/rules.mk2
-rw-r--r--keyboards/orthodox/keymaps/drashna/keymap.c2
-rw-r--r--keyboards/quefrency/keymaps/bjohnson/config.h41
-rw-r--r--keyboards/quefrency/keymaps/bjohnson/keymap.c33
-rw-r--r--keyboards/quefrency/keymaps/bjohnson/rules.mk22
-rw-r--r--keyboards/viterbi/keymaps/drashna/keymap.c4
10 files changed, 221 insertions, 53 deletions
diff --git a/keyboards/crkbd/keymaps/drashna/config.h b/keyboards/crkbd/keymaps/drashna/config.h
index adfd79044..cbc3feeb6 100644
--- a/keyboards/crkbd/keymaps/drashna/config.h
+++ b/keyboards/crkbd/keymaps/drashna/config.h
@@ -41,5 +41,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
41#define RGBLIGHT_HUE_STEP 8 41#define RGBLIGHT_HUE_STEP 8
42#define RGBLIGHT_SAT_STEP 8 42#define RGBLIGHT_SAT_STEP 8
43#define RGBLIGHT_VAL_STEP 8 43#define RGBLIGHT_VAL_STEP 8
44#define RGBLIGHT_LIMIT_VAL 120 44#define RGBLIGHT_LIMIT_VAL 100
45#endif
46
47#ifdef AUDIO_ENABLE
48#define B6_AUDIO
49// #define NO_MUSIC_MODE
45#endif 50#endif
diff --git a/keyboards/crkbd/keymaps/drashna/keymap.c b/keyboards/crkbd/keymaps/drashna/keymap.c
index 99dcdb4e1..282ee2572 100644
--- a/keyboards/crkbd/keymaps/drashna/keymap.c
+++ b/keyboards/crkbd/keymaps/drashna/keymap.c
@@ -26,10 +26,10 @@ enum crkbd_keycodes {
26 K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \ 26 K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
27 ) \ 27 ) \
28 LAYOUT_wrapper( \ 28 LAYOUT_wrapper( \
29 KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_BSPC, \ 29 KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_MINS, \
30 KC_TAB, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, KC_QUOT, \ 30 KC_TAB, ALT_T(K11), K12, K13, K14, K15, K16, K17, K18, K19, K1A, RGUI_T(KC_QUOT), \
31 OS_LSFT, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, CTL_T(K2A), OS_RSFT, \ 31 OS_LSFT, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, CTL_T(K2A), OS_RSFT, \
32 LT(_LOWER,KC_GRV), KC_SPC, LALT_T(KC_BSPC), KC_DEL, KC_ENT, RAISE \ 32 LT(_LOWER,KC_GRV), KC_SPC, KC_BSPC, KC_DEL, KC_ENT, RAISE \
33 ) 33 )
34#define LAYOUT_crkbd_base_wrapper(...) LAYOUT_crkbd_base(__VA_ARGS__) 34#define LAYOUT_crkbd_base_wrapper(...) LAYOUT_crkbd_base(__VA_ARGS__)
35 35
@@ -66,14 +66,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
66 ), 66 ),
67 67
68 [_LOWER] = LAYOUT_wrapper( 68 [_LOWER] = LAYOUT_wrapper(
69 KC_TILD, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_BSPC, 69 KC_F11, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_F11,
70 KC_F11, _________________LOWER_L2__________________, _________________LOWER_R2__________________, KC_PIPE, 70 KC_F12, _________________LOWER_L2__________________, _________________LOWER_R2__________________, KC_PIPE,
71 KC_F12, _________________LOWER_L3__________________, _________________LOWER_R3__________________, _______, 71 _______, _________________LOWER_L3__________________, _________________LOWER_R3__________________, _______,
72 _______, _______, _______, _______, _______, _______ 72 _______, _______, _______, _______, _______, _______
73 ), 73 ),
74 74
75 [_RAISE] = LAYOUT_wrapper( \ 75 [_RAISE] = LAYOUT_wrapper( \
76 KC_GRV, _________________RAISE_L1__________________, _________________RAISE_R1__________________, KC_BSPC, 76 _______, _________________RAISE_L1__________________, _________________RAISE_R1__________________, _______,
77 _______, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_BSLS, 77 _______, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_BSLS,
78 _______, _________________RAISE_L3__________________, _________________RAISE_R3__________________, _______, 78 _______, _________________RAISE_L3__________________, _________________RAISE_R3__________________, _______,
79 _______, _______, _______, _______, _______, _______ 79 _______, _______, _______, _______, _______, _______
@@ -81,18 +81,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
81 81
82 [_ADJUST] = LAYOUT_wrapper( \ 82 [_ADJUST] = LAYOUT_wrapper( \
83 KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET, 83 KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET,
84 VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EPRM, 84 VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
85 TG_MODS, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, KC_MPLY, 85 _______, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, KC_MPLY,
86 _______, _______, _______, _______, _______, _______ 86 _______, _______, _______, KC_NUKE, TG_MODS, _______
87 ) 87 )
88}; 88};
89 89
90int RGB_current_mode;
91
92void matrix_init_keymap(void) { 90void matrix_init_keymap(void) {
93 #ifdef RGBLIGHT_ENABLE
94 RGB_current_mode = rgblight_config.mode;
95 #endif
96 //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h 91 //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
97 #ifdef SSD1306OLED 92 #ifdef SSD1306OLED
98 iota_gfx_init(!has_usb()); // turns on the display 93 iota_gfx_init(!has_usb()); // turns on the display
@@ -102,53 +97,118 @@ void matrix_init_keymap(void) {
102 PORTD &= ~(1<<5); 97 PORTD &= ~(1<<5);
103 98
104 DDRB &= ~(1<<0); 99 DDRB &= ~(1<<0);
105 PORTB &= ~(1<<0);} 100 PORTB &= ~(1<<0);
101}
106 102
107//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h 103//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
108#ifdef SSD1306OLED 104#ifdef SSD1306OLED
109 105
110// When add source files to SRC in rules.mk, you can use functions. 106// When add source files to SRC in rules.mk, you can use functions.
111const char *read_layer_state(void);
112const char *read_logo(void); 107const char *read_logo(void);
113void set_keylog(uint16_t keycode, keyrecord_t *record);
114const char *read_keylog(void);
115const char *read_keylogs(void);
116char layer_state_str[24]; 108char layer_state_str[24];
109char modifier_state_str[24];
110char host_led_state_str[24];
111char keylog_str[24] = {};
112char keylogs_str[21] = {};
113int keylogs_str_idx = 0;
114
117// const char *read_mode_icon(bool swap); 115// const char *read_mode_icon(bool swap);
118const char *read_host_led_state(void);
119// void set_timelog(void); 116// void set_timelog(void);
120// const char *read_timelog(void); 117// const char *read_timelog(void);
121 118
119const char code_to_name[60] = {
120 ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
121 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
122 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
123 '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
124 'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
125 '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
126
127void set_keylog(uint16_t keycode, keyrecord_t *record) {
128 char name = ' ';
129 if (keycode < 60) {
130 name = code_to_name[keycode];
131 }
132
133 // update keylog
134 snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
135 record->event.key.row, record->event.key.col,
136 keycode, name);
137
138 // update keylogs
139 if (keylogs_str_idx == sizeof(keylogs_str) - 1) {
140 keylogs_str_idx = 0;
141 for (int i = 0; i < sizeof(keylogs_str) - 1; i++) {
142 keylogs_str[i] = ' ';
143 }
144 }
145
146 keylogs_str[keylogs_str_idx] = name;
147 keylogs_str_idx++;
148}
149
150const char *read_keylog(void) {
151 return keylog_str;
152}
153
154const char *read_keylogs(void) {
155 return keylogs_str;
156}
157
158
159const char* read_modifier_state(void) {
160 uint8_t modifiers = get_mods();
161 uint8_t one_shot = get_oneshot_mods();
162
163 snprintf(modifier_state_str, sizeof(modifier_state_str), "Mods:%s %s %s %s",
164 (modifiers & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) ? "CTL" : " ",
165 (modifiers & MODS_GUI_MASK || one_shot & MODS_GUI_MASK) ? "GUI" : " ",
166 (modifiers & MODS_ALT_MASK || one_shot & MODS_ALT_MASK) ? "ALT" : " ",
167 (modifiers & MODS_SHIFT_MASK || one_shot & MODS_SHIFT_MASK) ? "SFT" : " "
168 );
169
170 return modifier_state_str;
171}
172
173const char *read_host_led_state(void) {
174 uint8_t leds = host_keyboard_leds();
175
176 snprintf(host_led_state_str, sizeof(host_led_state_str), "NL:%s CL:%s SL:%s",
177 (leds & (1 << USB_LED_NUM_LOCK)) ? "on" : "- ",
178 (leds & (1 << USB_LED_CAPS_LOCK)) ? "on" : "- ",
179 (leds & (1 << USB_LED_SCROLL_LOCK)) ? "on" : "- "
180 );
181
182 return host_led_state_str;
183}
122 184
123const char* read_layer_state(void) { 185const char* read_layer_state(void) {
124 switch (layer_state) { 186 switch (biton32(layer_state)) {
125 case _QWERTY: 187 case _RAISE:
126 switch (default_layer_state) { 188 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Raise ");
189 break;
190 case _LOWER:
191 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Lower ");
192 break;
193 case _ADJUST:
194 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Adjust ");
195 break;
196 default:
197 switch (biton32(default_layer_state)) {
127 case _QWERTY: 198 case _QWERTY:
128 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: QWERTY"); 199 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Qwerty ");
129 break; 200 break;
130 case _COLEMAK: 201 case _COLEMAK:
131 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Colemak"); 202 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Colemak");
132 break; 203 break;
133 case _DVORAK: 204 case _DVORAK:
134 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Dvorak"); 205 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Dvorak ");
135 break; 206 break;
136 case _WORKMAN: 207 case _WORKMAN:
137 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Workman"); 208 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Workman");
138 break; 209 break;
139 } 210 }
140 break; 211 break;
141 case _RAISE:
142 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Raise");
143 break;
144 case _LOWER:
145 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Lower");
146 break;
147 case _ADJUST:
148 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Adjust");
149 break;
150 default:
151 snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state);
152 } 212 }
153 213
154 return layer_state_str; 214 return layer_state_str;
@@ -160,12 +220,13 @@ void matrix_scan_keymap(void) {
160 220
161void matrix_render_user(struct CharacterMatrix *matrix) { 221void matrix_render_user(struct CharacterMatrix *matrix) {
162 if (is_master) { 222 if (is_master) {
163 // If you want to change the display of OLED, you need to change here 223 //If you want to change the display of OLED, you need to change here
164 matrix_write_ln(matrix, read_layer_state()); 224 matrix_write_ln(matrix, read_layer_state());
165 matrix_write_ln(matrix, read_keylog()); 225 matrix_write_ln(matrix, read_modifier_state());
226 // matrix_write_ln(matrix, read_keylog());
166 matrix_write_ln(matrix, read_keylogs()); 227 matrix_write_ln(matrix, read_keylogs());
167 //matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui)); 228 // matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui));
168 matrix_write_ln(matrix, read_host_led_state()); 229 matrix_write(matrix, read_host_led_state());
169 //matrix_write_ln(matrix, read_timelog()); 230 //matrix_write_ln(matrix, read_timelog());
170 } else { 231 } else {
171 matrix_write(matrix, read_logo()); 232 matrix_write(matrix, read_logo());
@@ -187,8 +248,14 @@ void iota_gfx_task_user(void) {
187} 248}
188 249
189bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { 250bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
190 if (record->event.pressed) { 251 switch (keycode) {
191 set_keylog(keycode, record); 252 case KC_A ... KC_SLASH:
253 case KC_F1 ... KC_F12:
254 case KC_INSERT ... KC_UP:
255 case KC_KP_SLASH ... KC_KP_DOT:
256 case KC_F13 ... KC_F24:
257 if (record->event.pressed) { set_keylog(keycode, record); }
258 break;
192 // set_timelog(); 259 // set_timelog();
193 } 260 }
194 return true; 261 return true;
diff --git a/keyboards/crkbd/keymaps/drashna/rules.mk b/keyboards/crkbd/keymaps/drashna/rules.mk
index ccf8e2b7c..4b70f66f7 100644
--- a/keyboards/crkbd/keymaps/drashna/rules.mk
+++ b/keyboards/crkbd/keymaps/drashna/rules.mk
@@ -20,12 +20,14 @@ SWAP_HANDS_ENABLE = no # Enable one-hand typing
20# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 20# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
21SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 21SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
22 22
23BOOTLOADER = qmk-dfu
24
23# If you want to change the display of OLED, you need to change here 25# If you want to change the display of OLED, you need to change here
24SRC += ./lib/glcdfont.c \ 26SRC += ./lib/glcdfont.c \
25 ./lib/rgb_state_reader.c \ 27 ./lib/rgb_state_reader.c \
26 ./lib/logo_reader.c \ 28 ./lib/logo_reader.c \
27 ./lib/keylogger.c \ 29 # ./lib/keylogger.c \
28 ./lib/host_led_state_reader.c \ 30 # ./lib/host_led_state_reader.c \
29 # ./lib/layer_state_reader.c \
30 # ./lib/mode_icon_reader.c \ 31 # ./lib/mode_icon_reader.c \
32 # ./lib/layer_state_reader.c \
31 # ./lib/timelogger.c \ 33 # ./lib/timelogger.c \
diff --git a/keyboards/iris/keymaps/drashna/keymap.c b/keyboards/iris/keymaps/drashna/keymap.c
index 21e3151c0..ba6f18edd 100644
--- a/keyboards/iris/keymaps/drashna/keymap.c
+++ b/keyboards/iris/keymaps/drashna/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
79 79
80 [_ADJUST] = LAYOUT_wrapper( 80 [_ADJUST] = LAYOUT_wrapper(
81 KC_MAKE, _______, _______, _______, _______, _______, _________________ADJUST_R1_________________, KC_RST, 81 KC_MAKE, _______, _______, _______, _______, _______, _________________ADJUST_R1_________________, KC_RST,
82 VRSN, _________________ADJUST_L1_________________, KC_NUKE, _______, _______, _______, _______, EPRM, 82 VRSN, _________________ADJUST_L1_________________, KC_NUKE, _______, _______, _______, _______, EEP_RST,
83 _______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, TG_MODS, 83 _______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, TG_MODS,
84 _______, _________________ADJUST_L3_________________, TG_GAME, _______, _________________ADJUST_R3_________________, KC_MPLY, 84 _______, _________________ADJUST_L3_________________, TG_GAME, _______, _________________ADJUST_R3_________________, KC_MPLY,
85 _______, _______, _______, _______, _______, _______ 85 _______, _______, _______, _______, _______, _______
diff --git a/keyboards/iris/keymaps/drashna/rules.mk b/keyboards/iris/keymaps/drashna/rules.mk
index 89e568f39..ccc33c06f 100644
--- a/keyboards/iris/keymaps/drashna/rules.mk
+++ b/keyboards/iris/keymaps/drashna/rules.mk
@@ -8,7 +8,7 @@ RGBLIGHT_ENABLE = yes
8AUDIO_ENABLE = yes 8AUDIO_ENABLE = yes
9NKRO_ENABLE = yes 9NKRO_ENABLE = yes
10BACKLIGHT_ENABLE = no 10BACKLIGHT_ENABLE = no
11SWAP_HANDS_ENABLE = yes 11SWAP_HANDS_ENABLE = no
12 12
13INDICATOR_LIGHTS = yes 13INDICATOR_LIGHTS = yes
14MACROS_ENABLED = no 14MACROS_ENABLED = no
diff --git a/keyboards/orthodox/keymaps/drashna/keymap.c b/keyboards/orthodox/keymaps/drashna/keymap.c
index 545ad25dc..346ca4f12 100644
--- a/keyboards/orthodox/keymaps/drashna/keymap.c
+++ b/keyboards/orthodox/keymaps/drashna/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
91 91
92[_ADJUST] = LAYOUT_wrapper(\ 92[_ADJUST] = LAYOUT_wrapper(\
93 KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET, 93 KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET,
94 VRSN, _________________ADJUST_L2_________________, _______, _______, _______, KC_NUKE, _________________ADJUST_R2_________________, EPRM, 94 VRSN, _________________ADJUST_L2_________________, _______, _______, _______, KC_NUKE, _________________ADJUST_R2_________________, EEP_RST,
95 TG_MODS, _________________ADJUST_L3_________________, _______, _______, _______, _______, _______, _______, _________________ADJUST_R3_________________, KC_MPLY 95 TG_MODS, _________________ADJUST_L3_________________, _______, _______, _______, _______, _______, _______, _________________ADJUST_R3_________________, KC_MPLY
96) 96)
97}; 97};
diff --git a/keyboards/quefrency/keymaps/bjohnson/config.h b/keyboards/quefrency/keymaps/bjohnson/config.h
new file mode 100644
index 000000000..37c6d6672
--- /dev/null
+++ b/keyboards/quefrency/keymaps/bjohnson/config.h
@@ -0,0 +1,41 @@
1/*
2This is the c configuration file for the keymap
3
4Copyright 2012 Jun Wako <wakojun@gmail.com>
5Copyright 2015 Jack Humbert
6Copyright 2018 Danny Nguyen <danny@keeb.io>
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/* Use I2C or Serial, not both */
25
26#define USE_SERIAL
27// #define USE_I2C
28
29#define TAPPING_TERM 500
30
31#define IGNORE_MOD_TAP_INTERRUPT
32#define PERMISSIVE_HOLD
33#define FORCE_NKRO
34#define RETRO_TAPPING
35
36#define TAPPING_TOGGLE 1
37
38#define NO_ACTION_MACRO
39#define NO_ACTION_FUNCTION
40
41#define RGBLIGHT_SLEEP
diff --git a/keyboards/quefrency/keymaps/bjohnson/keymap.c b/keyboards/quefrency/keymaps/bjohnson/keymap.c
new file mode 100644
index 000000000..434a0a305
--- /dev/null
+++ b/keyboards/quefrency/keymaps/bjohnson/keymap.c
@@ -0,0 +1,33 @@
1#include QMK_KEYBOARD_H
2
3extern keymap_config_t keymap_config;
4
5// Each layer gets a name for readability, which is then used in the keymap matrix below.
6// The underscores don't mean anything - you can have a layer called STUFF or any other name.
7// Layer names don't all need to be of the same length, obviously, and you can also skip them
8// entirely and just use numbers.
9#define _BASE 0
10#define _FN1 1
11
12enum custom_keycodes {
13 QWERTY = SAFE_RANGE,
14};
15
16
17const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
18 [_BASE] = LAYOUT_65(
19 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, XXXXXXX, KC_BSPC, KC_HOME, \
20 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, KC_END, \
21 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, KC_DEL, \
22 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_INS, \
23 KC_LCTL, KC_LGUI, KC_LALT, LT(_FN1,KC_SPC),KC_SPC, KC_SPC, XXXXXXX, KC_RALT, KC_RGUI, XXXXXXX, KC_APP, KC_RCTL, TT(_FN1)
24 ),
25
26 [_FN1] = LAYOUT_65(
27 KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, KC_BSPC, KC_PGUP, \
28 _______, _______, KC_UP, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, _______, _______, KC_PGDN, \
29 _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______, \
30 _______, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______, \
31 _______, _______, _______, _______, _______, KC_P0, XXXXXXX, _______, _______, XXXXXXX, _______, _______, _______
32 )
33};
diff --git a/keyboards/quefrency/keymaps/bjohnson/rules.mk b/keyboards/quefrency/keymaps/bjohnson/rules.mk
new file mode 100644
index 000000000..70fa71100
--- /dev/null
+++ b/keyboards/quefrency/keymaps/bjohnson/rules.mk
@@ -0,0 +1,22 @@
1BOOTLOADER = atmel-dfu
2
3# Build Options
4# change to "no" to disable the options, or define them in the Makefile in
5# the appropriate keymap folder that will get included automatically
6#
7BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000)
8MOUSEKEY_ENABLE = no # Mouse keys(+4700)
9EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
10CONSOLE_ENABLE = no # Console for debug(+400)
11COMMAND_ENABLE = no # Commands for debug and configuration
12NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
13BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
14MIDI_ENABLE = no # MIDI controls
15AUDIO_ENABLE = no # Audio output on port C6
16UNICODE_ENABLE = yes # Unicode
17BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
18RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
19# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
20SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
21
22SPLIT_KEYBOARD = yes
diff --git a/keyboards/viterbi/keymaps/drashna/keymap.c b/keyboards/viterbi/keymaps/drashna/keymap.c
index acda8a0d2..a34320519 100644
--- a/keyboards/viterbi/keymaps/drashna/keymap.c
+++ b/keyboards/viterbi/keymaps/drashna/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
60 60
61 [_MEDIA] = LAYOUT_ortho_5x7( 61 [_MEDIA] = LAYOUT_ortho_5x7(
62 KC_MAKE, KC_RESET,MU_TOG, AU_ON, AU_OFF, CK_TOGG, RGB_SAD, 62 KC_MAKE, KC_RESET,MU_TOG, AU_ON, AU_OFF, CK_TOGG, RGB_SAD,
63 MEDIA, EPRM, KC_RGB_T,RGB_M_P, RGB_M_B, RGB_M_R, RGB_SAI, 63 MEDIA, EEP_RST, KC_RGB_T,RGB_M_P, RGB_M_B, RGB_M_R, RGB_SAI,
64 RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_HUD, 64 RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_HUD,
65 KC_MPLY, KC_MPRV, KC_MNXT, RGB_M_X, RGB_M_G, RGB_M_P, RGB_HUI, 65 KC_MPLY, KC_MPRV, KC_MNXT, RGB_M_X, RGB_M_G, RGB_M_P, RGB_HUI,
66 KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI 66 KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI
@@ -94,5 +94,3 @@ void matrix_init_keymap(void) {
94 DDRB &= ~(1<<0); 94 DDRB &= ~(1<<0);
95 PORTB &= ~(1<<0); 95 PORTB &= ~(1<<0);
96} 96}
97
98