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