Switch over MANUFACTURER and PRODUCT to string literals (#18183)
This commit is contained in:
		
							parent
							
								
									6a28ceefcd
								
							
						
					
					
						commit
						d983251c10
					
				| @ -40,7 +40,7 @@ | ||||
|     "LED_COMPOSE_PIN": {"info_key": "indicators.compose"}, | ||||
|     "LED_KANA_PIN": {"info_key": "indicators.kana"}, | ||||
|     "LED_PIN_ON_STATE": {"info_key": "indicators.on_state", "value_type": "int"}, | ||||
|     "MANUFACTURER": {"info_key": "manufacturer"}, | ||||
|     "MANUFACTURER": {"info_key": "manufacturer", "value_type": "str"}, | ||||
|     "MATRIX_HAS_GHOST": {"info_key": "matrix_pins.ghost", "value_type": "bool"}, | ||||
|     "MATRIX_IO_DELAY": {"info_key": "matrix_pins.io_delay", "value_type": "int"}, | ||||
|     "MOUSEKEY_DELAY": {"info_key": "mousekey.delay", "value_type": "int"}, | ||||
| @ -78,7 +78,7 @@ | ||||
|     "RGBLIGHT_SLEEP": {"info_key": "rgblight.sleep", "value_type": "bool"}, | ||||
|     "RGBLIGHT_SPLIT": {"info_key": "rgblight.split", "value_type": "bool"}, | ||||
|     "RGBW": {"info_key": "rgblight.rgbw", "value_type": "bool"}, | ||||
|     "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false}, | ||||
|     "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str"}, | ||||
|     "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex"}, | ||||
|     "VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex"}, | ||||
|     "QMK_ESC_OUTPUT": {"info_key": "qmk_lufa_bootloader.esc_output"}, | ||||
|  | ||||
| @ -39,11 +39,11 @@ This is a C header file that is one of the first things included, and will persi | ||||
|   * defines your VID, and for most DIY projects, can be whatever you want | ||||
| * `#define PRODUCT_ID 0x5678` | ||||
|   * defines your PID, and for most DIY projects, can be whatever you want | ||||
| * `#define DEVICE_VER 0` | ||||
| * `#define DEVICE_VER 0x0100` | ||||
|   * defines the device version (often used for revisions) | ||||
| * `#define MANUFACTURER Me` | ||||
| * `#define MANUFACTURER "Me"` | ||||
|   * generally who/whatever brand produced the board | ||||
| * `#define PRODUCT Board` | ||||
| * `#define PRODUCT "Board"` | ||||
|   * the name of the keyboard | ||||
| * `#define MATRIX_ROWS 5` | ||||
|   * the number of rows in your keyboard's matrix | ||||
|  | ||||
| @ -1,5 +1,4 @@ | ||||
| #pragma once | ||||
| 
 | ||||
| /* USB Device descriptor parameter */ | ||||
| #undef MANUFACTURER | ||||
| #define MANUFACTURER    Some Guy | ||||
| #define MANUFACTURER    "Some Guy" | ||||
|  | ||||
| @ -9,5 +9,5 @@ | ||||
| #define VENDOR_ID 0xFEED | ||||
| #define PRODUCT_ID 0x0A0C | ||||
| #define DEVICE_VER 0x0068 | ||||
| #define MANUFACTURER 68Keys.io | ||||
| #define PRODUCT The 68Keys.io Keyboard | ||||
| #define MANUFACTURER "68Keys.io" | ||||
| #define PRODUCT "The 68Keys.io Keyboard" | ||||
|  | ||||
| @ -21,10 +21,10 @@ | ||||
| #pragma once | ||||
| 
 | ||||
| #undef MANUFACTURER | ||||
| #define MANUFACTURER Dan | ||||
| #define MANUFACTURER "Dan" | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #define PRODUCT Magicforce 68 QMK | ||||
| #define PRODUCT "Magicforce 68 QMK" | ||||
| 
 | ||||
| #undef BACKLIGHT_LEVELS | ||||
| #define BACKLIGHT_LEVELS 20 | ||||
|  | ||||
| @ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #pragma once | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #define PRODUCT Charybdis Nano (Blackpill) | ||||
| #define PRODUCT "Charybdis Nano (Blackpill)" | ||||
| 
 | ||||
| #undef MATRIX_ROW_PINS | ||||
| #define MATRIX_ROW_PINS \ | ||||
|  | ||||
| @ -3,4 +3,4 @@ | ||||
| /* overridden settings: */ | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #define PRODUCT Pegasus Hoof Citadel | ||||
| #define PRODUCT "Pegasus Hoof Citadel" | ||||
|  | ||||
| @ -17,7 +17,7 @@ | ||||
| #pragma once | ||||
| 
 | ||||
| #undef MANUFACTURER | ||||
| #define MANUFACTURER Trner | ||||
| #define MANUFACTURER "Trner" | ||||
| 
 | ||||
| /* Select hand configuration */ | ||||
| #define MASTER_LEFT | ||||
|  | ||||
| @ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define TAPPING_FORCE_HOLD | ||||
| #define TAPPING_TERM 150 | ||||
| #undef PRODUCT | ||||
| #define PRODUCT         CRKBD Loose Transistor Ed. | ||||
| #define PRODUCT         "CRKBD Loose Transistor Ed." | ||||
| 
 | ||||
| #ifdef RGBLIGHT_ENABLE | ||||
|     //#undef RGBLED_NUM
 | ||||
|  | ||||
| @ -131,7 +131,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define NO_ACTION_ONESHOT | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #define PRODUCT Corne Keyboard | ||||
| #define PRODUCT "Corne Keyboard" | ||||
| 
 | ||||
| #define LCPC_KEYS KC_LCTL, KC_LSFT, KC_9 | ||||
| #define RCPC_KEYS KC_RCTL, KC_RSFT, KC_0 | ||||
|  | ||||
| @ -1,48 +1,5 @@ | ||||
| #ifndef CONFIG_H | ||||
| #define CONFIG_H | ||||
| 
 | ||||
| #include "config.h" | ||||
| 
 | ||||
| /* USB Device descriptor parameter */ | ||||
| #define VENDOR_ID       0xFEED | ||||
| #define PRODUCT_ID      0x2260 | ||||
| #define DEVICE_VER      0x0001 | ||||
| #define MANUFACTURER    KBDFans | ||||
| #define PRODUCT         DZ60 | ||||
| 
 | ||||
| /* key matrix size */ | ||||
| #define MATRIX_ROWS 5 | ||||
| #define MATRIX_COLS 15 | ||||
| 
 | ||||
| /* key matrix pins */ | ||||
| #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } | ||||
| #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 } | ||||
| 
 | ||||
| /* COL2ROW or ROW2COL */ | ||||
| #define DIODE_DIRECTION COL2ROW | ||||
| 
 | ||||
| /* number of backlight levels */ | ||||
| #define BACKLIGHT_PIN B6 | ||||
| #define BACKLIGHT_LEVELS 5 | ||||
| 
 | ||||
| /* Set 0 if debouncing isn't needed */ | ||||
| #define DEBOUNCE 5 | ||||
| 
 | ||||
| /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||||
| #define LOCKING_SUPPORT_ENABLE | ||||
| 
 | ||||
| /* Locking resynchronize hack */ | ||||
| #define LOCKING_RESYNC_ENABLE | ||||
| 
 | ||||
| #define RGB_DI_PIN E2 | ||||
| #define RGBLIGHT_ANIMATIONS | ||||
| #define RGBLED_NUM 16 | ||||
| #define RGBLIGHT_HUE_STEP 8 | ||||
| #define RGBLIGHT_SAT_STEP 8 | ||||
| #define RGBLIGHT_VAL_STEP 8 | ||||
| #pragma once | ||||
| 
 | ||||
| /* sets 'Auto Shift' timeouts */ | ||||
| #define AUTO_SHIFT_TIMEOUT 150 | ||||
| #define NO_AUTO_SHIFT_SPECIAL | ||||
| 
 | ||||
| #endif | ||||
|  | ||||
| @ -1,87 +1,3 @@ | ||||
| /*
 | ||||
| Copyright 2012 Jun Wako <wakojun@gmail.com> | ||||
| 
 | ||||
| This program is free software: you can redistribute it and/or modify | ||||
| it under the terms of the GNU General Public License as published by | ||||
| the Free Software Foundation, either version 2 of the License, or | ||||
| (at your option) any later version. | ||||
| 
 | ||||
| This program is distributed in the hope that it will be useful, | ||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| GNU General Public License for more details. | ||||
| 
 | ||||
| You should have received a copy of the GNU General Public License | ||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| */ | ||||
| 
 | ||||
| #ifndef CONFIG_H_ADMSTROK | ||||
| #define CONFIG_H_ADMSTROK | ||||
| 
 | ||||
| #include "config_common.h" | ||||
| #include "../../config.h" | ||||
| 
 | ||||
