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/alf | |
| parent | 327b1c02986795b2d8208169b8c14f8d3892f5e1 (diff) | |
| parent | 6f36eb469d11fd9619add54c2e037e50069d1eee (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/alf')
| -rw-r--r-- | keyboards/alf/dc60/config.h | 48 | ||||
| -rw-r--r-- | keyboards/alf/x11/config.h | 53 |
2 files changed, 0 insertions, 101 deletions
diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index 0064da01fe..5c37685322 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/config.h | |||
| @@ -103,54 +103,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 103 | //#define FORCE_NKRO | 103 | //#define FORCE_NKRO |
| 104 | 104 | ||
| 105 | /* | 105 | /* |
| 106 | * Magic Key Options | ||
| 107 | * | ||
| 108 | * Magic keys are hotkey commands that allow control over firmware functions of | ||
| 109 | * the keyboard. They are best used in combination with the HID Listen program, | ||
| 110 | * found here: https://www.pjrc.com/teensy/hid_listen.html | ||
| 111 | * | ||
| 112 | * The options below allow the magic key functionality to be changed. This is | ||
| 113 | * useful if your keyboard/keypad is missing keys and you want magic key support. | ||
| 114 | * | ||
| 115 | */ | ||
| 116 | |||
| 117 | /* control how magic key switches layers */ | ||
| 118 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true | ||
| 119 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true | ||
| 120 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false | ||
| 121 | |||
| 122 | /* override magic key keymap */ | ||
| 123 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS | ||
| 124 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS | ||
| 125 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM | ||
| 126 | //#define MAGIC_KEY_HELP1 H | ||
| 127 | //#define MAGIC_KEY_HELP2 SLASH | ||
| 128 | //#define MAGIC_KEY_DEBUG D | ||
| 129 | //#define MAGIC_KEY_DEBUG_MATRIX X | ||
| 130 | //#define MAGIC_KEY_DEBUG_KBD K | ||
| 131 | //#define MAGIC_KEY_DEBUG_MOUSE M | ||
| 132 | //#define MAGIC_KEY_VERSION V | ||
| 133 | //#define MAGIC_KEY_STATUS S | ||
| 134 | //#define MAGIC_KEY_CONSOLE C | ||
| 135 | //#define MAGIC_KEY_LAYER0_ALT1 ESC | ||
| 136 | //#define MAGIC_KEY_LAYER0_ALT2 GRAVE | ||
| 137 | //#define MAGIC_KEY_LAYER0 0 | ||
| 138 | //#define MAGIC_KEY_LAYER1 1 | ||
| 139 | //#define MAGIC_KEY_LAYER2 2 | ||
| 140 | //#define MAGIC_KEY_LAYER3 3 | ||
| 141 | //#define MAGIC_KEY_LAYER4 4 | ||
| 142 | //#define MAGIC_KEY_LAYER5 5 | ||
| 143 | //#define MAGIC_KEY_LAYER6 6 | ||
| 144 | //#define MAGIC_KEY_LAYER7 7 | ||
| 145 | //#define MAGIC_KEY_LAYER8 8 | ||
| 146 | //#define MAGIC_KEY_LAYER9 9 | ||
| 147 | //#define MAGIC_KEY_BOOTLOADER PAUSE | ||
| 148 | //#define MAGIC_KEY_LOCK CAPS | ||
| 149 | //#define MAGIC_KEY_EEPROM E | ||
| 150 | //#define MAGIC_KEY_NKRO N | ||
| 151 | //#define MAGIC_KEY_SLEEP_LED Z | ||
| 152 | |||
| 153 | /* | ||
| 154 | * Feature disable options | 106 | * Feature disable options |
| 155 | * These options are also useful to firmware size reduction. | 107 | * These options are also useful to firmware size reduction. |
| 156 | */ | 108 | */ |
diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h index d643cb29aa..437f1e22ba 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h | |||
| @@ -118,59 +118,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 118 | //#define FORCE_NKRO | 118 | //#define FORCE_NKRO |
| 119 | 119 | ||
| 120 | /* | 120 | /* |
| 121 | * Magic Key Options | ||
| 122 | * | ||
| 123 | * Magic keys are hotkey commands that allow control over firmware functions of | ||
| 124 | * the keyboard. They are best used in combination with the HID Listen program, | ||
| 125 | * found here: https://www.pjrc.com/teensy/hid_listen.html | ||
| 126 | * | ||
| 127 | * The options below allow the magic key functionality to be changed. This is | ||
| 128 | * useful if your keyboard/keypad is missing keys and you want magic key support. | ||
| 129 | * | ||
| 130 | */ | ||
| 131 | |||
| 132 | /* key combination for magic key command */ | ||
| 133 | /* defined by default; to change, uncomment and set to the combination you want */ | ||
| 134 | // #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) | ||
| 135 | |||
| 136 | /* control how magic key switches layers */ | ||
| 137 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true | ||
| 138 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true | ||
| 139 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false | ||
| 140 | |||
| 141 | /* override magic key keymap */ | ||
| 142 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS | ||
| 143 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS | ||
| 144 | //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM | ||
| 145 | //#define MAGIC_KEY_HELP H | ||
| 146 | //#define MAGIC_KEY_HELP_ALT SLASH | ||
| 147 | //#define MAGIC_KEY_DEBUG D | ||
| 148 | //#define MAGIC_KEY_DEBUG_MATRIX X | ||
| 149 | //#define MAGIC_KEY_DEBUG_KBD K | ||
| 150 | //#define MAGIC_KEY_DEBUG_MOUSE M | ||
| 151 | //#define MAGIC_KEY_VERSION V | ||
| 152 | //#define MAGIC_KEY_STATUS S | ||
| 153 | //#define MAGIC_KEY_CONSOLE C | ||
| 154 | //#define MAGIC_KEY_LAYER0 0 | ||
| 155 | //#define MAGIC_KEY_LAYER0_ALT GRAVE | ||
| 156 | //#define MAGIC_KEY_LAYER1 1 | ||
| 157 | //#define MAGIC_KEY_LAYER2 2 | ||
| 158 | //#define MAGIC_KEY_LAYER3 3 | ||
| 159 | //#define MAGIC_KEY_LAYER4 4 | ||
| 160 | //#define MAGIC_KEY_LAYER5 5 | ||
| 161 | //#define MAGIC_KEY_LAYER6 6 | ||
| 162 | //#define MAGIC_KEY_LAYER7 7 | ||
| 163 | //#define MAGIC_KEY_LAYER8 8 | ||
| 164 | //#define MAGIC_KEY_LAYER9 9 | ||
| 165 | //#define MAGIC_KEY_BOOTLOADER B | ||
| 166 | //#define MAGIC_KEY_BOOTLOADER_ALT ESC | ||
| 167 | //#define MAGIC_KEY_LOCK CAPS | ||
| 168 | //#define MAGIC_KEY_EEPROM E | ||
| 169 | //#define MAGIC_KEY_EEPROM_CLEAR BSPACE | ||
| 170 | //#define MAGIC_KEY_NKRO N | ||
| 171 | //#define MAGIC_KEY_SLEEP_LED Z | ||
| 172 | |||
| 173 | /* | ||
| 174 | * Feature disable options | 121 | * Feature disable options |
| 175 | * These options are also useful to firmware size reduction. | 122 | * These options are also useful to firmware size reduction. |
| 176 | */ | 123 | */ |
