drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

[Keymap] Drashna updates for 0.19 (#19175)

Browse source 
* Fix up bastardkb boards since blackpill support is officially added.
  * Check for blackpill version, not elite c.
  * Add checks in chibiOS config since multiple ARM controllers supported.
  * Rework rules.mk for keymaps to better handle arm vs avr support
* Start moving away from `matrix_*_*` functions.
  * `housekeeping_task_*` instead of `matrix_scan_*`
  * `keyboard_(pre|post)_init_*` instead of `matrix_init_*` 
* Add ℂℴmⅈℂ unicode input method.
* Clean up unicode code to be more compact and flexible.
* Remove/move Pro Micro LED commands to userspace and better filter them
* Fixup OLED code
  * Use newer quantum keycode functions/preprocessors rather than manual bit manipulation
  * Make unicode mode render much more compact/simple.
* Make qmk secrets more self contained
* Remove custom implementation of split watchdog
This commit is contained in:
Drashna Jael're 2022-11-29 11:43:42 -08:00 • committed by GitHub
parent 8a8000b4ec
commit 4a87af0e9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
49 changed files with 622 additions and 560 deletions
Download patch file Download diff file Expand all files Collapse all files

4
keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
View file

@ -60,8 +60,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_MOUSE] = LAYOUT_4x6_right(
_______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, DPI_CONFIG, _______,
_______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, _______,
_______, _______, _______, _______, _______, _______, KC_WH_U, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, SNP_TOG,
_______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING,
_______, _______, _______, _______, _______, _______, KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
_______, _______, _______, _______,
_______, _______, _______,

33
keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
View file

@ -132,6 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#ifdef ENCODER_ENABLE
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[_DEFAULT_LAYER_1] = { { KC_VOLD, KC_VOLU }, { KC_WH_D, KC_WH_U } },
@ -185,6 +186,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
return false;
}
#endif
#endif
#ifdef OLED_ENABLE
# include "keyrecords/unicode.h"
@ -209,36 +211,7 @@ void oled_render_large_display(bool side) {
// clang-format on
oled_write_P(logo, false);
# ifdef CUSTOM_UNICODE_ENABLE
oled_set_cursor(1, 14);
oled_write_ln_P(PSTR("Unicode:"), false);
switch (typing_mode) {
case UCTM_WIDE:
oled_write_P(PSTR(" Wide"), false);
break;
case UCTM_SCRIPT:
oled_write_P(PSTR(" Script"), false);
break;
case UCTM_BLOCKS:
oled_write_P(PSTR(" Blocks"), false);
break;
case UCTM_REGIONAL:
oled_write_P(PSTR(" Regional"), false);
break;
case UCTM_AUSSIE:
oled_write_P(PSTR(" Aussie"), false);
break;
case UCTM_ZALGO:
oled_write_P(PSTR(" Zalgo"), false);
break;
case UCTM_NO_MODE:
oled_write_P(PSTR(" Normal"), false);
break;
default:
oled_write_P(PSTR(" Unknown"), false);
break;
}
# endif
render_unicode_mode(1, 14);
}
}
#endif

72
keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
View file

@ -1,40 +1,52 @@
COMMAND_ENABLE = no
RGBLIGHT_ENABLE = yes
RGBLIGHT_STARTUP_ANIMATION = yes
AUDIO_ENABLE = yes
AUTOCORRECT_ENABLE = no
AUDIO_ENABLE = no
ENCODER_ENABLE = no
CUSTOM_BOOTMAGIC_ENABLE = no
CUSTOM_UNICODE_ENABLE = no
HAPTIC_ENABLE = no
TAP_DANCE_ENABLE = yes
OLED_ENABLE = yes
WPM_ENABLE = yes
ENCODER_ENABLE = yes
ENCODER_MAP_ENABLE = yes
AUTOCORRECT_ENABLE = yes
CAPS_WORD_ENABLE = yes
DEFERRED_EXEC_ENABLE = yes
OLED_ENABLE = no
OLED_DRIVER = custom
RGBLIGHT_ENABLE = no
SWAP_HANDS_ENABLE = no
TAP_DANCE_ENABLE = no
WPM_ENABLE = no
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/elite_c)
RGBLIGHT_ENABLE = no
AUDIO_ENABLE = no
HAPTIC_ENABLE = no
TAP_DANCE_ENABLE = no
OLED_ENABLE = no
WPM_ENABLE = no
ENCODER_ENABLE = no
AUTOCORRECT_ENABLE = no
LTO_SUPPORTED = yes
SWAP_HANDS_ENABLE = no
CUSTOM_UNICODE_ENABLE = no
CAPS_WORD_ENABLE = no
BOOTLOADER = qmk-hid
BOOTLOADER_SIZE = 512
BOOTLOADER = qmk-hid
BOOTLOADER_SIZE = 512
CUSTOM_SPLIT_TRANSPORT_SYNC = no
LTO_ENABLE = yes
endif
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/arduinomicro)
BOOTLOADER = qmk-hid
BOOTLOADER_SIZE = 512
CUSTOM_SPLIT_TRANSPORT_SYNC = no
LTO_ENABLE = yes
endif
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/teensy2pp)
AUTOCORRECT_ENABLE = no
CAPS_WORD_ENABLE = yes
AUTOCORRECT_ENABLE = no
OVERLOAD_FEATURES = yes
LTO_ENABLE = yes
endif
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/f411)
BOOTLOADER = tinyuf2
BOOTLOADER = tinyuf2
AUTOCORRECT_ENABLE = yes
LTO_SUPPORTED = no
OVERLOAD_FEATURES = yes
endif
# DEBOUNCE_TYPE = sym_eager_pk
OLED_DRIVER = custom
ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
AUDIO_ENABLE = yes
CAPS_WORD_ENABLE = yes
CUSTOM_BOOTMAGIC_ENABLE = yes
CUSTOM_UNICODE_ENABLE = yes
ENCODER_ENABLE = yes
ENCODER_MAP_ENABLE = yes
OLED_ENABLE = yes
RGBLIGHT_ENABLE = yes
RGBLIGHT_STARTUP_ANIMATION = yes
TAP_DANCE_ENABLE = yes
SWAP_HANDS_ENABLE = yes
WPM_ENABLE = yes
endif