| /* USB Device descriptor parameter */ | ||||
| #define VENDOR_ID       0xFEED | ||||
| #define PRODUCT_ID      0x6060 | ||||
| #define DEVICE_VER      0x0003 | ||||
| #define MANUFACTURER    SATAN | ||||
| #define PRODUCT         GH60 | ||||
| 
 | ||||
| /* key matrix size */ | ||||
| #define MATRIX_ROWS 5 | ||||
| #define MATRIX_COLS 14 | ||||
| 
 | ||||
| // ROWS: Top to bottom, COLS: Left to right
 | ||||
| 
 | ||||
| #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } | ||||
| #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 } | ||||
| 
 | ||||
| #define BACKLIGHT_PIN B6 | ||||
| 
 | ||||
| /* COL2ROW or ROW2COL */ | ||||
| #define DIODE_DIRECTION COL2ROW | ||||
| 
 | ||||
| /* define if matrix has ghost */ | ||||
| //#define MATRIX_HAS_GHOST
 | ||||
| 
 | ||||
| /* Set 0 if debouncing isn't needed */ | ||||
| #define DEBOUNCE 5 | ||||
| 
 | ||||
| /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||||
| #define LOCKING_SUPPORT_ENABLE | ||||
| /* Locking resynchronize hack */ | ||||
| #define LOCKING_RESYNC_ENABLE | ||||
| 
 | ||||
| /* Backlight configuration */ | ||||
| #define BACKLIGHT_LEVELS 4 | ||||
| 
 | ||||
| /* Underlight configuration */ | ||||
| #define RGB_DI_PIN E2 | ||||
| #define RGBLIGHT_ANIMATIONS | ||||
| #define RGBLED_NUM 8     // Number of LEDs
 | ||||
| #define RGBLIGHT_HUE_STEP 10 | ||||
| #define RGBLIGHT_SAT_STEP 17 | ||||
| #define RGBLIGHT_VAL_STEP 17 | ||||
| #pragma once | ||||
| 
 | ||||
| #define DISABLE_SPACE_CADET_ROLLOVER | ||||
| 
 | ||||
| /*
 | ||||
|  * Feature disable options | ||||
|  *  These options are also useful to firmware size reduction. | ||||
|  */ | ||||
| 
 | ||||
| /* disable debug print */ | ||||
| //#define NO_DEBUG
 | ||||
| 
 | ||||
| /* disable print */ | ||||
| //#define NO_PRINT
 | ||||
| 
 | ||||
| /* disable action features */ | ||||
| //#define NO_ACTION_LAYER
 | ||||
| //#define NO_ACTION_TAPPING
 | ||||
| //#define NO_ACTION_ONESHOT
 | ||||
| //#define NO_ACTION_MACRO
 | ||||
| //#define NO_ACTION_FUNCTION
 | ||||
| 
 | ||||
| #endif | ||||
|  | ||||
| @ -1,57 +1,8 @@ | ||||
| /*
 | ||||
| Copyright 2012 Jun Wako <wakojun@gmail.com> | ||||
| 
 | ||||
| This program is free software: you can redistribute it and/or modify | ||||
| it under the terms of the GNU General Public License as published by | ||||
| the Free Software Foundation, either version 2 of the License, or | ||||
| (at your option) any later version. | ||||
| 
 | ||||
| This program is distributed in the hope that it will be useful, | ||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| GNU General Public License for more details. | ||||
| 
 | ||||
| You should have received a copy of the GNU General Public License | ||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| */ | ||||
| 
 | ||||
| #ifndef CONFIG_H_BEN | ||||
| #define CONFIG_H_BEN | ||||
| 
 | ||||
| #include "config_common.h" | ||||
| #include "../../config.h" | ||||
| 
 | ||||
| /* USB Device descriptor parameter */ | ||||
| #define VENDOR_ID       0xFEED | ||||
| #define PRODUCT_ID      0x6060 | ||||
| #define DEVICE_VER      0x0003 | ||||
| #define MANUFACTURER    SATAN | ||||
| #define PRODUCT         GH60 | ||||
| #pragma once | ||||
| 
 | ||||
| /*MOUSE CONFIG OPTIONS */ | ||||
| 
 | ||||
| #define MOUSEKEY_INTERVAL       20 | ||||
| #define MOUSEKEY_DELAY          0 | ||||
| #define MOUSEKEY_TIME_TO_MAX    45 | ||||
| #define MOUSEKEY_MAX_SPEED      3 | ||||
| #define MOUSEKEY_WHEEL_DELAY 	0 | ||||
| 
 | ||||
| /*
 | ||||
|  * Feature disable options | ||||
|  *  These options are also useful to firmware size reduction. | ||||
|  */ | ||||
| 
 | ||||
| /* disable debug print */ | ||||
| //#define NO_DEBUG
 | ||||
| 
 | ||||
| /* disable print */ | ||||
| //#define NO_PRINT
 | ||||
| 
 | ||||
| /* disable action features */ | ||||
| //#define NO_ACTION_LAYER
 | ||||
| //#define NO_ACTION_TAPPING
 | ||||
| //#define NO_ACTION_ONESHOT
 | ||||
| //#define NO_ACTION_MACRO
 | ||||
| //#define NO_ACTION_FUNCTION
 | ||||
| 
 | ||||
| #endif | ||||
|  | ||||
| @ -1,76 +1,9 @@ | ||||
| #ifndef CONFIG_H | ||||
| #define CONFIG_H | ||||
| #pragma once | ||||
| 
 | ||||
| #include "config_common.h" | ||||
| 
 | ||||
| /* USB Device descriptor parameter */ | ||||
| #define VENDOR_ID       0xFEED | ||||
| #define PRODUCT_ID      0x6060 | ||||
| #define DEVICE_VER      0x0003 | ||||
| #define MANUFACTURER    SATAN | ||||
| #define PRODUCT         GH60 | ||||
| 
 | ||||
| /* key matrix size */ | ||||
| #define MATRIX_ROWS 5 | ||||
| #define MATRIX_COLS 14 | ||||
| 
 | ||||
| // ROWS: Top to bottom, COLS: Left to right
 | ||||
| 
 | ||||
| #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } | ||||
| #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 } | ||||
| 
 | ||||
| #define BACKLIGHT_PIN B6 | ||||
| 
 | ||||
| /* COL2ROW or ROW2COL */ | ||||
| #define DIODE_DIRECTION COL2ROW | ||||
| 
 | ||||
| /* define if matrix has ghost */ | ||||
| //#define MATRIX_HAS_GHOST
 | ||||
| 
 | ||||
| /* Set 0 if debouncing isn't needed */ | ||||
| #define DEBOUNCE 5 | ||||
| 
 | ||||
| /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||||
| //#define LOCKING_SUPPORT_ENABLE
 | ||||
| /* Locking resynchronize hack */ | ||||
| //#define LOCKING_RESYNC_ENABLE
 | ||||
| 
 | ||||
| /* Backlight configuration
 | ||||
|  */ | ||||
| #undef BACKLIGHT_LEVELS | ||||
| #define BACKLIGHT_LEVELS 8 | ||||
| 
 | ||||
| /* Underlight configuration
 | ||||
|  */ | ||||
| 
 | ||||
| #define RGB_DI_PIN E2 | ||||
| #define RGBLIGHT_ANIMATIONS | ||||
| #define RGBLED_NUM 8     // Number of LEDs
 | ||||
| #define RGBLIGHT_HUE_STEP 10 | ||||
| #define RGBLIGHT_SAT_STEP 17 | ||||
| #define RGBLIGHT_VAL_STEP 17 | ||||
| 
 | ||||
| /*
 | ||||
|  * Feature disable options | ||||
|  *  These options are also useful to firmware size reduction. | ||||
|  */ | ||||
| 
 | ||||
| /* disable debug print */ | ||||
| //#define NO_DEBUG
 | ||||
| 
 | ||||
| /* disable print */ | ||||
| //#define NO_PRINT
 | ||||
| 
 | ||||
| /* disable action features */ | ||||
| //#define NO_ACTION_LAYER
 | ||||
| //#define NO_ACTION_TAPPING
 | ||||
| #define NO_ACTION_ONESHOT | ||||
| #define NO_ACTION_MACRO | ||||
| #define NO_ACTION_FUNCTION | ||||
| 
 | ||||
| #endif | ||||
| 
 | ||||
| #ifndef CONFIG_USER_H | ||||
| #define CONFIG_USER_H | ||||
| 
 | ||||
| #define MOUSEKEY_DELAY             0 | ||||
| #define MOUSEKEY_INTERVAL          1 | ||||
| @ -79,8 +12,5 @@ | ||||
| #define MOUSEKEY_WHEEL_MAX_SPEED   1 | ||||
| #define MOUSEKEY_WHEEL_TIME_TO_MAX 255 | ||||
| 
 | ||||
| // only change
 | ||||
| #undef RGB_DI_PIN | ||||
| #define RGB_DI_PIN B2 | ||||
| 
 | ||||
