diff options
Diffstat (limited to 'keyboards/kbdfans')
59 files changed, 263 insertions, 500 deletions
diff --git a/keyboards/kbdfans/bella/rgb/config.h b/keyboards/kbdfans/bella/rgb/config.h index f56049690..07594a34a 100644 --- a/keyboards/kbdfans/bella/rgb/config.h +++ b/keyboards/kbdfans/bella/rgb/config.h | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | /* disable these deprecated features by default */ | 37 | /* disable these deprecated features by default */ |
| 38 | #ifdef RGB_MATRIX_ENABLE | 38 | #ifdef RGB_MATRIX_ENABLE |
| 39 | #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects | 39 | #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects |
| 40 | #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended | 40 | #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended |
| 41 | #define RGB_MATRIX_KEYPRESSES | 41 | #define RGB_MATRIX_KEYPRESSES |
| 42 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 42 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
| 43 | #define RGB_MATRIX_LED_PROCESS_LIMIT 4 | 43 | #define RGB_MATRIX_LED_PROCESS_LIMIT 4 |
diff --git a/keyboards/kbdfans/bella/rgb/rgb.c b/keyboards/kbdfans/bella/rgb/rgb.c index e197d9b53..17cf99214 100644 --- a/keyboards/kbdfans/bella/rgb/rgb.c +++ b/keyboards/kbdfans/bella/rgb/rgb.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include "rgb.h" | 16 | #include "rgb.h" |
| 17 | #ifdef RGB_MATRIX_ENABLE | 17 | #ifdef RGB_MATRIX_ENABLE |
| 18 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | 18 | const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { |
| 19 | {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB6 */ | 19 | {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB6 */ |
| 20 | {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB32 */ | 20 | {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB32 */ |
| 21 | {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB45 */ | 21 | {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB45 */ |
diff --git a/keyboards/kbdfans/bella/rgb/rules.mk b/keyboards/kbdfans/bella/rgb/rules.mk index bba2c1a6c..11f748ffb 100644 --- a/keyboards/kbdfans/bella/rgb/rules.mk +++ b/keyboards/kbdfans/bella/rgb/rules.mk | |||
| @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu | |||
| 7 | # Build Options | 7 | # Build Options |
| 8 | # change yes to no to disable | 8 | # change yes to no to disable |
| 9 | # | 9 | # |
| 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 10 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 11 | MOUSEKEY_ENABLE = yes # Mouse keys | 11 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 12 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 13 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/kbdfans/bella/rgb_iso/config.h b/keyboards/kbdfans/bella/rgb_iso/config.h index fc7a9d7c0..4fda99867 100644 --- a/keyboards/kbdfans/bella/rgb_iso/config.h +++ b/keyboards/kbdfans/bella/rgb_iso/config.h | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | /* disable these deprecated features by default */ | 37 | /* disable these deprecated features by default */ |
| 38 | #ifdef RGB_MATRIX_ENABLE | 38 | #ifdef RGB_MATRIX_ENABLE |
| 39 | #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects | 39 | #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects |
| 40 | #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended | 40 | #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended |
| 41 | #define RGB_MATRIX_KEYPRESSES | 41 | #define RGB_MATRIX_KEYPRESSES |
| 42 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 42 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
| 43 | #define RGB_MATRIX_LED_PROCESS_LIMIT 4 | 43 | #define RGB_MATRIX_LED_PROCESS_LIMIT 4 |
diff --git a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c index 1a853ac8a..0c431b154 100644 --- a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c +++ b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include "rgb_iso.h" | 16 | #include "rgb_iso.h" |
| 17 | #ifdef RGB_MATRIX_ENABLE | 17 | #ifdef RGB_MATRIX_ENABLE |
| 18 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | 18 | const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { |
| 19 | {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB6 */ | 19 | {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB6 */ |
| 20 | {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB32 */ | 20 | {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB32 */ |
| 21 | {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB45 */ | 21 | {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB45 */ |
diff --git a/keyboards/kbdfans/bella/rgb_iso/rules.mk b/keyboards/kbdfans/bella/rgb_iso/rules.mk index bba2c1a6c..11f748ffb 100644 --- a/keyboards/kbdfans/bella/rgb_iso/rules.mk +++ b/keyboards/kbdfans/bella/rgb_iso/rules.mk | |||
| @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu | |||
| 7 | # Build Options | 7 | # Build Options |
| 8 | # change yes to no to disable | 8 | # change yes to no to disable |
| 9 | # | 9 | # |
| 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 10 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 11 | MOUSEKEY_ENABLE = yes # Mouse keys | 11 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 12 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 13 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/kbdfans/bella/soldered/rules.mk b/keyboards/kbdfans/bella/soldered/rules.mk index b0ed9e41e..4cc1ef31d 100755 --- a/keyboards/kbdfans/bella/soldered/rules.mk +++ b/keyboards/kbdfans/bella/soldered/rules.mk | |||
| @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu | |||
| 7 | # Build Options | 7 | # Build Options |
| 8 | # change yes to no to disable | 8 | # change yes to no to disable |
| 9 | # | 9 | # |
| 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 10 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 11 | MOUSEKEY_ENABLE = yes # Mouse keys | 11 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 12 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 13 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h index 090beb590..d3549b0aa 100644 --- a/keyboards/kbdfans/kbd19x/config.h +++ b/keyboards/kbdfans/kbd19x/config.h | |||
| @@ -171,23 +171,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 171 | //#define NO_ACTION_MACRO | 171 | //#define NO_ACTION_MACRO |
| 172 | //#define NO_ACTION_FUNCTION | 172 | //#define NO_ACTION_FUNCTION |
| 173 | 173 | ||
| 174 | /* | ||
| 175 | * MIDI options | ||
| 176 | */ | ||
| 177 | |||
| 178 | /* enable basic MIDI features: | ||
| 179 | - MIDI notes can be sent when in Music mode is on | ||
| 180 | */ | ||
| 181 | //#define MIDI_BASIC | ||
| 182 | |||
| 183 | /* enable advanced MIDI features: | ||
| 184 | - MIDI notes can be added to the keymap | ||
| 185 | - Octave shift and transpose | ||
| 186 | - Virtual sustain, portamento, and modulation wheel | ||
| 187 | - etc. | ||
| 188 | */ | ||
| 189 | //#define MIDI_ADVANCED | ||
| 190 | |||
| 191 | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | ||
| 192 | //#define MIDI_TONE_KEYCODE_OCTAVES 1 | ||
| 193 | |||
diff --git a/keyboards/kbdfans/kbd19x/rules.mk b/keyboards/kbdfans/kbd19x/rules.mk index 914ef3c21..dd2c8f6b7 100644 --- a/keyboards/kbdfans/kbd19x/rules.mk +++ b/keyboards/kbdfans/kbd19x/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # change yes to no to disable | 15 | # change yes to no to disable |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = yes # Mouse keys | 18 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = no # Console for debug | 20 | CONSOLE_ENABLE = no # Console for debug |
| @@ -25,7 +25,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 25 | NKRO_ENABLE = yes # USB Nkey Rollover | 25 | NKRO_ENABLE = yes # USB Nkey Rollover |
| 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default | 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default |
| 27 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | 27 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow |
| 28 | MIDI_ENABLE = no # MIDI support | ||
| 29 | UNICODE_ENABLE = no # Unicode | 28 | UNICODE_ENABLE = no # Unicode |
| 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 31 | AUDIO_ENABLE = no # Audio output on port C6 | 30 | AUDIO_ENABLE = no # Audio output on port C6 |
diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h index 9efffa0b1..5c655278f 100644 --- a/keyboards/kbdfans/kbd4x/config.h +++ b/keyboards/kbdfans/kbd4x/config.h | |||
| @@ -166,23 +166,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 166 | //#define NO_ACTION_MACRO | 166 | //#define NO_ACTION_MACRO |
| 167 | //#define NO_ACTION_FUNCTION | 167 | //#define NO_ACTION_FUNCTION |
| 168 | 168 | ||
| 169 | /* | ||
| 170 | * MIDI options | ||
| 171 | */ | ||
| 172 | |||
| 173 | /* enable basic MIDI features: | ||
| 174 | - MIDI notes can be sent when in Music mode is on | ||
| 175 | */ | ||
| 176 | //#define MIDI_BASIC | ||
| 177 | |||
| 178 | /* enable advanced MIDI features: | ||
| 179 | - MIDI notes can be added to the keymap | ||
| 180 | - Octave shift and transpose | ||
| 181 | - Virtual sustain, portamento, and modulation wheel | ||
| 182 | - etc. | ||
| 183 | */ | ||
| 184 | //#define MIDI_ADVANCED | ||
| 185 | |||
| 186 | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | ||
| 187 | //#define MIDI_TONE_KEYCODE_OCTAVES 1 | ||
| 188 | |||
diff --git a/keyboards/kbdfans/kbd4x/rules.mk b/keyboards/kbdfans/kbd4x/rules.mk index 38cca183c..785653214 100644 --- a/keyboards/kbdfans/kbd4x/rules.mk +++ b/keyboards/kbdfans/kbd4x/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # change yes to no to disable | 15 | # change yes to no to disable |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = no # Mouse keys | 18 | MOUSEKEY_ENABLE = no # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = no # Console for debug | 20 | CONSOLE_ENABLE = no # Console for debug |
| @@ -25,7 +25,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 25 | NKRO_ENABLE = yes # USB Nkey Rollover | 25 | NKRO_ENABLE = yes # USB Nkey Rollover |
| 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default | 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default |
| 27 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | 27 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow |
| 28 | MIDI_ENABLE = no # MIDI support | ||
| 29 | UNICODE_ENABLE = no # Unicode | 28 | UNICODE_ENABLE = no # Unicode |
| 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 31 | AUDIO_ENABLE = no # Audio output on port C6 | 30 | AUDIO_ENABLE = no # Audio output on port C6 |
diff --git a/keyboards/kbdfans/kbd66/config.h b/keyboards/kbdfans/kbd66/config.h index 8b5be9f0a..15a3b4b81 100644 --- a/keyboards/kbdfans/kbd66/config.h +++ b/keyboards/kbdfans/kbd66/config.h | |||
| @@ -156,23 +156,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 156 | //#define NO_ACTION_ONESHOT | 156 | //#define NO_ACTION_ONESHOT |
| 157 | //#define NO_ACTION_MACRO | 157 | //#define NO_ACTION_MACRO |
| 158 | //#define NO_ACTION_FUNCTION | 158 | //#define NO_ACTION_FUNCTION |
| 159 | |||
| 160 | /* | ||
| 161 | * MIDI options | ||
| 162 | */ | ||
| 163 | |||
| 164 | /* enable basic MIDI features: | ||
| 165 | - MIDI notes can be sent when in Music mode is on | ||
| 166 | */ | ||
| 167 | //#define MIDI_BASIC | ||
| 168 | |||
| 169 | /* enable advanced MIDI features: | ||
| 170 | - MIDI notes can be added to the keymap | ||
| 171 | - Octave shift and transpose | ||
| 172 | - Virtual sustain, portamento, and modulation wheel | ||
| 173 | - etc. | ||
| 174 | */ | ||
| 175 | //#define MIDI_ADVANCED | ||
| 176 | |||
| 177 | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | ||
| 178 | //#define MIDI_TONE_KEYCODE_OCTAVES 1 | ||
diff --git a/keyboards/kbdfans/kbd66/rules.mk b/keyboards/kbdfans/kbd66/rules.mk index 4f42fb7f8..1329c8350 100644 --- a/keyboards/kbdfans/kbd66/rules.mk +++ b/keyboards/kbdfans/kbd66/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # change yes to no to disable | 15 | # change yes to no to disable |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = yes # Mouse keys | 18 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = yes # Console for debug | 20 | CONSOLE_ENABLE = yes # Console for debug |
| @@ -24,7 +24,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 24 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 24 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 25 | NKRO_ENABLE = yes # USB Nkey Rollover | 25 | NKRO_ENABLE = yes # USB Nkey Rollover |
| 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default | 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default |
| 27 | MIDI_ENABLE = no # MIDI support | ||
| 28 | UNICODE_ENABLE = no # Unicode | 27 | UNICODE_ENABLE = no # Unicode |
| 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 28 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 30 | AUDIO_ENABLE = no # Audio output on port C6 | 29 | AUDIO_ENABLE = no # Audio output on port C6 |
diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h index 400b7540c..3bee63332 100644 --- a/keyboards/kbdfans/kbd67/hotswap/config.h +++ b/keyboards/kbdfans/kbd67/hotswap/config.h | |||
| @@ -185,26 +185,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 185 | //#define NO_ACTION_MACRO | 185 | //#define NO_ACTION_MACRO |
| 186 | //#define NO_ACTION_FUNCTION | 186 | //#define NO_ACTION_FUNCTION |
| 187 | 187 | ||
| 188 | /* | ||
| 189 | * MIDI options | ||
| 190 | */ | ||
| 191 | |||
| 192 | /* enable basic MIDI features: | ||
| 193 | - MIDI notes can be sent when in Music mode is on | ||
| 194 | */ | ||
| 195 | //#define MIDI_BASIC | ||
| 196 | |||
| 197 | /* enable advanced MIDI features: | ||
| 198 | - MIDI notes can be added to the keymap | ||
| 199 | - Octave shift and transpose | ||
| 200 | - Virtual sustain, portamento, and modulation wheel | ||
| 201 | - etc. | ||
| 202 | */ | ||
| 203 | //#define MIDI_ADVANCED | ||
| 204 | |||
| 205 | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | ||
| 206 | //#define MIDI_TONE_KEYCODE_OCTAVES 1 | ||
| 207 | |||
| 208 | /* Bootmagic Lite key configuration */ | 188 | /* Bootmagic Lite key configuration */ |
| 209 | // #define BOOTMAGIC_LITE_ROW 0 | 189 | // #define BOOTMAGIC_LITE_ROW 0 |
| 210 | // #define BOOTMAGIC_LITE_COLUMN 0 | 190 | // #define BOOTMAGIC_LITE_COLUMN 0 |
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/rules.mk b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/rules.mk index f24246449..98bf07960 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/rules.mk +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/rules.mk | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | # Build Options | 1 | # Build Options |
| 2 | BOOTMAGIC_ENABLE = full # Use full Bootmagic | 2 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/rules.mk b/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/rules.mk index 16eb6cb44..0bef91295 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/rules.mk +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/rules.mk | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | BOOTMAGIC_ENABLE = no | 1 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
| 2 | COMMAND_ENABLE = yes | 2 | COMMAND_ENABLE = yes |
| 3 | CONSOLE_ENABLE = yes | 3 | CONSOLE_ENABLE = yes |
| 4 | EXTRAKEY_ENABLE = yes | 4 | EXTRAKEY_ENABLE = yes |
diff --git a/keyboards/kbdfans/kbd67/hotswap/rules.mk b/keyboards/kbdfans/kbd67/hotswap/rules.mk index 12610edcc..4a2801684 100644 --- a/keyboards/kbdfans/kbd67/hotswap/rules.mk +++ b/keyboards/kbdfans/kbd67/hotswap/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # change yes to no to disable | 15 | # change yes to no to disable |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = yes # Mouse keys | 18 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = yes # Console for debug | 20 | CONSOLE_ENABLE = yes # Console for debug |
| @@ -25,7 +25,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 25 | NKRO_ENABLE = yes # USB Nkey Rollover | 25 | NKRO_ENABLE = yes # USB Nkey Rollover |
| 26 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default | 26 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default |
| 27 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 27 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
| 28 | MIDI_ENABLE = no # MIDI support | ||
| 29 | UNICODE_ENABLE = no # Unicode | 28 | UNICODE_ENABLE = no # Unicode |
| 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 31 | AUDIO_ENABLE = no # Audio output on port C6 | 30 | AUDIO_ENABLE = no # Audio output on port C6 |
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk b/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk index 8a4949096..8686f77d7 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk +++ b/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # change yes to no to disable | 15 | # change yes to no to disable |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = yes # Mouse keys | 18 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = no # Console for debug | 20 | CONSOLE_ENABLE = no # Console for debug |
| @@ -25,7 +25,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 25 | NKRO_ENABLE = yes # USB Nkey Rollover | 25 | NKRO_ENABLE = yes # USB Nkey Rollover |
| 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default | 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default |
| 27 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 27 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
| 28 | MIDI_ENABLE = no # MIDI support | ||
| 29 | UNICODE_ENABLE = no # Unicode | 28 | UNICODE_ENABLE = no # Unicode |
| 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 31 | AUDIO_ENABLE = no # Audio output on port C6 | 30 | AUDIO_ENABLE = no # Audio output on port C6 |
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h index e5b7c718a..2cd513223 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h | |||
| @@ -23,15 +23,10 @@ | |||
| 23 | #define QMK_KEYS_PER_SCAN 4 | 23 | #define QMK_KEYS_PER_SCAN 4 |
| 24 | 24 | ||
| 25 | /* Force NKRO on boot up */ | 25 | /* Force NKRO on boot up */ |
| 26 | #define FORCE_NKRO | 26 | #define FORCE_NKRO |
| 27 | |||
| 28 | 27 | ||
| 29 | #ifdef RGB_MATRIX_ENABLE | 28 | #ifdef RGB_MATRIX_ENABLE |
| 30 | 29 | # define RGB_DISABLE_WHEN_USB_SUSPENDED | |
| 31 | #undef RGB_DISABLE_WHEN_USB_SUSPENDED | 30 | # undef RGB_DISABLE_TIMEOUT |
| 32 | #define RGB_DISABLE_WHEN_USB_SUSPENDED true | 31 | # define RGB_DISABLE_TIMEOUT 900000 |
| 33 | |||
| 34 | #undef RGB_DISABLE_TIMEOUT | ||
| 35 | #define RGB_DISABLE_TIMEOUT 900000 | ||
| 36 | |||
| 37 | #endif | 32 | #endif |
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c index 13684ce09..7a105ae54 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c +++ b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c | |||
| @@ -13,5 +13,5 @@ | |||
| 13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include "mkiirgb.h" \ No newline at end of file | 17 | #include "mkiirgb.h" |
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h index a832110d3..b0b7e1dad 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/config.h | |||
| @@ -16,9 +16,9 @@ | |||
| 16 | #define RGB_MATRIX_LED_FLUSH_LIMIT 26 | 16 | #define RGB_MATRIX_LED_FLUSH_LIMIT 26 |
| 17 | #define DEBOUNCE 3 | 17 | #define DEBOUNCE 3 |
| 18 | #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects | 18 | #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects |
| 19 | #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended | 19 | #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended |
| 20 | #define RGB_MATRIX_KEYPRESSES | 20 | #define RGB_MATRIX_KEYPRESSES |
| 21 | #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN | 21 | #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN |
| 22 | #define DISABLE_RGB_MATRIX_BAND_SAT | 22 | #define DISABLE_RGB_MATRIX_BAND_SAT |
| 23 | #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT | 23 | #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT |
| 24 | #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT | 24 | #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT |
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk index 85897df63..e7c5b3780 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk | |||
| @@ -6,7 +6,7 @@ BOARD = QMK_PROTON_C | |||
| 6 | BOOTLOADER = stm32-dfu | 6 | BOOTLOADER = stm32-dfu |
| 7 | 7 | ||
| 8 | BACKLIGHT_ENABLE = no | 8 | BACKLIGHT_ENABLE = no |
| 9 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 9 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 10 | MOUSEKEY_ENABLE = yes # Mouse keys | 10 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 11 | EXTRAKEY_ENABLE = yes # Audio control and System control | 11 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 12 | CONSOLE_ENABLE = no # Console for debug | 12 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c index 466b0148a..53b57dc73 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c +++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/v1.c | |||
| @@ -16,108 +16,88 @@ | |||
| 16 | 16 | ||
| 17 | #include "v1.h" | 17 | #include "v1.h" |
| 18 | #ifdef RGB_MATRIX_ENABLE | 18 | #ifdef RGB_MATRIX_ENABLE |
| 19 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | 19 | const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { |
| 20 | |||
| 21 | {0, C8_8, C7_8, C6_8}, // LA17 | ||
| 22 | {0, C9_8, C7_7, C6_7}, // LA16 | ||
| 23 | {0, C9_7, C8_7, C6_6}, // LA15 | ||
| 24 | {0, C9_6, C8_6, C7_6}, // LA14 | ||
| 25 | {0, C9_5, C8_5, C7_5}, // LA13 | ||
| 26 | {0, C9_4, C8_4, C7_4}, // LA12 | ||
| 27 | {0, C9_3, C8_3, C7_3}, // LA11 | ||
| 28 | {0, C9_2, C8_2, C7_2}, // LA10 | ||
| 29 | {0, C9_1, C8_1, C7_1}, // LA9 | ||
| 30 | {0, C2_9, C3_9, C4_9}, // LB0 | ||
| 31 | {0, C1_9, C3_10, C4_10}, // LB1 | ||
| 32 | {0, C1_10, C2_10, C4_11}, // LB2 | ||
| 33 | {0, C1_11, C2_11, C3_11}, // LB3 | ||
| 34 | {0, C1_13, C2_13, C3_13}, // LB5 | ||
| 35 | {0, C1_14, C2_14, C3_14}, // LB6 | ||
| 36 | |||
| 37 | {0, C1_7, C2_7, C3_7}, // LA7 | ||
| 38 | {0, C1_6, C2_6, C3_6}, // LA6 | ||
| 39 | {0, C1_5, C2_5, C3_5}, // LA5 | ||
| 40 | {0, C1_4, C2_4, C3_4}, // LA4 | ||
| 41 | {0, C1_3, C2_3, C3_3}, // LA3 | ||
| 42 | {0, C1_2, C2_2, C4_3}, // LA2 | ||
| 43 | {0, C1_1, C3_2, C4_2}, // LA1 | ||
| 44 | {0, C2_1, C3_1, C4_1}, // LA0 | ||
| 45 | {0, C9_9, C8_9, C7_9}, // LB9 | ||
| 46 | {0, C9_10, C8_10, C7_10}, // LB10 | ||
| 47 | {0, C9_11, C8_11, C7_11}, // LB11 | ||
| 48 | {0, C9_12, C8_12, C7_12}, // LB12 | ||
| 49 | {0, C9_13, C8_13, C7_13}, // LB13 | ||
| 50 | {0, C9_14, C8_14, C7_14}, // LB14 | ||
| 51 | {0, C1_15, C2_15, C3_15}, // LB7 | ||
| 52 | 20 | ||
| 53 | {0, C1_8, C2_8, C3_8}, // LA8 | 21 | {0, C8_8, C7_8, C6_8}, // LA17 |
| 54 | {1, C9_6, C8_6, C7_6}, // LC14 | 22 | {0, C9_8, C7_7, C6_7}, // LA16 |
| 55 | {1, C9_5, C8_5, C7_5}, // LC13 | 23 | {0, C9_7, C8_7, C6_6}, // LA15 |
| 56 | {1, C9_4, C8_4, C7_4}, // LC12 | 24 | {0, C9_6, C8_6, C7_6}, // LA14 |
| 57 | {1, C9_3, C8_3, C7_3}, // LC11 | 25 | {0, C9_5, C8_5, C7_5}, // LA13 |
| 58 | {1, C9_2, C8_2, C7_2}, // LC10 | 26 | {0, C9_4, C8_4, C7_4}, // LA12 |
| 59 | {1, C9_1, C8_1, C7_1}, // LC9 | 27 | {0, C9_3, C8_3, C7_3}, // LA11 |
| 60 | {1, C2_9, C3_9, C4_9}, // LD0 | 28 | {0, C9_2, C8_2, C7_2}, // LA10 |
| 61 | {1, C1_9, C3_10, C4_10}, // LD1 | 29 | {0, C9_1, C8_1, C7_1}, // LA9 |
| 62 | {1, C1_10, C2_10, C4_11}, // LD2 | 30 | {0, C2_9, C3_9, C4_9}, // LB0 |
| 63 | {1, C1_11, C2_11, C3_11}, // LD3 | 31 | {0, C1_9, C3_10, C4_10}, // LB1 |
| 64 | {1, C1_12, C2_12, C3_12}, // LD4 | 32 | {0, C1_10, C2_10, C4_11}, // LB2 |
| 65 | {1, C1_13, C2_13, C3_13}, // LD5 | 33 | {0, C1_11, C2_11, C3_11}, // LB3 |
| 66 | {0, C1_16, C2_16, C3_16}, // LB8 | 34 | {0, C1_13, C2_13, C3_13}, // LB5 |
| 35 | {0, C1_14, C2_14, C3_14}, // LB6 | ||
| 67 | 36 | ||
| 68 | {1, C9_8, C7_7, C6_7}, // LC16 | 37 | {0, C1_7, C2_7, C3_7}, // LA7 |
| 69 | {1, C1_5, C2_5, C3_5}, // LC5 | 38 | {0, C1_6, C2_6, C3_6}, // LA6 |
| 70 | {1, C1_4, C2_4, C3_4}, // LC4 | 39 | {0, C1_5, C2_5, C3_5}, // LA5 |
| 71 | {1, C1_3, C2_3, C3_3}, // LC3 | 40 | {0, C1_4, C2_4, C3_4}, // LA4 |
| 72 | {1, C1_2, C2_2, C4_3}, // LC2 | 41 | {0, C1_3, C2_3, C3_3}, // LA3 |
| 73 | {1, C1_1, C3_2, C4_2}, // LC1 | 42 | {0, C1_2, C2_2, C4_3}, // LA2 |
| 74 | {1, C9_9, C8_9, C7_9}, // LD9 | 43 | {0, C1_1, C3_2, C4_2}, // LA1 |
| 75 | {1, C9_10, C8_10, C7_10}, // LD10 | 44 | {0, C2_1, C3_1, C4_1}, // LA0 |
| 76 | {1, C9_11, C8_11, C7_11}, // LD11 | 45 | {0, C9_9, C8_9, C7_9}, // LB9 |
| 77 | {1, C9_12, C8_12, C7_12}, // LD12 | 46 | {0, C9_10, C8_10, C7_10}, // LB10 |
| 78 | {1, C1_14, C2_14, C3_14}, // LD6 | 47 | {0, C9_11, C8_11, C7_11}, // LB11 |
| 79 | {1, C1_15, C2_15, C3_15}, // LD7 | 48 | {0, C9_12, C8_12, C7_12}, // LB12 |
| 80 | {1, C1_16, C2_16, C3_16}, // LD8 | 49 | {0, C9_13, C8_13, C7_13}, // LB13 |
| 81 | {0, C9_15, C8_15, C6_14}, // LB15 | 50 | {0, C9_14, C8_14, C7_14}, // LB14 |
| 51 | {0, C1_15, C2_15, C3_15}, // LB7 | ||
| 82 | 52 | ||
| 83 | {1, C8_8, C7_8, C6_8}, // LC17 | 53 | {0, C1_8, C2_8, C3_8}, // LA8 |
| 84 | {1, C1_8, C2_8, C3_8}, // LC8 | 54 | {1, C9_6, C8_6, C7_6}, // LC14 |
| 85 | {1, C1_7, C2_7, C3_7}, // LC7 | 55 | {1, C9_5, C8_5, C7_5}, // LC13 |
| 86 | {1, C2_1, C3_1, C4_1}, // LC0 | 56 | {1, C9_4, C8_4, C7_4}, // LC12 |
| 87 | {1, C9_14, C8_14, C7_14}, // LD14 | 57 | {1, C9_3, C8_3, C7_3}, // LC11 |
| 88 | {1, C9_15, C8_15, C6_14}, // LD15 | 58 | {1, C9_2, C8_2, C7_2}, // LC10 |
| 89 | {1, C8_16, C7_16, C6_16}, // LD17 | 59 | {1, C9_1, C8_1, C7_1}, // LC9 |
| 90 | {0, C8_16, C7_16, C6_16}, // LB17 | 60 | {1, C2_9, C3_9, C4_9}, // LD0 |
| 91 | {0, C9_16, C7_15, C6_15}, // LB16 | 61 | {1, C1_9, C3_10, C4_10}, // LD1 |
| 62 | {1, C1_10, C2_10, C4_11}, // LD2 | ||
| 63 | {1, C1_11, C2_11, C3_11}, // LD3 | ||
| 64 | {1, C1_12, C2_12, C3_12}, // LD4 | ||
| 65 | {1, C1_13, C2_13, C3_13}, // LD5 | ||
| 66 | {0, C1_16, C2_16, C3_16}, // LB8 | ||
| 92 | 67 | ||
| 93 | }; | 68 | {1, C9_8, C7_7, C6_7}, // LC16 |
| 69 | {1, C1_5, C2_5, C3_5}, // LC5 | ||
| 70 | {1, C1_4, C2_4, C3_4}, // LC4 | ||
| 71 | {1, C1_3, C2_3, C3_3}, // LC3 | ||
| 72 | {1, C1_2, C2_2, C4_3}, // LC2 | ||
| 73 | {1, C1_1, C3_2, C4_2}, // LC1 | ||
| 74 | {1, C9_9, C8_9, C7_9}, // LD9 | ||
| 75 | {1, C9_10, C8_10, C7_10}, // LD10 | ||
| 76 | {1, C9_11, C8_11, C7_11}, // LD11 | ||
| 77 | {1, C9_12, C8_12, C7_12}, // LD12 | ||
| 78 | {1, C1_14, C2_14, C3_14}, // LD6 | ||
| 79 | {1, C1_15, C2_15, C3_15}, // LD7 | ||
| 80 | {1, C1_16, C2_16, C3_16}, // LD8 | ||
| 81 | {0, C9_15, C8_15, C6_14}, // LB15 | ||
| 82 | |||
| 83 | {1, C8_8, C7_8, C6_8}, // LC17 | ||
| 84 | {1, C1_8, C2_8, C3_8}, // LC8 | ||
| 85 | {1, C1_7, C2_7, C3_7}, // LC7 | ||
| 86 | {1, C2_1, C3_1, C4_1}, // LC0 | ||
| 87 | {1, C9_14, C8_14, C7_14}, // LD14 | ||
| 88 | {1, C9_15, C8_15, C6_14}, // LD15 | ||
| 89 | {1, C8_16, C7_16, C6_16}, // LD17 | ||
| 90 | {0, C8_16, C7_16, C6_16}, // LB17 | ||
| 91 | {0, C9_16, C7_15, C6_15}, // LB16 | ||
| 94 | 92 | ||
| 95 | led_config_t g_led_config = { { | 93 | }; |
| 96 | { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, | ||
| 97 | { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, | ||
| 98 | { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED,42, 43 }, | ||
| 99 | { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED,56, 57 }, | ||
| 100 | { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 } | ||
| 101 | }, { | ||
| 102 | {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0}, | ||
| 103 | {4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16}, | ||
| 104 | {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32}, | ||
| 105 | {9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48}, | ||
| 106 | {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64} | ||
| 107 | }, { | ||
| 108 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | ||
| 109 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | ||
| 110 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | ||
| 111 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | ||
| 112 | 1, 1, 1, 4, 1, 1, 1, 1, 1 | ||
| 113 | } }; | ||
| 114 | 94 | ||
| 95 | led_config_t g_led_config = {{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, {15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}, {30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, 43}, {44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56, 57}, {58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66}}, | ||
| 96 | {{0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, {90, 0}, {105, 0}, {120, 0}, {135, 0}, {150, 0}, {165, 0}, {180, 0}, {203, 0}, {224, 0}, {4, 16}, {23, 16}, {38, 16}, {53, 16}, {68, 16}, {83, 16}, {98, 16}, {113, 16}, {128, 16}, {143, 16}, {158, 16}, {173, 16}, {188, 16}, {206, 16}, {224, 16}, {6, 32}, {26, 32}, {41, 32}, {56, 32}, {71, 32}, {86, 32}, {101, 32}, {116, 32}, {131, 32}, {146, 32}, {161, 32}, {176, 32}, {201, 32}, {224, 32}, {9, 48}, {34, 48}, {49, 48}, {64, 48}, {79, 48}, {94, 48}, {109, 48}, {124, 48}, {139, 48}, {154, 48}, {169, 48}, {189, 48}, {210, 48}, {224, 48}, {2, 64}, {21, 64}, {39, 64}, {96, 64}, {152, 64}, {171, 64}, {195, 64}, {210, 64}, {224, 64}}, | ||
| 97 | {1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1}}; | ||
| 115 | 98 | ||
| 116 | __attribute__ ((weak)) | 99 | __attribute__((weak)) void rgb_matrix_indicators_user(void) { |
| 117 | void rgb_matrix_indicators_user(void) | 100 | if (host_keyboard_led_state().caps_lock) { |
| 118 | { | ||
| 119 | if (host_keyboard_led_state().caps_lock) | ||
| 120 | { | ||
| 121 | rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); | 101 | rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); |
| 122 | } | 102 | } |
| 123 | } | 103 | } |
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h index 1ac9c770d..51e732f10 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/config.h | |||
| @@ -16,10 +16,10 @@ | |||
| 16 | #define RGB_MATRIX_LED_FLUSH_LIMIT 26 | 16 | #define RGB_MATRIX_LED_FLUSH_LIMIT 26 |
| 17 | #define DEBOUNCE 3 | 17 | #define DEBOUNCE 3 |
| 18 | #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects | 18 | #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects |
| 19 | #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended | 19 | #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended |
| 20 | #define RGB_MATRIX_KEYPRESSES | 20 | #define RGB_MATRIX_KEYPRESSES |
| 21 | #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL | 21 | #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL |
| 22 | #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN | 22 | #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN |
| 23 | #define DISABLE_RGB_MATRIX_BAND_SAT | 23 | #define DISABLE_RGB_MATRIX_BAND_SAT |
| 24 | #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT | 24 | #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT |
| 25 | #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT | 25 | #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT |
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk index 39ea07487..44ce87e44 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # change yes to no to disable | 15 | # change yes to no to disable |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = yes # Mouse keys | 18 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = no # Console for debug | 20 | CONSOLE_ENABLE = no # Console for debug |
| @@ -24,7 +24,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 24 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 24 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 25 | NKRO_ENABLE = yes # USB Nkey Rollover | 25 | NKRO_ENABLE = yes # USB Nkey Rollover |
| 26 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 26 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
| 27 | MIDI_ENABLE = no # MIDI support | ||
| 28 | UNICODE_ENABLE = no # Unicode | 27 | UNICODE_ENABLE = no # Unicode |
| 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 28 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 30 | AUDIO_ENABLE = no # Audio output on port C6 | 29 | AUDIO_ENABLE = no # Audio output on port C6 |
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c index 951dd028f..562b9c454 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/v2.c | |||
| @@ -16,79 +16,79 @@ | |||
| 16 | 16 | ||
| 17 | #include "v2.h" | 17 | #include "v2.h" |
| 18 | #ifdef RGB_MATRIX_ENABLE | 18 | #ifdef RGB_MATRIX_ENABLE |
| 19 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | 19 | const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { |
| 20 | 20 | ||
| 21 | {0, C8_8, C7_8, C6_8}, // LA17 | 21 | {0, C8_8, C7_8, C6_8}, // LA17 |
| 22 | {0, C9_8, C7_7, C6_7}, // LA16 | 22 | {0, C9_8, C7_7, C6_7}, // LA16 |
| 23 | {0, C9_7, C8_7, C6_6}, // LA15 | 23 | {0, C9_7, C8_7, C6_6}, // LA15 |
| 24 | {0, C9_6, C8_6, C7_6}, // LA14 | 24 | {0, C9_6, C8_6, C7_6}, // LA14 |
| 25 | {0, C9_5, C8_5, C7_5}, // LA13 | 25 | {0, C9_5, C8_5, C7_5}, // LA13 |
| 26 | {0, C9_4, C8_4, C7_4}, // LA12 | 26 | {0, C9_4, C8_4, C7_4}, // LA12 |
| 27 | {0, C9_3, C8_3, C7_3}, // LA11 | 27 | {0, C9_3, C8_3, C7_3}, // LA11 |
| 28 | {0, C9_2, C8_2, C7_2}, // LA10 | 28 | {0, C9_2, C8_2, C7_2}, // LA10 |
| 29 | {0, C9_1, C8_1, C7_1}, // LA9 | 29 | {0, C9_1, C8_1, C7_1}, // LA9 |
| 30 | {0, C2_9, C3_9, C4_9}, // LB0 | 30 | {0, C2_9, C3_9, C4_9}, // LB0 |
| 31 | {0, C1_9, C3_10, C4_10}, // LB1 | 31 | {0, C1_9, C3_10, C4_10}, // LB1 |
| 32 | {0, C1_10, C2_10, C4_11}, // LB2 | 32 | {0, C1_10, C2_10, C4_11}, // LB2 |
| 33 | {0, C1_11, C2_11, C3_11}, // LB3 | 33 | {0, C1_11, C2_11, C3_11}, // LB3 |
| 34 | {0, C1_13, C2_13, C3_13}, // LB5 | 34 | {0, C1_13, C2_13, C3_13}, // LB5 |
| 35 | {0, C1_14, C2_14, C3_14}, // LB6 | 35 | {0, C1_14, C2_14, C3_14}, // LB6 |
| 36 | 36 | ||
| 37 | {0, C1_7, C2_7, C3_7}, // LA7 | 37 | {0, C1_7, C2_7, C3_7}, // LA7 |
| 38 | {0, C1_6, C2_6, C3_6}, // LA6 | 38 | {0, C1_6, C2_6, C3_6}, // LA6 |
| 39 | {0, C1_5, C2_5, C3_5}, // LA5 | 39 | {0, C1_5, C2_5, C3_5}, // LA5 |
| 40 | {0, C1_4, C2_4, C3_4}, // LA4 | 40 | {0, C1_4, C2_4, C3_4}, // LA4 |
| 41 | {0, C1_3, C2_3, C3_3}, // LA3 | 41 | {0, C1_3, C2_3, C3_3}, // LA3 |
| 42 | {0, C1_2, C2_2, C4_3}, // LA2 | 42 | {0, C1_2, C2_2, C4_3}, // LA2 |
| 43 | {0, C1_1, C3_2, C4_2}, // LA1 | 43 | {0, C1_1, C3_2, C4_2}, // LA1 |
| 44 | {0, C2_1, C3_1, C4_1}, // LA0 | 44 | {0, C2_1, C3_1, C4_1}, // LA0 |
| 45 | {0, C9_9, C8_9, C7_9}, // LB9 | 45 | {0, C9_9, C8_9, C7_9}, // LB9 |
| 46 | {0, C9_10, C8_10, C7_10}, // LB10 | 46 | {0, C9_10, C8_10, C7_10}, // LB10 |
| 47 | {0, C9_11, C8_11, C7_11}, // LB11 | 47 | {0, C9_11, C8_11, C7_11}, // LB11 |
| 48 | {0, C9_12, C8_12, C7_12}, // LB12 | 48 | {0, C9_12, C8_12, C7_12}, // LB12 |
| 49 | {0, C9_13, C8_13, C7_13}, // LB13 | 49 | {0, C9_13, C8_13, C7_13}, // LB13 |
| 50 | {0, C9_14, C8_14, C7_14}, // LB14 | 50 | {0, C9_14, C8_14, C7_14}, // LB14 |
| 51 | {0, C1_15, C2_15, C3_15}, // LB7 | 51 | {0, C1_15, C2_15, C3_15}, // LB7 |
| 52 | 52 | ||
| 53 | {0, C1_8, C2_8, C3_8}, // LA8 | 53 | {0, C1_8, C2_8, C3_8}, // LA8 |
| 54 | {1, C9_6, C8_6, C7_6}, // LC14 | 54 | {1, C9_6, C8_6, C7_6}, // LC14 |
| 55 | {1, C9_5, C8_5, C7_5}, // LC13 | 55 | {1, C9_5, C8_5, C7_5}, // LC13 |
| 56 | {1, C9_4, C8_4, C7_4}, // LC12 | 56 | {1, C9_4, C8_4, C7_4}, // LC12 |
| 57 | {1, C9_3, C8_3, C7_3}, // LC11 | 57 | {1, C9_3, C8_3, C7_3}, // LC11 |
| 58 | {1, C9_2, C8_2, C7_2}, // LC10 | 58 | {1, C9_2, C8_2, C7_2}, // LC10 |
| 59 | {1, C9_1, C8_1, C7_1}, // LC9 | 59 | {1, C9_1, C8_1, C7_1}, // LC9 |
| 60 | {1, C2_9, C3_9, C4_9}, // LD0 | 60 | {1, C2_9, C3_9, C4_9}, // LD0 |
| 61 | {1, C1_9, C3_10, C4_10}, // LD1 | 61 | {1, C1_9, C3_10, C4_10}, // LD1 |
| 62 | {1, C1_10, C2_10, C4_11}, // LD2 | 62 | {1, C1_10, C2_10, C4_11}, // LD2 |
| 63 | {1, C1_11, C2_11, C3_11}, // LD3 | 63 | {1, C1_11, C2_11, C3_11}, // LD3 |
| 64 | {1, C1_12, C2_12, C3_12}, // LD4 | 64 | {1, C1_12, C2_12, C3_12}, // LD4 |
| 65 | {1, C1_13, C2_13, C3_13}, // LD5 | 65 | {1, C1_13, C2_13, C3_13}, // LD5 |
| 66 | {0, C1_16, C2_16, C3_16}, // LB8 | 66 | {0, C1_16, C2_16, C3_16}, // LB8 |
| 67 | 67 | ||
| 68 | {1, C9_8, C7_7, C6_7}, // LC16 | 68 | {1, C9_8, C7_7, C6_7}, // LC16 |
| 69 | {1, C1_5, C2_5, C3_5}, // LC5 | 69 | {1, C1_5, C2_5, C3_5}, // LC5 |
| 70 | {1, C1_4, C2_4, C3_4}, // LC4 | 70 | {1, C1_4, C2_4, C3_4}, // LC4 |
| 71 | {1, C1_3, C2_3, C3_3}, // LC3 | 71 | {1, C1_3, C2_3, C3_3}, // LC3 |
| 72 | {1, C1_2, C2_2, C4_3}, // LC2 | 72 | {1, C1_2, C2_2, C4_3}, // LC2 |
| 73 | {1, C1_1, C3_2, C4_2}, // LC1 | 73 | {1, C1_1, C3_2, C4_2}, // LC1 |
| 74 | {1, C9_9, C8_9, C7_9}, // LD9 | 74 | {1, C9_9, C8_9, C7_9}, // LD9 |
| 75 | {1, C9_10, C8_10, C7_10}, // LD10 | 75 | {1, C9_10, C8_10, C7_10}, // LD10 |
| 76 | {1, C9_11, C8_11, C7_11}, // LD11 | 76 | {1, C9_11, C8_11, C7_11}, // LD11 |
| 77 | {1, C9_12, C8_12, C7_12}, // LD12 | 77 | {1, C9_12, C8_12, C7_12}, // LD12 |
| 78 | {1, C1_14, C2_14, C3_14}, // LD6 | 78 | {1, C1_14, C2_14, C3_14}, // LD6 |
| 79 | {1, C1_15, C2_15, C3_15}, // LD7 | 79 | {1, C1_15, C2_15, C3_15}, // LD7 |
| 80 | {1, C1_16, C2_16, C3_16}, // LD8 | 80 | {1, C1_16, C2_16, C3_16}, // LD8 |
| 81 | {0, C9_15, C8_15, C6_14}, // LB15 | 81 | {0, C9_15, C8_15, C6_14}, // LB15 |
| 82 | 82 | ||
| 83 | {1, C8_8, C7_8, C6_8}, // LC17 | 83 | {1, C8_8, C7_8, C6_8}, // LC17 |
| 84 | {1, C1_8, C2_8, C3_8}, // LC8 | 84 | {1, C1_8, C2_8, C3_8}, // LC8 |
| 85 | {1, C1_7, C2_7, C3_7}, // LC7 | 85 | {1, C1_7, C2_7, C3_7}, // LC7 |
| 86 | {1, C2_1, C3_1, C4_1}, // LC0 | 86 | {1, C2_1, C3_1, C4_1}, // LC0 |
| 87 | {1, C9_14, C8_14, C7_14}, // LD14 | 87 | {1, C9_14, C8_14, C7_14}, // LD14 |
| 88 | {1, C9_15, C8_15, C6_14}, // LD15 | 88 | {1, C9_15, C8_15, C6_14}, // LD15 |
| 89 | {1, C8_16, C7_16, C6_16}, // LD17 | 89 | {1, C8_16, C7_16, C6_16}, // LD17 |
| 90 | {0, C8_16, C7_16, C6_16}, // LB17 | 90 | {0, C8_16, C7_16, C6_16}, // LB17 |
| 91 | {0, C9_16, C7_15, C6_15}, // LB16 | 91 | {0, C9_16, C7_15, C6_15}, // LB16 |
| 92 | 92 | ||
| 93 | }; | 93 | }; |
| 94 | 94 | ||
| @@ -100,24 +100,22 @@ led_config_t g_led_config = { { | |||
| 100 | { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 } | 100 | { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 } |
| 101 | }, { | 101 | }, { |
| 102 | {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0}, | 102 | {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0}, |
| 103 | {4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16}, | 103 | {4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16}, |
| 104 | {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32}, | 104 | {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32}, |
| 105 | {9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48}, | 105 | {9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48}, |
| 106 | {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64} | 106 | {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64} |
| 107 | }, { | 107 | }, { |
| 108 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | 108 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, |
| 109 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | 109 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, |
| 110 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | 110 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, |
| 111 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | 111 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, |
| 112 | 1, 1, 1, 4, 1, 1, 1, 1, 1 | 112 | 1, 1, 1, 4, 1, 1, 1, 1, 1 |
| 113 | } }; | 113 | } }; |
| 114 | 114 | ||
| 115 | 115 | ||
| 116 | __attribute__ ((weak)) | 116 | __attribute__ ((weak)) |
| 117 | void rgb_matrix_indicators_user(void) | 117 | void rgb_matrix_indicators_user(void) { |
| 118 | { | 118 | if (host_keyboard_led_state().caps_lock) { |
| 119 | if (host_keyboard_led_state().caps_lock) | ||
| 120 | { | ||
| 121 | rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); | 119 | rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); |
| 122 | } | 120 | } |
| 123 | } | 121 | } |
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h index 6a783f55a..1ee83cdc9 100755 --- a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | #define NO_ACTION_FUNCTION | 42 | #define NO_ACTION_FUNCTION |
| 43 | #ifdef RGB_MATRIX_ENABLE | 43 | #ifdef RGB_MATRIX_ENABLE |
| 44 | #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects | 44 | #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects |
| 45 | #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended | 45 | #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended |
| 46 | #define USB_SUSPEND_WAKEUP_DELAY 5000 | 46 | #define USB_SUSPEND_WAKEUP_DELAY 5000 |
| 47 | #define RGB_MATRIX_KEYPRESSES | 47 | #define RGB_MATRIX_KEYPRESSES |
| 48 | #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN | 48 | #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN |
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c index 585ae39b6..6e368a5c7 100755 --- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c | |||
| @@ -18,80 +18,80 @@ | |||
| 18 | 18 | ||
| 19 | #ifdef RGB_MATRIX_ENABLE | 19 | #ifdef RGB_MATRIX_ENABLE |
| 20 | 20 | ||
| 21 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | 21 | const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { |
| 22 | {0, CS21_SW1, CS20_SW1, CS19_SW1}, | 22 | {0, CS21_SW1, CS20_SW1, CS19_SW1}, |
| 23 | {0, CS21_SW2, CS20_SW2, CS19_SW2}, | 23 | {0, CS21_SW2, CS20_SW2, CS19_SW2}, |
| 24 | {0, CS21_SW3, CS20_SW3, CS19_SW3}, | 24 | {0, CS21_SW3, CS20_SW3, CS19_SW3}, |
| 25 | {0, CS21_SW4, CS20_SW4, CS19_SW4}, | 25 | {0, CS21_SW4, CS20_SW4, CS19_SW4}, |
| 26 | {0, CS21_SW5, CS20_SW5, CS19_SW5}, | 26 | {0, CS21_SW5, CS20_SW5, CS19_SW5}, |
| 27 | {0, CS21_SW6, CS20_SW6, CS19_SW6}, | 27 | {0, CS21_SW6, CS20_SW6, CS19_SW6}, |
| 28 | {0, CS21_SW7, CS20_SW7, CS19_SW7}, | 28 | {0, CS21_SW7, CS20_SW7, CS19_SW7}, |
| 29 | {0, CS21_SW8, CS20_SW8, CS19_SW8}, | 29 | {0, CS21_SW8, CS20_SW8, CS19_SW8}, |
| 30 | {0, CS24_SW1, CS23_SW1, CS22_SW1}, | 30 | {0, CS24_SW1, CS23_SW1, CS22_SW1}, |
| 31 | {0, CS24_SW2, CS23_SW2, CS22_SW2}, | 31 | {0, CS24_SW2, CS23_SW2, CS22_SW2}, |
| 32 | {0, CS24_SW3, CS23_SW3, CS22_SW3}, | 32 | {0, CS24_SW3, CS23_SW3, CS22_SW3}, |
| 33 | {0, CS24_SW4, CS23_SW4, CS22_SW4}, | 33 | {0, CS24_SW4, CS23_SW4, CS22_SW4}, |
| 34 | {0, CS24_SW5, CS23_SW5, CS22_SW5}, | 34 | {0, CS24_SW5, CS23_SW5, CS22_SW5}, |
| 35 | {0, CS24_SW6, CS23_SW6, CS22_SW6}, | 35 | {0, CS24_SW6, CS23_SW6, CS22_SW6}, |
| 36 | {0, CS24_SW7, CS23_SW7, CS22_SW7}, | 36 | {0, CS24_SW7, CS23_SW7, CS22_SW7}, |
| 37 | 37 | ||
| 38 | {0, CS15_SW1, CS14_SW1, CS13_SW1}, | 38 | {0, CS15_SW1, CS14_SW1, CS13_SW1}, |
| 39 | {0, CS15_SW2, CS14_SW2, CS13_SW2}, | 39 | {0, CS15_SW2, CS14_SW2, CS13_SW2}, |
| 40 | {0, CS15_SW3, CS14_SW3, CS13_SW3}, | 40 | {0, CS15_SW3, CS14_SW3, CS13_SW3}, |
| 41 | {0, CS15_SW4, CS14_SW4, CS13_SW4}, | 41 | {0, CS15_SW4, CS14_SW4, CS13_SW4}, |
| 42 | {0, CS15_SW5, CS14_SW5, CS13_SW5}, | 42 | {0, CS15_SW5, CS14_SW5, CS13_SW5}, |
| 43 | {0, CS15_SW6, CS14_SW6, CS13_SW6}, | 43 | {0, CS15_SW6, CS14_SW6, CS13_SW6}, |
| 44 | {0, CS15_SW7, CS14_SW7, CS13_SW7}, | 44 | {0, CS15_SW7, CS14_SW7, CS13_SW7}, |
| 45 | {0, CS15_SW8, CS14_SW8, CS13_SW8}, | 45 | {0, CS15_SW8, CS14_SW8, CS13_SW8}, |
| 46 | {0, CS30_SW1, CS29_SW1, CS28_SW1}, | 46 | {0, CS30_SW1, CS29_SW1, CS28_SW1}, |
| 47 | {0, CS30_SW2, CS29_SW2, CS28_SW2}, | 47 | {0, CS30_SW2, CS29_SW2, CS28_SW2}, |
| 48 | {0, CS30_SW3, CS29_SW3, CS28_SW3}, | 48 | {0, CS30_SW3, CS29_SW3, CS28_SW3}, |
| 49 | {0, CS30_SW4, CS29_SW4, CS28_SW4}, | 49 | {0, CS30_SW4, CS29_SW4, CS28_SW4}, |
| 50 | {0, CS30_SW5, CS29_SW5, CS28_SW5}, | 50 | {0, CS30_SW5, CS29_SW5, CS28_SW5}, |
| 51 | {0, CS30_SW6, CS29_SW6, CS28_SW6}, | 51 | {0, CS30_SW6, CS29_SW6, CS28_SW6}, |
| 52 | {0, CS30_SW7, CS29_SW7, CS28_SW7}, | 52 | {0, CS30_SW7, CS29_SW7, CS28_SW7}, |
| 53 | 53 | ||
| 54 | {0, CS12_SW1, CS11_SW1, CS10_SW1}, | 54 | {0, CS12_SW1, CS11_SW1, CS10_SW1}, |
| 55 | {0, CS12_SW2, CS11_SW2, CS10_SW2}, | 55 | {0, CS12_SW2, CS11_SW2, CS10_SW2}, |
| 56 | {0, CS12_SW3, CS11_SW3, CS10_SW3}, | 56 | {0, CS12_SW3, CS11_SW3, CS10_SW3}, |
| 57 | {0, CS12_SW4, CS11_SW4, CS10_SW4}, | 57 | {0, CS12_SW4, CS11_SW4, CS10_SW4}, |
| 58 | {0, CS12_SW5, CS11_SW5, CS10_SW5}, | 58 | {0, CS12_SW5, CS11_SW5, CS10_SW5}, |
| 59 | {0, CS12_SW6, CS11_SW6, CS10_SW6}, | 59 | {0, CS12_SW6, CS11_SW6, CS10_SW6}, |
| 60 | {0, CS12_SW7, CS11_SW7, CS10_SW7}, | 60 | {0, CS12_SW7, CS11_SW7, CS10_SW7}, |
| 61 | {0, CS12_SW8, CS11_SW8, CS10_SW8}, | 61 | {0, CS12_SW8, CS11_SW8, CS10_SW8}, |
| 62 | {0, CS33_SW1, CS32_SW1, CS31_SW1}, | 62 | {0, CS33_SW1, CS32_SW1, CS31_SW1}, |
| 63 | {0, CS33_SW2, CS32_SW2, CS31_SW2}, | 63 | {0, CS33_SW2, CS32_SW2, CS31_SW2}, |
| 64 | {0, CS33_SW3, CS32_SW3, CS31_SW3}, | 64 | {0, CS33_SW3, CS32_SW3, CS31_SW3}, |
| 65 | {0, CS33_SW4, CS32_SW4, CS31_SW4}, | 65 | {0, CS33_SW4, CS32_SW4, CS31_SW4}, |
| 66 | {0, CS33_SW5, CS32_SW5, CS31_SW5}, | 66 | {0, CS33_SW5, CS32_SW5, CS31_SW5}, |
| 67 | {0, CS33_SW7, CS32_SW7, CS31_SW7}, | 67 | {0, CS33_SW7, CS32_SW7, CS31_SW7}, |
| 68 | 68 | ||
| 69 | {0, CS9_SW1, CS8_SW1, CS7_SW1}, | 69 | {0, CS9_SW1, CS8_SW1, CS7_SW1}, |
| 70 | {0, CS9_SW2, CS8_SW2, CS7_SW2}, | 70 | {0, CS9_SW2, CS8_SW2, CS7_SW2}, |
| 71 | {0, CS9_SW3, CS8_SW3, CS7_SW3}, | 71 | {0, CS9_SW3, CS8_SW3, CS7_SW3}, |
| 72 | {0, CS9_SW4, CS8_SW4, CS7_SW4}, | 72 | {0, CS9_SW4, CS8_SW4, CS7_SW4}, |
| 73 | {0, CS9_SW5, CS8_SW5, CS7_SW5}, | 73 | {0, CS9_SW5, CS8_SW5, CS7_SW5}, |
| 74 | {0, CS9_SW6, CS8_SW6, CS7_SW6}, | 74 | {0, CS9_SW6, CS8_SW6, CS7_SW6}, |
| 75 | {0, CS9_SW7, CS8_SW7, CS7_SW7}, | 75 | {0, CS9_SW7, CS8_SW7, CS7_SW7}, |
| 76 | {0, CS9_SW8, CS8_SW8, CS7_SW8}, | 76 | {0, CS9_SW8, CS8_SW8, CS7_SW8}, |
| 77 | {0, CS36_SW1, CS35_SW1, CS34_SW1}, | 77 | {0, CS36_SW1, CS35_SW1, CS34_SW1}, |
| 78 | {0, CS36_SW2, CS35_SW2, CS34_SW2}, | 78 | {0, CS36_SW2, CS35_SW2, CS34_SW2}, |
| 79 | {0, CS36_SW3, CS35_SW3, CS34_SW3}, | 79 | {0, CS36_SW3, CS35_SW3, CS34_SW3}, |
| 80 | {0, CS36_SW4, CS35_SW4, CS34_SW4}, | 80 | {0, CS36_SW4, CS35_SW4, CS34_SW4}, |
| 81 | {0, CS36_SW5, CS35_SW5, CS34_SW5}, | 81 | {0, CS36_SW5, CS35_SW5, CS34_SW5}, |
| 82 | {0, CS36_SW7, CS35_SW7, CS34_SW7}, | 82 | {0, CS36_SW7, CS35_SW7, CS34_SW7}, |
| 83 | 83 | ||
| 84 | {0, CS3_SW1, CS2_SW1, CS1_SW1}, | 84 | {0, CS3_SW1, CS2_SW1, CS1_SW1}, |
| 85 | {0, CS3_SW2, CS2_SW2, CS1_SW2}, | 85 | {0, CS3_SW2, CS2_SW2, CS1_SW2}, |
| 86 | {0, CS3_SW3, CS2_SW3, CS1_SW3}, | 86 | {0, CS3_SW3, CS2_SW3, CS1_SW3}, |
| 87 | {0, CS3_SW6, CS2_SW6, CS1_SW6}, | 87 | {0, CS3_SW6, CS2_SW6, CS1_SW6}, |
| 88 | // {0, CS39_SW1, CS38_SW1, CS37_SW1}, | 88 | // {0, CS39_SW1, CS38_SW1, CS37_SW1}, |
| 89 | {0, CS39_SW2, CS38_SW2, CS37_SW2}, | 89 | {0, CS39_SW2, CS38_SW2, CS37_SW2}, |
| 90 | {0, CS39_SW3, CS38_SW3, CS37_SW3}, | 90 | {0, CS39_SW3, CS38_SW3, CS37_SW3}, |
| 91 | {0, CS39_SW4, CS38_SW4, CS37_SW4}, | 91 | {0, CS39_SW4, CS38_SW4, CS37_SW4}, |
| 92 | {0, CS39_SW5, CS38_SW5, CS37_SW5}, | 92 | {0, CS39_SW5, CS38_SW5, CS37_SW5}, |
| 93 | {0, CS39_SW7, CS38_SW7, CS37_SW7} | 93 | {0, CS39_SW7, CS38_SW7, CS37_SW7} |
| 94 | 94 | ||
| 95 | }; | 95 | }; |
| 96 | led_config_t g_led_config = { { | 96 | led_config_t g_led_config = { { |
| 97 | // Key Matrix to LED Index | 97 | // Key Matrix to LED Index |
| @@ -112,17 +112,15 @@ led_config_t g_led_config = { { | |||
| 112 | // LED Index to Flag | 112 | // LED Index to Flag |
| 113 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | 113 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, |
| 114 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | 114 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, |
| 115 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | ||
| 116 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | 115 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, |
| 117 | 1, 1, 1, 4, 1, 1, 1, 1, 1 | 116 | 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, |
| 117 | 1, 1, 1, 4, 1, 1, 1, 1, 1 | ||
| 118 | } }; | 118 | } }; |
| 119 | 119 | ||
| 120 | 120 | ||
| 121 | __attribute__ ((weak)) | 121 | __attribute__ ((weak)) |
| 122 | void rgb_matrix_indicators_user(void) | 122 | void rgb_matrix_indicators_user(void) { |
| 123 | { | 123 | if (host_keyboard_led_state().caps_lock) { |
| 124 | if (host_keyboard_led_state().caps_lock) | ||
| 125 | { | ||
| 126 | rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); | 124 | rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); |
| 127 | } | 125 | } |
| 128 | } | 126 | } |
diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h index b12b83683..b8aad647c 100644 --- a/keyboards/kbdfans/kbd67/rev1/config.h +++ b/keyboards/kbdfans/kbd67/rev1/config.h | |||
| @@ -182,26 +182,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 182 | //#define NO_ACTION_MACRO | 182 | //#define NO_ACTION_MACRO |
| 183 | //#define NO_ACTION_FUNCTION | 183 | //#define NO_ACTION_FUNCTION |
| 184 | 184 | ||
| 185 | /* | ||
| 186 | * MIDI options | ||
| 187 | */ | ||
| 188 | |||
| 189 | /* enable basic MIDI features: | ||
| 190 | - MIDI notes can be sent when in Music mode is on | ||
| 191 | */ | ||
| 192 | //#define MIDI_BASIC | ||
| 193 | |||
| 194 | /* enable advanced MIDI features: | ||
| 195 | - MIDI notes can be added to the keymap | ||
| 196 | - Octave shift and transpose | ||
| 197 | - Virtual sustain, portamento, and modulation wheel | ||
| 198 | - etc. | ||
| 199 | */ | ||
| 200 | //#define MIDI_ADVANCED | ||
| 201 | |||
| 202 | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | ||
| 203 | //#define MIDI_TONE_KEYCODE_OCTAVES 1 | ||
| 204 | |||
| 205 | /* Bootmagic Lite key configuration */ | 185 | /* Bootmagic Lite key configuration */ |
| 206 | // #define BOOTMAGIC_LITE_ROW 0 | 186 | // #define BOOTMAGIC_LITE_ROW 0 |
| 207 | // #define BOOTMAGIC_LITE_COLUMN 0 | 187 | // #define BOOTMAGIC_LITE_COLUMN 0 |
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/default/config.h b/keyboards/kbdfans/kbd67/rev1/keymaps/default/config.h index a3ed4f762..90fb10ebb 100644 --- a/keyboards/kbdfans/kbd67/rev1/keymaps/default/config.h +++ b/keyboards/kbdfans/kbd67/rev1/keymaps/default/config.h | |||
| @@ -16,4 +16,4 @@ | |||
| 16 | 16 | ||
| 17 | #pragma once | 17 | #pragma once |
| 18 | 18 | ||
| 19 | // place overrides here | 19 | #define LAYER_STATE_8BIT |
diff --git a/keyboards/kbdfans/kbd67/rev1/rules.mk b/keyboards/kbdfans/kbd67/rev1/rules.mk index 786722eb7..fe5da7716 100644 --- a/keyboards/kbdfans/kbd67/rev1/rules.mk +++ b/keyboards/kbdfans/kbd67/rev1/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # change yes to no to disable | 15 | # change yes to no to disable |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = yes # Mouse keys | 18 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = yes # Console for debug | 20 | CONSOLE_ENABLE = yes # Console for debug |
| @@ -25,7 +25,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 25 | NKRO_ENABLE = yes # USB Nkey Rollover | 25 | NKRO_ENABLE = yes # USB Nkey Rollover |
| 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default | 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default |
| 27 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | 27 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow |
| 28 | MIDI_ENABLE = no # MIDI support | ||
| 29 | UNICODE_ENABLE = no # Unicode | 28 | UNICODE_ENABLE = no # Unicode |
| 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 31 | AUDIO_ENABLE = no # Audio output on port C6 | 30 | AUDIO_ENABLE = no # Audio output on port C6 |
diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json index b5cc79654..208a13c58 100644 --- a/keyboards/kbdfans/kbd67/rev2/info.json +++ b/keyboards/kbdfans/kbd67/rev2/info.json | |||
| @@ -235,7 +235,7 @@ | |||
| 235 | {"x":14, "y":4}, | 235 | {"x":14, "y":4}, |
| 236 | {"x":15, "y":4}] | 236 | {"x":15, "y":4}] |
| 237 | }, | 237 | }, |
| 238 | "LAYOUT_65_ansi_blocker_splitbs": { | 238 | "LAYOUT_65_ansi_blocker_split_bs": { |
| 239 | "layout": [ | 239 | "layout": [ |
| 240 | {"x":0, "y":0}, | 240 | {"x":0, "y":0}, |
| 241 | {"x":1, "y":0}, | 241 | {"x":1, "y":0}, |
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/rules.mk b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/rules.mk index 108a7517f..3031077b9 100644 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/rules.mk +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/rules.mk | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # Build Options | 1 | # Build Options |
| 2 | # change yes to no to disable | 2 | # change yes to no to disable |
| 3 | # | 3 | # |
| 4 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000) | 4 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 5 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) | 5 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) |
| 6 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 6 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
| 7 | CONSOLE_ENABLE = no # Console for debug(+400) | 7 | CONSOLE_ENABLE = no # Console for debug(+400) |
diff --git a/keyboards/kbdfans/kbd67/rev2/rules.mk b/keyboards/kbdfans/kbd67/rev2/rules.mk index 280e0b41e..e209df498 100644 --- a/keyboards/kbdfans/kbd67/rev2/rules.mk +++ b/keyboards/kbdfans/kbd67/rev2/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # change yes to no to disable | 15 | # change yes to no to disable |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = yes # Mouse keys | 18 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = no # Console for debug | 20 | CONSOLE_ENABLE = no # Console for debug |
| @@ -25,7 +25,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 25 | NKRO_ENABLE = yes # USB Nkey Rollover | 25 | NKRO_ENABLE = yes # USB Nkey Rollover |
| 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default | 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default |
| 27 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | 27 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow |
| 28 | MIDI_ENABLE = no # MIDI support | ||
| 29 | UNICODE_ENABLE = no # Unicode | 28 | UNICODE_ENABLE = no # Unicode |
| 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 31 | AUDIO_ENABLE = no # Audio output on port C6 | 30 | AUDIO_ENABLE = no # Audio output on port C6 |
diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h index 390e5a66e..d9758edb8 100644 --- a/keyboards/kbdfans/kbd6x/config.h +++ b/keyboards/kbdfans/kbd6x/config.h | |||
| @@ -169,23 +169,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 169 | #define NO_ACTION_MACRO | 169 | #define NO_ACTION_MACRO |
| 170 | #define NO_ACTION_FUNCTION | 170 | #define NO_ACTION_FUNCTION |
| 171 | 171 | ||
| 172 | /* | ||
| 173 | * MIDI options | ||
| 174 | */ | ||
| 175 | |||
| 176 | /* enable basic MIDI features: | ||
| 177 | - MIDI notes can be sent when in Music mode is on | ||
| 178 | */ | ||
| 179 | //#define MIDI_BASIC | ||
| 180 | |||
| 181 | /* enable advanced MIDI features: | ||
| 182 | - MIDI notes can be added to the keymap | ||
| 183 | - Octave shift and transpose | ||
| 184 | - Virtual sustain, portamento, and modulation wheel | ||
| 185 | - etc. | ||
| 186 | */ | ||
| 187 | //#define MIDI_ADVANCED | ||
| 188 | |||
| 189 | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | ||
| 190 | //#define MIDI_TONE_KEYCODE_OCTAVES 1 | ||
| 191 | |||
diff --git a/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk index e2f34468a..0f7f72f34 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk +++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # Generic features | 1 | # Generic features |
| 2 | BOOTMAGIC_ENABLE = lite | 2 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 3 | COMMAND_ENABLE = yes | 3 | COMMAND_ENABLE = yes |
| 4 | CONSOLE_ENABLE = no | 4 | CONSOLE_ENABLE = no |
| 5 | EXTRAKEY_ENABLE = yes | 5 | EXTRAKEY_ENABLE = yes |
diff --git a/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c index 1e0fc8ad7..6bbbdd87c 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c +++ b/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c | |||
| @@ -29,15 +29,15 @@ | |||
| 29 | void eeconfig_init_user(void) { | 29 | void eeconfig_init_user(void) { |
| 30 | set_unicode_input_mode(UC_LNX); | 30 | set_unicode_input_mode(UC_LNX); |
| 31 | } | 31 | } |
| 32 | #define DE_AE UC(0x00E4) | 32 | #define DE_ADIA UC(0x00E4) |
| 33 | #define DE_SS UC(0x00DF) | 33 | #define DE_SS UC(0x00DF) |
| 34 | #define DE_OE UC(0x00F6) | 34 | #define DE_ODIA UC(0x00F6) |
| 35 | #define DE_UE UC(0x00FC) | 35 | #define DE_UDIA UC(0x00FC) |
| 36 | #define DE_AE_CAP UC(0x00C4) | 36 | #define DE_ADIA_CAP UC(0x00C4) |
| 37 | #define DE_OE_CAP UC(0x00D6) | 37 | #define DE_ODIA_CAP UC(0x00D6) |
| 38 | #define DE_UE_CAP UC(0x00DC) | 38 | #define DE_UDIA_CAP UC(0x00DC) |
| 39 | 39 | ||
| 40 | uint32_t layer_state_set_user(uint32_t state) { | 40 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 41 | switch (biton32(state)) { | 41 | switch (biton32(state)) { |
| 42 | case NM_MODE: | 42 | case NM_MODE: |
| 43 | rgblight_setrgb (0x00, 0x66, 0x00); | 43 | rgblight_setrgb (0x00, 0x66, 0x00); |
| @@ -174,15 +174,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 174 | ), | 174 | ), |
| 175 | [ACCENT] = LAYOUT( | 175 | [ACCENT] = LAYOUT( |
| 176 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, | 176 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, |
| 177 | _______, RGB_TOG, RGB_MODE_PLAIN, _______, _______, _______, _______, _______, DE_UE, _______, _______, _______, _______, _______, | 177 | _______, RGB_TOG, RGB_MODE_PLAIN, _______, _______, _______, _______, _______, DE_UDIA, _______, _______, _______, _______, _______, |
| 178 | _______, DE_AE, UC_Z, DE_SS, _______, _______, _______, _______, _______, _______, DE_OE, _______, _______, | 178 | _______, DE_ADIA, UC_Z, DE_SS, _______, _______, _______, _______, _______, _______, DE_ODIA, _______, _______, |
| 179 | OSL(ACCENT_CAP), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(CL), | 179 | OSL(ACCENT_CAP), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(CL), |
| 180 | _______, _______, _______, _______, _______, _______, _______ | 180 | _______, _______, _______, _______, _______, _______, _______ |
| 181 | ), | 181 | ), |
| 182 | [ACCENT_CAP] = LAYOUT( | 182 | [ACCENT_CAP] = LAYOUT( |
| 183 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 183 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 184 | _______, _______, _______, _______, _______, _______, _______, _______, DE_UE_CAP, _______, _______, _______, _______, _______, | 184 | _______, _______, _______, _______, _______, _______, _______, _______, DE_UDIA_CAP, _______, _______, _______, _______, _______, |
| 185 | _______, DE_AE_CAP, _______, DE_SS, _______, _______, _______, _______, _______, _______, DE_OE_CAP, _______, TO(CL), | 185 | _______, DE_ADIA_CAP, _______, DE_SS, _______, _______, _______, _______, _______, _______, DE_ODIA_CAP, _______, TO(CL), |
| 186 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 186 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 187 | _______, _______, _______, _______, _______, _______, _______ | 187 | _______, _______, _______, _______, _______, _______, _______ |
| 188 | ), | 188 | ), |
diff --git a/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk index 00bd80ef0..9a4459c28 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk +++ b/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) | 1 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
| 2 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) | 2 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) |
| 3 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 3 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
| 4 | CONSOLE_ENABLE = no # Console for debug(+400) | 4 | CONSOLE_ENABLE = no # Console for debug(+400) |
diff --git a/keyboards/kbdfans/kbd6x/keymaps/wanleg/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/wanleg/rules.mk index 92cc41e21..76c257581 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/wanleg/rules.mk +++ b/keyboards/kbdfans/kbd6x/keymaps/wanleg/rules.mk | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) | 1 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
| 2 | EXTRAKEY_ENABLE = no # Audio control and System control(+450) | 2 | EXTRAKEY_ENABLE = no # Audio control and System control(+450) |
| 3 | CONSOLE_ENABLE = no # Console for debug(+400) \ No newline at end of file | 3 | CONSOLE_ENABLE = no # Console for debug(+400) \ No newline at end of file |
diff --git a/keyboards/kbdfans/kbd6x/rules.mk b/keyboards/kbdfans/kbd6x/rules.mk index 7d9f13e31..eabefb6bd 100644 --- a/keyboards/kbdfans/kbd6x/rules.mk +++ b/keyboards/kbdfans/kbd6x/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # change yes to no to disable | 15 | # change yes to no to disable |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = no # Mouse keys | 18 | MOUSEKEY_ENABLE = no # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = yes # Console for debug | 20 | CONSOLE_ENABLE = yes # Console for debug |
| @@ -24,7 +24,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 24 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 24 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 25 | NKRO_ENABLE = yes # USB Nkey Rollover | 25 | NKRO_ENABLE = yes # USB Nkey Rollover |
| 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default | 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default |
| 27 | MIDI_ENABLE = no # MIDI support | ||
| 28 | UNICODE_ENABLE = no # Unicode | 27 | UNICODE_ENABLE = no # Unicode |
| 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 28 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 30 | RGBLIGHT_ENABLE = yes | 29 | RGBLIGHT_ENABLE = yes |
diff --git a/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c b/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c index 778515788..af4243c49 100644 --- a/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/adit/keymap.c | |||
| @@ -1,7 +1,5 @@ | |||
| 1 | #include QMK_KEYBOARD_H | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | #define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) | ||
| 4 | |||
| 5 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 6 | 4 | ||
| 7 | [0] = LAYOUT( | 5 | [0] = LAYOUT( |
| @@ -23,37 +21,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 23 | ) | 21 | ) |
| 24 | 22 | ||
| 25 | }; | 23 | }; |
| 26 | |||
| 27 | enum function_id { | ||
| 28 | SHIFT_ESC, | ||
| 29 | }; | ||
| 30 | |||
| 31 | const uint16_t PROGMEM fn_actions[] = { | ||
| 32 | [0] = ACTION_FUNCTION(SHIFT_ESC), | ||
| 33 | }; | ||
| 34 | |||
| 35 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 36 | static uint8_t shift_esc_shift_mask; | ||
| 37 | switch (id) { | ||
| 38 | case SHIFT_ESC: | ||
| 39 | shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; | ||
| 40 | if (record->event.pressed) { | ||
| 41 | if (shift_esc_shift_mask) { | ||
| 42 | add_key(KC_GRV); | ||
| 43 | send_keyboard_report(); | ||
| 44 | } else { | ||
| 45 | add_key(KC_ESC); | ||
| 46 | send_keyboard_report(); | ||
| 47 | } | ||
| 48 | } else { | ||
| 49 | if (shift_esc_shift_mask) { | ||
| 50 | del_key(KC_GRV); | ||
| 51 | send_keyboard_report(); | ||
| 52 | } else { | ||
| 53 | del_key(KC_ESC); | ||
| 54 | send_keyboard_report(); | ||
| 55 | } | ||
| 56 | } | ||
| 57 | break; | ||
| 58 | } | ||
| 59 | } | ||
diff --git a/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c index 533d83fdb..998f1a25d 100644 --- a/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c | |||
| @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 44 | ) | 44 | ) |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | uint32_t layer_state_set_user(uint32_t state) { | 47 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 48 | switch (biton32(state)) { | 48 | switch (biton32(state)) { |
| 49 | case WINDOWS_LAYER: | 49 | case WINDOWS_LAYER: |
| 50 | rgblight_setrgb_blue(); | 50 | rgblight_setrgb_blue(); |
diff --git a/keyboards/kbdfans/kbd75/keymaps/noroadsleft/rules.mk b/keyboards/kbdfans/kbd75/keymaps/noroadsleft/rules.mk index 6867e0a60..87373812c 100644 --- a/keyboards/kbdfans/kbd75/keymaps/noroadsleft/rules.mk +++ b/keyboards/kbdfans/kbd75/keymaps/noroadsleft/rules.mk | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | BOOTMAGIC_ENABLE = lite | 1 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 2 | CONSOLE_ENABLE = yes | 2 | CONSOLE_ENABLE = yes |
| 3 | TAP_DANCE_ENABLE = yes | 3 | TAP_DANCE_ENABLE = yes |
| 4 | 4 | ||
diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/rules.mk b/keyboards/kbdfans/kbd75/keymaps/tucznak/rules.mk index c854fdd2d..77bc0e2b0 100644 --- a/keyboards/kbdfans/kbd75/keymaps/tucznak/rules.mk +++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/rules.mk | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # Build Options | 1 | # Build Options |
| 2 | # change yes to no to disable | 2 | # change yes to no to disable |
| 3 | # | 3 | # |
| 4 | BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration(+1000) | 4 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 5 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) | 5 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) |
| 6 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 6 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
| 7 | CONSOLE_ENABLE = no # Console for debug(+400) | 7 | CONSOLE_ENABLE = no # Console for debug(+400) |
diff --git a/keyboards/kbdfans/kbd75/rev1/rules.mk b/keyboards/kbdfans/kbd75/rev1/rules.mk index 054cb687b..fb31f5609 100644 --- a/keyboards/kbdfans/kbd75/rev1/rules.mk +++ b/keyboards/kbdfans/kbd75/rev1/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # comment out to disable the options. | 15 | # comment out to disable the options. |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = yes # Mouse keys | 18 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = no # Console for debug | 20 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/kbdfans/kbd75/rev2/rules.mk b/keyboards/kbdfans/kbd75/rev2/rules.mk index 054cb687b..fb31f5609 100644 --- a/keyboards/kbdfans/kbd75/rev2/rules.mk +++ b/keyboards/kbdfans/kbd75/rev2/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # comment out to disable the options. | 15 | # comment out to disable the options. |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = yes # Mouse keys | 18 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = no # Console for debug | 20 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/kbdfans/kbd8x/rules.mk b/keyboards/kbdfans/kbd8x/rules.mk index b1ac31739..a4f86de37 100644 --- a/keyboards/kbdfans/kbd8x/rules.mk +++ b/keyboards/kbdfans/kbd8x/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # change yes to no to disable | 15 | # change yes to no to disable |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = no # Mouse keys | 18 | MOUSEKEY_ENABLE = no # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = no # Console for debug | 20 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h index 008b6b517..a8ead3fd1 100644 --- a/keyboards/kbdfans/kbd8x_mk2/config.h +++ b/keyboards/kbdfans/kbd8x_mk2/config.h | |||
| @@ -194,26 +194,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 194 | //#define NO_ACTION_MACRO | 194 | //#define NO_ACTION_MACRO |
| 195 | //#define NO_ACTION_FUNCTION | 195 | //#define NO_ACTION_FUNCTION |
| 196 | 196 | ||
| 197 | /* | ||
| 198 | * MIDI options | ||
| 199 | */ | ||
| 200 | |||
| 201 | /* enable basic MIDI features: | ||
| 202 | - MIDI notes can be sent when in Music mode is on | ||
| 203 | */ | ||
| 204 | //#define MIDI_BASIC | ||
| 205 | |||
| 206 | /* enable advanced MIDI features: | ||
| 207 | - MIDI notes can be added to the keymap | ||
| 208 | - Octave shift and transpose | ||
| 209 | - Virtual sustain, portamento, and modulation wheel | ||
| 210 | - etc. | ||
| 211 | */ | ||
| 212 | //#define MIDI_ADVANCED | ||
| 213 | |||
| 214 | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | ||
| 215 | //#define MIDI_TONE_KEYCODE_OCTAVES 1 | ||
| 216 | |||
| 217 | /* Bootmagic Lite key configuration */ | 197 | /* Bootmagic Lite key configuration */ |
| 218 | // #define BOOTMAGIC_LITE_ROW 0 | 198 | // #define BOOTMAGIC_LITE_ROW 0 |
| 219 | // #define BOOTMAGIC_LITE_COLUMN 0 | 199 | // #define BOOTMAGIC_LITE_COLUMN 0 |
diff --git a/keyboards/kbdfans/kbd8x_mk2/rules.mk b/keyboards/kbdfans/kbd8x_mk2/rules.mk index 3bb1ec74e..6524858e4 100644 --- a/keyboards/kbdfans/kbd8x_mk2/rules.mk +++ b/keyboards/kbdfans/kbd8x_mk2/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # change yes to no to disable | 15 | # change yes to no to disable |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = yes # Mouse keys | 18 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = no # Console for debug | 20 | CONSOLE_ENABLE = no # Console for debug |
| @@ -25,7 +25,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 25 | NKRO_ENABLE = yes # USB Nkey Rollover | 25 | NKRO_ENABLE = yes # USB Nkey Rollover |
| 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default | 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default |
| 27 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | 27 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow |
| 28 | MIDI_ENABLE = no # MIDI support | ||
| 29 | UNICODE_ENABLE = no # Unicode | 28 | UNICODE_ENABLE = no # Unicode |
| 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 31 | AUDIO_ENABLE = no # Audio output on port C6 | 30 | AUDIO_ENABLE = no # Audio output on port C6 |
diff --git a/keyboards/kbdfans/kbdmini/config.h b/keyboards/kbdfans/kbdmini/config.h index 5a36e983d..fc65f4341 100644 --- a/keyboards/kbdfans/kbdmini/config.h +++ b/keyboards/kbdfans/kbdmini/config.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | 35 | ||
| 36 | #ifdef RGB_MATRIX_ENABLE | 36 | #ifdef RGB_MATRIX_ENABLE |
| 37 | #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects | 37 | #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects |
| 38 | #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended | 38 | #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended |
| 39 | #define RGB_MATRIX_KEYPRESSES | 39 | #define RGB_MATRIX_KEYPRESSES |
| 40 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | 40 | #define RGB_MATRIX_FRAMEBUFFER_EFFECTS |
| 41 | #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN | 41 | #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN |
diff --git a/keyboards/kbdfans/kbdmini/kbdmini.c b/keyboards/kbdfans/kbdmini/kbdmini.c index 0e0df2f9a..799803c6f 100644 --- a/keyboards/kbdfans/kbdmini/kbdmini.c +++ b/keyboards/kbdfans/kbdmini/kbdmini.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #include "kbdmini.h" | 1 | #include "kbdmini.h" |
| 2 | 2 | ||
| 3 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | 3 | const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { |
| 4 | { 0, B_9, A_9, C_9 }, //LA33 | 4 | { 0, B_9, A_9, C_9 }, //LA33 |
| 5 | { 0, B_10, A_10, C_10 }, //LA37 | 5 | { 0, B_10, A_10, C_10 }, //LA37 |
| 6 | { 0, B_11, A_11, C_11 }, //LA41 | 6 | { 0, B_11, A_11, C_11 }, //LA41 |
diff --git a/keyboards/kbdfans/kbdmini/rules.mk b/keyboards/kbdfans/kbdmini/rules.mk index aaab18afc..e9716f3f3 100644 --- a/keyboards/kbdfans/kbdmini/rules.mk +++ b/keyboards/kbdfans/kbdmini/rules.mk | |||
| @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu | |||
| 7 | # Build Options | 7 | # Build Options |
| 8 | # change yes to no to disable | 8 | # change yes to no to disable |
| 9 | # | 9 | # |
| 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 10 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 11 | MOUSEKEY_ENABLE = yes # Mouse keys | 11 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 12 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 13 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/kbdfans/kbdpad/mk1/rules.mk b/keyboards/kbdfans/kbdpad/mk1/rules.mk index 679ac08fa..d46766338 100644 --- a/keyboards/kbdfans/kbdpad/mk1/rules.mk +++ b/keyboards/kbdfans/kbdpad/mk1/rules.mk | |||
| @@ -12,7 +12,7 @@ MCU = atmega32a | |||
| 12 | BOOTLOADER = bootloadHID | 12 | BOOTLOADER = bootloadHID |
| 13 | 13 | ||
| 14 | # build options | 14 | # build options |
| 15 | BOOTMAGIC_ENABLE = no | 15 | BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite |
| 16 | MOUSEKEY_ENABLE = yes | 16 | MOUSEKEY_ENABLE = yes |
| 17 | EXTRAKEY_ENABLE = yes | 17 | EXTRAKEY_ENABLE = yes |
| 18 | CONSOLE_ENABLE = no | 18 | CONSOLE_ENABLE = no |
diff --git a/keyboards/kbdfans/kbdpad_mk2/config.h b/keyboards/kbdfans/kbdpad_mk2/config.h index 2c32d1c8a..e99a73696 100644 --- a/keyboards/kbdfans/kbdpad_mk2/config.h +++ b/keyboards/kbdfans/kbdpad_mk2/config.h | |||
| @@ -193,26 +193,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 193 | //#define NO_ACTION_MACRO | 193 | //#define NO_ACTION_MACRO |
| 194 | //#define NO_ACTION_FUNCTION | 194 | //#define NO_ACTION_FUNCTION |
| 195 | 195 | ||
| 196 | /* | ||
| 197 | * MIDI options | ||
| 198 | */ | ||
| 199 | |||
| 200 | /* enable basic MIDI features: | ||
| 201 | - MIDI notes can be sent when in Music mode is on | ||
| 202 | */ | ||
| 203 | //#define MIDI_BASIC | ||
| 204 | |||
| 205 | /* enable advanced MIDI features: | ||
| 206 | - MIDI notes can be added to the keymap | ||
| 207 | - Octave shift and transpose | ||
| 208 | - Virtual sustain, portamento, and modulation wheel | ||
| 209 | - etc. | ||
| 210 | */ | ||
| 211 | //#define MIDI_ADVANCED | ||
| 212 | |||
| 213 | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | ||
| 214 | //#define MIDI_TONE_KEYCODE_OCTAVES 1 | ||
| 215 | |||
| 216 | /* Bootmagic Lite key configuration */ | 196 | /* Bootmagic Lite key configuration */ |
| 217 | // #define BOOTMAGIC_LITE_ROW 0 | 197 | // #define BOOTMAGIC_LITE_ROW 0 |
| 218 | // #define BOOTMAGIC_LITE_COLUMN 0 | 198 | // #define BOOTMAGIC_LITE_COLUMN 0 |
diff --git a/keyboards/kbdfans/kbdpad_mk2/rules.mk b/keyboards/kbdfans/kbdpad_mk2/rules.mk index 32e834ee0..406195888 100644 --- a/keyboards/kbdfans/kbdpad_mk2/rules.mk +++ b/keyboards/kbdfans/kbdpad_mk2/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # change yes to no to disable | 15 | # change yes to no to disable |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = yes # Mouse keys | 18 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = no # Console for debug | 20 | CONSOLE_ENABLE = no # Console for debug |
| @@ -25,7 +25,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 25 | NKRO_ENABLE = yes # USB Nkey Rollover | 25 | NKRO_ENABLE = yes # USB Nkey Rollover |
| 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default | 26 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default |
| 27 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | 27 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow |
| 28 | MIDI_ENABLE = no # MIDI support | ||
| 29 | UNICODE_ENABLE = no # Unicode | 28 | UNICODE_ENABLE = no # Unicode |
| 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 31 | AUDIO_ENABLE = no # Audio output on port C6 | 30 | AUDIO_ENABLE = no # Audio output on port C6 |
diff --git a/keyboards/kbdfans/maja/config.h b/keyboards/kbdfans/maja/config.h index d8553766b..3722c8381 100755 --- a/keyboards/kbdfans/maja/config.h +++ b/keyboards/kbdfans/maja/config.h | |||
| @@ -18,9 +18,9 @@ | |||
| 18 | #define RGB_MATRIX_LED_FLUSH_LIMIT 26 | 18 | #define RGB_MATRIX_LED_FLUSH_LIMIT 26 |
| 19 | #define DEBOUNCE 3 | 19 | #define DEBOUNCE 3 |
| 20 | #define RGB_DISABLE_AFTER_TIMEOUT 0 | 20 | #define RGB_DISABLE_AFTER_TIMEOUT 0 |
| 21 | #define RGB_DISABLE_WHEN_USB_SUSPENDED true | 21 | #define RGB_DISABLE_WHEN_USB_SUSPENDED |
| 22 | #define RGB_MATRIX_KEYPRESSES | 22 | #define RGB_MATRIX_KEYPRESSES |
| 23 | #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN | 23 | #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN |
| 24 | #define DISABLE_RGB_MATRIX_BAND_SAT | 24 | #define DISABLE_RGB_MATRIX_BAND_SAT |
| 25 | #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT | 25 | #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT |
| 26 | #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT | 26 | #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT |
diff --git a/keyboards/kbdfans/maja/maja.c b/keyboards/kbdfans/maja/maja.c index a0afcbda8..9619a84b4 100755 --- a/keyboards/kbdfans/maja/maja.c +++ b/keyboards/kbdfans/maja/maja.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #include "maja.h" | 1 | #include "maja.h" |
| 2 | 2 | ||
| 3 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | 3 | const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { |
| 4 | {0, C2_1, C3_1, C4_1}, // LA0 | 4 | {0, C2_1, C3_1, C4_1}, // LA0 |
| 5 | {0, C1_1, C3_2, C4_2}, // LA1 | 5 | {0, C1_1, C3_2, C4_2}, // LA1 |
| 6 | {0, C1_2, C2_2, C4_3}, // LA2 | 6 | {0, C1_2, C2_2, C4_3}, // LA2 |
diff --git a/keyboards/kbdfans/maja/rules.mk b/keyboards/kbdfans/maja/rules.mk index c499a39aa..03054bc70 100755 --- a/keyboards/kbdfans/maja/rules.mk +++ b/keyboards/kbdfans/maja/rules.mk | |||
| @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu | |||
| 14 | # Build Options | 14 | # Build Options |
| 15 | # change yes to no to disable | 15 | # change yes to no to disable |
| 16 | # | 16 | # |
| 17 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 17 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 18 | MOUSEKEY_ENABLE = yes # Mouse keys | 18 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 19 | EXTRAKEY_ENABLE = yes # Audio control and System control | 19 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 20 | CONSOLE_ENABLE = no # Console for debug | 20 | CONSOLE_ENABLE = no # Console for debug |
| @@ -24,7 +24,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 24 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 24 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 25 | NKRO_ENABLE = yes # USB Nkey Rollover | 25 | NKRO_ENABLE = yes # USB Nkey Rollover |
| 26 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 26 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
| 27 | MIDI_ENABLE = no # MIDI support | ||
| 28 | UNICODE_ENABLE = no # Unicode | 27 | UNICODE_ENABLE = no # Unicode |
| 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 28 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 30 | AUDIO_ENABLE = no # Audio output on port C6 | 29 | AUDIO_ENABLE = no # Audio output on port C6 |
diff --git a/keyboards/kbdfans/maja_soldered/rules.mk b/keyboards/kbdfans/maja_soldered/rules.mk index 6cd4d9260..481b64bcd 100755 --- a/keyboards/kbdfans/maja_soldered/rules.mk +++ b/keyboards/kbdfans/maja_soldered/rules.mk | |||
| @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu | |||
| 7 | # Build Options | 7 | # Build Options |
| 8 | # change yes to no to disable | 8 | # change yes to no to disable |
| 9 | # | 9 | # |
| 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 10 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 11 | MOUSEKEY_ENABLE = yes # Mouse keys | 11 | MOUSEKEY_ENABLE = yes # Mouse keys |
| 12 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 13 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
