Skip to content

Commit 254e265

Browse files
drashnadrashna
authored
[Keymap] updates for oled, and diablo 2 layer - Drashna (#15194)
1 parent 2c5d669 commit 254e265

File tree

9 files changed

+51
-13
lines changed

9 files changed

+51
-13
lines changed

‎keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h

+4
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
102102
// #define EXTERNAL_EEPROM_ADDRESS_SIZE 2
103103
// #define DEBUG_EEPROM_OUTPUT
104104

105+
#ifdef EEPROM_SPI
106+
# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8195
107+
#endif
108+
105109
/* pmw3360 config */
106110
#define PMW3360_CS_PIN B0
107111
#define PMW3360_SPI_MODE 3

‎keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@
1818

1919
#define TRACKBALL_DPI_OPTIONS { 1200, 1800, 2600, 3400 }
2020

21-
#undef DEBOUNCE
22-
#define DEBOUNCE 15
21+
#define DEBOUNCE 45

‎keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c

+11-1
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
9494
SFT_T(KC_SPC), KC_J, _______,
9595
ALT_T(KC_Q), KC_LGUI, _______, _______
9696
),
97+
[_DIABLOII] = LAYOUT_5x6_right(
98+
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_GRV, _______, _______, _______, _______, _______, _______,
99+
KC_TAB, KC_A, KC_T, KC_Q, KC_I, KC_M, _______, _______, _______, _______, _______, _______,
100+
KC_S, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, _______, _______,
101+
KC_LCTL, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______,
102+
KC_F, KC_L, KC_NO, TG(_DIABLOII),
103+
_______, KC_G, _______,
104+
KC_LSFT, _______, _______,
105+
KC_LCTL, KC_V, _______, _______
106+
),
97107
[_LOWER] = LAYOUT_5x6_right_wrapper(
98108
KC_F12, _________________FUNC_LEFT_________________, _________________FUNC_RIGHT________________, KC_F11,
99109
_______, _________________LOWER_L1__________________, _________________LOWER_R1__________________, _______,
@@ -122,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
122132
HPT_DWLI, HPT_DWLD, TG_GAME, TG_DBLO,
123133
HPT_TOG, HPT_BUZ, KC_NUKE,
124134
_______, _______, _______,
125-
_______, _______, KC_NUKE, _______
135+
_______, TG(_DIABLOII),KC_NUKE, _______
126136
),
127137
};
128138

‎keyboards/moonlander/keymaps/drashna/keymap.c

+9-1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
8282
KC_NO, KC_NO, KC_L, KC_J, KC_F, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
8383
KC_DIABLO_CLEAR, SFT_T(KC_SPACE), ALT_T(KC_Q), KC_PGDN, KC_DEL, KC_ENT
8484
),
85+
[_DIABLOII] = LAYOUT_moonlander_wrapper(
86+
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_GRV, KC_NO, KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
87+
KC_TAB, KC_A, KC_T, KC_Q, KC_I, KC_M, TG(_DIABLOII), KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
88+
KC_S, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
89+
KC_LCTL, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO,
90+
KC_NO, KC_NO, KC_G, KC_F, KC_L, KC_V, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
91+
KC_G, KC_LSFT, KC_LCTL, KC_PGDN, KC_DEL, KC_ENT
92+
),
8593