| #endif | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| #pragma once | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #define PRODUCT MadHatter\x27s Custom Spacc | ||||
| #define PRODUCT "MadHatter's Custom Spacc" | ||||
|  | ||||
| @ -15,137 +15,25 @@ You should have received a copy of the GNU General Public License | ||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| */ | ||||
| 
 | ||||
| #ifndef CONFIG_H | ||||
| #define CONFIG_H | ||||
| #pragma once | ||||
| 
 | ||||
| #include "config_common.h" | ||||
| 
 | ||||
| /* USB Device descriptor parameter */ | ||||
| #undef VENDOR_ID | ||||
| #undef PRODUCT_ID | ||||
| #undef DEVICE_VER | ||||
| #undef MANUFACTURER | ||||
| #undef PRODUCT | ||||
| #define VENDOR_ID       0xFEED | ||||
| #define PRODUCT_ID      0x4097 | ||||
| #define DEVICE_VER      0x0001 | ||||
| #define MANUFACTURER    Nobody | ||||
| #define PRODUCT         Arrow Pad 21 | ||||
| #define MANUFACTURER    "Nobody" | ||||
| #define PRODUCT         "Arrow Pad 21" | ||||
| 
 | ||||
| /* key matrix size */ | ||||
| #undef MATRIX_ROWS | ||||
| #undef MATRIX_COLS | ||||
| #define MATRIX_ROWS 2 | ||||
| #define MATRIX_COLS 11 | ||||
| 
 | ||||
| /*
 | ||||
|  * Keyboard Matrix Assignments | ||||
|  * | ||||
|  * Change this to how you wired your keyboard | ||||
|  * COLS: AVR pins used for columns, left to right | ||||
|  * ROWS: AVR pins used for rows, top to bottom | ||||
|  * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) | ||||
|  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) | ||||
|  * | ||||
| */ | ||||
| #undef MATRIX_ROW_PINS | ||||
| #undef MATRIX_COL_PINS | ||||
| #define MATRIX_ROW_PINS { D3, D5 } | ||||
| #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D4 } | ||||
| 
 | ||||
| /* COL2ROW or ROW2COL */ | ||||
| #define DIODE_DIRECTION ROW2COL | ||||
| 
 | ||||
| /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | ||||
| #define DEBOUNCE 5 | ||||
| 
 | ||||
| /* define if matrix has ghost (lacks anti-ghosting diodes) */ | ||||
| //#define MATRIX_HAS_GHOST
 | ||||
| 
 | ||||
| /* number of backlight levels */ | ||||
| #define BACKLIGHT_LEVELS 3 | ||||
| 
 | ||||
| /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||||
| //#define LOCKING_SUPPORT_ENABLE
 | ||||
| /* Locking resynchronize hack */ | ||||
| //#define LOCKING_RESYNC_ENABLE
 | ||||
| 
 | ||||
| /*
 | ||||
|  * Force NKRO | ||||
|  * | ||||
|  * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved | ||||
|  * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the | ||||
|  * makefile for this to work.) | ||||
|  * | ||||
|  * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) | ||||
|  * until the next keyboard reset. | ||||
|  * | ||||
|  * NKRO may prevent your keystrokes from being detected in the BIOS, but it is | ||||
|  * fully operational during normal computer usage. | ||||
|  * | ||||
|  * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) | ||||
|  * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by | ||||
|  * bootmagic, NKRO mode will always be enabled until it is toggled again during a | ||||
|  * power-up. | ||||
|  * | ||||
|  */ | ||||
| #define FORCE_NKRO | ||||
| 
 | ||||
| /*
 | ||||
|  * Magic Key Options | ||||
|  * | ||||
|  * Magic keys are hotkey commands that allow control over firmware functions of | ||||
|  * the keyboard. They are best used in combination with the HID Listen program, | ||||
|  * found here: https://www.pjrc.com/teensy/hid_listen.html
 | ||||
|  * | ||||
|  * The options below allow the magic key functionality to be changed. This is | ||||
|  * useful if your keyboard/keypad is missing keys and you want magic key support. | ||||
|  * | ||||
|  */ | ||||
| 
 | ||||
| /* control how magic key switches layers */ | ||||
| //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
 | ||||
| //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
 | ||||
| //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
 | ||||
| 
 | ||||
| /* override magic key keymap */ | ||||
| //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
 | ||||
| //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
 | ||||
| //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
 | ||||
| //#define MAGIC_KEY_HELP1          H
 | ||||
| //#define MAGIC_KEY_HELP2          SLASH
 | ||||
| //#define MAGIC_KEY_DEBUG          D
 | ||||
| //#define MAGIC_KEY_DEBUG_MATRIX   X
 | ||||
| //#define MAGIC_KEY_DEBUG_KBD      K
 | ||||
| //#define MAGIC_KEY_DEBUG_MOUSE    M
 | ||||
| //#define MAGIC_KEY_VERSION        V
 | ||||
| //#define MAGIC_KEY_STATUS         S
 | ||||
| //#define MAGIC_KEY_CONSOLE        C
 | ||||
| //#define MAGIC_KEY_LAYER0_ALT1    ESC
 | ||||
| //#define MAGIC_KEY_LAYER0_ALT2    GRAVE
 | ||||
| //#define MAGIC_KEY_LAYER0         0
 | ||||
| //#define MAGIC_KEY_LAYER1         1
 | ||||
| //#define MAGIC_KEY_LAYER2         2
 | ||||
| //#define MAGIC_KEY_LAYER3         3
 | ||||
| //#define MAGIC_KEY_LAYER4         4
 | ||||
| //#define MAGIC_KEY_LAYER5         5
 | ||||
| //#define MAGIC_KEY_LAYER6         6
 | ||||
| //#define MAGIC_KEY_LAYER7         7
 | ||||
| //#define MAGIC_KEY_LAYER8         8
 | ||||
| //#define MAGIC_KEY_LAYER9         9
 | ||||
| //#define MAGIC_KEY_BOOTLOADER     PAUSE
 | ||||
| //#define MAGIC_KEY_LOCK           CAPS
 | ||||
| //#define MAGIC_KEY_EEPROM         E
 | ||||
| //#define MAGIC_KEY_NKRO           N
 | ||||
| //#define MAGIC_KEY_SLEEP_LED      Z
 | ||||
| 
 | ||||
| /*
 | ||||
|  * Feature disable options | ||||
|  *  These options are also useful to firmware size reduction. | ||||
|  */ | ||||
| 
 | ||||
| /* disable debug print */ | ||||
| //#define NO_DEBUG
 | ||||
| 
 | ||||
| /* disable print */ | ||||
| //#define NO_PRINT
 | ||||
| 
 | ||||
| /* disable action features */ | ||||
| //#define NO_ACTION_LAYER
 | ||||
| //#define NO_ACTION_TAPPING
 | ||||
| //#define NO_ACTION_ONESHOT
 | ||||
| //#define NO_ACTION_MACRO
 | ||||
| //#define NO_ACTION_FUNCTION
 | ||||
| 
 | ||||
| #endif | ||||
|  | ||||
| @ -10,5 +10,3 @@ AUDIO_ENABLE     = no  # Audio output on port C6 | ||||
| UNICODE_ENABLE   = no  # Unicode | ||||
| BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID | ||||
| RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight.  | ||||
| 
 | ||||
| CONFIG_H = keymaps/$(KEYMAP)/config.h | ||||
| @ -15,139 +15,15 @@ You should have received a copy of the GNU General Public License | ||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| */ | ||||
| 
 | ||||
| #ifndef CONFIG_H | ||||
| #define CONFIG_H | ||||
| #pragma once | ||||
| 
 | ||||
| #include "config_common.h" | ||||
| 
 | ||||
| /* USB Device descriptor parameter */ | ||||
| #undef VENDOR_ID | ||||
| #undef PRODUCT_ID | ||||
| #undef DEVICE_VER | ||||
| #undef MANUFACTURER | ||||
| #undef PRODUCT | ||||
| #define VENDOR_ID       0xFEED | ||||
| #define PRODUCT_ID      0x4096 | ||||
| #define DEVICE_VER      0x0001 | ||||
| #define MANUFACTURER    Nobody | ||||
| #define PRODUCT         Arrow Pad 24 | ||||
| 
 | ||||
| /* key matrix size */ | ||||
| #define MATRIX_ROWS 6 | ||||
| #define MATRIX_COLS 4 | ||||
| 
 | ||||
| /*
 | ||||
|  * Keyboard Matrix Assignments | ||||
|  * | ||||
|  * Change this to how you wired your keyboard | ||||
|  * COLS: AVR pins used for columns, left to right | ||||
|  * ROWS: AVR pins used for rows, top to bottom | ||||
|  * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) | ||||
|  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) | ||||
|  * | ||||
| */ | ||||
| #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 } | ||||
| #define MATRIX_COL_PINS { B0, B1, B2, B3 } | ||||
| 
 | ||||
