diff options
Diffstat (limited to 'keyboard')
| -rw-r--r-- | keyboard/atomic/Makefile | 2 | ||||
| -rw-r--r-- | keyboard/atomic/keymap_common.h | 12 | ||||
| -rw-r--r-- | keyboard/atomic/keymap_plain.c | 18 | ||||
| -rw-r--r-- | keyboard/atomic/matrix.c | 11 | ||||
| -rw-r--r-- | keyboard/planck/Makefile | 2 | ||||
| -rw-r--r-- | keyboard/planck/keymap_sean.c | 50 | ||||
| -rw-r--r-- | keyboard/planck/matrix.c | 58 |
7 files changed, 92 insertions, 61 deletions
diff --git a/keyboard/atomic/Makefile b/keyboard/atomic/Makefile index 0c407f703b..a018b6cab8 100644 --- a/keyboard/atomic/Makefile +++ b/keyboard/atomic/Makefile @@ -39,7 +39,7 @@ #---------------------------------------------------------------------------- # Target file name (without extension). -TARGET = gh60_lufa +TARGET = atomic_lufa # Directory common source filess exist TOP_DIR = ../.. diff --git a/keyboard/atomic/keymap_common.h b/keyboard/atomic/keymap_common.h index f827480f0e..76864aae47 100644 --- a/keyboard/atomic/keymap_common.h +++ b/keyboard/atomic/keymap_common.h @@ -37,15 +37,15 @@ extern const uint16_t fn_actions[]; #define KEYMAP( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ - K40, K42, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, K3D, K3E, \ + K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E \ ) { \ { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_NO, KC_##K0E }, \ { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E }, \ - { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_NO, KC_##K2E }, \ - { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_NO, KC_##K3D, KC_##K3E }, \ - { KC_##K40, KC_NO, KC_##K42, KC_NO, KC_NO, KC_##K45, KC_##K46, KC_##K47, KC_##K48, KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E } \ + { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_NO, KC_##K2D, KC_##K2E }, \ + { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_NO, KC_##K3C, KC_##K3D, KC_##K3E }, \ + { KC_##K40, KC_##K41, KC_NO, KC_##K43, KC_NO, KC_NO, KC_##K46, KC_NO, KC_NO, KC_NO, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E } \ } #endif diff --git a/keyboard/atomic/keymap_plain.c b/keyboard/atomic/keymap_plain.c index d1e5c54871..c335fbe16f 100644 --- a/keyboard/atomic/keymap_plain.c +++ b/keyboard/atomic/keymap_plain.c @@ -6,31 +6,25 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, DEL, \ ESC, A, S, D, F, G, H, J, K, L, SCLN, QUOT, ENT, MPLY, \ LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, VOLD, VOLU, \ - LCTL, LALT, LGUI, FN2, SPC, FN1, RGUI, RALT, LEFT, DOWN, UP, RGHT), + LCTL, LALT, LGUI, SPC, FN1, LEFT, DOWN, UP, RGHT), [1] = KEYMAP(GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, BSPC, \ TAB, Q, W, F, P, G, J, L, U, Y, SCLN, LBRC, RBRC, BSLS, DEL, \ ESC, A, R, S, T, D, H, N, E, I, O, QUOT, ENT, MPLY, \ LSFT, Z, X, C, V, B, K, M, COMM, DOT, SLSH, RSFT, VOLD, VOLU, \ - LCTL, LALT, LGUI, FN2, SPC, FN1, RGUI, RALT, LEFT, DOWN, UP, RGHT), + LCTL, LALT, LGUI, SPC, FN1, LEFT, DOWN, UP, RGHT), [2] = KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, BSPC, \ TAB, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC, RBRC, BSLS, DEL, \ ESC, FN3, FN4, TRNS, TRNS, TRNS, TRNS, MINS, EQL, LBRC, RBRC, BSLS, ENT, MPLY, \ - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, VOLD, VOLU, \ - LCTL, LALT, LGUI, TRNS, SPC, FN1, RGUI, RALT, MNXT, VOLD, VOLU, MPLY), - [3] = KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, BSPC, \ - TAB, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, LBRC, RBRC, BSLS, DEL, \ - ESC, FN3, FN4, TRNS, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28, ENT, MPLY, \ - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, VOLD, VOLU, \ - LCTL, LALT, LGUI, FN2, SPC, TRNS, RGUI, RALT, MNXT, VOLD, VOLU, MPLY), + LSFT, FN9, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, VOLD, VOLU, \ + LCTL, LALT, LGUI, SPC, TRNS, MNXT, VOLD, VOLU, MPLY), }; const uint16_t PROGMEM fn_actions[] = { [1] = ACTION_LAYER_MOMENTARY(2), // to Fn overlay - [2] = ACTION_LAYER_MOMENTARY(3), // to Fn overlay - // [1] = ACTION_LAYER_ON_OFF(1), - // [2] = ACTION_LAYER_ON_OFF(2), [3] = ACTION_DEFAULT_LAYER_SET(0), [4] = ACTION_DEFAULT_LAYER_SET(1), + [9] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE), + [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), diff --git a/keyboard/atomic/matrix.c b/keyboard/atomic/matrix.c index 435e08952a..86803c9ed0 100644 --- a/keyboard/atomic/matrix.c +++ b/keyboard/atomic/matrix.c @@ -104,17 +104,6 @@ uint8_t matrix_scan(void) } } - // uint8_t layer = biton32(default_layer_state); - switch (default_layer_state) { - case 1: - DDRF &= ~(1<<0); - PORTF &= ~(1<<0); - break; - case 2: - DDRF |= (1<<0); - PORTF |= (1<<0); - break; - } return 1; } diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index 0d84d8b472..22101096e9 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -55,7 +55,7 @@ SRC = keymap_common.c \ ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) else - SRC := keymap_dotcom.c $(SRC) + SRC := keymap_sean.c $(SRC) endif CONFIG_H = config.h diff --git a/keyboard/planck/keymap_sean.c b/keyboard/planck/keymap_sean.c new file mode 100644 index 0000000000..4029846640 --- /dev/null +++ b/keyboard/planck/keymap_sean.c @@ -0,0 +1,50 @@ +#include "keymap_common.h" + +const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = KEYMAP( /* Matrix Dvorak */ + QUOT, COMM, DOT, P, Y, SLSH, EQL, F, G, C, R, L, + A, O, E, U, I, ESC, BSPC, D, H, T, N, S, + SCLN, Q, J, K, X, TAB, ENT, B, M, W, V, Z, + LSFT, LCTL, LALT, LGUI, FN1, SPC, FN2, LEFT, DOWN, UP, RGHT), + + [1] = KEYMAP( /* Matrix Qwerty */ + Q, W, E, R, T, SLSH, EQL, Y, U, I, O, P, + A, S, D, F, G, ESC, BSPC, H, J, K, L, SCLN, + Z, X, C, V, B, TAB, ENT, N, M, COMM, DOT, SLSH, + LSFT, LCTL, LALT, LGUI, FN1, SPC, FN2, LEFT, DOWN, UP, RGHT), + + [2] = KEYMAP( /* fn1 */ + F1, F2, F3, F4, F5, NO, NO, F6, F7, F8, F9, F10, + 1, 2, 3, 4, 5, ESC, DEL, 6, 7, 8, 9, 0, + FN3, FN4, NO, GRV, MINS, F18, INS, BSLS, LBRC, RBRC, NO, NO, + TRNS, TRNS, TRNS, TRNS, FN1, TRNS, FN3, HOME, PGDN, PGUP, END), + + [3] = KEYMAP( /* fn2 */ + F11, F12, F13, F14, F15, NO, NO, F16, F17, F18, F19, F20, + F1, F2, F3, F4, F5, ESC, DEL, F6, F7, F8, F9, F10, + FN3, FN4, NO, GRV, MINS, F18, INS, INS, PSCR, SLCK, PAUS, TRNS, + TRNS, TRNS, TRNS, TRNS, FN3, TRNS, FN2, MUTE, VOLD, VOLU, MPLY), +}; +const uint16_t PROGMEM fn_actions[] = { + [1] = ACTION_LAYER_MOMENTARY(2), // to Fn overlay + [2] = ACTION_LAYER_MOMENTARY(3), // to Fn overlay + [3] = ACTION_DEFAULT_LAYER_SET(0), + [4] = ACTION_DEFAULT_LAYER_SET(1), + + [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), + [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), + [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), + [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), + [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), + [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), + [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), + [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), + [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), + [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), + [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), + [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), + [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), + [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), + [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), + [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), +};
\ No newline at end of file diff --git a/keyboard/planck/matrix.c b/keyboard/planck/matrix.c index ca59f7c73b..38d35e3e07 100644 --- a/keyboard/planck/matrix.c +++ b/keyboard/planck/matrix.c @@ -136,38 +136,36 @@ uint8_t matrix_key_count(void) static void init_cols(void) { - DDRB &= ~(1<<7 | 1<<4 | 1<<5 | 1<<6); - PORTB |= (1<<7 | 1<<4 | 1<<5 | 1<<6); - DDRC &= ~(1<<6); - PORTC |= (1<<6); - DDRD &= ~(1<<0 | 1<<1 | 1<<2 | 1<<3 | 1<<7); - PORTD |= (1<<0 | 1<<1 | 1<<2 | 1<<3 | 1<<7); - DDRF &= ~(1<<7 | 1<<6); - PORTF |= (1<<7 | 1<<6); + DDRB &= ~(1<<6 | 1<<5 | 1<<4); + PORTB |= (1<<6 | 1<<5 | 1<<4); + DDRD &= ~(1<<7 | 1<<6 | 1<<4); + PORTD |= (1<<7 | 1<<6 | 1<<4); + DDRF &= ~(1<<0 | 1<<1 | 1<<4 | 1<<5 | 1<<6 | 1<<7); + PORTF |= (1<<0 | 1<<1 | 1<<4 | 1<<5 | 1<<6 | 1<<7); } static matrix_row_t read_cols(void) { - return (PINB&(1<<7) ? 0 : (1<<0)) | - (PIND&(1<<0) ? 0 : (1<<1)) | - (PIND&(1<<1) ? 0 : (1<<2)) | - (PIND&(1<<2) ? 0 : (1<<3)) | - (PIND&(1<<3) ? 0 : (1<<4)) | - (PINC&(1<<6) ? 0 : (1<<5)) | - (PIND&(1<<7) ? 0 : (1<<6)) | - (PINB&(1<<4) ? 0 : (1<<7)) | - (PINB&(1<<5) ? 0 : (1<<8)) | - (PINB&(1<<6) ? 0 : (1<<9)) | - (PINF&(1<<7) ? 0 : (1<<10)) | - (PINF&(1<<6) ? 0 : (1<<11)); + return (PIND&(1<<4) ? 0 : (1<<0)) | + (PIND&(1<<6) ? 0 : (1<<1)) | + (PIND&(1<<7) ? 0 : (1<<2)) | + (PINB&(1<<4) ? 0 : (1<<3)) | + (PINB&(1<<5) ? 0 : (1<<4)) | + (PINB&(1<<6) ? 0 : (1<<5)) | + (PINF&(1<<7) ? 0 : (1<<6)) | + (PINF&(1<<6) ? 0 : (1<<7)) | + (PINF&(1<<5) ? 0 : (1<<8)) | + (PINF&(1<<4) ? 0 : (1<<9)) | + (PINF&(1<<1) ? 0 : (1<<10)) | + (PINF&(1<<0) ? 0 : (1<<11)); } static void unselect_rows(void) { - DDRF &= ~(1<<0 | 1<<1 | 1<<4 | 1<<5); - PORTF |= (1<<0 | 1<<1 | 1<<4 | 1<<5); + DDRB &= ~(1<<0 | 1<<1 | 1<<2 | 1<<3); + PORTB |= (1<<0 | 1<<1 | 1<<2 | 1<<3); } @@ -175,20 +173,20 @@ static void select_row(uint8_t row) { switch (row) { case 0: - DDRF |= (1<<0); - PORTF &= ~(1<<0); + DDRB |= (1<<0); + PORTB &= ~(1<<0); break; case 1: - DDRF |= (1<<1); - PORTF &= ~(1<<1); + DDRB |= (1<<1); + PORTB &= ~(1<<1); break; case 2: - DDRF |= (1<<4); - PORTF &= ~(1<<4); + DDRB |= (1<<2); + PORTB &= ~(1<<2); break; case 3: - DDRF |= (1<<5); - PORTF &= ~(1<<5); + DDRB |= (1<<3); + PORTB &= ~(1<<3); break; } |