diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-09-26 03:04:11 -0700 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-09-26 03:04:11 -0700 |
| commit | 843b9a7e4d23a7cff97f7d7d2f4baa373ee32efa (patch) | |
| tree | 5f857d4269e413be1b611c802f7c6329766d5019 /keyboards/dm9records | |
| parent | 327b1c02986795b2d8208169b8c14f8d3892f5e1 (diff) | |
| parent | 6f36eb469d11fd9619add54c2e037e50069d1eee (diff) | |
| download | qmk_firmware-843b9a7e4d23a7cff97f7d7d2f4baa373ee32efa.tar.gz qmk_firmware-843b9a7e4d23a7cff97f7d7d2f4baa373ee32efa.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/dm9records')
| -rw-r--r-- | keyboards/dm9records/plaid/config.h | 53 | ||||
| -rw-r--r-- | keyboards/dm9records/tartan/config.h | 53 |
2 files changed, 0 insertions, 106 deletions
diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h index bbe974e3f..86ff5be35 100644 --- a/keyboards/dm9records/plaid/config.h +++ b/keyboards/dm9records/plaid/config.h | |||
| @@ -121,59 +121,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 121 | //#define FORCE_NKRO | 121 | //#define FORCE_NKRO |
| 122 | 122 | ||
| 123 | /* | 123 | /* |
| 124 | * Magic Key Options | ||
| 125 | * | ||
| 126 | * Magic keys are hotkey commands that allow control over firmware functions of | ||
| 127 | * the keyboard. They are best used in combination with the HID Listen program, | ||
| 128 | * found here: https://www.pjrc.com/teensy/hid_listen.html | ||
| 129 | * | ||
| 130 | * The options below allow the magic key functionality to be changed. This is | ||
| 131 | * useful if your keyboard/keypad is missing keys and you want magic key support. | ||
| 132 | * | ||
| 133 | */ | ||
| 134 | |||
| 135 | /* key combination for magic key command */ | ||
| 136 | /* defined by default; to change, uncomment and set to the combination you want */ | ||
| 137 | // #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) | ||
| 138 | |||
| 139 | /* control how magic key switches layers */ | ||
| 140 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true | ||
| 141 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true | ||
| 142 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false | ||
| 143 | |||
| 144 | /* override magic key keymap */ | ||
| 145 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS | ||
| 146 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS | ||
| 147 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM | ||
| 148 | //#define MAGIC_KEY_HELP H | ||
| 149 | //#define MAGIC_KEY_HELP_ALT SLASH | ||
| 150 | //#define MAGIC_KEY_DEBUG D | ||
| 151 | //#define MAGIC_KEY_DEBUG_MATRIX X | ||
| 152 | //#define MAGIC_KEY_DEBUG_KBD K | ||
| 153 | //#define MAGIC_KEY_DEBUG_MOUSE M | ||
| 154 | //#define MAGIC_KEY_VERSION V | ||
| 155 | //#define MAGIC_KEY_STATUS S | ||
| 156 | //#define MAGIC_KEY_CONSOLE C | ||
| 157 | //#define MAGIC_KEY_LAYER0 0 | ||
| 158 | //#define MAGIC_KEY_LAYER0_ALT GRAVE | ||
| 159 | //#define MAGIC_KEY_LAYER1 1 | ||
| 160 | //#define MAGIC_KEY_LAYER2 2 | ||
| 161 | //#define MAGIC_KEY_LAYER3 3 | ||
| 162 | //#define MAGIC_KEY_LAYER4 4 | ||
| 163 | //#define MAGIC_KEY_LAYER5 5 | ||
| 164 | //#define MAGIC_KEY_LAYER6 6 | ||
| 165 | //#define MAGIC_KEY_LAYER7 7 | ||
| 166 | //#define MAGIC_KEY_LAYER8 8 | ||
| 167 | //#define MAGIC_KEY_LAYER9 9 | ||
| 168 | //#define MAGIC_KEY_BOOTLOADER B | ||
| 169 | //#define MAGIC_KEY_BOOTLOADER_ALT ESC | ||
| 170 | //#define MAGIC_KEY_LOCK CAPS | ||
| 171 | //#define MAGIC_KEY_EEPROM E | ||
| 172 | //#define MAGIC_KEY_EEPROM_CLEAR BSPACE | ||
| 173 | //#define MAGIC_KEY_NKRO N | ||
| 174 | //#define MAGIC_KEY_SLEEP_LED Z | ||
| 175 | |||
| 176 | /* | ||
| 177 | * Feature disable options | 124 | * Feature disable options |
| 178 | * These options are also useful to firmware size reduction. | 125 | * These options are also useful to firmware size reduction. |
| 179 | */ | 126 | */ |
diff --git a/keyboards/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h index 544ab4a64..7ad97ea45 100644 --- a/keyboards/dm9records/tartan/config.h +++ b/keyboards/dm9records/tartan/config.h | |||
| @@ -119,59 +119,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 119 | //#define FORCE_NKRO | 119 | //#define FORCE_NKRO |
| 120 | 120 | ||
| 121 | /* | 121 | /* |
| 122 | * Magic Key Options | ||
| 123 | * | ||
| 124 | * Magic keys are hotkey commands that allow control over firmware functions of | ||
| 125 | * the keyboard. They are best used in combination with the HID Listen program, | ||
| 126 | * found here: https://www.pjrc.com/teensy/hid_listen.html | ||
| 127 | * | ||
| 128 | * The options below allow the magic key functionality to be changed. This is | ||
| 129 | * useful if your keyboard/keypad is missing keys and you want magic key support. | ||
| 130 | * | ||
| 131 | */ | ||
| 132 | |||
| 133 | /* key combination for magic key command */ | ||
| 134 | /* defined by default; to change, uncomment and set to the combination you want */ | ||
| 135 | // #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) | ||
| 136 | |||
| 137 | /* control how magic key switches layers */ | ||
| 138 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true | ||
| 139 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true | ||
| 140 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false | ||
| 141 | |||
| 142 | /* override magic key keymap */ | ||
| 143 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS | ||
| 144 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS | ||
| 145 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM | ||
| 146 | //#define MAGIC_KEY_HELP H | ||
| 147 | //#define MAGIC_KEY_HELP_ALT SLASH | ||
| 148 | //#define MAGIC_KEY_DEBUG D | ||
| 149 | //#define MAGIC_KEY_DEBUG_MATRIX X | ||
| 150 | //#define MAGIC_KEY_DEBUG_KBD K | ||
| 151 | //#define MAGIC_KEY_DEBUG_MOUSE M | ||
| 152 | //#define MAGIC_KEY_VERSION V | ||
| 153 | //#define MAGIC_KEY_STATUS S | ||
| 154 | //#define MAGIC_KEY_CONSOLE C | ||
| 155 | //#define MAGIC_KEY_LAYER0 0 | ||
| 156 | //#define MAGIC_KEY_LAYER0_ALT GRAVE | ||
| 157 | //#define MAGIC_KEY_LAYER1 1 | ||
| 158 | //#define MAGIC_KEY_LAYER2 2 | ||
| 159 | //#define MAGIC_KEY_LAYER3 3 | ||
| 160 | //#define MAGIC_KEY_LAYER4 4 | ||
| 161 | //#define MAGIC_KEY_LAYER5 5 | ||
| 162 | //#define MAGIC_KEY_LAYER6 6 | ||
| 163 | //#define MAGIC_KEY_LAYER7 7 | ||
| 164 | //#define MAGIC_KEY_LAYER8 8 | ||
| 165 | //#define MAGIC_KEY_LAYER9 9 | ||
| 166 | //#define MAGIC_KEY_BOOTLOADER B | ||
| 167 | //#define MAGIC_KEY_BOOTLOADER_ALT ESC | ||
| 168 | //#define MAGIC_KEY_LOCK CAPS | ||
| 169 | //#define MAGIC_KEY_EEPROM E | ||
| 170 | //#define MAGIC_KEY_EEPROM_CLEAR BSPACE | ||
| 171 | //#define MAGIC_KEY_NKRO N | ||
| 172 | //#define MAGIC_KEY_SLEEP_LED Z | ||
| 173 | |||
| 174 | /* | ||
| 175 | * Feature disable options | 122 | * Feature disable options |
| 176 | * These options are also useful to firmware size reduction. | 123 | * These options are also useful to firmware size reduction. |
| 177 | */ | 124 | */ |
