aboutsummaryrefslogtreecommitdiff
path: root/keyboards/crkbd
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/crkbd')
-rw-r--r--keyboards/crkbd/keymaps/drashna/config.h10
-rw-r--r--keyboards/crkbd/keymaps/drashna/keymap.c51
-rw-r--r--keyboards/crkbd/keymaps/drashna/rules.mk1
3 files changed, 43 insertions, 19 deletions
diff --git a/keyboards/crkbd/keymaps/drashna/config.h b/keyboards/crkbd/keymaps/drashna/config.h
index d35f723da..26af02957 100644
--- a/keyboards/crkbd/keymaps/drashna/config.h
+++ b/keyboards/crkbd/keymaps/drashna/config.h
@@ -41,7 +41,7 @@ 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 5 43# define RGBLIGHT_VAL_STEP 5
44# define RGBLIGHT_LIMIT_VAL 150 44# define RGBLIGHT_LIMIT_VAL 120
45#endif 45#endif
46 46
47#ifdef RGB_MATRIX_ENABLE 47#ifdef RGB_MATRIX_ENABLE
@@ -51,7 +51,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
51# define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended 51# define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
52// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) 52// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
53// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) 53// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
54# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 54# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
55# define RGB_MATRIX_HUE_STEP 8 55# define RGB_MATRIX_HUE_STEP 8
56# define RGB_MATRIX_SAT_STEP 8 56# define RGB_MATRIX_SAT_STEP 8
57# define RGB_MATRIX_VAL_STEP 5 57# define RGB_MATRIX_VAL_STEP 5
@@ -60,7 +60,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
60 60
61#ifdef AUDIO_ENABLE 61#ifdef AUDIO_ENABLE
62# define B6_AUDIO 62# define B6_AUDIO
63// #define NO_MUSIC_MODE 63# define NO_MUSIC_MODE
64#endif
65
66#ifdef HAPTIC_ENABLE
67# define SOLENOID_PIN B7
64#endif 68#endif
65 69
66#undef PRODUCT 70#undef PRODUCT
diff --git a/keyboards/crkbd/keymaps/drashna/keymap.c b/keyboards/crkbd/keymaps/drashna/keymap.c
index 36a5f5dd3..cd84f0d91 100644
--- a/keyboards/crkbd/keymaps/drashna/keymap.c
+++ b/keyboards/crkbd/keymaps/drashna/keymap.c
@@ -12,7 +12,25 @@ extern rgblight_config_t rgblight_config;
12static uint32_t oled_timer = 0; 12static uint32_t oled_timer = 0;
13static char keylog_str[6] = {}; 13static char keylog_str[6] = {};
14static uint16_t log_timer = 0; 14static uint16_t log_timer = 0;
15static const char code_to_name[60] = {' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\', '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '}; 15static const char PROGMEM code_to_name[0xFF] = {
16// 0 1 2 3 4 5 6 7 8 9 A B c D E F
17 ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', // 0x
18 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2', // 1x
19 '3', '4', '5', '6', '7', '8', '9', '0', 20, 19, 27, 26, 22, '-', '=', '[', // 2x
20 ']','\\', '#', ';','\'', '`', ',', '.', '/', 128, ' ', ' ', ' ', ' ', ' ', ' ', // 3x
21 ' ', ' ', ' ', ' ', ' ', ' ', 'P', 'S', ' ', ' ', ' ', ' ', 16, ' ', ' ', ' ', // 4x
22 ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 5x
23 ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 6x
24 ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 7x
25 ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 8x
26 ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 9x
27 ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Ax
28 ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Bx
29 ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Cx
30 ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Dx
31 'C', 'S', 'A', 'C', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Ex
32 ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' // Fx
33};
16 34
17void add_keylog(uint16_t keycode); 35void add_keylog(uint16_t keycode);
18#endif 36#endif
@@ -27,7 +45,7 @@ enum crkbd_keycodes { RGBRST = NEW_SAFE_RANGE };
27 ) \ 45 ) \
28 LAYOUT_wrapper( \ 46 LAYOUT_wrapper( \
29 KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_MINS, \ 47 KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_MINS, \
30 KC_TAB, ALT_T(K11), K12, K13, K14, K15, K16, K17, K18, K19, K1A, RALT_T(KC_QUOT), \ 48 ALT_T(KC_TAB), K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, RALT_T(KC_QUOT), \
31 OS_LSFT, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), OS_RSFT, \ 49 OS_LSFT, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), OS_RSFT, \
32 KC_GRV, KC_SPC, BK_LWER, DL_RAIS, KC_ENT, OS_RGUI \ 50 KC_GRV, KC_SPC, BK_LWER, DL_RAIS, KC_ENT, OS_RGUI \
33 ) 51 )
@@ -107,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
107 KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET, 125 KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET,
108 VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST, 126 VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
109 MG_NKRO, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL, 127 MG_NKRO, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL,
110 _______, KC_NUKE, _______, _______, TG_MODS, _______ 128 HPT_TOG, KC_NUKE, _______, _______, TG_MODS, HPT_FBK
111 ) 129 )
112}; 130};
113// clang-format on 131// clang-format on
@@ -131,16 +149,18 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
131oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; } 149oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
132 150
133void add_keylog(uint16_t keycode) { 151void add_keylog(uint16_t keycode) {
134 if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { 152 if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
135 keycode = keycode & 0xFF; 153 keycode = keycode & 0xFF;
154 } else if (keycode > 0xFF) {
155 keycode = 0;
136 } 156 }
137 157
138 for (uint8_t i = 4; i > 0; --i) { 158 for (uint8_t i = 4; i > 0; --i) {
139 keylog_str[i] = keylog_str[i - 1]; 159 keylog_str[i] = keylog_str[i - 1];
140 } 160 }
141 161
142 if (keycode < 60) { 162 if (keycode < (sizeof(code_to_name) / sizeof(char))) {
143 keylog_str[0] = code_to_name[keycode]; 163 keylog_str[0] = pgm_read_byte(&code_to_name[keycode]);
144 } 164 }
145 165
146 log_timer = timer_read(); 166 log_timer = timer_read();
@@ -148,7 +168,7 @@ void add_keylog(uint16_t keycode) {
148 168
149void update_log(void) { 169void update_log(void) {
150 if (timer_elapsed(log_timer) > 750) { 170 if (timer_elapsed(log_timer) > 750) {
151 add_keylog(0); 171 //add_keylog(0);
152 } 172 }
153} 173}
154 174
@@ -197,19 +217,18 @@ void render_layer_state(void) {
197void render_keylock_status(uint8_t led_usb_state) { 217void render_keylock_status(uint8_t led_usb_state) {
198 oled_write_P(PSTR("Lock:"), false); 218 oled_write_P(PSTR("Lock:"), false);
199 oled_write_P(PSTR(" "), false); 219 oled_write_P(PSTR(" "), false);
200 oled_write_P(PSTR("NUM "), led_usb_state & (1 << USB_LED_NUM_LOCK)); 220 oled_write_P(PSTR("N"), led_usb_state & (1 << USB_LED_NUM_LOCK));
201 oled_write_P(PSTR(" "), false); 221 oled_write_P(PSTR("C"), led_usb_state & (1 << USB_LED_CAPS_LOCK));
202 oled_write_P(PSTR("CAPS"), led_usb_state & (1 << USB_LED_CAPS_LOCK)); 222 oled_write_ln_P(PSTR("S"), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
203 oled_write_P(PSTR(" "), false);
204 oled_write_P(PSTR("SCRL"), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
205} 223}
206 224
207void render_mod_status(uint8_t modifiers) { 225void render_mod_status(uint8_t modifiers) {
208 oled_write_P(PSTR("Mods:"), false); 226 oled_write_P(PSTR("Mods:"), false);
209 oled_write_P(PSTR(" SHFT"), (modifiers & MOD_MASK_SHIFT)); 227 oled_write_P(PSTR(" "), false);
210 oled_write_P(PSTR(" CTRL"), (modifiers & MOD_MASK_CTRL)); 228 oled_write_P(PSTR("S"), (modifiers & MOD_MASK_SHIFT));
211 oled_write_P(PSTR(" ALT "), (modifiers & MOD_MASK_ALT)); 229 oled_write_P(PSTR("C"), (modifiers & MOD_MASK_CTRL));
212 oled_write_P(PSTR(" GUI "), (modifiers & MOD_MASK_GUI)); 230 oled_write_P(PSTR("A"), (modifiers & MOD_MASK_ALT));
231 oled_write_P(PSTR("G"), (modifiers & MOD_MASK_GUI));
213} 232}
214 233
215void render_bootmagic_status(void) { 234void render_bootmagic_status(void) {
diff --git a/keyboards/crkbd/keymaps/drashna/rules.mk b/keyboards/crkbd/keymaps/drashna/rules.mk
index af3404597..492c17e20 100644
--- a/keyboards/crkbd/keymaps/drashna/rules.mk
+++ b/keyboards/crkbd/keymaps/drashna/rules.mk
@@ -18,6 +18,7 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
18SWAP_HANDS_ENABLE = no # Enable one-hand typing 18SWAP_HANDS_ENABLE = no # Enable one-hand typing
19RGB_MATRIX_ENABLE = WS2812 19RGB_MATRIX_ENABLE = WS2812
20 20
21HAPTIC_ENABLE = SOLENOID
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
23 24
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-27 07:48:49 +0000