diff options
| -rw-r--r-- | keyboard/atomic/Makefile | 25 | ||||
| -rw-r--r-- | keyboard/atomic/atomic.h | 3 | ||||
| -rw-r--r-- | keyboard/atomic/backlight.c | 2 | ||||
| -rw-r--r-- | keyboard/atomic/config.h | 93 | ||||
| -rw-r--r-- | keyboard/atomic/keymaps/default.c | 283 | ||||
| -rw-r--r-- | keyboard/atomic/keymaps/pc_atomic.c | 75 | ||||
| -rw-r--r-- | keyboard/planck/Makefile | 4 | ||||
| -rw-r--r-- | keyboard/planck/config.h | 4 | ||||
| -rw-r--r-- | keyboard/planck/keymaps/default/keymap.c | 16 | ||||
| -rw-r--r-- | keyboard/planck/keymaps/pc.c | 158 | ||||
| -rw-r--r-- | quantum/keymap_common.c | 6 | ||||
| -rw-r--r-- | quantum/keymap_common.h | 2 | ||||
| -rw-r--r-- | quantum/keymap_midi.h | 2 | ||||
| -rw-r--r-- | tmk_core/common/action_code.h | 2 | ||||
| -rw-r--r-- | tmk_core/common/keymap.c | 3 |
15 files changed, 574 insertions, 104 deletions
diff --git a/keyboard/atomic/Makefile b/keyboard/atomic/Makefile index da6d0ac60..2b017446d 100644 --- a/keyboard/atomic/Makefile +++ b/keyboard/atomic/Makefile | |||
| @@ -114,19 +114,19 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 | |||
| 114 | # Build Options | 114 | # Build Options |
| 115 | # comment out to disable the options. | 115 | # comment out to disable the options. |
| 116 | # | 116 | # |
| 117 | BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) | 117 | BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) |
| 118 | MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | 118 | MOUSEKEY_ENABLE = yes # Mouse keys(+4700) |
| 119 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 119 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
| 120 | CONSOLE_ENABLE = yes # Console for debug(+400) | 120 | CONSOLE_ENABLE = yes # Console for debug(+400) |
| 121 | COMMAND_ENABLE = yes # Commands for debug and configuration | 121 | COMMAND_ENABLE = yes # Commands for debug and configuration |
| 122 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 122 | #NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA |
| 123 | # SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | 123 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality |
| 124 | # NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA | 124 | #MIDI_ENABLE = yes # MIDI controls |
| 125 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | 125 | #UNICODE_ENABLE = yes # Unicode |
| 126 | # MIDI_ENABLE = YES # MIDI controls | 126 | #BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID |
| 127 | # UNICODE_ENABLE = YES # Unicode | ||
| 128 | # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID | ||
| 129 | 127 | ||
| 128 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | ||
| 129 | #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | ||
| 130 | 130 | ||
| 131 | # Optimize size but this may cause error "relocation truncated to fit" | 131 | # Optimize size but this may cause error "relocation truncated to fit" |
| 132 | #EXTRALDFLAGS = -Wl,--relax | 132 | #EXTRALDFLAGS = -Wl,--relax |
| @@ -137,4 +137,3 @@ VPATH += $(TOP_DIR) | |||
| 137 | VPATH += $(TMK_DIR) | 137 | VPATH += $(TMK_DIR) |
| 138 | 138 | ||
| 139 | include $(TOP_DIR)/quantum/quantum.mk | 139 | include $(TOP_DIR)/quantum/quantum.mk |
| 140 | |||
diff --git a/keyboard/atomic/atomic.h b/keyboard/atomic/atomic.h index d8574efa9..d5461e424 100644 --- a/keyboard/atomic/atomic.h +++ b/keyboard/atomic/atomic.h | |||
| @@ -26,5 +26,8 @@ | |||
| 26 | 26 | ||
| 27 | void matrix_init_user(void); | 27 | void matrix_init_user(void); |
| 28 | void matrix_scan_user(void); | 28 | void matrix_scan_user(void); |
| 29 | void process_action_user(keyrecord_t *record); | ||
| 30 | void led_set_user(uint8_t usb_led); | ||
| 31 | void backlight_init_ports(void); | ||
| 29 | 32 | ||
| 30 | #endif \ No newline at end of file | 33 | #endif \ No newline at end of file |
diff --git a/keyboard/atomic/backlight.c b/keyboard/atomic/backlight.c index f69364b2a..647b57e71 100644 --- a/keyboard/atomic/backlight.c +++ b/keyboard/atomic/backlight.c | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | 1 | ||
| 2 | #include <avr/io.h> | 2 | #include <avr/io.h> |
| 3 | #include "backlight.h" | 3 | #include "backlight.h" |
| 4 | #include "atomic.h" | ||
| 5 | |||
| 4 | 6 | ||
| 5 | #define CHANNEL OCR1C | 7 | #define CHANNEL OCR1C |
| 6 | 8 | ||
diff --git a/keyboard/atomic/config.h b/keyboard/atomic/config.h index 149aed471..f30a9e6cc 100644 --- a/keyboard/atomic/config.h +++ b/keyboard/atomic/config.h | |||
| @@ -32,36 +32,109 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 32 | #define MATRIX_ROWS 5 | 32 | #define MATRIX_ROWS 5 |
| 33 | #define MATRIX_COLS 15 | 33 | #define MATRIX_COLS 15 |
| 34 | 34 | ||
| 35 | // Planck PCB default pin-out | 35 | /* |
| 36 | // Change this to how you wired your keyboard | 36 | * Keyboard Matrix Assignments |
| 37 | // COLS: Left to right, ROWS: Top to bottom | 37 | * |
| 38 | * Change this to how you wired your keyboard | ||
| 39 | * COLS: AVR pins used for columns, left to right | ||
| 40 | * ROWS: AVR pins used for rows, top to bottom | ||
| 41 | * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) | ||
| 42 | * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) | ||
| 43 | * | ||
| 44 | */ | ||
| 38 | #define COLS (int []){ F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 } | 45 | #define COLS (int []){ F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 } |
| 39 | #define ROWS (int []){ D0, D5, B5, B6, C6 } | 46 | #define ROWS (int []){ D0, D5, B5, B6, C6 } |
| 40 | 47 | ||
| 41 | /* COL2ROW or ROW2COL */ | 48 | /* COL2ROW or ROW2COL */ |
| 42 | #define DIODE_DIRECTION COL2ROW | 49 | #define DIODE_DIRECTION COL2ROW |
| 43 | 50 | ||
| 44 | /* define if matrix has ghost */ | 51 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ |
| 52 | #define DEBOUNCE 5 | ||
| 53 | |||
| 54 | /* define if matrix has ghost (lacks anti-ghosting diodes) */ | ||
| 45 | //#define MATRIX_HAS_GHOST | 55 | //#define MATRIX_HAS_GHOST |
| 46 | 56 | ||
| 47 | /* number of backlight levels */ | 57 | /* number of backlight levels */ |
| 48 | /* NOTE: this is the max value of 0..BACKLIGHT_LEVELS so really 16 levels. */ | ||
| 49 | #define BACKLIGHT_LEVELS 3 | 58 | #define BACKLIGHT_LEVELS 3 |
| 50 | 59 | ||
| 51 | /* Set 0 if debouncing isn't needed */ | ||
| 52 | #define DEBOUNCE 5 | ||
| 53 | |||
| 54 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | 60 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ |
| 55 | #define LOCKING_SUPPORT_ENABLE | 61 | #define LOCKING_SUPPORT_ENABLE |
| 56 | /* Locking resynchronize hack */ | 62 | /* Locking resynchronize hack */ |
| 57 | #define LOCKING_RESYNC_ENABLE | 63 | #define LOCKING_RESYNC_ENABLE |
| 58 | 64 | ||
| 59 | /* key combination for command */ | 65 | /* |
| 66 | * Force NKRO | ||
| 67 | * | ||
| 68 | * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved | ||
| 69 | * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the | ||
| 70 | * makefile for this to work.) | ||
| 71 | * | ||
| 72 | * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) | ||
| 73 | * until the next keyboard reset. | ||
| 74 | * | ||
| 75 | * NKRO may prevent your keystrokes from being detected in the BIOS, but it is | ||
| 76 | * fully operational during normal computer usage. | ||
| 77 | * | ||
| 78 | * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) | ||
| 79 | * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by | ||
| 80 | * bootmagic, NKRO mode will always be enabled until it is toggled again during a | ||
| 81 | * power-up. | ||
| 82 | * | ||
| 83 | */ | ||
| 84 | //#define FORCE_NKRO | ||
| 85 | |||
| 86 | /* | ||
| 87 | * Magic Key Options | ||
| 88 | * | ||
| 89 | * Magic keys are hotkey commands that allow control over firmware functions of | ||
| 90 | * the keyboard. They are best used in combination with the HID Listen program, | ||
| 91 | * found here: https://www.pjrc.com/teensy/hid_listen.html | ||
| 92 | * | ||
| 93 | * The options below allow the magic key functionality to be changed. This is | ||
| 94 | * useful if your keyboard/keypad is missing keys and you want magic key support. | ||
| 95 | * | ||
| 96 | */ | ||
| 97 | |||
| 98 | /* key combination for magic key command */ | ||
| 60 | #define IS_COMMAND() ( \ | 99 | #define IS_COMMAND() ( \ |
| 61 | keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ | 100 | keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ |
| 62 | ) | 101 | ) |
| 63 | 102 | ||
| 64 | 103 | /* control how magic key switches layers */ | |
| 104 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true | ||
| 105 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true | ||
| 106 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false | ||
| 107 | |||
| 108 | /* override magic key keymap */ | ||
| 109 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS | ||
| 110 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS | ||
| 111 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM | ||
| 112 | //#define MAGIC_KEY_HELP1 H | ||
| 113 | //#define MAGIC_KEY_HELP2 SLASH | ||
| 114 | //#define MAGIC_KEY_DEBUG D | ||
| 115 | //#define MAGIC_KEY_DEBUG_MATRIX X | ||
| 116 | //#define MAGIC_KEY_DEBUG_KBD K | ||
| 117 | //#define MAGIC_KEY_DEBUG_MOUSE M | ||
| 118 | //#define MAGIC_KEY_VERSION V | ||
| 119 | //#define MAGIC_KEY_STATUS S | ||
| 120 | //#define MAGIC_KEY_CONSOLE C | ||
| 121 | //#define MAGIC_KEY_LAYER0_ALT1 ESC | ||
| 122 | //#define MAGIC_KEY_LAYER0_ALT2 GRAVE | ||
| 123 | //#define MAGIC_KEY_LAYER0 0 | ||
| 124 | //#define MAGIC_KEY_LAYER1 1 | ||
| 125 | //#define MAGIC_KEY_LAYER2 2 | ||
| 126 | //#define MAGIC_KEY_LAYER3 3 | ||
| 127 | //#define MAGIC_KEY_LAYER4 4 | ||
| 128 | //#define MAGIC_KEY_LAYER5 5 | ||
| 129 | //#define MAGIC_KEY_LAYER6 6 | ||
| 130 | //#define MAGIC_KEY_LAYER7 7 | ||
| 131 | //#define MAGIC_KEY_LAYER8 8 | ||
| 132 | //#define MAGIC_KEY_LAYER9 9 | ||
| 133 | //#define MAGIC_KEY_BOOTLOADER PAUSE | ||
| 134 | //#define MAGIC_KEY_LOCK CAPS | ||
| 135 | //#define MAGIC_KEY_EEPROM E | ||
| 136 | //#define MAGIC_KEY_NKRO N | ||
| 137 | //#define MAGIC_KEY_SLEEP_LED Z | ||
| 65 | 138 | ||
| 66 | /* | 139 | /* |
| 67 | * Feature disable options | 140 | * Feature disable options |
diff --git a/keyboard/atomic/keymaps/default.c b/keyboard/atomic/keymaps/default.c index f37d9d9a5..0ede363a1 100644 --- a/keyboard/atomic/keymaps/default.c +++ b/keyboard/atomic/keymaps/default.c | |||
| @@ -1,79 +1,234 @@ | |||
| 1 | #include "atomic.h" | 1 | #include "atomic.h" |
| 2 | 2 | ||
| 3 | // Fillers to make layering more clear | ||
| 4 | #define _______ KC_TRNS | ||
| 5 | #define ___T___ KC_TRNS | ||
| 6 | #define XXXXXXX KC_NO | ||
| 7 | |||
| 8 | // Layer shorthand | ||
| 9 | #define _QW 0 | ||
| 10 | #define _CM 1 | ||
| 11 | #define _DV 2 | ||
| 12 | #define _LW 3 | ||
| 13 | #define _RS 4 | ||
| 14 | #define _FN 5 | ||
| 15 | |||
| 16 | /* ROW 1 OPTIONS | ||
| 17 | * .--------------------------------------------------------------------------------------------------------------------------------------. | ||
| 18 | * | | | | | | | | | | | | | | | | | ||
| 19 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 20 | * .- 2u ------------. | ||
| 21 | * | KEY . XXXXXX | | ||
| 22 | * '-----------------' | ||
| 23 | */ | ||
| 24 | |||
| 25 | /* ROW 2 OPTIONS | ||
| 26 | * .--------------------------------------------------------------------------------------------------------------------------------------. | ||
| 27 | * | | | | | | | | | | | | | | | | | ||
| 28 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 29 | * .- 2u ------------. .- 2u ------------. | ||
| 30 | * | KEY . XXXXXX | | KEY . XXXXXX | | ||
| 31 | * '-----------------' '-----------------' | ||
| 32 | */ | ||
| 33 | |||
| 34 | /* ROW 3 OPTIONS | ||
| 35 | * .--------------------------------------------------------------------------------------------------------------------------------------. | ||
| 36 | * | | | | | | | | | | | | | | | | | ||
| 37 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 38 | * .- 2u ------------. .- 2u ------------. | ||
| 39 | * | KEY . XXXXXX | | X | | ||
| 40 | * '-----------------' '-----------------' | ||
| 41 | * .- 2u ------------. | ||
| 42 | * | X | | ||
| 43 | * '-----------------' | ||
| 44 | */ | ||
| 45 | |||
| 46 | /* ROW 4 OPTIONS | ||
| 47 | * .--------------------------------------------------------------------------------------------------------------------------------------. | ||
| 48 | * | | | | | | | | | | | | | | | | | ||
| 49 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 50 | * .- 2u ------------. | ||
| 51 | * | KEY . XXXXXX | | ||
| 52 | * '-----------------' | ||
| 53 | * .- 2u ------------. .- 2u ------------. | ||
| 54 | * | KEY . XXXXXX | | KEY . XXXXXX | | ||
| 55 | * '-----------------' '-----------------' | ||
| 56 | * .- 2u ------------. | ||
| 57 | * | KEY . XXXXXX | | ||
| 58 | * '-----------------' | ||
| 59 | */ | ||
| 60 | |||
| 61 | /* ROW 5 OPTIONS | ||
| 62 | * .--------------------------------------------------------------------------------------------------------------------------------------. | ||
| 63 | * | | | | | | | | | | | | | | | | | ||
| 64 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 65 | * .- 1.25u --+ 1.25u ------- 1.25u +--- 1.25u --- 2u -------------- 1.25u ---- 1.25u ------ 1.25u +---- 1.25u . | ||
| 66 | * | X | X | X | X | X | X | X | X | X | | ||
| 67 | * '-----------------------------------------------------------------------------------------------------------' | ||
| 68 | * .- 2u ------------. | ||
| 69 | * | X | | ||
| 70 | * '-----------------' | ||
| 71 | * .--------------------- 6.25u ----------------------------. | ||
| 72 | * | X | | ||
| 73 | * '--------------------------------------------------------' | ||
| 74 | * .----------------------- 6.25u ---------------------------- 1.25u ---- 1.25u ---- 1.25u ------ 1.25u +-- 1.25u --. | ||
| 75 | * | X | X | X | X | X | X | | ||
| 76 | * '----------------------------------------------------------------------------------------------------------------' | ||
| 77 | */ | ||
| 78 | |||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 79 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 4 | [0] = { /* Qwerty */ | 80 | |
| 5 | { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL }, | 81 | /* QWERTY - MIT ENHANCED / GRID COMPATIBLE |
| 6 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | 82 | * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. |
| 7 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | 83 | * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP | |
| 8 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | 84 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| |
| 9 | // ┌─ 2u ────────────┐ | 85 | * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL | |
| 10 | // │ X │ | 86 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| |
| 11 | // └─────────────────┘ | 87 | * | ESC | A | S | D | F | G | H | J | K | L | ; | ' | XXXXXX . ENTER | PG UP | |
| 88 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| | ||
| 89 | * | LSHIFT | Z | X | C | V | B | N | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN | | ||
| 90 | * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| | ||
| 91 | * | BRITE | LCTRL | LALT | LGUI | RAISE | XXXXXX . SPACE | LOWER | RGUI | RALT | RCTRL | FN | LEFT | DOWN | RIGHT | | ||
| 92 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 93 | */ | ||
| 94 | |||
| 95 | [_QW] = { /* QWERTY */ | ||
| 96 | { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC }, | ||
| 12 | { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL }, | 97 | { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL }, |
| 13 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | ||
| 14 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 15 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | ||
| 16 | // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ | ||
| 17 | // │ X │ │ X │ | ||
| 18 | // └─────────────────┘ └─────────────────┘ | ||
| 19 | { KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP }, | 98 | { KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP }, |
| 20 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | 99 | { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN }, |
| 21 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | 100 | { M(0), KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC, KC_SPC, MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT }, |
| 22 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | 101 | }, |
| 23 | // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ | 102 | |
| 24 | // │ X │ │ X │ | 103 | /* COLEMAK - MIT ENHANCED / GRID COMPATIBLE |
| 25 | // └─────────────────┘ └─────────────────┘ | 104 | * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. |
| 26 | // ┌─ 2u ────────────┐ | 105 | * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP | |
| 27 | // │ X │ | 106 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| |
| 28 | // └─────────────────┘ | 107 | * | TAB | Q | W | F | P | G | J | L | U | Y | ; | [ | ] | \ | DEL | |
| 29 | { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN }, | 108 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| |
| 30 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | 109 | * | ESC | A | R | S | T | D | H | N | E | I | O | ' | XXXXXX . ENTER | PG UP | |
| 31 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | 110 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| |
| 32 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | 111 | * | LSHIFT | Z | X | C | V | B | K | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN | |
| 33 | // ┌─ 2u ────────────┐ | 112 | * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| |
| 34 | // │ X │ | 113 | * | BRITE | LCTRL | LALT | LGUI | RAISE | XXXXXX . SPACE | LOWER | RGUI | RALT | RCTRL | FN | LEFT | DOWN | RIGHT | |
| 35 | // └─────────────────┘ | 114 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 36 | // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ | 115 | */ |
| 37 | // │ X │ │ X │ | 116 | |
| 38 | // └─────────────────┘ └─────────────────┘ | 117 | [_CM] = { /* COLEMAK */ |
| 39 | // ┌─ 2u ────────────┐ | 118 | { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC }, |
| 40 | // │ X │ | 119 | { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL }, |
| 41 | // └─────────────────┘ | 120 | { KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP }, |
| 42 | { BL_STEP, KC_LCTL, KC_LALT, KC_LGUI, KC_LGUI, KC_SPC, KC_SPC, KC_RGUI, KC_RGUI, KC_RALT, KC_RCTL, BL_STEP, KC_LEFT, KC_DOWN, KC_RGHT }, | 121 | { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN }, |
| 43 | // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ | 122 | { M(0), KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC, KC_SPC, MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT }, |
| 44 | // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | 123 | }, |
| 45 | // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ | 124 | |
| 46 | // ┌─ 1.25u ──┬ 1.25u ───┬─── 1.25u ┬─── 1.25u ─┬─ 2u ────────────┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬──── 1.25u ┐ | 125 | /* DVORAK - MIT ENHANCED / GRID COMPATIBLE |
| 47 | // │ X │ X │ X │ X │ X │ X │ X │ X │ X │ | 126 | * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. |
| 48 | // └──────────┴──────────┴──────────┴───────────┴─────────────────┴──────────┴──────────┴──────────┴───────────┘ | 127 | * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP | |
| 49 | // ┌─ 2u ────────────┐ | 128 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| |
| 50 | // │ X │ | 129 | * | TAB | ' | , | . | P | Y | F | G | C | R | L | [ | ] | \ | DEL | |
| 51 | // └─────────────────┘ | 130 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| |
| 52 | // ┌───────────────────── 6.25u ────────────────────────────┐ | 131 | * | ESC | A | O | E | U | I | D | H | T | N | S | / | XXXXXX . ENTER | PG UP | |
| 53 | // │ X │ | 132 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| |
| 54 | // └────────────────────────────────────────────────────────┘ | 133 | * | LSHIFT | ; | Q | J | K | X | B | M | W | V | Z | XXXXXX . RSHIFT | UP | PG DN | |
| 55 | // ┌─────────────────────── 6.25u ──────────────────────────┬─ 1.25u ──┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬── 1.25u ──┐ | 134 | * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| |
| 56 | // │ X │ X │ X │ X │ X │ X │ | 135 | * | BRITE | LCTRL | LALT | LGUI | RAISE | XXXXXX . SPACE | LOWER | RGUI | RALT | RCTRL | FN | LEFT | DOWN | RIGHT | |
| 57 | // └────────────────────────────────────────────────────────┴──────────┴──────────┴──────────┴──────────┴───────────┘ | 136 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 58 | } | 137 | */ |
| 138 | |||
| 139 | [_DV] = { /* DVORAK */ | ||
| 140 | { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC }, | ||
| 141 | { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL }, | ||
| 142 | { KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, KC_ENT, KC_ENT, KC_PGUP }, | ||
| 143 | { KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN }, | ||
| 144 | { M(0), KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC, KC_SPC, MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT }, | ||
| 145 | }, | ||
| 146 | |||
| 147 | /* LOWERED | ||
| 148 | * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. | ||
| 149 | * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . | | ||
| 150 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| | ||
| 151 | * | | ! | @ | # | $ | % | ^ | & | * | ( | ) | | | | INS | | ||
| 152 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| | ||
| 153 | * | | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | XXXXXX . | | | ||
| 154 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| | ||
| 155 | * | | F7 | F8 | F9 | F10 | F11 | F12 | | | | | XXXXXX . | | | | ||
| 156 | * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| | ||
| 157 | * | | | | | | XXXXXX . | | | | | | | | | | ||
| 158 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 159 | */ | ||
| 160 | |||
| 161 | [_LW] = { /* LOWERED */ | ||
| 162 | { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ }, | ||
| 163 | { _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS }, | ||
| 164 | { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______ }, | ||
| 165 | { _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, ___T___, ___T___, _______, _______ }, | ||
| 166 | { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, | ||
| 167 | }, | ||
| 168 | |||
| 169 | /* RAISED | ||
| 170 | * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. | ||
| 171 | * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . | | ||
| 172 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| | ||
| 173 | * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | | | INS | | ||
| 174 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| | ||
| 175 | * | | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | XXXXXX . | | | ||
| 176 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| | ||
| 177 | * | | F7 | F8 | F9 | F10 | F11 | F12 | | | | | XXXXXX . | | | | ||
| 178 | * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| | ||
| 179 | * | | | | | | XXXXXX . | | | | | | | | | | ||
| 180 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 181 | */ | ||
| 182 | |||
| 183 | [_RS] = { /* RAISED */ | ||
| 184 | { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ }, | ||
| 185 | { _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, _______, KC_INS }, | ||
| 186 | { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___, _______ }, | ||
| 187 | { _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, ___T___, ___T___, _______, _______ }, | ||
| 188 | { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, | ||
| 189 | }, | ||
| 190 | |||
| 191 | /* FUNCTION | ||
| 192 | * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. | ||
| 193 | * | NUM LK | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . | | ||
| 194 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| | ||
| 195 | * | SCR LK | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | F21 | F22 | F23 | F24 | PAUSE | PR SCR | | ||
| 196 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| | ||
| 197 | * | CAP LK | MS BT5 | MS BT4 | MS BT3 | MS BT2 | SLOW M | FAST M | NEXT | VOL+ | VOL- | PLAY | | XXXXXX . | WHEEL+ | | ||
| 198 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| | ||
| 199 | * | | | QWERTY | COLEMK | DVORAK | | | | | | | XXXXXX . | MOUS U | WHEEL- | | ||
| 200 | * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| | ||
| 201 | * | | | | | | XXXXXX . MS BT1 | | | | | | MOUS L | MOUS D | MOUS R | | ||
| 202 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 203 | */ | ||
| 204 | |||
| 205 | [_FN] = { /* FUNCTION */ | ||
| 206 | { KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ }, | ||
| 207 | { KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR }, | ||
| 208 | { KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U }, | ||
| 209 | { _______, _______, DF(_QW), DF(_CM), DF(_DV), _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D }, | ||
| 210 | { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R }, | ||
| 211 | }, | ||
| 59 | }; | 212 | }; |
| 60 | 213 | ||
| 61 | const uint16_t PROGMEM fn_actions[] = { | 214 | const uint16_t PROGMEM fn_actions[] = { |
| 62 | [1] = ACTION_LAYER_MOMENTARY(2), // to RAISE | ||
| 63 | [2] = ACTION_LAYER_MOMENTARY(3), // to LOWER | ||
| 64 | |||
| 65 | [3] = ACTION_DEFAULT_LAYER_SET(0), | ||
| 66 | [4] = ACTION_DEFAULT_LAYER_SET(1), | ||
| 67 | 215 | ||
| 68 | }; | 216 | }; |
| 69 | 217 | ||
| 70 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 218 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 71 | { | 219 | { |
| 72 | // MACRODOWN only works in this function | 220 | // MACRODOWN only works in this function |
| 73 | switch(id) { | 221 | switch(id) { |
| 74 | case 0: | 222 | case 0: |
| 75 | return MACRODOWN(TYPE(KC_T), END); | 223 | if (record->event.pressed) { |
| 76 | break; | 224 | register_code(KC_RSFT); |
| 77 | } | 225 | #ifdef BACKLIGHT_ENABLE |
| 226 | backlight_step(); | ||
| 227 | #endif | ||
| 228 | } else { | ||
| 229 | unregister_code(KC_RSFT); | ||
| 230 | } | ||
| 231 | break; | ||
| 232 | } | ||
| 78 | return MACRO_NONE; | 233 | return MACRO_NONE; |
| 79 | }; | 234 | }; |
diff --git a/keyboard/atomic/keymaps/pc_atomic.c b/keyboard/atomic/keymaps/pc_atomic.c new file mode 100644 index 000000000..bdf575046 --- /dev/null +++ b/keyboard/atomic/keymaps/pc_atomic.c | |||
| @@ -0,0 +1,75 @@ | |||
| 1 | #include "atomic.h" | ||
| 2 | |||
| 3 | #define _QW 0 | ||
| 4 | #define _LW 1 | ||
| 5 | #define _RS 2 | ||
| 6 | #define _FN 3 | ||
| 7 | |||
| 8 | #define _______ KC_TRNS | ||
| 9 | #define ___T___ KC_TRNS | ||
| 10 | #define XXXXXXX KC_NO | ||
| 11 | |||
| 12 | /* | ||
| 13 | * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. | ||
| 14 | * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP | | ||
| 15 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| | ||
| 16 | * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL | | ||
| 17 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| | ||
| 18 | * | CAPS | A | S | D | F | G | H | J | K | L | ; | ' | XXXXXX . ENTER | PG UP | | ||
| 19 | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| | ||
| 20 | * | LSHIFT | Z | X | C | V | B | N | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN | | ||
| 21 | * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| | ||
| 22 | * | LCTRL | LWIN | FN | LALT | RAISED | XXXXXX . SPACE | LOWER | RALT | HOME | END | RCTRL | LEFT | DOWN | RIGHT | | ||
| 23 | * '--------------------------------------------------------------------------------------------------------------------------------------' | ||
| 24 | */ | ||
| 25 | |||
| 26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 27 | [_QW] = { /* QWERTY */ | ||
| 28 | { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, XXXXXXX }, | ||
| 29 | { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL }, | ||
| 30 | { KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, XXXXXXX, KC_PGUP }, | ||
| 31 | { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, XXXXXXX, KC_UP, KC_PGDN }, | ||
| 32 | { KC_LCTL, KC_LGUI, MO(_FN), KC_LALT, MO(_RS), KC_SPC, XXXXXXX, MO(_LW), KC_RALT, KC_HOME, KC_END, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT }, | ||
| 33 | }, | ||
| 34 | [_LW] = { /* LOWERED */ | ||
| 35 | { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ }, | ||
| 36 | { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS }, | ||
| 37 | { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______ }, | ||
| 38 | { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______ }, | ||
| 39 | { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, | ||
| 40 | }, | ||
| 41 | [_RS] = { /* RAISED */ | ||
| 42 | { KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ }, | ||
| 43 | { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS }, | ||
| 44 | { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______ }, | ||
| 45 | { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______ }, | ||
| 46 | { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, | ||
| 47 | }, | ||
| 48 | [_FN] = { /* FUNCTION */ | ||
| 49 | { KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ }, | ||
| 50 | { KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR }, | ||
| 51 | { KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U }, | ||
| 52 | { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D }, | ||
| 53 | { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R }, | ||
| 54 | }, | ||
| 55 | }; | ||
| 56 | |||
| 57 | const uint16_t PROGMEM fn_actions[] = { | ||
| 58 | [1] = ACTION_LAYER_MOMENTARY(2), // to RAISE | ||
| 59 | [2] = ACTION_LAYER_MOMENTARY(3), // to LOWER | ||
| 60 | |||
| 61 | [3] = ACTION_DEFAULT_LAYER_SET(0), | ||
| 62 | [4] = ACTION_DEFAULT_LAYER_SET(1), | ||
| 63 | |||
| 64 | }; | ||
| 65 | |||
| 66 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | ||
| 67 | { | ||
| 68 | // MACRODOWN only works in this function | ||
| 69 | switch(id) { | ||
| 70 | case 0: | ||
| 71 | return MACRODOWN(TYPE(KC_T), END); | ||
| 72 | break; | ||
| 73 | } | ||
| 74 | return MACRO_NONE; | ||
| 75 | }; | ||
diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index 03d260176..17e5cd45c 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile | |||
| @@ -137,8 +137,8 @@ CONSOLE_ENABLE = yes # Console for debug(+400) | |||
| 137 | COMMAND_ENABLE = yes # Commands for debug and configuration | 137 | COMMAND_ENABLE = yes # Commands for debug and configuration |
| 138 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 138 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 139 | # SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | 139 | # SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend |
| 140 | # NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 140 | NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 141 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | 141 | # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality |
| 142 | # MIDI_ENABLE = YES # MIDI controls | 142 | # MIDI_ENABLE = YES # MIDI controls |
| 143 | # AUDIO_ENABLE = YES # Audio output on port C6 | 143 | # AUDIO_ENABLE = YES # Audio output on port C6 |
| 144 | # UNICODE_ENABLE = YES # Unicode | 144 | # UNICODE_ENABLE = YES # Unicode |
diff --git a/keyboard/planck/config.h b/keyboard/planck/config.h index d3719e0cb..7d64f0977 100644 --- a/keyboard/planck/config.h +++ b/keyboard/planck/config.h | |||
| @@ -73,10 +73,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 73 | */ | 73 | */ |
| 74 | 74 | ||
| 75 | /* disable debug print */ | 75 | /* disable debug print */ |
| 76 | #define NO_DEBUG | 76 | //#define NO_DEBUG |
| 77 | 77 | ||
| 78 | /* disable print */ | 78 | /* disable print */ |
| 79 | #define NO_PRINT | 79 | //#define NO_PRINT |
| 80 | 80 | ||
| 81 | /* disable action features */ | 81 | /* disable action features */ |
| 82 | //#define NO_ACTION_LAYER | 82 | //#define NO_ACTION_LAYER |
diff --git a/keyboard/planck/keymaps/default/keymap.c b/keyboard/planck/keymaps/default/keymap.c index a7541b0b8..30ad87760 100644 --- a/keyboard/planck/keymaps/default/keymap.c +++ b/keyboard/planck/keymaps/default/keymap.c | |||
| @@ -16,6 +16,10 @@ | |||
| 16 | #define _LW 3 | 16 | #define _LW 3 |
| 17 | #define _RS 4 | 17 | #define _RS 4 |
| 18 | 18 | ||
| 19 | // Fillers to make layering more clear | ||
| 20 | #define _______ KC_TRNS | ||
| 21 | #define XXXXXXX KC_NO | ||
| 22 | |||
| 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 23 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 20 | 24 | ||
| 21 | /* Qwerty | 25 | /* Qwerty |
| @@ -85,9 +89,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 85 | */ | 89 | */ |
| 86 | [_RS] = { | 90 | [_RS] = { |
| 87 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 91 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, |
| 88 | {KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, | 92 | {_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, |
| 89 | {KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, DF(_QW), DF(_CM), DF(_DV), RESET, KC_TRNS}, | 93 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, DF(_QW), DF(_CM), DF(_DV), RESET, _______}, |
| 90 | {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 94 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} |
| 91 | }, | 95 | }, |
| 92 | 96 | ||
| 93 | /* Lower | 97 | /* Lower |
| @@ -103,9 +107,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 103 | */ | 107 | */ |
| 104 | [_LW] = { | 108 | [_LW] = { |
| 105 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, | 109 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, |
| 106 | {KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, | 110 | {_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, |
| 107 | {KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, DF(_QW), DF(_CM), DF(_DV), RESET, KC_TRNS}, | 111 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, DF(_QW), DF(_CM), DF(_DV), RESET, _______}, |
| 108 | {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 112 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} |
| 109 | } | 113 | } |
| 110 | }; | 114 | }; |
| 111 | 115 | ||
diff --git a/keyboard/planck/keymaps/pc.c b/keyboard/planck/keymaps/pc.c new file mode 100644 index 000000000..ed062609f --- /dev/null +++ b/keyboard/planck/keymaps/pc.c | |||
| @@ -0,0 +1,158 @@ | |||
| 1 | // This is the canonical layout file for the Quantum project. If you want to add another keyboard, | ||
| 2 | // this is the style you want to emulate. | ||
| 3 | |||
| 4 | #include "planck.h" | ||
| 5 | #ifdef BACKLIGHT_ENABLE | ||
| 6 | #include "backlight.h" | ||
| 7 | #endif | ||
| 8 | |||
| 9 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | ||
| 10 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | ||
| 11 | // Layer names don't all need to be of the same length, obviously, and you can also skip them | ||
| 12 | // entirely and just use numbers. | ||
| 13 | #define _QW 0 | ||
| 14 | #define _CM 1 | ||
| 15 | #define _DV 2 | ||
| 16 | #define _LW 3 | ||
| 17 | #define _RS 4 | ||
| 18 | #define _FN 5 | ||
| 19 | |||
| 20 | #define XXXXXXX KC_NO | ||
| 21 | #define _______ KC_TRNS | ||
| 22 | |||
| 23 | #define ASFT(kc) LSFT(RSFT(kc)) | ||
| 24 | #define MG_B ASFT(KC_B) | ||
| 25 | #define MG_H ASFT(KC_H) | ||
| 26 | |||
| 27 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 28 | |||
| 29 | /* Qwerty | ||
| 30 | * ,-----------------------------------------------------------------------------------. | ||
| 31 | * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | | ||
| 32 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 33 | * | Esc | A | S | D | F | G | H | J | K | L | ; | " | | ||
| 34 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 35 | * | Shift| Z | X | C | V | B | N | M | , | . | Up |Enter | | ||
| 36 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 37 | * | Ctrl | GUI | Alt | Del |Raise | Space |Lower | / | Left | Down |Right | | ||
| 38 | * `-----------------------------------------------------------------------------------' | ||
| 39 | */ | ||
| 40 | [_QW] = { | ||
| 41 | {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, | ||
| 42 | {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, | ||
| 43 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT }, | ||
| 44 | {KC_LCTL, KC_LGUI, KC_LALT, KC_DEL, MO(_LW), KC_SPC, KC_SPC, MO(_RS), KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT} | ||
| 45 | }, | ||
| 46 | |||
| 47 | /* Colemak | ||
| 48 | * ,-----------------------------------------------------------------------------------. | ||
| 49 | * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp | | ||
| 50 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 51 | * | Esc | A | R | S | T | D | H | N | E | I | O | " | | ||
| 52 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 53 | * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | | ||
| 54 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 55 | * | Brite| Ctrl | Alt | GUI |Raise | Space |Lower | Left | Down | Up |Right | | ||
| 56 | * `-----------------------------------------------------------------------------------' | ||
| 57 | */ | ||
| 58 | [_CM] = { | ||
| 59 | {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC}, | ||
| 60 | {KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, | ||
| 61 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, | ||
| 62 | {M(0), KC_LCTL, KC_LALT, KC_LGUI, MO(_LW), KC_SPC, KC_SPC, MO(_RS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | ||
| 63 | }, | ||
| 64 | |||
| 65 | /* Dvorak | ||
| 66 | * ,-----------------------------------------------------------------------------------. | ||
| 67 | * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | | ||
| 68 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 69 | * | Esc | A | O | E | U | I | D | H | T | N | S | / | | ||
| 70 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 71 | * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | | ||
| 72 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 73 | * | Brite| Ctrl | Alt | GUI |Raise | Space |Lower | Left | Down | Up |Right | | ||
| 74 | * `-----------------------------------------------------------------------------------' | ||
| 75 | */ | ||
| 76 | [_DV] = { | ||
| 77 | {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, | ||
| 78 | {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH}, | ||
| 79 | {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT }, | ||
| 80 | {M(0), KC_LCTL, KC_LALT, KC_LGUI, MO(_LW), KC_SPC, KC_SPC, MO(_RS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} | ||
| 81 | }, | ||
| 82 | |||
| 83 | /* Raise | ||
| 84 | * ,-----------------------------------------------------------------------------------. | ||
| 85 | * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | | ||
| 86 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 87 | * | Esc | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | | ||
| 88 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 89 | * | Shift| F7 | F8 | F9 | F10 | F11 | F12 |Qwerty|Colemk|Dvorak| Reset|Enter | | ||
| 90 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 91 | * | Brite| Ctrl | Alt | GUI |Raise | Space |Lower | Next | Vol- | Vol+ | Play | | ||
| 92 | * `-----------------------------------------------------------------------------------' | ||
| 93 | */ | ||
| 94 | [_RS] = { | ||
| 95 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | ||
| 96 | {_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, | ||
| 97 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, RESET, _______}, | ||
| 98 | {_______, _______, _______, _______, MO(_FN), _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | ||
| 99 | }, | ||
| 100 | |||
| 101 | /* Lower | ||
| 102 | * ,-----------------------------------------------------------------------------------. | ||
| 103 | * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | | ||
| 104 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 105 | * | Esc | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | | ||
| 106 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 107 | * | Shift| F7 | F8 | F9 | F10 | F11 | F12 |Qwerty|Colemk|Dvorak| Reset|Enter | | ||
| 108 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 109 | * | Brite| Ctrl | Alt | GUI |Raise | Space |Lower | Next | Vol- | Vol+ | Play | | ||
| 110 | * `-----------------------------------------------------------------------------------' | ||
| 111 | */ | ||
| 112 | [_LW] = { | ||
| 113 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, | ||
| 114 | {_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, | ||
| 115 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, MG_B, _______}, | ||
| 116 | {_______, _______, _______, _______, _______, _______, _______, MO(_FN), KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | ||
| 117 | }, | ||
| 118 | |||
| 119 | /* Function | ||
| 120 | * ,-----------------------------------------------------------------------------------. | ||
| 121 | * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | | ||
| 122 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 123 | * | Esc | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | | ||
| 124 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 125 | * | Shift| F7 | F8 | F9 | F10 | F11 | F12 |Qwerty|Colemk|Dvorak| Reset|Enter | | ||
| 126 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 127 | * | Brite| Ctrl | Alt | GUI |Raise | Space |Lower | Next | Vol- | Vol+ | Play | | ||
| 128 | * `-----------------------------------------------------------------------------------' | ||
| 129 | */ | ||
| 130 | [_FN] = { | ||
| 131 | {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, | ||
| 132 | {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MG_H, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, | ||
| 133 | {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, | ||
| 134 | {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX} | ||
| 135 | } | ||
| 136 | }; | ||
| 137 | |||
| 138 | const uint16_t PROGMEM fn_actions[] = { | ||
| 139 | |||
| 140 | }; | ||
| 141 | |||
| 142 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | ||
| 143 | { | ||
| 144 | // MACRODOWN only works in this function | ||
| 145 | switch(id) { | ||
| 146 | case 0: | ||
| 147 | if (record->event.pressed) { | ||
| 148 | register_code(KC_RSFT); | ||
| 149 | #ifdef BACKLIGHT_ENABLE | ||
| 150 | backlight_step(); | ||
| 151 | #endif | ||
| 152 | } else { | ||
| 153 | unregister_code(KC_RSFT); | ||
| 154 | } | ||
| 155 | break; | ||
| 156 | } | ||
| 157 | return MACRO_NONE; | ||
| 158 | }; | ||
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index 2eef4f15a..ae6cddb34 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c | |||
| @@ -87,6 +87,7 @@ action_t action_for_key(uint8_t layer, keypos_t key) | |||
| 87 | return action; | 87 | return action; |
| 88 | #endif | 88 | #endif |
| 89 | } else if (keycode == RESET) { // RESET is 0x5000, which is why this is here | 89 | } else if (keycode == RESET) { // RESET is 0x5000, which is why this is here |
| 90 | action_t action; | ||
| 90 | clear_keyboard(); | 91 | clear_keyboard(); |
| 91 | #ifdef AUDIO_ENABLE | 92 | #ifdef AUDIO_ENABLE |
| 92 | play_notes(&goodbye, 5, false); | 93 | play_notes(&goodbye, 5, false); |
| @@ -96,12 +97,13 @@ action_t action_for_key(uint8_t layer, keypos_t key) | |||
| 96 | *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific | 97 | *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific |
| 97 | #endif | 98 | #endif |
| 98 | bootloader_jump(); | 99 | bootloader_jump(); |
| 99 | return; | 100 | return action; |
| 100 | } else if (keycode == DEBUG) { // DEBUG is 0x5001 | 101 | } else if (keycode == DEBUG) { // DEBUG is 0x5001 |
| 101 | // TODO: Does this actually work? | 102 | // TODO: Does this actually work? |
| 103 | action_t action; | ||
| 102 | print("\nDEBUG: enabled.\n"); | 104 | print("\nDEBUG: enabled.\n"); |
| 103 | debug_enable = true; | 105 | debug_enable = true; |
| 104 | return; | 106 | return action; |
| 105 | } else if (keycode >= 0x5000 && keycode < 0x6000) { | 107 | } else if (keycode >= 0x5000 && keycode < 0x6000) { |
| 106 | // Layer movement shortcuts | 108 | // Layer movement shortcuts |
| 107 | // See .h to see constraints/usage | 109 | // See .h to see constraints/usage |
diff --git a/quantum/keymap_common.h b/quantum/keymap_common.h index 3db40772e..4a877d2a7 100644 --- a/quantum/keymap_common.h +++ b/quantum/keymap_common.h | |||
| @@ -184,8 +184,6 @@ extern const uint16_t fn_actions[]; | |||
| 184 | // Toggle to layer - 256 layer max | 184 | // Toggle to layer - 256 layer max |
| 185 | #define TG(layer) (layer | 0x5400) | 185 | #define TG(layer) (layer | 0x5400) |
| 186 | 186 | ||
| 187 | #define MIDI(n) (n | 0x6000) | ||
| 188 | |||
| 189 | // M-od, T-ap - 256 keycode max | 187 | // M-od, T-ap - 256 keycode max |
| 190 | #define MT(mod, kc) (kc | 0x7000 | ((mod & 0xF) << 8)) | 188 | #define MT(mod, kc) (kc | 0x7000 | ((mod & 0xF) << 8)) |
| 191 | #define CTL_T(kc) MT(0x1, kc) | 189 | #define CTL_T(kc) MT(0x1, kc) |
diff --git a/quantum/keymap_midi.h b/quantum/keymap_midi.h index a89420ce2..436fb2eb5 100644 --- a/quantum/keymap_midi.h +++ b/quantum/keymap_midi.h | |||
| @@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 20 | 20 | ||
| 21 | #include <lufa.h> | 21 | #include <lufa.h> |
| 22 | 22 | ||
| 23 | #define MIDI 0x6000 | 23 | #define MIDI(n) (n | 0x6000) |
| 24 | #define MIDI12 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000 | 24 | #define MIDI12 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000 |
| 25 | 25 | ||
| 26 | #define CHNL(note, channel) (note + (channel << 8)) | 26 | #define CHNL(note, channel) (note + (channel << 8)) |
diff --git a/tmk_core/common/action_code.h b/tmk_core/common/action_code.h index 4fe9c1d58..2b0b0b077 100644 --- a/tmk_core/common/action_code.h +++ b/tmk_core/common/action_code.h | |||
| @@ -301,7 +301,7 @@ enum backlight_opt { | |||
| 301 | #define ACTION_BACKLIGHT_DECREASE() ACTION(ACT_BACKLIGHT, BACKLIGHT_DECREASE << 8) | 301 | #define ACTION_BACKLIGHT_DECREASE() ACTION(ACT_BACKLIGHT, BACKLIGHT_DECREASE << 8) |
| 302 | #define ACTION_BACKLIGHT_TOGGLE() ACTION(ACT_BACKLIGHT, BACKLIGHT_TOGGLE << 8) | 302 | #define ACTION_BACKLIGHT_TOGGLE() ACTION(ACT_BACKLIGHT, BACKLIGHT_TOGGLE << 8) |
| 303 | #define ACTION_BACKLIGHT_STEP() ACTION(ACT_BACKLIGHT, BACKLIGHT_STEP << 8) | 303 | #define ACTION_BACKLIGHT_STEP() ACTION(ACT_BACKLIGHT, BACKLIGHT_STEP << 8) |
| 304 | #define ACTION_BACKLIGHT_LEVEL(level) ACTION(ACT_BACKLIGHT, BACKLIGHT_LEVEL << 8 | level) | 304 | #define ACTION_BACKLIGHT_LEVEL(level) ACTION(ACT_BACKLIGHT, BACKLIGHT_LEVEL << 8 | (level)) |
| 305 | /* Command */ | 305 | /* Command */ |
| 306 | #define ACTION_COMMAND(id, opt) ACTION(ACT_COMMAND, (opt)<<8 | (addr)) | 306 | #define ACTION_COMMAND(id, opt) ACTION(ACT_COMMAND, (opt)<<8 | (addr)) |
| 307 | /* Function */ | 307 | /* Function */ |
diff --git a/tmk_core/common/keymap.c b/tmk_core/common/keymap.c index 11f4aa8aa..8955fc710 100644 --- a/tmk_core/common/keymap.c +++ b/tmk_core/common/keymap.c | |||
| @@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 22 | #include "action_macro.h" | 22 | #include "action_macro.h" |
| 23 | #include "wait.h" | 23 | #include "wait.h" |
| 24 | #include "debug.h" | 24 | #include "debug.h" |
| 25 | 25 | #include "bootloader.h" | |
| 26 | 26 | ||
| 27 | static action_t keycode_to_action(uint8_t keycode); | 27 | static action_t keycode_to_action(uint8_t keycode); |
| 28 | 28 | ||
| @@ -143,6 +143,7 @@ static action_t keycode_to_action(uint8_t keycode) | |||
| 143 | action.code = ACTION_TRANSPARENT; | 143 | action.code = ACTION_TRANSPARENT; |
| 144 | break; | 144 | break; |
| 145 | case KC_BOOTLOADER: | 145 | case KC_BOOTLOADER: |
| 146 | action.code = ACTION_NO; | ||
| 146 | clear_keyboard(); | 147 | clear_keyboard(); |
| 147 | wait_ms(50); | 148 | wait_ms(50); |
| 148 | bootloader_jump(); // not return | 149 | bootloader_jump(); // not return |
