diff options
| author | Drashna Jael're <drashna@live.com> | 2021-06-29 12:23:03 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2021-06-29 12:24:07 -0700 |
| commit | acf2c323e2927f6007b17ded577cf49fd86fec6c (patch) | |
| tree | 8334dc5c71e6ab9bf33c76143eac7bb0e60159b0 /keyboards/ergodox_ez/config.h | |
| parent | ec7a7beeed3046e9144d4c4ce0ef3b2c4f9e4341 (diff) | |
| parent | f55e39e8a2246f6f96fd5d4a84a866e2615cde7b (diff) | |
Merge upstream QMK Firmware at '0.12.52~1'
Diffstat (limited to 'keyboards/ergodox_ez/config.h')
| -rw-r--r-- | keyboards/ergodox_ez/config.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h index 65d307d28c..874ec795bd 100644 --- a/keyboards/ergodox_ez/config.h +++ b/keyboards/ergodox_ez/config.h @@ -24,11 +24,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* USB Device descriptor parameter */ #define VENDOR_ID 0x3297 -#define PRODUCT_ID 0x4974 #define DEVICE_VER 0x0001 -#define MANUFACTURER ZSA Technology Labs Inc +#define MANUFACTURER ZSA Technology Labs +#define PRODUCT_ID 0x4974 #define PRODUCT ErgoDox EZ -#define WEBUSB_LANDING_PAGE_URL u8"configure.ergodox-ez.com" /* key matrix size */ #define MATRIX_ROWS 14 @@ -44,7 +43,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_EXPANDER_COL_PINS { 5, 4, 3, 2, 1, 0 } #define MATRIX_EXPANDER_ROW_PINS { 0, 1, 2, 3, 4, 5, 6 } - #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_DELAY 0 #define MOUSEKEY_TIME_TO_MAX 60 @@ -54,6 +52,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED #define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX +#define DEBOUNCE 30 + #define TAPPING_TOGGLE 1 /* define if matrix has ghost */ @@ -114,9 +114,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * manufacturer specs. */ -#define DEBOUNCE 30 - -#define USB_MAX_POWER_CONSUMPTION 500 // RGB backlight #define DRIVER_ADDR_1 0b1110100 |