| #define BACKLIGHT_PIN B7 | ||||
| 
 | ||||
| /* COL2ROW or ROW2COL */ | ||||
| #define DIODE_DIRECTION ROW2COL | ||||
| 
 | ||||
| /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | ||||
| #define DEBOUNCE 5 | ||||
| 
 | ||||
| /* define if matrix has ghost (lacks anti-ghosting diodes) */ | ||||
| //#define MATRIX_HAS_GHOST
 | ||||
| 
 | ||||
| /* number of backlight levels */ | ||||
| #define BACKLIGHT_LEVELS 3 | ||||
| 
 | ||||
| /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||||
| //#define LOCKING_SUPPORT_ENABLE
 | ||||
| /* Locking resynchronize hack */ | ||||
| //#define LOCKING_RESYNC_ENABLE
 | ||||
| 
 | ||||
| /*
 | ||||
|  * Force NKRO | ||||
|  * | ||||
|  * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved | ||||
|  * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the | ||||
|  * makefile for this to work.) | ||||
|  * | ||||
|  * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) | ||||
|  * until the next keyboard reset. | ||||
|  * | ||||
|  * NKRO may prevent your keystrokes from being detected in the BIOS, but it is | ||||
|  * fully operational during normal computer usage. | ||||
|  * | ||||
|  * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) | ||||
|  * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by | ||||
|  * bootmagic, NKRO mode will always be enabled until it is toggled again during a | ||||
|  * power-up. | ||||
|  * | ||||
|  */ | ||||
| #define FORCE_NKRO | ||||
| 
 | ||||
| /*
 | ||||
|  * Magic Key Options | ||||
|  * | ||||
|  * Magic keys are hotkey commands that allow control over firmware functions of | ||||
|  * the keyboard. They are best used in combination with the HID Listen program, | ||||
|  * found here: https://www.pjrc.com/teensy/hid_listen.html
 | ||||
|  * | ||||
|  * The options below allow the magic key functionality to be changed. This is | ||||
|  * useful if your keyboard/keypad is missing keys and you want magic key support. | ||||
|  * | ||||
|  */ | ||||
| 
 | ||||
| /* control how magic key switches layers */ | ||||
| //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
 | ||||
| //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
 | ||||
| //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
 | ||||
| 
 | ||||
| /* override magic key keymap */ | ||||
| //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
 | ||||
| //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
 | ||||
| //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
 | ||||
| //#define MAGIC_KEY_HELP1          H
 | ||||
| //#define MAGIC_KEY_HELP2          SLASH
 | ||||
| //#define MAGIC_KEY_DEBUG          D
 | ||||
| //#define MAGIC_KEY_DEBUG_MATRIX   X
 | ||||
| //#define MAGIC_KEY_DEBUG_KBD      K
 | ||||
| //#define MAGIC_KEY_DEBUG_MOUSE    M
 | ||||
| //#define MAGIC_KEY_VERSION        V
 | ||||
| //#define MAGIC_KEY_STATUS         S
 | ||||
| //#define MAGIC_KEY_CONSOLE        C
 | ||||
| //#define MAGIC_KEY_LAYER0_ALT1    ESC
 | ||||
| //#define MAGIC_KEY_LAYER0_ALT2    GRAVE
 | ||||
| //#define MAGIC_KEY_LAYER0         0
 | ||||
| //#define MAGIC_KEY_LAYER1         1
 | ||||
| //#define MAGIC_KEY_LAYER2         2
 | ||||
| //#define MAGIC_KEY_LAYER3         3
 | ||||
| //#define MAGIC_KEY_LAYER4         4
 | ||||
| //#define MAGIC_KEY_LAYER5         5
 | ||||
| //#define MAGIC_KEY_LAYER6         6
 | ||||
| //#define MAGIC_KEY_LAYER7         7
 | ||||
| //#define MAGIC_KEY_LAYER8         8
 | ||||
| //#define MAGIC_KEY_LAYER9         9
 | ||||
| //#define MAGIC_KEY_BOOTLOADER     PAUSE
 | ||||
| //#define MAGIC_KEY_LOCK           CAPS
 | ||||
| //#define MAGIC_KEY_EEPROM         E
 | ||||
| //#define MAGIC_KEY_NKRO           N
 | ||||
| //#define MAGIC_KEY_SLEEP_LED      Z
 | ||||
| 
 | ||||
| /*
 | ||||
|  * Feature disable options | ||||
|  *  These options are also useful to firmware size reduction. | ||||
|  */ | ||||
| 
 | ||||
| /* disable debug print */ | ||||
| //#define NO_DEBUG
 | ||||
| 
 | ||||
| /* disable print */ | ||||
| //#define NO_PRINT
 | ||||
| 
 | ||||
| /* disable action features */ | ||||
| //#define NO_ACTION_LAYER
 | ||||
| //#define NO_ACTION_TAPPING
 | ||||
| //#define NO_ACTION_ONESHOT
 | ||||
| //#define NO_ACTION_MACRO
 | ||||
| //#define NO_ACTION_FUNCTION
 | ||||
| 
 | ||||
| #endif | ||||
| #define MANUFACTURER    "Nobody" | ||||
| #define PRODUCT         "Arrow Pad 24" | ||||
|  | ||||
| @ -10,5 +10,3 @@ AUDIO_ENABLE     = no  # Audio output on port C6 | ||||
| UNICODE_ENABLE   = no  # Unicode | ||||
| BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID | ||||
| RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight.  | ||||
| 
 | ||||
| CONFIG_H = keymaps/$(KEYMAP)/config.h | ||||
| @ -1,18 +1,10 @@ | ||||
| #ifndef CONFIG_CINAECO_H | ||||
| #define CONFIG_CINAECO_H | ||||
| 
 | ||||
| #include "../../config.h" | ||||
| #pragma once | ||||
| 
 | ||||
| #undef MANUFACTURER | ||||
| #undef PRODUCT | ||||
| #define MANUFACTURER    QMK | ||||
| #define PRODUCT         HHKB QMK cinaeco | ||||
| #define MANUFACTURER    "QMK" | ||||
| #define PRODUCT         "HHKB QMK cinaeco" | ||||
| 
 | ||||
| // Increase "Tap" detection window. Avoid missing 'q' or 'z' when typing slowly.
 | ||||
| #undef TAPPING_TERM | ||||
| #define TAPPING_TERM 230 | ||||
| 
 | ||||
| // Uncomment to enable NKRO by default. May cause issues with KVM switches.
 | ||||
| //#define FORCE_NKRO
 | ||||
| 
 | ||||
| #endif | ||||
|  | ||||
| @ -1,71 +1,3 @@ | ||||
| /*
 | ||||
| Copyright 2012 Jun Wako <wakojun@gmail.com> | ||||
| 
 | ||||
| This program is free software: you can redistribute it and/or modify | ||||
| it under the terms of the GNU General Public License as published by | ||||
| the Free Software Foundation, either version 2 of the License, or | ||||
| (at your option) any later version. | ||||
| 
 | ||||
| This program is distributed in the hope that it will be useful, | ||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| GNU General Public License for more details. | ||||
| 
 | ||||
| You should have received a copy of the GNU General Public License | ||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| */ | ||||
| 
 | ||||
| #ifndef CONFIG_H | ||||
| #define CONFIG_H | ||||
| 
 | ||||
| #include "config_common.h" | ||||
| 
 | ||||
| /* USB Device descriptor parameter */ | ||||
| #define VENDOR_ID       0xFEED | ||||
| #define PRODUCT_ID      0xCAFE | ||||
| #define DEVICE_VER      0x0104 | ||||
| #define MANUFACTURER    q.m.k | ||||
| #define PRODUCT         HHKB mod | ||||
| 
 | ||||
| /* key matrix size */ | ||||
| #ifdef HHKB_JP | ||||
| #   define MATRIX_ROWS 16 | ||||
| #else | ||||
| #   define MATRIX_ROWS 8 | ||||
| #endif | ||||
| #define MATRIX_COLS 8 | ||||
| 
 | ||||
| #define TAPPING_TERM    200 | ||||
| 
 | ||||
| /* number of backlight levels */ | ||||
| #define BACKLIGHT_LEVELS 3 | ||||
| #pragma once | ||||
| 
 | ||||
| #define USB_MAX_POWER_CONSUMPTION 50 | ||||
| 
 | ||||
| /* Set 0 if debouncing isn't needed */ | ||||
| #define DEBOUNCE    5 | ||||
| 
 | ||||
| /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||||
| //#define LOCKING_SUPPORT_ENABLE
 | ||||
| /* Locking resynchronize hack */ | ||||
| //#define LOCKING_RESYNC_ENABLE
 | ||||
| 
 | ||||
| /*
 | ||||
|  * Feature disable options | ||||
|  *  These options are also useful to firmware size reduction. | ||||
| */ | ||||
| 
 | ||||
| /* disable debug print */ | ||||
| //#define NO_DEBUG
 | ||||
| 
 | ||||