8694
[_LOWER] = LAYOUT_moonlander_wrapper(
8795
KC_F12, _________________FUNC_LEFT_________________, _______, _______, _________________FUNC_RIGHT________________, KC_F11,
@@ -103,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
103111

104112
[_ADJUST] = LAYOUT_moonlander_wrapper(
105113
KC_MAKE, _________________FUNC_LEFT_________________, UC_MOD, KC_NUKE, _________________ADJUST_R1_________________, KC_RST,
106-
VRSN, _________________ADJUST_L1_________________, _______, _______, _________________ADJUST_R1_________________, EEP_RST,
114+
VRSN, _________________ADJUST_L1_________________, TG(_DIABLOII), _______, _________________ADJUST_R1_________________, EEP_RST,
107115
_______, _________________ADJUST_L2_________________, _______, _______, _________________ADJUST_R2_________________, RGB_IDL,
108116
KEYLOCK, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS,
109117
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,

‎keyboards/work_louder/work_board/keymaps/drashna/keymap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
117117
clockwise ? rgb_matrix_step() : rgb_matrix_step_reverse();
118118
break;
119119
default:
120-
clockwise ? tap_code(KC_VOLD) : tap_code(KC_VOLU);
120+
clockwise ? tap_code(KC_VOLU) : tap_code(KC_VOLD);
121121
break;
122122
}
123123
return false;

‎users/drashna/config.h

+19-3
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,32 @@
148148
// # define OLED_FONT_AZTECH
149149
// # define OLED_FONT_BMPLAIN
150150
// # define OLED_FONT_CRACKERS
151-
// # define OLED_FONT_HISKYF21
152151
# define OLED_FONT_DEAD_MEAL
152+
// # define OLED_FONT_EIN
153+
// # define OLED_FONT_HISKYF21
154+
// # define OLED_FONT_SQUASH
155+
// # define OLED_FONT_ZXPIX
153156
// # define OLED_FONT_SUPER_DIGG
154-
// # define OLED_LOGO_GMK_BAD
155-
// # define OLED_LOGO_HUE_MANITEE
157+
158+
// # define OLED_LOGO_BEBOP
156159
// # define OLED_LOGO_CORNE
160+
// # define OLED_LOGO_GMK_BAD
157161
// # define OLED_LOGO_GOTHAM
162+
// # define OLED_LOGO_HUE_MANITEE
163+
// # define OLED_LOGO_LOOSE
158164
# define OLED_LOGO_SCIFI
165+
// # define OLED_LOGO_SETS3N
166+
// # define OLED_LOGO_SKEEB
159167
#endif
160168

169+
// #define WPM_ESTIMATED_WORD_SIZE 5
170+
#define WPM_ALLOW_COUNT_REGRESSION
171+
// #define WPM_UNFILTERED
172+
// #define WPM_SAMPLE_SECONDS 5
173+
// #define WPM_SAMPLE_PERIODS 50
174+
// #define WPM_LAUNCH_CONTROL
175+
176+
161177
#ifndef ONESHOT_TAP_TOGGLE
162178
# define ONESHOT_TAP_TOGGLE 2
163179
#endif // !ONESHOT_TAP_TOGGLE

‎users/drashna/drashna.h

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ enum userspace_layers {
5050
LAST_DEFAULT_LAYER = _DVORAK,
5151
_GAMEPAD,
5252
_DIABLO,
53+
_DIABLOII,
5354
_MOUSE,
5455
_MEDIA,
5556
_LOWER,

‎users/drashna/oled_stuff.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ static const char PROGMEM code_to_name[256] = {
3636
' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', // 0x
3737
'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2', // 1x
3838
'3', '4', '5', '6', '7', '8', '9', '0', 20, 19, 27, 26, 22, '-', '=', '[', // 2x
39-
']','\\', '#', ';','\'', '`', ',', '.', '/', 128, '1', '2', '3', '4', '5', '6', // 3x
40-
'7', '8', '9', '0', '1', '2', 'P', 'S', 19, ' ', 17, 30, 16, 16, 31, 26, // 4x
39+
']','\\', '#', ';','\'', '`', ',', '.', '/', 128,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA, // 3x
40+
0xDB,0xDC,0xDD,0xDE,0XDF,0xFB,'P', 'S', 19, ' ', 17, 30, 16, 16, 31, 26, // 4x
4141
27, 25, 24, 'N', '/', '*', '-', '+', 23, '1', '2', '3', '4', '5', '6', '7', // 5x
4242
'8', '9', '0', '.','\\', 'A', 0, '=', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 6x
4343
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 7x
@@ -47,8 +47,8 @@ static const char PROGMEM code_to_name[256] = {
4747
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Bx
4848
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Cx
4949
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Dx
50-
'C', 'S', 'A', 'C', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 24, 26, 24, // Ex
51-
25,0x9D,0x9D,0x9D,0x9D,0x9D,0x9D,0x9D,0x9D, 24, 25, 27, 26, ' ', ' ', ' ' // Fx
50+
'C', 'S', 'A', 'C', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 24, 26, 24, // Ex
51+
25,0x9D,0x9D,0x9D,0x9D,0x9D,0x9D,0x9D,0x9D, 24, 25, 27, 26, ' ', ' ', ' ' // Fx
5252
};
5353
// clang-format on
5454

‎users/drashna/process_records.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *re
199199
}
200200
}
201201
break;
202+
#endif
202203
case KEYLOCK: {
203204
static host_driver_t *host_driver = 0;
204205

@@ -215,7 +216,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *re
215216
}
216217
break;
217218
}
218-
#endif
219219
}
220220
return true;
221221
}

0 commit comments

Comments
 (0)