Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Keymap] All about (ARM) RGB and OLEDs (drashna keymaps) #7354

Merged
merged 30 commits into from
Nov 20, 2019
Merged

[Keymap] All about (ARM) RGB and OLEDs (drashna keymaps) #7354

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1e847ec
Add Kyria Keymap
drashna Nov 6, 2019
ff9d0d1
Enable all RGBLIGHT Animations for ARM and high capacity AVR
drashna Nov 9, 2019
88c399d
Reduce GNUC version for __has_include
drashna Nov 9, 2019
d0ddfe0
Cleanup Ortho 4x12 Community layout
drashna Nov 9, 2019
0a7b006
Update Collide 39 keymap
drashna Nov 9, 2019
f074ee8
Cleanup Keymaps
drashna Nov 9, 2019
4bad5a4
Enable full 30 LEDs for Ergodox
drashna Nov 9, 2019
0e902b2
Change EEPROM Load timing
drashna Nov 10, 2019
f06cf65
Use RGB Matrix on Planck Rev6
drashna Nov 10, 2019
5ee8aa2
Use correct keymap swap
drashna Nov 10, 2019
5f3fb26
Enable everything for ARM
drashna Nov 10, 2019
cc1b7ee
Only enable rgb sleep on avr until crash is fixed
drashna Nov 10, 2019
bc4a7a3
Add additional Kyria keymap config
drashna Nov 12, 2019
8a4fe57
Overhaul Kyria OLED display
drashna Nov 13, 2019
ab47479
Improve kyria keymap based on usage
drashna Nov 13, 2019
e15999b
Minor tweaks to rules
drashna Nov 13, 2019
65982bf
Update OLED code to truncate properly
drashna Nov 14, 2019
8986b1e
Fix RGB Light layer indication
drashna Nov 14, 2019
fb3f24f
Switch all of biton32 to get_highest_layer function
drashna Nov 14, 2019
5723ca1
Fix OLED Keylogger display
drashna Nov 14, 2019
d3f1f18
Run qmk cformat over all of my user files
drashna Nov 14, 2019
48e4528
Slight tweak to kyria based on usage
drashna Nov 16, 2019
3616c8b
Move around LALT_T config
drashna Nov 18, 2019
d127434
Add comments about base wrappers to keymaps
drashna Nov 18, 2019
4351458
Another cformat pass
drashna Nov 18, 2019
e00a85f
Temp fix for VUSB boards and NKRO
drashna Nov 18, 2019
f96d923
Convert tabs to spaces in rules.mk files
drashna Nov 18, 2019
20eb492
Only enable RGBLight if it's enabled
drashna Nov 19, 2019
128e5a1
Add Encoder Flip setting
drashna Nov 19, 2019
cf783da
Update OLED font file
drashna Nov 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Slight tweak to kyria based on usage
  • Loading branch information
@drashna
drashna committed Nov 20, 2019
commit 48e45282298c5a4bf8e6fe84fab54ee5d0506a4f
5 changes: 3 additions & 2 deletions keyboards/kyria/keymaps/drashna/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void add_keylog(uint16_t keycode);
KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_MINS, \
LALT_T(KC_TAB), K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, RALT_T(KC_QUOT), \
OS_LSFT, CTL_T(K21), K22, K23, K24, K25, KC_NO, KC_NO, KC_NO, KC_NO, K26, K27, K28, K29, RCTL_T(K2A), OS_RSFT, \
KC_MUTE, KC_GRV, OS_LALT, KC_SPC, BK_LWER, DL_RAIS, KC_ENT, OS_RGUI, UC(0x2E2E), KC_NO \
KC_MUTE, OS_LALT, KC_GRV, KC_SPC, BK_LWER, DL_RAIS, KC_ENT, OS_RGUI, UC(0x03A8), UC(0x2E2E) \
)
/* Re-pass though to allow templates to be used */
#define LAYOUT_kyria_base_wrapper(...) LAYOUT_kyria_base(__VA_ARGS__)
Expand Down Expand Up @@ -254,13 +254,14 @@ void render_bootmagic_status(void) {
{{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
{{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
};
oled_write_ln_P(PSTR("Bootmagic Settings"), false);
oled_write_P(PSTR("Boot "), 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(PSTR("NKRO"), keymap_config.nkro);
oled_write_P(PSTR(" "), false);
oled_write_ln_P(PSTR("GUI"), !keymap_config.no_gui);
oled_write_P(PSTR("Magic "), 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(" "), false);
Expand Down