| /* disable print */ | ||||
| //#define NO_PRINT
 | ||||
| 
 | ||||
| /* disable action features */ | ||||
| //#define NO_ACTION_LAYER
 | ||||
| //#define NO_ACTION_TAPPING
 | ||||
| //#define NO_ACTION_ONESHOT
 | ||||
| //#define NO_ACTION_MACRO
 | ||||
| //#define NO_ACTION_FUNCTION
 | ||||
| 
 | ||||
| #endif | ||||
|  | ||||
| @ -16,8 +16,6 @@ | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #include "../../config.h" | ||||
| 
 | ||||
| /* USB Device descriptor parameter */ | ||||
| #undef VENDOR_ID | ||||
| #define VENDOR_ID 0x0853 | ||||
| @ -26,9 +24,9 @@ | ||||
| #undef DEVICE_VER | ||||
| #define DEVICE_VER 0x0102 | ||||
| #undef MANUFACTURER | ||||
| #define MANUFACTURER Topre Corporation | ||||
| #define MANUFACTURER "Topre Corporation" | ||||
| #undef PRODUCT | ||||
| #define PRODUCT HHKB Professional | ||||
| #define PRODUCT "HHKB Professional" | ||||
| 
 | ||||
| #undef TAPPING_TERM | ||||
| #define TAPPING_TERM 210 | ||||
|  | ||||
| @ -17,4 +17,4 @@ | ||||
| #pragma once | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #define PRODUCT MadHatter\x27s Hotswap Kbd67 rev1 | ||||
| #define PRODUCT "MadHatter's Hotswap Kbd67 rev1" | ||||
|  | ||||
| @ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #undef PRODUCT | ||||
| 
 | ||||
| #define VENDOR_ID       0xAF88 | ||||
| #define MANUFACTURER    Droxx-FurFuzz | ||||
| #define PRODUCT         Carbon v2 4rk | ||||
| #define MANUFACTURER    "Droxx-FurFuzz" | ||||
| #define PRODUCT         "Carbon v2 4rk" | ||||
| 
 | ||||
| /* force N key rollover even on startup regardless of EEPROM setting */ | ||||
| #define FORCE_NKRO | ||||
|  | ||||
| @ -3,8 +3,8 @@ | ||||
| #undef MANUFACTURER | ||||
| #undef PRODUCT | ||||
| 
 | ||||
| #define MANUFACTURER    Potato Inc. | ||||
| #define PRODUCT         Qt3.14 | ||||
| #define MANUFACTURER    "Potato Inc." | ||||
| #define PRODUCT         "Qt3.14" | ||||
| 
 | ||||
| /* send tap key if no layer key was used even after tap delay */ | ||||
| #define TAPPING_TERM 50 | ||||
|  | ||||
| @ -16,11 +16,6 @@ | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #undef MANUFACTURER | ||||
| #undef PRODUCT | ||||
| #define MANUFACTURER    KBDfans | ||||
| #define PRODUCT         KBD75 rev1 | ||||
| 
 | ||||
| #define BACKLIGHT_BREATHING | ||||
| 
 | ||||
| #define ANSI_NUBS_ROW 4 | ||||
|  | ||||
| @ -3,8 +3,8 @@ | ||||
| #undef MANUFACTURER | ||||
| #undef PRODUCT | ||||
| 
 | ||||
| #define MANUFACTURER    Potato Inc. | ||||
| #define PRODUCT         Qt3.14 | ||||
| #define MANUFACTURER    "Potato Inc." | ||||
| #define PRODUCT         "Qt3.14" | ||||
| 
 | ||||
| /* send tap key if no layer key was used even after tap delay */ | ||||
| #define TAPPING_TERM 250 | ||||
|  | ||||
| @ -3,8 +3,8 @@ | ||||
| #undef MANUFACTURER | ||||
| #undef PRODUCT | ||||
| 
 | ||||
| #define MANUFACTURER    Potato Inc. | ||||
| #define PRODUCT         Qt3.14 | ||||
| #define MANUFACTURER    "Potato Inc." | ||||
| #define PRODUCT         "Qt3.14" | ||||
| 
 | ||||
| /* turn off RGB when computer sleeps */ | ||||
| #ifdef RGB_DI_PIN | ||||
|  | ||||
| @ -51,11 +51,11 @@ | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #if defined(KEYBOARD_keebio_iris_rev2) | ||||
| #    define PRODUCT Drashna Hacked Iris Rev 2 | ||||
| #    define PRODUCT "Drashna Hacked Iris Rev 2" | ||||
| #elif defined(KEYBOARD_keebio_iris_rev3) | ||||
| #    define PRODUCT Drashna Hacked Iris Rev 3 | ||||
| #    define PRODUCT "Drashna Hacked Iris Rev 3" | ||||
| #elif defined(KEYBOARD_keebio_iris_rev4) | ||||
| #    define PRODUCT Drashna Hacked Iris Rev 4 | ||||
| #    define PRODUCT "Drashna Hacked Iris Rev 4" | ||||
| #endif | ||||
| 
 | ||||
| #define SHFT_LED1 6 | ||||
|  | ||||
| @ -2,7 +2,7 @@ | ||||
| 
 | ||||
| #ifdef PRODUCT | ||||
| #    undef PRODUCT | ||||
| #    define PRODUCT Iris Keyboard - pvinis | ||||
| #    define PRODUCT "Iris Keyboard - pvinis" | ||||
| #endif | ||||
| 
 | ||||
| // Use I2C or Serial, not both.
 | ||||
|  | ||||
| @ -1,33 +1,13 @@ | ||||
| /*
 | ||||
| Copyright 2017 Danny Nguyen <danny@hexwire.com> | ||||
| 
 | ||||
| This program is free software: you can redistribute it and/or modify | ||||
| it under the terms of the GNU General Public License as published by | ||||
| the Free Software Foundation, either version 2 of the License, or | ||||
| (at your option) any later version. | ||||
| 
 | ||||
| This program is distributed in the hope that it will be useful, | ||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| GNU General Public License for more details. | ||||
| 
 | ||||
| You should have received a copy of the GNU General Public License | ||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| */ | ||||
| 
 | ||||
| #ifndef CONFIG_USER_H | ||||
| #define CONFIG_USER_H | ||||
| 
 | ||||
| #include "config_common.h" | ||||
| #pragma once | ||||
| 
 | ||||
| #define USE_SERIAL | ||||
| #define EE_HANDS | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #define PRODUCT Iris Keyboard | ||||
| #define PRODUCT "Iris Keyboard" | ||||
| 
 | ||||
| #undef MANUFACTURER | ||||
| #define MANUFACTURER Ian Sterling | ||||
| #define MANUFACTURER "Ian Sterling" | ||||
| 
 | ||||
| #undef RGBLED_NUM | ||||
| #define RGBLIGHT_ANIMATIONS | ||||
| @ -35,5 +15,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define RGBLIGHT_HUE_STEP 8 | ||||
| #define RGBLIGHT_SAT_STEP 8 | ||||
| #define RGBLIGHT_VAL_STEP 8 | ||||
| 
 | ||||
| #endif | ||||
|  | ||||
| @ -31,7 +31,7 @@ | ||||
| #endif  // RGBLIGHT_ENABLE
 | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #define PRODUCT Drashnas Viterbi Macro Pad | ||||
| #define PRODUCT "Drashnas Viterbi Macro Pad" | ||||
| 
 | ||||
| #ifdef AUDIO_ENABLE | ||||
| #    define AUDIO_PIN C6 | ||||
|  | ||||
| @ -3,8 +3,8 @@ | ||||
| #undef MANUFACTURER | ||||
| #undef PRODUCT | ||||
| 
 | ||||
| #define MANUFACTURER    Potato Inc. | ||||
| #define PRODUCT         Qt3.14 | ||||
| #define MANUFACTURER    "Potato Inc." | ||||
| #define PRODUCT         "Qt3.14" | ||||
| 
 | ||||
| /* turn off RGB when computer sleeps */ | ||||
| #ifdef RGBLIGHT_ENABLE | ||||
|  | ||||
| @ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #include "config_common.h" | ||||
| 
 | ||||
| /* USB Device descriptor parameter */ | ||||
| #define MANUFACTURER        "Massdrop Inc." | ||||
| #define PRODUCT             "ALT Keyboard" | ||||
| #define SERIAL_NUM          "Unavailable" | ||||
| 
 | ||||
| /* key matrix size */ | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| { | ||||
|     "keyboard_name": "ALT", | ||||
|     "keyboard_name": "ALT Keyboard", | ||||
|     "manufacturer": "Massdrop Inc.", | ||||
|     "url": "https://www.massdrop.com/buy/massdrop-alt-mechanical-keyboard", | ||||
|     "maintainer": "Massdrop", | ||||
|     "usb": { | ||||
|  | ||||
| @ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #include "config_common.h" | ||||
| 
 | ||||
| /* USB Device descriptor parameter */ | ||||
| #define MANUFACTURER        "Massdrop Inc." | ||||
| #define PRODUCT             "CTRL Keyboard" | ||||
| #define SERIAL_NUM          "Unavailable" | ||||
| 
 | ||||
| /* key matrix size */ | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| { | ||||
|     "keyboard_name": "CTRL", | ||||
|     "keyboard_name": "CTRL Keyboard", | ||||
|     "manufacturer": "Massdrop Inc.", | ||||
|     "url": "https://www.massdrop.com/buy/massdrop-ctrl-mechanical-keyboard", | ||||
|     "maintainer": "Massdrop", | ||||
|     "usb": { | ||||
|  | ||||
| @ -22,6 +22,6 @@ | ||||
| #define ORYX_CONFIGURATOR | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #define PRODUCT         Moonlander Mark I - Modified by <@jjerrell> | ||||
| #define PRODUCT         "Moonlander Mark I - Modified by <@jjerrell>" | ||||
| 
 | ||||
| #define IGNORE_MOD_TAP_INTERRUPT | ||||
|  | ||||
| @ -18,37 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| /* USB Device descriptor parameter */ | ||||
| #define VENDOR_ID       0xBEEF | ||||
| #define PRODUCT_ID      0xFED0 | ||||
| #define DEVICE_VER      0x0001 | ||||
| #define MANUFACTURER    NaCly | ||||
| #define PRODUCT         Splitreus62 | ||||
| 
 | ||||
| /* key matrix size */ | ||||
| // Rows are doubled-up
 | ||||
| #define MATRIX_ROWS 12 | ||||
| #define MATRIX_COLS 6 | ||||
| 
 | ||||
| // wiring of each half
 | ||||
| #define MATRIX_ROW_PINS { D3, D2, D1, D4, C6, D7 } | ||||
| #define MATRIX_COL_PINS { E6, B4, B5, B6, B2, B3 } | ||||
| 
 | ||||
| #define DIODE_DIRECTION ROW2COL | ||||
| 
 | ||||
| #define SPLIT_HAND_PIN F4 | ||||
| 
 | ||||
| /* Set 0 if debouncing isn't needed */ | ||||
| #define DEBOUNCE 5 | ||||
| 
 | ||||
| /* serial.c configuration for split keyboard */ | ||||
| #define SOFT_SERIAL_PIN D0 | ||||
| 
 | ||||
| /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||||
| #define LOCKING_SUPPORT_ENABLE | ||||
| /* Locking resynchronize hack */ | ||||
| #define LOCKING_RESYNC_ENABLE | ||||
| 
 | ||||
| #define AUTO_SHIFT_TIMEOUT 100 | ||||
| #define NO_AUTO_SHIFT_SPECIAL | ||||
| #define NO_AUTO_SHIFT_NUMERIC | ||||
|  | ||||
| @ -58,9 +58,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #ifdef KEYBOARD_orthodox_rev1 | ||||
| #    define PRODUCT Drashna Hacked Orthodox Rev .1 | ||||
| #    define PRODUCT "Drashna Hacked Orthodox Rev .1" | ||||
| #elif KEYBOARD_orthodox_rev3 | ||||
| #    define PRODUCT Drashna Hacked Orthodox Rev .3 | ||||
| #    define PRODUCT "Drashna Hacked Orthodox Rev .3" | ||||
| #endif | ||||
| 
 | ||||
| #define QMK_ESC_OUTPUT D7  // usually COL
 | ||||
|  | ||||
| @ -1,9 +1,9 @@ | ||||
| #pragma once | ||||
| 
 | ||||
| #undef MANUFACTURER | ||||
| #define MANUFACTURER binaryplease | ||||
| #define MANUFACTURER "binaryplease" | ||||
| #undef PRODUCT | ||||
| #define PRODUCT      Teensy_Planck | ||||
| #define PRODUCT      "Teensy_Planck" | ||||
| 
 | ||||
| #undef MATRIX_ROW_PINS | ||||
| #define MATRIX_ROW_PINS { D3, D2, D1, D0 } | ||||
|  | ||||
| @ -1,58 +1,4 @@ | ||||
| /*
 | ||||
| Copyright 2012 Jun Wako <wakojun@gmail.com> | ||||
| 
 | ||||
| This program is free software: you can redistribute it and/or modify | ||||
| it under the terms of the GNU General Public License as published by | ||||
| the Free Software Foundation, either version 2 of the License, or | ||||
| (at your option) any later version. | ||||
| 
 | ||||
| This program is distributed in the hope that it will be useful, | ||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| GNU General Public License for more details. | ||||
| 
 | ||||
| You should have received a copy of the GNU General Public License | ||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| */ | ||||
| 
 | ||||
| #ifndef CONFIG_H | ||||
| #define CONFIG_H | ||||
| 
 | ||||
| #include "config_common.h" | ||||
| 
 | ||||
| /* USB Device descriptor parameter */ | ||||
| #define VENDOR_ID       0xFEED | ||||
| #define PRODUCT_ID      0x6061 | ||||
| #define DEVICE_VER      0x0001 | ||||
| #define MANUFACTURER    Ortholinear Keyboards | ||||
| #define PRODUCT         The Preonic Keyboard | ||||
| 
 | ||||
| /* key matrix size */ | ||||
| #define MATRIX_ROWS 5 | ||||
| #define MATRIX_COLS 12 | ||||
| 
 | ||||
| /* Planck PCB default pin-out */ | ||||
| #define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 } | ||||
| #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } | ||||
| 
 | ||||
| #define BACKLIGHT_PIN B7 | ||||
| 
 | ||||
| /* COL2ROW or ROW2COL */ | ||||
| #define DIODE_DIRECTION COL2ROW | ||||
| 
 | ||||
| /* define if matrix has ghost */ | ||||
| //#define MATRIX_HAS_GHOST
 | ||||
| 
 | ||||
| /* number of backlight levels */ | ||||
| #define BACKLIGHT_LEVELS 3 | ||||
| 
 | ||||
| /* Set 0 if debouncing isn't needed */ | ||||
| #define DEBOUNCE 5 | ||||
| 
 | ||||
| /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||||
| #define LOCKING_SUPPORT_ENABLE | ||||
| /* Locking resynchronize hack */ | ||||
| #define LOCKING_RESYNC_ENABLE | ||||
| #pragma once | ||||
| 
 | ||||
| /* ws2812 RGB LED */ | ||||
| #define RGB_DI_PIN D1 | ||||
| @ -61,25 +7,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define RGBLIGHT_HUE_STEP 10 | ||||
| #define RGBLIGHT_SAT_STEP 17 | ||||
| #define RGBLIGHT_VAL_STEP 17 | ||||
| 
 | ||||
| /*
 | ||||
|  * Feature disable options | ||||
|  *  These options are also useful to firmware size reduction. | ||||
|  */ | ||||
| 
 | ||||
| #define TAPPING_TERM 200 | ||||
| 
 | ||||
| /* disable debug print */ | ||||
| // #define NO_DEBUG
 | ||||
| 
 | ||||
| /* disable print */ | ||||
| // #define NO_PRINT
 | ||||
| 
 | ||||
| /* disable action features */ | ||||
| //#define NO_ACTION_LAYER
 | ||||
| //#define NO_ACTION_TAPPING
 | ||||
| //#define NO_ACTION_ONESHOT
 | ||||
| //#define NO_ACTION_MACRO
 | ||||
| //#define NO_ACTION_FUNCTION
 | ||||
| 
 | ||||
| #endif | ||||
|  | ||||
| @ -1,85 +1,7 @@ | ||||
| /*
 | ||||
| Copyright 2012 Jun Wako <wakojun@gmail.com> | ||||
| 
 | ||||
| This program is free software: you can redistribute it and/or modify | ||||
| it under the terms of the GNU General Public License as published by | ||||
| the Free Software Foundation, either version 2 of the License, or | ||||
| (at your option) any later version. | ||||
| 
 | ||||
| This program is distributed in the hope that it will be useful, | ||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| GNU General Public License for more details. | ||||
| 
 | ||||
| You should have received a copy of the GNU General Public License | ||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| */ | ||||
| 
 | ||||
| #ifndef CONFIG_H | ||||
| #define CONFIG_H | ||||
| 
 | ||||
| #include "config_common.h" | ||||
| 
 | ||||
| /* USB Device descriptor parameter */ | ||||
| #define VENDOR_ID       0xFEED | ||||
| #define PRODUCT_ID      0x6061 | ||||
| #define DEVICE_VER      0x0001 | ||||
| #define MANUFACTURER    Ortholinear Keyboards | ||||
| #define PRODUCT         The Preonic Keyboard | ||||
| 
 | ||||
| /* key matrix size */ | ||||
| #define MATRIX_ROWS 5 | ||||
| #define MATRIX_COLS 12 | ||||
| 
 | ||||
| /* Planck PCB default pin-out */ | ||||
| #define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 } | ||||
| #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } | ||||
| 
 | ||||
| #define BACKLIGHT_PIN B7 | ||||
| 
 | ||||
| /* COL2ROW or ROW2COL */ | ||||
| #define DIODE_DIRECTION COL2ROW | ||||
| 
 | ||||
| /* define if matrix has ghost */ | ||||
| //#define MATRIX_HAS_GHOST
 | ||||
| #pragma once | ||||
| 
 | ||||
| #define BACKLIGHT_BREATHING     // LED breathing
 | ||||
| /* number of backlight levels */ | ||||
| #undef BACKLIGHT_LEVELS | ||||
| #define BACKLIGHT_LEVELS 5 | ||||
| 
 | ||||
| /* Set 0 if debouncing isn't needed */ | ||||
| #define DEBOUNCE 5 | ||||
| 
 | ||||
| /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||||
| //#define LOCKING_SUPPORT_ENABLE
 | ||||
| /* Locking resynchronize hack */ | ||||
| //#define LOCKING_RESYNC_ENABLE
 | ||||
| 
 | ||||
| /* ws2812 RGB LED */ | ||||
| //#define RGB_DI_PIN D1
 | ||||
| 
 | ||||
| //#define RGBLED_NUM 28     // Number of LEDs
 | ||||
| //#define RGBLIGHT_HUE_STEP 10
 | ||||
| //#define RGBLIGHT_SAT_STEP 17
 | ||||
| //#define RGBLIGHT_VAL_STEP 17
 | ||||
| 
 | ||||
| /*
 | ||||
|  * Feature disable options | ||||
|  *  These options are also useful to firmware size reduction. | ||||
|  */ | ||||
| 
 | ||||
| /* disable debug print */ | ||||
| //#define NO_DEBUG
 | ||||
| /* disable print */ | ||||
| //#define NO_PRINT
 | ||||
| 
 | ||||
| /* disable action features */ | ||||
| //#define NO_ACTION_LAYER
 | ||||
| #define NO_ACTION_TAPPING | ||||
| //#define NO_ACTION_ONESHOT
 | ||||
| #define NO_ACTION_MACRO | ||||
| #define NO_ACTION_FUNCTION | ||||
| //#define DYNAMIC_MACRO_ENABLE    // Enable if you need to use the macro functionality
 | ||||
| //#define SPACE_CADET             // Parenthesis on L/R shift
 | ||||
| 
 | ||||
| #endif | ||||
|  | ||||
| @ -3,4 +3,4 @@ | ||||
| #define TAPPING_TERM 150 | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #define PRODUCT MadHatter\x27s Custom Ilpse | ||||
| #define PRODUCT "MadHatter's Custom Ilpse" | ||||
|  | ||||
| @ -37,4 +37,4 @@ | ||||
| #define TAPPING_TERM 200 | ||||
| 
 | ||||
| #undef MANUFACTURER | ||||
| #define MANUFACTURER Flare576 | ||||
| #define MANUFACTURER "Flare576" | ||||
|  | ||||
| @ -3,23 +3,16 @@ | ||||
| #undef MANUFACTURER | ||||
| #undef PRODUCT | ||||
| 
 | ||||
| #define MANUFACTURER    Potato Inc. | ||||
| #define PRODUCT         Trash Panda | ||||
| #define MANUFACTURER    "Potato Inc." | ||||
| #define PRODUCT         "Trash Panda" | ||||
| 
 | ||||
| /* for bootloader */ | ||||
| #define QMK_ESC_OUTPUT B2 | ||||
| #define QMK_ESC_INPUT D0 | ||||
| #define QMK_LED B0 | ||||
| 
 | ||||
| /* turn off RGB when computer sleeps */ | ||||
| #ifdef RGBLIGHT_ENABLE | ||||
| #define RGBLIGHT_SLEEP | ||||
| #endif | ||||
| 
 | ||||
| /* send tap key if no layer key was used even after tap delay */ | ||||
| #ifdef TAPPING_TERM | ||||
| #undef TAPPING_TERM | ||||
| #endif | ||||
| #define TAPPING_TERM 250 | ||||
| #define RETRO_TAPPING | ||||
| #define TAPPING_TOGGLE 2 | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| #pragma once | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #define PRODUCT MadHatter\x27s Custom Singa V3 | ||||
| #define PRODUCT "MadHatter's Custom Singa V3" | ||||
|  | ||||
| @ -18,5 +18,4 @@ | ||||
| 
 | ||||
| // place overrides here
 | ||||
| #undef MANUFACTURER | ||||
| #define MANUFACTURER    mtdjr | ||||
| #define PRODUCT         XD75 | ||||
| #define MANUFACTURER    "mtdjr" | ||||
|  | ||||
| @ -19,36 +19,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #define VENDOR_ID       0x20A0 | ||||
| #define PRODUCT_ID      0x422D | ||||
| // Edit usbconfig.h to change these.
 | ||||
| #define MANUFACTURER    ymdkey | ||||
| #define PRODUCT         ymd96 | ||||
| 
 | ||||
| /* Matrix Size */ | ||||
| #define MATRIX_ROWS 8 | ||||
| #define MATRIX_COLS 15 | ||||
| #define DIODE_DIRECTION COL2ROW | ||||
| 
 | ||||
| /* Required for MX Locks installed */ | ||||
| #define LOCKING_SUPPORT_ENABLE | ||||
| #define LOCKING_RESYNC_ENABLE | ||||
| 
 | ||||
| #define PREVENT_STUCK_MODIFIERS | ||||
| #define TAPPING_TOGGLE 3 | ||||
| #define NO_UART 1 | ||||
| 
 | ||||
| #undef BACKLIGHT_LEVELS | ||||
| #define BACKLIGHT_LEVELS 12 | ||||
| 
 | ||||
| /* RGB Underglow  */ | ||||
| // The RGB_DI_PING value seems to be shared between all PS2AVRGB boards.
 | ||||
| // The same pin is used on the JJ40, at least.
 | ||||
| #define RGBLED_NUM 18 | ||||
| #define RGB_DI_PIN E2 // NOTE: for PS2AVRGB boards, underglow commands are send
 | ||||
|                       //       via I2C to 0xB0
 | ||||
| 
 | ||||
| #define RGBLIGHT_ANIMATIONS | ||||
| 
 | ||||
| #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1.0-2.7
 | ||||
| #define RGBLIGHT_EFFECT_BREATHE_MAX 255     // 1-255
 | ||||
| #define RGBLIGHT_EFFECT_SNAKE_LENGTH 7 | ||||
|  | ||||
| @ -28,7 +28,7 @@ | ||||
| #endif  // RGBLIGHT_ENABLE
 | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #define PRODUCT DrashnaDox - Hacked ErgoDox EZ Hybrid Monstrosity | ||||
| #define PRODUCT "DrashnaDox - Hacked ErgoDox EZ Hybrid Monstrosity" | ||||
| 
 | ||||
| #undef DEBOUNCE | ||||
| #define DEBOUNCE 20 | ||||
|  | ||||
| @ -17,5 +17,5 @@ | ||||
| 
 | ||||
| #ifdef KEYBOARD_ergodox_ez | ||||
| #undef   PRODUCT | ||||
| #define  PRODUCT  ErgoDox EZ - Modified by <@jjerrell> | ||||
| #define  PRODUCT  "ErgoDox EZ - Modified by <@jjerrell>" | ||||
| #endif | ||||
|  | ||||
| @ -5,9 +5,9 @@ | ||||
| #undef DEVICE_VER | ||||
| #define DEVICE_VER      0x0001 | ||||
| #undef MANUFACTURER | ||||
| #define MANUFACTURER    meagerfindings | ||||
| #define MANUFACTURER    "meagerfindings" | ||||
| #undef PRODUCT | ||||
| #define PRODUCT         ErgoDox | ||||
| #define PRODUCT         "ErgoDox" | ||||
| 
 | ||||
| #define USB_MAX_POWER_CONSUMPTION 500 | ||||
| 
 | ||||
|  | ||||
| @ -32,5 +32,5 @@ | ||||
| 
 | ||||
| #if defined(KEYBOARD_primekb_prime_m) | ||||
| #    undef PRODUCT | ||||
| #    define PRODUCT Drashna Hacked Prime_M Macro Pad | ||||
| #    define PRODUCT "Drashna Hacked Prime_M Macro Pad" | ||||
| #endif | ||||
|  | ||||
| @ -70,11 +70,11 @@ | ||||
| #if defined(KEYBOARD_planck) | ||||
| #    undef PRODUCT | ||||
| #    if defined(KEYBOARD_planck_light) | ||||
| #        define PRODUCT Drashna Hacked RGB Beacon(Planck Light) | ||||
| #        define PRODUCT "Drashna Hacked RGB Beacon(Planck Light)" | ||||
| #    elif defined(KEYBOARD_planck_rev6) | ||||
| #        define PRODUCT Drashna Hacked Planck Rev6 | ||||
| #        define PRODUCT "Drashna Hacked Planck Rev6" | ||||
| #    elif defined(KEYBOARD_planck_ez) | ||||
| #        define PRODUCT Drashna Hacked Planck EZ | ||||
| #        define PRODUCT "Drashna Hacked Planck EZ" | ||||
| #        define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095 | ||||
| #    endif | ||||
| #endif | ||||
|  | ||||
| @ -32,7 +32,7 @@ | ||||
| 
 | ||||
| #ifdef KEYBOARD_planck_ez_glow | ||||
| #undef   PRODUCT | ||||
| #define  PRODUCT  Planck EZ Glow - Modified by <@jjerrell> | ||||
| #define  PRODUCT  "Planck EZ Glow - Modified by <@jjerrell>" | ||||
| #endif | ||||
| 
 | ||||
| /*
 | ||||
|  | ||||
| @ -26,9 +26,9 @@ | ||||
| 
 | ||||
|     // Rebrand the PCB
 | ||||
| #   undef PRODUCT | ||||
| #   define PRODUCT Protorne Keyboard | ||||
| #   define PRODUCT "Protorne Keyboard" | ||||
| #   undef MANUFACTURER | ||||
| #   define MANUFACTURER Waffles | ||||
| #   define MANUFACTURER "Waffles" | ||||
| 
 | ||||
|     // Remove OLED definitions? 
 | ||||
| #   undef USE_I2C | ||||
|  | ||||
| @ -87,9 +87,9 @@ | ||||
| 
 | ||||
| #undef PRODUCT | ||||
| #ifdef CONVERT_TO_PROTON_C | ||||
| #    define PRODUCT Drashna Hacked ARM Corne Keyboard | ||||
| #    define PRODUCT "Drashna Hacked ARM Corne Keyboard" | ||||
| #else | ||||
| #    define PRODUCT Drashna Hacked Corne Keyboard | ||||
| #    define PRODUCT "Drashna Hacked Corne Keyboard" | ||||
| #endif | ||||
| 
 | ||||
| #define TAPPING_TERM_PER_KEY | ||||
|  | ||||
| @ -265,8 +265,8 @@ def test_generate_config_h(): | ||||
|     check_returncode(result) | ||||
|     assert '#   define DEVICE_VER 0x0001' in result.stdout | ||||
|     assert '#   define DIODE_DIRECTION COL2ROW' in result.stdout | ||||
|     assert '#   define MANUFACTURER none' in result.stdout | ||||
|     assert '#   define PRODUCT pytest' in result.stdout | ||||
|     assert '#   define MANUFACTURER "none"' in result.stdout | ||||
|     assert '#   define PRODUCT "pytest"' in result.stdout | ||||
|     assert '#   define PRODUCT_ID 0x6465' in result.stdout | ||||
|     assert '#   define VENDOR_ID 0xFEED' in result.stdout | ||||
|     assert '#   define MATRIX_COLS 1' in result.stdout | ||||
|  | ||||
| @ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| 
 | ||||
| #include "bitwise.h" | ||||
| 
 | ||||
| // convert to L string
 | ||||
| #define LSTR(s) XLSTR(s) | ||||
| #define XLSTR(s) L## #s | ||||
| // convert to string
 | ||||
| #define STR(s) XSTR(s) | ||||
| #define XSTR(s) #s | ||||
|  | ||||
| @ -1043,7 +1043,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = { | ||||
|  */ | ||||
| const USB_Descriptor_String_t PROGMEM LanguageString = { | ||||
|     .Header = { | ||||
|         .Size                   = USB_STRING_LEN(1), | ||||
|         .Size                   = 4, | ||||
|         .Type                   = DTYPE_String | ||||
|     }, | ||||
|     .UnicodeString              = {LANGUAGE_ID_ENG} | ||||
| @ -1051,24 +1051,24 @@ const USB_Descriptor_String_t PROGMEM LanguageString = { | ||||
| 
 | ||||
| const USB_Descriptor_String_t PROGMEM ManufacturerString = { | ||||
|     .Header = { | ||||
|         .Size                   = USB_STRING_LEN(sizeof(STR(MANUFACTURER)) - 1), // Subtract 1 for null terminator
 | ||||
|         .Size                   = sizeof(USBSTR(MANUFACTURER)), | ||||
|         .Type                   = DTYPE_String | ||||
|     }, | ||||
|     .UnicodeString              = LSTR(MANUFACTURER) | ||||
|     .UnicodeString              = USBSTR(MANUFACTURER) | ||||
| }; | ||||
| 
 | ||||
| const USB_Descriptor_String_t PROGMEM ProductString = { | ||||
|     .Header = { | ||||
|         .Size                   = USB_STRING_LEN(sizeof(STR(PRODUCT)) - 1), // Subtract 1 for null terminator
 | ||||
|         .Size                   = sizeof(USBSTR(PRODUCT)), | ||||
|         .Type                   = DTYPE_String | ||||
|     }, | ||||
|     .UnicodeString              = LSTR(PRODUCT) | ||||
|     .UnicodeString              = USBSTR(PRODUCT) | ||||
| }; | ||||
| 
 | ||||
| #if defined(SERIAL_NUMBER) | ||||
| const USB_Descriptor_String_t PROGMEM SerialNumberString = { | ||||
|     .Header = { | ||||
|         .Size                   = USB_STRING_LEN(sizeof(SERIAL_NUMBER) - 1), // Subtract 1 for null terminator
 | ||||
|         .Size                   = sizeof(USBSTR(SERIAL_NUMBER)), | ||||
|         .Type                   = DTYPE_String | ||||
|     }, | ||||
|     .UnicodeString              = USBSTR(SERIAL_NUMBER) | ||||
|  | ||||
| @ -672,7 +672,7 @@ const PROGMEM uchar console_hid_report[] = { | ||||
| // clang-format off
 | ||||
| const PROGMEM usbStringDescriptor_t usbStringDescriptorZero = { | ||||
|     .header = { | ||||
|         .bLength         = USB_STRING_LEN(1), | ||||
|         .bLength         = 4, | ||||
|         .bDescriptorType = USBDESCR_STRING | ||||
|     }, | ||||
|     .bString             = {0x0409} // US English
 | ||||
| @ -680,24 +680,24 @@ const PROGMEM usbStringDescriptor_t usbStringDescriptorZero = { | ||||
| 
 | ||||
| const PROGMEM usbStringDescriptor_t usbStringDescriptorManufacturer = { | ||||
|     .header = { | ||||
|         .bLength         = USB_STRING_LEN(sizeof(STR(MANUFACTURER)) - 1), | ||||
|         .bLength         = sizeof(USBSTR(MANUFACTURER)), | ||||
|         .bDescriptorType = USBDESCR_STRING | ||||
|     }, | ||||
|     .bString             = LSTR(MANUFACTURER) | ||||
|     .bString             = USBSTR(MANUFACTURER) | ||||
| }; | ||||
| 
 | ||||
| const PROGMEM usbStringDescriptor_t usbStringDescriptorProduct = { | ||||
|     .header = { | ||||
|         .bLength         = USB_STRING_LEN(sizeof(STR(PRODUCT)) - 1), | ||||
|         .bLength         = sizeof(USBSTR(PRODUCT)), | ||||
|         .bDescriptorType = USBDESCR_STRING | ||||
|     }, | ||||
|     .bString             = LSTR(PRODUCT) | ||||
|     .bString             = USBSTR(PRODUCT) | ||||
| }; | ||||
| 
 | ||||
| #if defined(SERIAL_NUMBER) | ||||
| const PROGMEM usbStringDescriptor_t usbStringDescriptorSerial = { | ||||
|     .header = { | ||||
|         .bLength         = USB_STRING_LEN(sizeof(SERIAL_NUMBER) - 1), | ||||
|         .bLength         = sizeof(USBSTR(SERIAL_NUMBER)), | ||||
|         .bDescriptorType = USBDESCR_STRING | ||||
|     }, | ||||
|     .bString             = USBSTR(SERIAL_NUMBER) | ||||
|  | ||||
| @ -118,8 +118,6 @@ typedef struct usbConfigurationDescriptor { | ||||
| #endif | ||||
| } __attribute__((packed)) usbConfigurationDescriptor_t; | ||||
| 
 | ||||
| #define USB_STRING_LEN(s) (sizeof(usbDescriptorHeader_t) + ((s) << 1)) | ||||
| 
 | ||||
| extern bool vusb_suspended; | ||||
| 
 | ||||
| host_driver_t *vusb_driver(void); | ||||
|  | ||||
| @ -42,7 +42,7 @@ | ||||
| #define SPI_DEBUG_SCAN_RATE | ||||
| 
 | ||||
| #undef MANUFACTURER | ||||
| #define MANUFACTURER Window of Fire | ||||
| #define MANUFACTURER "Window of Fire" | ||||
| 
 | ||||
| // Some keyboards enable BACKLIGHT_CAPS_LOCK without checking if backlight is enabled.
 | ||||
| // Undef as appropriate to avoid compiler warnings in that case.
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user