1
0
Fork 0

[Keymap] removes gamelayer, finally got rgb working (#5817)

* removes gamelayer, finally got rgb working

* lowercasing readme

* changed to layout_ortho_4x12

* rules.mk: Removed BACKLIGHT_CUSTOM_DRIVER
This commit is contained in:
Florian B 2019-08-08 23:17:49 +02:00 committed by Drashna Jaelre
parent 406f03bb0c
commit c0e6734d3f
3 changed files with 15 additions and 37 deletions

View file

@ -4,15 +4,13 @@ extern keymap_config_t keymap_config;
#define _QWERTY 0 #define _QWERTY 0
#define _DVORAK 1 #define _DVORAK 1
#define _GAME 2 #define _LEFTY 2
#define _LEFTY 3 #define _RIGHTY 3
#define _RIGHTY 4 #define _DUAL 4
#define _DUAL 5
enum jj40_keycodes { enum jj40_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,
DVORAK, DVORAK,
GAME,
LEFTY, LEFTY,
RIGHTY, RIGHTY,
DUAL, DUAL,
@ -28,21 +26,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
CTLESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, SHFTENT, \ CTLESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, SHFTENT, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, \
KC_PSCR, KC_BSPC, KC_LALT, _______, LEFTY, KC_LGUI, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ KC_PSCR, KC_BSPC, KC_CAPS, KC_LALT, LEFTY, KC_LGUI, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
), ),
[_DVORAK] = LAYOUT_ortho_4x12( \ [_DVORAK] = LAYOUT_ortho_4x12( \
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \
CTLESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, SHFTENT, \ CTLESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, SHFTENT, \
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_SLSH, \ KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_SLSH, \
KC_PSCR, KC_LGUI, KC_LALT, KC_CAPS, LEFTY, KC_BSPC, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ KC_PSCR, KC_BSPC, KC_CAPS, KC_LALT, LEFTY, KC_LGUI, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
),
[_GAME] = LAYOUT_ortho_4x12( \
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, _______, _______, _______, _______, _______, QWERTY, \
CTLESC, KC_A, KC_S, KC_D, KC_F, KC_G, _______, _______, _______, _______, _______, _______, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, _______, _______, _______, _______, \
KC_LCTL, KC_1, KC_2, KC_3, LEFTY, KC_SPC, KC_BSPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT \
), ),
[_LEFTY] = LAYOUT_ortho_4x12( \ [_LEFTY] = LAYOUT_ortho_4x12( \
@ -60,10 +51,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
), ),
[_DUAL] = LAYOUT_ortho_4x12( \ [_DUAL] = LAYOUT_ortho_4x12( \
RESET, _______, _______, _______, _______, QWERTY, GAME, _______, _______, _______, BL_BRTG, RESET, \ RESET, _______, _______, _______, _______, QWERTY, DVORAK, _______, _______, RGB_HUD, RGB_TOG, RESET, \
_______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, AG_NORM, AG_SWAP, _______, _______, _______, BL_TOGG, _______, \ _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, AG_NORM, AG_SWAP, _______, _______, RGB_HUI, RGB_MOD, _______, \
_______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, TG_NKRO, _______, _______, _______, _______, _______, \ _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, TG_NKRO, _______, _______, RGB_SAD, RGB_VAD, _______, \
_______, _______, _______, _______, _______, _______, DVORAK, _______, _______, _______, _______, _______ \ _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, RGB_VAI, _______ \
) )
}; };
@ -86,12 +77,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return false; return false;
break; break;
case GAME:
if (record->event.pressed) {
persistent_default_layer_set(1UL<<_GAME);
}
return false;
break;
case LEFTY: case LEFTY:
if (record->event.pressed) { if (record->event.pressed) {
layer_on(_LEFTY); layer_on(_LEFTY);

View file

@ -6,11 +6,15 @@
I currently have the following layers in my keymap: I currently have the following layers in my keymap:
* Qwerty (as default) * Qwerty (as default)
* Dvorak (still learning this type of layout, so not really used much) * Dvorak (still learning this type of layout, so not really used much)
* Gaming (WIP! I tried some I found, but didn't like them, so I'm in the progress of making my own)
* Lefty (lower) * Lefty (lower)
* Righty (raise) * Righty (raise)
* Dual (adjust) * Dual (adjust)
### Note to self:
YOU NEED TO USE [bootloadHID -r jj40_waples.hex](https://github.com/qmk/qmk_firmware/tree/master/keyboards/jj40)
## the stuff below is out of date and I think about removing them from this readme
#### QWERTY #### QWERTY
| Tab | Q | W | E | R | T | Y | U | I | O | P | Bsp | | Tab | Q | W | E | R | T | Y | U | I | O | P | Bsp |
|C_Esc| A | S | D | F | G | H | J | K | L | ; |S_Ent| |C_Esc| A | S | D | F | G | H | J | K | L | ; |S_Ent|
@ -24,14 +28,6 @@ I currently have the following layers in my keymap:
| Sft | ; | Q | J | K | X | B | M | W | V | Z | / | | Sft | ; | Q | J | K | X | B | M | W | V | Z | / |
|P_SCR| GUI | Alt | Cps | ^L^ | Bsp | Spc | ^R^ | Lft | Dwn | Up! | Rgt | |P_SCR| GUI | Alt | Cps | ^L^ | Bsp | Spc | ^R^ | Lft | Dwn | Up! | Rgt |
#### GAMING
| Tab | Q | W | E | R | T | | | | | |QWERT|
| Esc | A | S | D | F | G | | | | | | |
| Sft | Z | X | C | V | B | | | | | | |
| Ctl | 1 | 2 | 3 | ^L^ | Spc | Bsp | ^R^ | Lft | Dwn | Up | Rgt |
#### LEFTY (lower) #### LEFTY (lower)
| ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bsp | | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bsp |
| Del | | | | | | | ( | ) | [ | ] | | | Del | | | | | | | ( | ) | [ | ] | |
@ -51,5 +47,3 @@ I currently have the following layers in my keymap:
| | Prv | Stp | Tog | Nxt | Nrm | Swp | | | | | | | | Prv | Stp | Tog | Nxt | Nrm | Swp | | | | | |
| | | Mte | Vol-| Vol+| | NKRO| | | | | | | | | Mte | Vol-| Vol+| | NKRO| | | | | |
| | | | | | |DVORK| | | | | | | | | | | | |DVORK| | | | | |

View file

@ -5,7 +5,6 @@ EXTRAKEY_ENABLE = yes
CONSOLE_ENABLE = no CONSOLE_ENABLE = no
COMMAND_ENABLE = yes COMMAND_ENABLE = yes
BACKLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes
BACKLIGHT_CUSTOM_DRIVER = yes
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
RGBLIGHT_CUSTOM_DRIVER = yes RGBLIGHT_CUSTOM_DRIVER = yes
KEY_LOCK_ENABLE = yes KEY_LOCK_ENABLE = yes