[Keymap] Drashna update for post Q2 merge (#17241)
This commit is contained in:
parent
b554e4b612
commit
cda343acbe
59 changed files with 672 additions and 769 deletions
|
@ -167,8 +167,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
),
|
||||
|
||||
[_ADJUST] = LAYOUT_ergodox_pretty_wrapper(
|
||||
KC_MAKE, _______, _______, _______, _______, _______, UC_MOD, KC_NUKE, _________________ADJUST_R1_________________, KC_RST,
|
||||
VRSN, _________________ADJUST_L1_________________, _______, _______, _________________ADJUST_R1_________________, EEP_RST,
|
||||
QK_MAKE, _______, _______, _______, _______, _______, UC_MOD, KC_NUKE, _________________ADJUST_R1_________________, QK_BOOT,
|
||||
VRSN, _________________ADJUST_L1_________________, _______, _______, _________________ADJUST_R1_________________, EE_CLR,
|
||||
_______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, RGB_IDL,
|
||||
KEYLOCK, _________________ADJUST_L3_________________, _______, _______, _________________ADJUST_R3_________________, TG_MODS,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
|
|
|
@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
),
|
||||
|
||||
[_GAMEPAD] = LAYOUT_numpad_5x6(
|
||||
RGB_TOG, _______, _______, EEP_RST, KC_MAKE, RESET,
|
||||
RGB_TOG, _______, _______, EE_CLR, QK_MAKE, QK_BOOT,
|
||||
RGB_MOD, RGB_RMOD, _______, _______, _______,
|
||||
RGB_HUI, RGB_HUD, _______, _______, _______, _______,
|
||||
RGB_SAI, RGB_SAD, _______, _______, _______,
|
||||
|
|
|
@ -103,10 +103,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
),
|
||||
|
||||
[_ADJUST] = LAYOUT_ortho_4x12_wrapper(
|
||||
KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST,
|
||||
VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
|
||||
QK_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, QK_BOOT,
|
||||
VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EE_CLR,
|
||||
TH_LVL, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL,
|
||||
KEYLOCK, _______, _______, REBOOT, _______, KC_NUKE, _______, _______, AUTO_CTN,_______, _______, TG_MODS
|
||||
KEYLOCK, _______, _______, QK_RBT, _______, KC_NUKE, _______, _______, AUTO_CTN,_______, _______, TG_MODS
|
||||
)
|
||||
|
||||
};
|
||||
|
|
|
@ -121,8 +121,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* `-----------------------------------------------------------------------------------'
|
||||
*/
|
||||
[_ADJUST] = LAYOUT_ortho_5x12_wrapper( \
|
||||
KC_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RST,
|
||||
VRSN, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, EEP_RST,
|
||||
QK_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
|
||||
VRSN, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, EE_CLR,
|
||||
_______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, RGB_IDL,
|
||||
KEYLOCK, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
|
|
|
@ -87,10 +87,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
),
|
||||
|
||||
[_ADJUST] = LAYOUT_split_3x6_3_wrapper( \
|
||||
KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET,
|
||||
VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
|
||||
QK_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, QK_BOOT,
|
||||
VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EE_CLR,
|
||||
KEYLOCK, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL,
|
||||
REBOOT, KC_NUKE, _______, _______, TG_MODS, AUTO_CTN
|
||||
QK_RBT, KC_NUKE, _______, _______, TG_MODS, AUTO_CTN
|
||||
)
|
||||
};
|
||||
// clang-format on
|
||||
|
@ -120,7 +120,9 @@ 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_kaki_frame = 0;
|
||||
#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) {
|
||||
|
@ -171,6 +173,7 @@ void render_small_kitty(void) {
|
|||
0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0d, 0x8d, 0x55, 0x50, 0x94, 0xf0, 0x10, 0x0a, 0x0e, 0x1d, 0x95, 0x24, 0x24, 0x27, 0x13, 0xe1, 0x01, 0x01, 0x01, 0x01, 0x02, 0xfc, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x19, 0x18, 0x1c, 0x14, 0x14, 0x17, 0x14, 0x14, 0x14, 0x14, 0x08,
|
||||
}};
|
||||
#ifdef SWAP_HANDS_ENABLE
|
||||
static const char PROGMEM rtogi[KAKI_FRAMES][ANIM_SIZE] = {{
|
||||
// 'rtogi1', 32x32px
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x04, 0x02, 0x01, 0x0f, 0x90, 0x10, 0x20, 0xf0, 0xf8, 0xf8,
|
||||
|
@ -184,15 +187,20 @@ void render_small_kitty(void) {
|
|||
0x0f, 0x11, 0x22, 0x44, 0x48, 0x4c, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0x80, 0x80, 0xc0, 0xe1, 0xfe, 0xb8, 0x88, 0x0c, 0x04, 0x06, 0x06, 0x06, 0x0e, 0x0e, 0x06, 0x01,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x04, 0x04, 0x05, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
}};
|
||||
|
||||
#endif
|
||||
// assumes 1 frame prep stage
|
||||
#ifdef SWAP_HANDS_ENABLE
|
||||
extern bool swap_hands;
|
||||
#endif
|
||||
void animation_phase(void) {
|
||||
#ifdef SWAP_HANDS_ENABLE
|
||||
if (swap_hands) {
|
||||
anim_frame_duration = 300;
|
||||
current_rtogi_frame = (current_rtogi_frame + 1) % RTOGI_FRAMES;
|
||||
oled_write_raw_P(rtogi[abs((RTOGI_FRAMES - 1) - current_rtogi_frame)], ANIM_SIZE);
|
||||
} else {
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
if (get_current_wpm() <= SLEEP_SPEED) {
|
||||
anim_frame_duration = 500;
|
||||
current_sleep_frame = (current_sleep_frame + 1) % SLEEP_FRAMES;
|
||||
|
|
|
@ -14,13 +14,21 @@ UNICODE_ENABLE = no # Unicode
|
|||
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
||||
SWAP_HANDS_ENABLE = no # Enable one-hand typing
|
||||
|
||||
ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
|
||||
OLED_ENABLE = yes
|
||||
RGB_MATRIX_ENABLE = yes
|
||||
HAPTIC_ENABLE = no
|
||||
USE_ARM_CONFIG ?= no
|
||||
ifeq ($(strip $(CONVERT_TO)), proton_c)
|
||||
USE_ARM_CONFIG = yes
|
||||
endif
|
||||
ifeq ($(strip $(CTPC)), yes)
|
||||
USE_ARM_CONFIG = yes
|
||||
endif
|
||||
ifeq ($(strip $(MCU)), STM32F303)
|
||||
USE_ARM_CONFIG = yes
|
||||
endif
|
||||
ifeq ($(strip $(MCU)), STM32F401)
|
||||
USE_ARM_CONFIG = yes
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(CTPC)), yes)
|
||||
ifeq ($(strip $(USE_ARM_CONFIG)), yes)
|
||||
HAPTIC_ENABLE = no
|
||||
WS2812_DRIVER = pwm # won't work without a patch to the ctpc mk file
|
||||
SERIAL_DRIVER = usart
|
||||
|
@ -33,3 +41,13 @@ else
|
|||
BOOTLOADER = qmk-hid
|
||||
BOOTLOADER_SIZE = 512
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
|
||||
OLED_ENABLE = yes
|
||||
RGB_MATRIX_ENABLE = yes
|
||||
HAPTIC_ENABLE = no
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(KEYBOARD)), cantor)
|
||||
SWAP_HANDS_ENABLE = no
|
||||
endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue