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.

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

[Keymap] Drashna Updates - Split+OLED edition #11968

Merged
merged 47 commits into from
Feb 23, 2021
Merged
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
a9c18b0
Improve OLED code for DM
drashna Jan 22, 2021
0bd82c2
More improvements to OLED code
drashna Jan 23, 2021
7636026
Add super custom transport
drashna Jan 23, 2021
1390cef
Add mouse support for Tap Toggle
drashna Jan 26, 2021
d0c498d
Add more features to OLEDs
drashna Jan 27, 2021
8a0e5ec
Fix drashna_transport.c
drashna Jan 27, 2021
8d06b79
Add Swap Hands keys
drashna Jan 27, 2021
4b1751a
Reset lights, serial, oled
drashna Jan 28, 2021
83aa94b
Force end mouse layer
drashna Jan 29, 2021
5448bc8
Add DPI to oled
drashna Jan 29, 2021
720cf4e
Force OLED off when suspended
drashna Jan 29, 2021
5bc5f0a
clean up TT handling a bit
drashna Jan 29, 2021
96ae4e6
Pack transport structures
drashna Jan 30, 2021
76e18b8
Make sure transport is not LTO'd
drashna Jan 30, 2021
3b367a9
Allow reverse cycling for dpi
drashna Jan 31, 2021
8ca36d0
Fix typo in drashna_transport
drashna Jan 31, 2021
910a367
Update OLED Stuff
drashna Feb 1, 2021
9868e9a
Fix order of quantum_lib_src stuff in tractyl manuform makefile
drashna Feb 1, 2021
f1bacd1
Add rgb suspend and fix other transport issues
drashna Feb 2, 2021
a0aecff
Fix printf stuff
drashna Feb 3, 2021
c63a003
Move wrapper stuff to keymap.c
drashna Feb 4, 2021
9da6a79
Force enable RGB and AUDIO on fractal
drashna Feb 4, 2021
12058bb
Include trailing key on middle row in wrapper macros
drashna Feb 5, 2021
60f30ca
Switch navigation keys
drashna Feb 5, 2021
f7222cc
Replace game layer keycodes with 7 char defines
drashna Feb 5, 2021
13ad491
Set layer masks directly and bypass callbacks
drashna Feb 5, 2021
a1110e2
Fix up OLED font stuff
drashna Feb 6, 2021
d468924
Cleanup DM code a bit
drashna Feb 9, 2021
59deb27
Expand OLED stuff
drashna Feb 10, 2021
165572c
More improvements to OLED code
drashna Feb 11, 2021
e2ec604
Update Proton C config to actually work
drashna Feb 12, 2021
b028047
Add horrible hack for dev
drashna Feb 12, 2021
7df568b
Use dual pin audio
drashna Feb 13, 2021
58d60a6
Add more oled icons
drashna Feb 13, 2021
6906db0
Add extra pin config for non adapted proton C config
drashna Feb 13, 2021
b3add4c
Enable DOOM song on gaming layer for maximum annoyance
drashna Feb 14, 2021
48c017d
Add hack for tapping term
drashna Feb 15, 2021
529d052
Formatting
drashna Feb 16, 2021
e061bc4
Make VIA reset on eeprom reset
drashna Feb 16, 2021
5cc245f
Only play loop if not arm, until fix is in
drashna Feb 17, 2021
eac1d45
More OLED tweaks, again!
drashna Feb 20, 2021
ef056e6
Fix split stuff
drashna Feb 20, 2021
5e882f5
Fix oled sides
drashna Feb 20, 2021
37ed16e
Add my zima keymap
drashna Feb 20, 2021
cb32e8d
remove old oled font files
drashna Feb 21, 2021
d9af6c6
cleanup for zima keymap
drashna Feb 21, 2021
c38bf45
fix submodules
drashna Feb 21, 2021
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
Cleanup DM code a bit
  • Loading branch information
drashna committed Feb 20, 2021
commit d46892443f845d9fe5ac2f669e1c1e7178ed4006
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
) \
LAYOUT_5x6_right_trackball_wrapper( \
KC_ESC, ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_MINS, \
SH_TT, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, SH_TT, \
SH_TT, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, SH_TT, \
LALT_T(KC_TAB), K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, RALT_T(K1B), \
OS_LSFT, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), OS_RSFT, \
OS_LALT, OS_LGUI, TG_GAME, TG_DBLO, \
Expand Down Expand Up @@ -220,18 +220,3 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t* record) {
return true;
}
#endif

#ifndef OLED_DRIVER_ENABLE
void oled_driver_render_logo(void) {
// clang-format off
static const char PROGMEM raw_logo[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128,192,192,224, 96,112, 48, 56, 24, 12, 12, 30, 12,128, 0, 0, 0, 0, 0, 0, 0, 0,128,192,224,240, 56, 28, 14, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128,128,128,128,128, 0, 0,128, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128, 0, 0, 0, 0,128,128,192,192, 96, 96, 48, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 16, 48, 48,112,120,120,124,124,126, 62, 63, 63, 59, 59, 57, 57, 56, 56, 56, 56, 56, 56, 56, 60, 56, 24,143,223,248,124,190,223,247,251,253,254,239,115, 59, 27, 31,239,247,255,126,111,111,111,111,109,189,225,249, 63, 63, 57,121,121,125,237,237,205,199,199,135,199,227,224,248,126, 63, 55, 51, 59, 27, 25, 25, 13,237,255,191,199,231,227,240,124,222,231,251, 62, 63,252,224,248, 62,207,243,252, 63, 31, 31, 60,126,118,243,227,129, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 48, 24, 30, 15, 3, 1, 0, 0, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,225,121, 62, 31, 7, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 3, 2, 6, 4, 8, 24, 16, 48, 32, 96, 0, 0, 0, 0, 0,
};
// clang-format on
oled_write_raw_P(raw_logo, sizeof(raw_logo));
oled_set_cursor(0, 3);
}

#endif