diff options
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/community/ergodox/drashna/keymap.c | 2 | ||||
| -rw-r--r-- | layouts/community/ortho_4x12/drashna/keymap.c | 28 | ||||
| -rw-r--r-- | layouts/community/split_3x6_3/drashna/keymap.c | 32 |
3 files changed, 23 insertions, 39 deletions
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c index e5675854e1..846bbc2351 100644 --- a/layouts/community/ergodox/drashna/keymap.c +++ b/layouts/community/ergodox/drashna/keymap.c @@ -17,7 +17,7 @@ #include "drashna.h" enum more_custom_keycodes { - KC_SWAP_NUM = NEW_SAFE_RANGE, + KC_SWAP_NUM = USER_SAFE_RANGE, PM_SCROLL, PM_PRECISION, }; diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c index b22401a77e..d5faf7f7c8 100644 --- a/layouts/community/ortho_4x12/drashna/keymap.c +++ b/layouts/community/ortho_4x12/drashna/keymap.c @@ -16,19 +16,11 @@ #include "drashna.h" -#ifdef BACKLIGHT_ENABLE +#define BACKLIT OSM(MOD_LSFT) enum planck_keycodes { - BACKLIT = NEW_SAFE_RANGE, - TH_LVL, + TH_LVL = USER_SAFE_RANGE, }; -#else -# define BACKLIT OSM(MOD_LSFT) -enum planck_keycodes { - TH_LVL = NEW_SAFE_RANGE, -}; -#endif - #ifdef KEYBOARD_planck_ez # define PLNK_1 BK_LWER # define PLNK_2 SP_LWER @@ -56,10 +48,10 @@ enum planck_keycodes { K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \ ) \ LAYOUT_ortho_4x12_wrapper( \ - KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_DEL, \ + KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, PRINT_SETUPS, \ LALT_T(KC_TAB), K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, RALT_T(K1B), \ KC_MLSF, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), KC_ENT, \ - BACKLIT, OS_LCTL, OS_LALT, OS_LGUI, PLNK_1, PLNK_2, PLNK_3, PLNK_4, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + STORE_SETUPS, OS_LCTL, OS_LALT, OS_LGUI, PLNK_1, PLNK_2, PLNK_3, PLNK_4, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ) #define LAYOUT_base_wrapper(...) LAYOUT_ortho_4x12_base(__VA_ARGS__) @@ -130,18 +122,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { -#ifdef BACKLIGHT_ENABLE - case BACKLIT: - if (record->event.pressed) { - register_code(KC_RSFT); -# ifdef BACKLIGHT_ENABLE - backlight_step(); -# endif - } else { - unregister_code(KC_RSFT); - } - break; -#endif #ifdef KEYBOARD_planck_ez case TH_LVL: if (record->event.pressed) { diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c index 7e051b6b5c..257e033f22 100644 --- a/layouts/community/split_3x6_3/drashna/keymap.c +++ b/layouts/community/split_3x6_3/drashna/keymap.c @@ -16,7 +16,9 @@ #include "drashna.h" -enum crkbd_keycodes { RGBRST = NEW_SAFE_RANGE }; +enum crkbd_keycodes { + RGBRST = USER_SAFE_RANGE, +}; /* * The `LAYOUT_crkbd_base` macro is a template to allow the use of identical @@ -96,33 +98,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #ifdef OLED_ENABLE -oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return OLED_ROTATION_270; } +oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { + return OLED_ROTATION_270; +} # ifdef CONVERT_TO_PROTON_C // WPM-responsive animation stuff here # define SLEEP_FRAMES 2 -# define SLEEP_SPEED 10 // below this wpm value your animation will idle +# define SLEEP_SPEED 10 // below this wpm value your animation will idle -# define WAKE_FRAMES 2 // uncomment if >1 +# define WAKE_FRAMES 2 // uncomment if >1 -# define KAKI_FRAMES 3 -# define KAKI_SPEED 40 // above this wpm value typing animation to triggere +# define KAKI_FRAMES 3 +# define KAKI_SPEED 40 // above this wpm value typing animation to triggere # define RTOGI_FRAMES 2 -//#define LTOGI_FRAMES 2 +// #define LTOGI_FRAMES 2 -//#define ANIM_FRAME_DURATION 500 // how long each frame lasts in ms -// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing -# define ANIM_SIZE 512 // number of bytes in array, minimize for adequate firmware size, max is 1024 +// #define ANIM_FRAME_DURATION 500 // how long each frame lasts in ms +// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing +# define ANIM_SIZE 512 // number of bytes in array, minimize for adequate firmware size, max is 1024 uint32_t anim_timer = 0; uint32_t anim_frame_duration = 500; uint8_t current_sleep_frame = 0; -uint8_t current_wake_frame = 0; // uncomment if WAKE_FRAMES >1 +uint8_t current_wake_frame = 0; // uncomment if WAKE_FRAMES >1 uint8_t current_kaki_frame = 0; -#ifdef SWAP_HANDS_ENABLE -uint8_t current_rtogi_frame = 0; -#endif +# ifdef SWAP_HANDS_ENABLE +uint8_t current_rtogi_frame = 0; +# endif // uint8_t current_ltogi_frame = 0; // clang-format off void render_small_kitty(void) { |