summaryrefslogtreecommitdiff
path: root/keyboards/crkbd/keymaps/drashna
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-09-07 08:57:30 -0700
committerGitHub <noreply@github.com>2019-09-07 08:57:30 -0700
commite88f80a891138d40acddcdd2b3dface8b2a57404 (patch)
tree1fa1e8cd0bd15d10970ce55efceaffcddaf01160 /keyboards/crkbd/keymaps/drashna
parent79a6c6eda50671b28f32dfb73728fcc1671fe4fc (diff)
[Keymap] Big Drashna code update (#6639)
* Add a quefrency keymap * New Alt-ernate layouts * Enable Per Key Tapping Term to preserve sanity * Use underglow and mod lights for status on Corne * Update the drashna_ms keymap for quefrency * Disable Audio since there isn't enough space * Update KC_MAKE to ues :flash target * Cleanup ergodox layout * Enable i2c support for Iris * Add keymap support for CG_SWAP * Enable RGB Matrix Shutdown mode * enable heatmap * Update gitlab CI to install python3 * Remove game macros These are no longer needed, and haven't been used in ages * Cleanup planck layout * Add RGB Matrix fun and RGB cleanup * Add keycode and config for RGB Matrix idle animations * Clean up rgb idle animation code * Add rgb idle keycode to keymaps * Fix issues with rgb matrix idle animation * Fix some handling for idle animation * Reduce idle animation timeout to 15s to be more reasonable * fix up rgb stuff * Fix isses with rgb functions not being called for matrix * Use custom EEPROM Magic Number so testing is easier * Extend Default Layer macro to support a lot more layers * Fix bjohnson macropad * Adjust KC_MAKE to process mods for more consistent behavior * Fix up rgb stuff on corne * Corne OLED Overhaul * Fixes a number of issues with weirdness. * Fixes issues with keylogger (should be more reliable now) * Modulaize the OLED render sections * Rewrite layer display code * Update URL for Font Editor Due to odd issues, I ended up rewriting from scratch. And using PROGMEM versions, since I think I was getting memory overflows. * Update polling rate on all keebs * Fix planck ez layout config * Remove macros from Viterbi
Diffstat (limited to 'keyboards/crkbd/keymaps/drashna')
-rw-r--r--keyboards/crkbd/keymaps/drashna/glcdfont.c4
-rw-r--r--keyboards/crkbd/keymaps/drashna/keymap.c305
2 files changed, 143 insertions, 166 deletions
diff --git a/keyboards/crkbd/keymaps/drashna/glcdfont.c b/keyboards/crkbd/keymaps/drashna/glcdfont.c
index 28521b4289..998b5c408a 100644
--- a/keyboards/crkbd/keymaps/drashna/glcdfont.c
+++ b/keyboards/crkbd/keymaps/drashna/glcdfont.c
@@ -9,8 +9,8 @@
#define PROGMEM
#endif
-// Helidox 8x6 font with QMK Firmware Logo
-// Online editor: http://teripom.x0.com/
+// Corne 8x6 font with QMK Firmware Logo
+// Online editor: https://helixfonteditor.netlify.com/
const unsigned char font[] PROGMEM = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/keyboards/crkbd/keymaps/drashna/keymap.c b/keyboards/crkbd/keymaps/drashna/keymap.c
index 693c53b167..36a5f5dd33 100644
--- a/keyboards/crkbd/keymaps/drashna/keymap.c
+++ b/keyboards/crkbd/keymaps/drashna/keymap.c
@@ -8,6 +8,14 @@ extern uint8_t is_master;
// Following line allows macro to read current RGB settings
extern rgblight_config_t rgblight_config;
#endif
+#ifdef OLED_DRIVER_ENABLE
+static uint32_t oled_timer = 0;
+static char keylog_str[6] = {};
+static uint16_t log_timer = 0;
+static 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', '_', '-', '=', '[', ']', '\\', '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
+
+void add_keylog(uint16_t keycode);
+#endif
enum crkbd_keycodes { RGBRST = NEW_SAFE_RANGE };
@@ -19,7 +27,7 @@ enum crkbd_keycodes { RGBRST = NEW_SAFE_RANGE };
) \
LAYOUT_wrapper( \
KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_MINS, \
- KC_TAB, ALT_T(K11), K12, K13, K14, K15, K16, K17, K18, K19, K1A, KC_QUOT, \
+ KC_TAB, ALT_T(K11), K12, K13, K14, K15, K16, K17, K18, K19, K1A, RALT_T(KC_QUOT), \
OS_LSFT, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), OS_RSFT, \
KC_GRV, KC_SPC, BK_LWER, DL_RAIS, KC_ENT, OS_RGUI \
)
@@ -98,34 +106,42 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ADJUST] = LAYOUT_wrapper( \
KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET,
VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
- _______, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, KC_MPLY,
+ MG_NKRO, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL,
_______, KC_NUKE, _______, _______, TG_MODS, _______
)
};
// clang-format on
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+ if (record->event.pressed) {
#ifdef OLED_DRIVER_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
-uint16_t oled_timer;
-
-char keylog_str[5] = {};
-uint8_t keylogs_str_idx = 0;
-uint16_t log_timer = 0;
+ oled_timer = timer_read32();
+ add_keylog(keycode);
+#endif
+#ifndef SPLIT_KEYBOARD
+ if (keycode == RESET && !is_master) {
+ return false;
+ }
+#endif
+ }
+ return true;
+}
-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', '_', '-', '=', '[', ']', '\\', '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
+#ifdef OLED_DRIVER_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
void add_keylog(uint16_t keycode) {
if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
keycode = keycode & 0xFF;
}
- for (uint8_t i = 4; i > 0; i--) {
+ for (uint8_t i = 4; i > 0; --i) {
keylog_str[i] = keylog_str[i - 1];
}
+
if (keycode < 60) {
keylog_str[0] = code_to_name[keycode];
}
- keylog_str[5] = 0;
log_timer = timer_read();
}
@@ -136,149 +152,118 @@ void update_log(void) {
}
}
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
- if (record->event.pressed) {
- add_keylog(keycode);
- oled_timer = timer_read();
- }
- return true;
-}
-
-void render_rgb_status(void) {
- oled_write_ln("RGB:", false);
- static char temp[20] = {0};
- snprintf(temp, sizeof(temp) + 1, "M:%3dH:%3dS:%3dV:%3d", rgb_matrix_config.mode, rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v);
- oled_write(temp, false);
+void render_keylogger_status(void) {
+ oled_write_P(PSTR("KLogr"), false);
+ oled_write(keylog_str, false);
}
-void render_status_main(void) {
- /* Show Keyboard Layout */
- oled_write("Lyout", false);
+void render_default_layer_state(void) {
+ oled_write_P(PSTR("Lyout"), false);
switch (biton32(default_layer_state)) {
case _QWERTY:
- oled_write(" QRTY", false);
+ oled_write_P(PSTR(" QRTY"), false);
break;
case _COLEMAK:
- oled_write(" COLE", false);
+ oled_write_P(PSTR(" COLE"), false);
break;
case _DVORAK:
- oled_write(" DVRK", false);
+ oled_write_P(PSTR(" DVRK"), false);
break;
case _WORKMAN:
- oled_write(" WKMN", false);
+ oled_write_P(PSTR(" WKMN"), false);
break;
case _NORMAN:
- oled_write(" NORM", false);
+ oled_write_P(PSTR(" NORM"), false);
break;
case _MALTRON:
- oled_write(" MLTN", false);
+ oled_write_P(PSTR(" MLTN"), false);
break;
case _EUCALYN:
- oled_write(" ECLN", false);
+ oled_write_P(PSTR(" ECLN"), false);
break;
case _CARPLAX:
- oled_write(" CRPX", false);
+ oled_write_P(PSTR(" CRPX"), false);
break;
}
+}
- /* Show Lock Status (only work on master side) */
- uint8_t led_usb_state = host_keyboard_leds();
- oled_write("Lock:", false);
- oled_write(" ", false);
- oled_write_ln("NUM", led_usb_state & (1 << USB_LED_NUM_LOCK));
- oled_write(" ", false);
- oled_write("CAPS", led_usb_state & (1 << USB_LED_CAPS_LOCK));
- oled_write(" ", false);
- oled_write("SCRL", led_usb_state & (1 << USB_LED_SCROLL_LOCK));
-
- /* Show Alt-Gui Swap options */
- oled_write("BTMGK", false);
- oled_write(" ", false);
- oled_write_ln("Win", !keymap_config.swap_lalt_lgui);
- oled_write(" ", false);
- oled_write_ln("Mac", keymap_config.swap_lalt_lgui);
-
-# if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
- /* Show RGB Options */
- render_rgb_status();
-# endif
+void render_layer_state(void) {
+ oled_write_P(PSTR("LAYER"), false);
+ oled_write_P(PSTR("Lower"), layer_state_is(_LOWER));
+ oled_write_P(PSTR("Raise"), layer_state_is(_RAISE));
+ oled_write_P(PSTR(" Mods"), layer_state_is(_MODS));
+}
- oled_write(keylog_str, false);
+void render_keylock_status(uint8_t led_usb_state) {
+ oled_write_P(PSTR("Lock:"), false);
+ oled_write_P(PSTR(" "), false);
+ oled_write_P(PSTR("NUM "), led_usb_state & (1 << USB_LED_NUM_LOCK));
+ oled_write_P(PSTR(" "), false);
+ oled_write_P(PSTR("CAPS"), led_usb_state & (1 << USB_LED_CAPS_LOCK));
+ oled_write_P(PSTR(" "), false);
+ oled_write_P(PSTR("SCRL"), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
}
-void render_status_secondary(void) {
+void render_mod_status(uint8_t modifiers) {
+ oled_write_P(PSTR("Mods:"), false);
+ oled_write_P(PSTR(" SHFT"), (modifiers & MOD_MASK_SHIFT));
+ oled_write_P(PSTR(" CTRL"), (modifiers & MOD_MASK_CTRL));
+ oled_write_P(PSTR(" ALT "), (modifiers & MOD_MASK_ALT));
+ oled_write_P(PSTR(" GUI "), (modifiers & MOD_MASK_GUI));
+}
+
+void render_bootmagic_status(void) {
+ /* Show Ctrl-Gui Swap options */
+ static const char PROGMEM logo[][2][3] = {
+ {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
+ {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
+ };
+ oled_write_P(PSTR("BTMGK"), false);
+ oled_write_P(PSTR(" "), false);
+ oled_write_P(logo[0][0], !keymap_config.swap_lctl_lgui);
+ oled_write_P(logo[1][0], keymap_config.swap_lctl_lgui);
+ oled_write_P(PSTR(" "), false);
+ oled_write_P(logo[0][1], !keymap_config.swap_lctl_lgui);
+ oled_write_P(logo[1][1], keymap_config.swap_lctl_lgui);
+ oled_write_P(PSTR(" NKRO"), keymap_config.nkro);
+}
+
+void render_user_status(void) {
+ oled_write_P(PSTR("USER:"), false);
+ oled_write_P(PSTR(" Anim"), userspace_config.rgb_matrix_idle_anim);
+ oled_write_P(PSTR(" Layr"), userspace_config.rgb_layer_change);
+ oled_write_P(PSTR(" Nuke"), userspace_config.nuke_switch);
+}
+
+void render_status_main(void) {
/* Show Keyboard Layout */
- oled_write("Lyout", false);
- switch (biton32(default_layer_state)) {
- case _QWERTY:
- oled_write(" QRTY", false);
- break;
- case _COLEMAK:
- oled_write(" COLE", false);
- break;
- case _DVORAK:
- oled_write(" DVRK", false);
- break;
- case _WORKMAN:
- oled_write(" WKMN", false);
- break;
- case _NORMAN:
- oled_write(" NORM", false);
- break;
- case _MALTRON:
- oled_write(" MLTN", false);
- break;
- case _EUCALYN:
- oled_write(" ECLN", false);
- break;
- case _CARPLAX:
- oled_write(" CRPX", false);
- break;
- }
+ render_default_layer_state();
+ render_keylock_status(host_keyboard_leds());
+ render_bootmagic_status();
+ render_user_status();
- /* Show Activate layer */
- oled_write("Layer", false);
- switch (biton32(layer_state)) {
- case _RAISE:
- oled_write("Raise", false);
- break;
- case _LOWER:
- oled_write("Lower", false);
- break;
- case _ADJUST:
- oled_write("Adjst", false);
- break;
- default:
- oled_write("Dflt ", false);
- break;
- }
+ render_keylogger_status();
+}
- /* Show Mod */
- uint8_t modifiers = get_mods() | get_oneshot_mods();
-
- oled_write("Mods:", false);
- oled_write(" ", false);
- oled_write_ln("SFT", (modifiers & MOD_MASK_SHIFT));
- oled_write(" ", false);
- oled_write_ln("CTL", (modifiers & MOD_MASK_CTRL));
- oled_write(" ", false);
- oled_write_ln("ALT", (modifiers & MOD_MASK_ALT));
- oled_write(" ", false);
- oled_write_ln("GUI", (modifiers & MOD_MASK_GUI));
-
-# if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
- render_rgb_status();
-# endif
+void render_status_secondary(void) {
+ /* Show Keyboard Layout */
+ render_default_layer_state();
+ render_layer_state();
+ render_mod_status(get_mods()|get_oneshot_mods());
- /* Show logged Keys */
- oled_write(keylog_str, false);
+ render_keylogger_status();
}
void oled_task_user(void) {
- if (timer_elapsed(oled_timer) > 60000) {
+ if (timer_elapsed32(oled_timer) > 30000) {
oled_off();
return;
}
+#ifndef SPLIT_KEYBOARD
+ else { oled_on(); }
+#endif
+
+ update_log();
if (is_master) {
render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
} else {
@@ -286,7 +271,6 @@ void oled_task_user(void) {
}
}
-void matrix_scan_keymap(void) { update_log(); }
#endif
uint16_t get_tapping_term(uint16_t keycode) {
@@ -300,25 +284,43 @@ uint16_t get_tapping_term(uint16_t keycode) {
#ifdef RGB_MATRIX_ENABLE
-static bool is_suspended;
-static bool rgb_matrix_enabled;
-
void suspend_power_down_keymap(void) {
rgb_matrix_set_suspend_state(true);
- if (!is_suspended) {
- is_suspended = true;
- rgb_matrix_enabled = (bool)rgb_matrix_config.enable;
- rgb_matrix_disable_noeeprom();
- }
}
void suspend_wakeup_init_keymap(void) {
rgb_matrix_set_suspend_state(false);
- is_suspended = false;
- if (rgb_matrix_enabled) {
- rgb_matrix_enable_noeeprom();
+}
+
+void check_default_layer(uint8_t mode, uint8_t type) {
+ switch (biton32(default_layer_state)) {
+ case _QWERTY:
+ rgb_matrix_layer_helper(HSV_CYAN, mode, rgb_matrix_config.speed, type);
+ break;
+ case _COLEMAK:
+ rgb_matrix_layer_helper(HSV_MAGENTA, mode, rgb_matrix_config.speed, type);
+ break;
+ case _DVORAK:
+ rgb_matrix_layer_helper(HSV_SPRINGGREEN, mode, rgb_matrix_config.speed, type);
+ break;
+ case _WORKMAN:
+ rgb_matrix_layer_helper(HSV_GOLDENROD, mode, rgb_matrix_config.speed, type);
+ break;
+ case _NORMAN:
+ rgb_matrix_layer_helper(HSV_CORAL, mode, rgb_matrix_config.speed, type);
+ break;
+ case _MALTRON:
+ rgb_matrix_layer_helper(HSV_YELLOW, mode, rgb_matrix_config.speed, type);
+ break;
+ case _EUCALYN:
+ rgb_matrix_layer_helper(HSV_PINK, mode, rgb_matrix_config.speed, type);
+ break;
+ case _CARPLAX:
+ rgb_matrix_layer_helper(HSV_BLUE, mode, rgb_matrix_config.speed, type);
+ break;
}
}
+
void rgb_matrix_indicators_user(void) {
if (userspace_config.rgb_layer_change &&
# ifdef RGB_DISABLE_WHEN_USB_SUSPENDED
@@ -332,51 +334,26 @@ void rgb_matrix_indicators_user(void) {
) {
switch (biton32(layer_state)) {
case _GAMEPAD:
- rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
+ rgb_matrix_layer_helper(HSV_ORANGE, 0, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
break;
case _DIABLO:
- rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
+ rgb_matrix_layer_helper(HSV_RED, 0, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
break;
case _RAISE:
- rgb_matrix_layer_helper(HSV_YELLOW, 1, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
+ rgb_matrix_layer_helper(HSV_YELLOW, 0, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
break;
case _LOWER:
- rgb_matrix_layer_helper(HSV_GREEN, 1, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
+ rgb_matrix_layer_helper(HSV_GREEN, 0, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
break;
case _ADJUST:
- rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
+ rgb_matrix_layer_helper(HSV_RED, 0, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
break;
default: {
- bool mods_enabled = IS_LAYER_ON(_MODS);
- switch (biton32(default_layer_state)) {
- case _QWERTY:
- rgb_matrix_layer_helper(HSV_CYAN, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
- break;
- case _COLEMAK:
- rgb_matrix_layer_helper(HSV_MAGENTA, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
- break;
- case _DVORAK:
- rgb_matrix_layer_helper(HSV_SPRINGGREEN, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
- break;
- case _WORKMAN:
- rgb_matrix_layer_helper(HSV_GOLDENROD, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
- break;
- case _NORMAN:
- rgb_matrix_layer_helper(HSV_CORAL, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
- break;
- case _MALTRON:
- rgb_matrix_layer_helper(HSV_YELLOW, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
- break;
- case _EUCALYN:
- rgb_matrix_layer_helper(HSV_PINK, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
- break;
- case _CARPLAX:
- rgb_matrix_layer_helper(HSV_BLUE, mods_enabled, rgb_matrix_config.speed, LED_FLAG_UNDERGLOW);
- break;
- }
+ check_default_layer(IS_LAYER_ON(_MODS), LED_FLAG_UNDERGLOW);
break;
}
}
+ check_default_layer(0, LED_FLAG_MODIFIER);
}
}
#endif