From 2944e938703e2049bb6262a0ab31e701d27e8ab3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 1 May 2023 17:37:12 +1000 Subject: [PATCH] Move `USB_MAX_POWER_CONSUMPTION` to data driven (#20648) --- keyboards/barleycorn_smd/config.h | 3 --- keyboards/barleycorn_smd/info.json | 3 ++- keyboards/basketweave/config.h | 2 -- keyboards/basketweave/info.json | 3 ++- keyboards/chavdai40/rev1/config.h | 3 --- keyboards/chavdai40/rev1/info.json | 3 ++- keyboards/chavdai40/rev2/config.h | 3 --- keyboards/chavdai40/rev2/info.json | 3 ++- keyboards/coseyfannitutti/discipad/config.h | 2 -- keyboards/coseyfannitutti/discipad/info.json | 3 ++- keyboards/coseyfannitutti/discipline/config.h | 2 -- .../coseyfannitutti/discipline/info.json | 3 ++- .../crimsonkeyboards/resume1800/config.h | 2 -- .../crimsonkeyboards/resume1800/info.json | 3 ++- keyboards/dm9records/plaid/config.h | 2 -- keyboards/dm9records/plaid/info.json | 3 ++- .../ericrlau/numdiscipline/rev1/config.h | 2 -- .../ericrlau/numdiscipline/rev1/info.json | 3 ++- keyboards/gboards/ergotaco/config.h | 2 -- keyboards/gboards/georgi/config.h | 2 -- keyboards/gboards/gergo/config.h | 2 -- keyboards/handwired/dactyl/config.h | 2 -- keyboards/handwired/dc/mc/001/config.h | 2 -- keyboards/handwired/dc/mc/001/info.json | 3 ++- keyboards/handwired/frenchdev/config.h | 2 -- keyboards/handwired/hnah40/config.h | 2 -- keyboards/handwired/hnah40/info.json | 3 ++- keyboards/handwired/lovelive9/config.h | 1 - keyboards/handwired/lovelive9/info.json | 3 ++- keyboards/hotdox/config.h | 2 -- keyboards/jkdlab/binary_monkey/config.h | 21 ------------------- keyboards/jkdlab/binary_monkey/info.json | 3 ++- keyboards/kagizaraya/chidori/config.h | 1 - keyboards/kagizaraya/chidori/info.json | 3 ++- keyboards/keycapsss/plaid_pad/config.h | 2 -- keyboards/keycapsss/plaid_pad/info.json | 3 ++- keyboards/kinesis/kint2pp/config.h | 5 ----- keyboards/kinesis/kint2pp/info.json | 3 ++- keyboards/kinesis/kint36/config.h | 4 ---- keyboards/kinesis/kint36/info.json | 3 ++- keyboards/kinesis/kint41/config.h | 4 ---- keyboards/kinesis/kint41/info.json | 3 ++- keyboards/kinesis/kintlc/config.h | 5 ----- keyboards/kinesis/kintlc/info.json | 3 ++- keyboards/kprepublic/jj40/config.h | 2 -- keyboards/kprepublic/jj40/info.json | 3 ++- keyboards/kprepublic/jj4x4/config.h | 2 -- keyboards/kprepublic/jj4x4/info.json | 3 ++- keyboards/littlealby/mute/config.h | 2 -- keyboards/littlealby/mute/info.json | 3 ++- keyboards/orthocode/config.h | 2 -- keyboards/orthocode/info.json | 3 ++- keyboards/p3d/glitch/config.h | 2 -- keyboards/p3d/glitch/info.json | 3 ++- keyboards/peej/lumberjack/config.h | 19 ----------------- keyboards/peej/lumberjack/info.json | 3 ++- keyboards/peej/rosaline/config.h | 2 -- keyboards/peej/rosaline/ortho/info.json | 3 ++- keyboards/peej/rosaline/staggered/info.json | 3 ++- keyboards/ploopyco/mouse/config.h | 2 -- keyboards/ploopyco/mouse/info.json | 3 ++- keyboards/ploopyco/trackball/config.h | 2 -- keyboards/ploopyco/trackball/info.json | 3 ++- keyboards/ploopyco/trackball_mini/config.h | 2 -- keyboards/ploopyco/trackball_mini/info.json | 3 ++- keyboards/ploopyco/trackball_nano/config.h | 2 -- keyboards/ploopyco/trackball_nano/info.json | 3 ++- keyboards/punk75/config.h | 2 -- keyboards/rgbkb/pan/config.h | 1 - keyboards/ryanskidmore/rskeys100/config.h | 3 --- keyboards/sendyyeah/pix/config.h | 2 -- keyboards/tokyokeyboard/tokyo60/config.h | 3 --- keyboards/tokyokeyboard/tokyo60/info.json | 3 ++- keyboards/torn/config.h | 2 -- keyboards/torn/info.json | 3 ++- keyboards/trashman/ketch/config.h | 1 - keyboards/trashman/ketch/info.json | 3 ++- keyboards/tronguylabs/m122_3270/config.h | 21 ------------------- keyboards/tronguylabs/m122_3270/info.json | 3 ++- keyboards/uranuma/config.h | 4 ---- keyboards/uranuma/info.json | 3 ++- keyboards/work_louder/loop/config.h | 2 -- keyboards/work_louder/loop/info.json | 3 ++- keyboards/work_louder/micro/config.h | 6 ------ keyboards/work_louder/micro/info.json | 3 ++- keyboards/work_louder/nano/config.h | 2 -- keyboards/work_louder/nano/info.json | 3 ++- keyboards/work_louder/work_board/config.h | 2 -- keyboards/work_louder/work_board/info.json | 3 ++- keyboards/yiancardesigns/barleycorn/config.h | 3 --- keyboards/yiancardesigns/barleycorn/info.json | 3 ++- keyboards/yiancardesigns/gingham/config.h | 2 -- keyboards/yiancardesigns/gingham/info.json | 3 ++- keyboards/yiancardesigns/seigaiha/config.h | 2 -- keyboards/yiancardesigns/seigaiha/info.json | 3 ++- keyboards/ymdk/np21/config.h | 2 -- keyboards/ymdk/np21/info.json | 3 ++- keyboards/ymdk/ymd96/config.h | 2 -- keyboards/ymdk/ymd96/info.json | 3 ++- 99 files changed, 90 insertions(+), 226 deletions(-) delete mode 100644 keyboards/jkdlab/binary_monkey/config.h delete mode 100644 keyboards/kinesis/kint2pp/config.h delete mode 100644 keyboards/peej/lumberjack/config.h delete mode 100644 keyboards/tronguylabs/m122_3270/config.h diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h index 2d53b280f71deb84234b5c0b4585c81d2a919378..167c3b5c87c4286c4f6bb70a50b46d0c97e3ca12 100644 --- a/keyboards/barleycorn_smd/config.h +++ b/keyboards/barleycorn_smd/config.h @@ -54,9 +54,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define USB_MAX_POWER_CONSUMPTION 400 - - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/info.json index b37d4003f7db1feb3595d9dc8efd3ce83cf1039b..0f759e5f4d53e5b3affce705c75628adc1c0c8ad 100644 --- a/keyboards/barleycorn_smd/info.json +++ b/keyboards/barleycorn_smd/info.json @@ -5,7 +5,8 @@ "usb": { "vid": "0x7033", "pid": "0x4749", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 400 }, "indicators": { "caps_lock": "B2", diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h index 87864e2bf4b0d26b0571d62a9b7309695de6b27b..36054e7bb6fbc23342d37b0028f51c19bbf80ff8 100644 --- a/keyboards/basketweave/config.h +++ b/keyboards/basketweave/config.h @@ -16,8 +16,6 @@ #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json index 825364424b9f204596742b7dd579fe5ae00a140d..8f9be9b4062eb36d335b0f88cefb5339f32e29db 100644 --- a/keyboards/basketweave/info.json +++ b/keyboards/basketweave/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x6B62", "pid": "0x8989", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "B0", "B1", "B2", "D5", "D6", "C5", "C4", "C3", "C2", "C1"], diff --git a/keyboards/chavdai40/rev1/config.h b/keyboards/chavdai40/rev1/config.h index 277219f16d013d14db2026b588f5bd8f3006a781..8f5f5496a26e19bfb575d34bba7bc704b1873927 100644 --- a/keyboards/chavdai40/rev1/config.h +++ b/keyboards/chavdai40/rev1/config.h @@ -19,6 +19,3 @@ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE - -/* usb power settings */ -#define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/chavdai40/rev1/info.json b/keyboards/chavdai40/rev1/info.json index 511dff4ad1e8c3c47b1df3b0f60b091d93d58d33..67705c25bb5e69b2f4ae3eb6466b5dfb4a4c24fc 100644 --- a/keyboards/chavdai40/rev1/info.json +++ b/keyboards/chavdai40/rev1/info.json @@ -1,7 +1,8 @@ { "keyboard_name": "Chavdai40", "usb": { - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["B8", "B4", "B3", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"], diff --git a/keyboards/chavdai40/rev2/config.h b/keyboards/chavdai40/rev2/config.h index 277219f16d013d14db2026b588f5bd8f3006a781..8f5f5496a26e19bfb575d34bba7bc704b1873927 100644 --- a/keyboards/chavdai40/rev2/config.h +++ b/keyboards/chavdai40/rev2/config.h @@ -19,6 +19,3 @@ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE - -/* usb power settings */ -#define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/chavdai40/rev2/info.json b/keyboards/chavdai40/rev2/info.json index 97cd474fa0100a3e83c7362544a4b263dd4a82b5..acefcabdc70bbce3028b1b985e94731193c632a1 100644 --- a/keyboards/chavdai40/rev2/info.json +++ b/keyboards/chavdai40/rev2/info.json @@ -1,7 +1,8 @@ { "keyboard_name": "Chavdai40 rev2", "usb": { - "device_version": "0.0.2" + "device_version": "0.0.2", + "max_power": 100 }, "matrix_pins": { "cols": ["B7", "B4", "B3", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"], diff --git a/keyboards/coseyfannitutti/discipad/config.h b/keyboards/coseyfannitutti/discipad/config.h index edcaedfb79451a753168ff3198ca178eb8492efb..31a3fe8cb0192cf61865584fb7aaa261de0c2bcd 100644 --- a/keyboards/coseyfannitutti/discipad/config.h +++ b/keyboards/coseyfannitutti/discipad/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/coseyfannitutti/discipad/info.json b/keyboards/coseyfannitutti/discipad/info.json index d7291698b31f189ade46437d2c3213a51ca87fbe..9ce76c840a14588f4bd4197756b7d4ece3491d0a 100644 --- a/keyboards/coseyfannitutti/discipad/info.json +++ b/keyboards/coseyfannitutti/discipad/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x6B62", "pid": "0x1769", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["C0", "C1", "C2", "C3"], diff --git a/keyboards/coseyfannitutti/discipline/config.h b/keyboards/coseyfannitutti/discipline/config.h index d43ae80cb9514f6edd13a66e233fc18d1485744a..0acee7345a596a0b6fe74a342a6d280996ff07cc 100644 --- a/keyboards/coseyfannitutti/discipline/config.h +++ b/keyboards/coseyfannitutti/discipline/config.h @@ -16,8 +16,6 @@ along with this program. If not, see . #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/coseyfannitutti/discipline/info.json b/keyboards/coseyfannitutti/discipline/info.json index e699bc0a465b27c4b37b679436c98bf670025913..f28e0cd4d807e6be2fa9d72a2b6d28383fce6502 100644 --- a/keyboards/coseyfannitutti/discipline/info.json +++ b/keyboards/coseyfannitutti/discipline/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x6B62", "pid": "0x6869", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["A2", "B3", "A3", "B4", "A4", "D5", "D6", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D7"], diff --git a/keyboards/crimsonkeyboards/resume1800/config.h b/keyboards/crimsonkeyboards/resume1800/config.h index 7c66ab16c64d2ab0d61e46d202b61978584f88b2..bdc484a3b3176fa832c5dd927a0af59e5400069f 100644 --- a/keyboards/crimsonkeyboards/resume1800/config.h +++ b/keyboards/crimsonkeyboards/resume1800/config.h @@ -16,8 +16,6 @@ along with this program. If not, see . #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/info.json index b8cd36dbed1544a0aee92d23b4ac0b36731e011d..664a69e22ecd017eaae5bc78aef57acf8ade925a 100644 --- a/keyboards/crimsonkeyboards/resume1800/info.json +++ b/keyboards/crimsonkeyboards/resume1800/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0xC18B", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["A2", "B3", "A3", "B4", "A4", "D1", "D5", "D6", "A6", "A7", "C7", "C6", "C5", "C4", "D7", "C3", "C2", "C1", "C0", "D0"], diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h index b4b541dbfc6891fb21aa9fd999bb7c5368a0bafa..71400c3cf889e5357236d9b631dd46aa64950b63 100644 --- a/keyboards/dm9records/plaid/config.h +++ b/keyboards/dm9records/plaid/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json index cedf1fae5dc1a4845ad7cde4111686cdde334864..a18de0accdb5d1cdbc088933029e4b59e28d7907 100644 --- a/keyboards/dm9records/plaid/info.json +++ b/keyboards/dm9records/plaid/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.2" + "device_version": "0.0.2", + "max_power": 100 }, "matrix_pins": { "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1", "D0"], diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h index d5c2b1438e0dc9440f5f2b2a3cc7e95ad30b93f6..055e8afe380fbbfef2795781c965034846a94ba3 100644 --- a/keyboards/ericrlau/numdiscipline/rev1/config.h +++ b/keyboards/ericrlau/numdiscipline/rev1/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/ericrlau/numdiscipline/rev1/info.json b/keyboards/ericrlau/numdiscipline/rev1/info.json index dd5a8a7a1613f3c4f45d4052aceff0e5c9be5071..efcbcf2ab044ceffba0cc48dd5cbe0c1b71bc53d 100644 --- a/keyboards/ericrlau/numdiscipline/rev1/info.json +++ b/keyboards/ericrlau/numdiscipline/rev1/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x454C", "pid": "0x0001", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["A2", "B3", "A3", "B4", "A4", "D5", "D6", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D7", "A5", "A6", "A7"], diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h index ba0078e71bbf14dd237dd642e081eabf7b6ef0f7..456eb3f9d91cae8d636f0e6bba6c3e31852174d8 100644 --- a/keyboards/gboards/ergotaco/config.h +++ b/keyboards/gboards/ergotaco/config.h @@ -43,5 +43,3 @@ along with this program. If not, see . /* key combination for command */ #define IS_COMMAND() (get_mods() == MOD_MASK_CTRL || get_mods() == MOD_MASK_SHIFT) - -#define USB_MAX_POWER_CONSUMPTION 500 diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h index 99bdd06bb5c741d99b448655739a8c8036c0769e..db2ff42a1e8c980306e62a1227892780a2b43fd1 100644 --- a/keyboards/gboards/georgi/config.h +++ b/keyboards/gboards/georgi/config.h @@ -51,5 +51,3 @@ along with this program. If not, see . get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ ) - -#define USB_MAX_POWER_CONSUMPTION 500 diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h index 37d4fe84999d0814b6970d51e98537e28ff9caea..dbff6ccf6f1ac535bbcf997435463662210b2330 100644 --- a/keyboards/gboards/gergo/config.h +++ b/keyboards/gboards/gergo/config.h @@ -55,5 +55,3 @@ along with this program. If not, see . get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ ) - -#define USB_MAX_POWER_CONSUMPTION 500 diff --git a/keyboards/handwired/dactyl/config.h b/keyboards/handwired/dactyl/config.h index 0b98f64a4f6c90e2abccc9ced6fad968fb2efb7c..f37a8f2722c95598a30939d47a32f421313fe3e0 100644 --- a/keyboards/handwired/dactyl/config.h +++ b/keyboards/handwired/dactyl/config.h @@ -49,5 +49,3 @@ along with this program. If not, see . /* fix space cadet rollover issue */ #define DISABLE_SPACE_CADET_ROLLOVER - -#define USB_MAX_POWER_CONSUMPTION 500 diff --git a/keyboards/handwired/dc/mc/001/config.h b/keyboards/handwired/dc/mc/001/config.h index 4e9dfdea8cc9d551243301415a1beabbdcbfda5b..533f50e0186b4576f74604313aeeb436ece195a9 100644 --- a/keyboards/handwired/dc/mc/001/config.h +++ b/keyboards/handwired/dc/mc/001/config.h @@ -32,5 +32,3 @@ along with this program. If not, see . #define NO_ACTION_LAYER #define NO_ACTION_TAPPING #define NO_ACTION_ONESHOT - -#define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/handwired/dc/mc/001/info.json b/keyboards/handwired/dc/mc/001/info.json index 852915569ed8cf6c292f33409dbe9730718becd8..404cf2e45dcfe7c0262f26cfe7514be4abe01090 100644 --- a/keyboards/handwired/dc/mc/001/info.json +++ b/keyboards/handwired/dc/mc/001/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4443", "pid": "0x4D43", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "encoder": { "rotary": [ diff --git a/keyboards/handwired/frenchdev/config.h b/keyboards/handwired/frenchdev/config.h index fc5d819060c23c360bd5fb7446428d1bbd33e4b2..9cb309c78ff396033ec63092a241d30ac8dd1c1e 100644 --- a/keyboards/handwired/frenchdev/config.h +++ b/keyboards/handwired/frenchdev/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define LED_BRIGHTNESS_LO 15 #define LED_BRIGHTNESS_HI 255 -#define USB_MAX_POWER_CONSUMPTION 500 - #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_DELAY 0 #define MOUSEKEY_TIME_TO_MAX 5 diff --git a/keyboards/handwired/hnah40/config.h b/keyboards/handwired/hnah40/config.h index 3ebccf9ad2de14f283f70194949365b8f44f9e51..611a6960cb5d01490bcf39685b05390c66ce1889 100644 --- a/keyboards/handwired/hnah40/config.h +++ b/keyboards/handwired/hnah40/config.h @@ -21,8 +21,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define USB_MAX_POWER_CONSUMPTION 100 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/handwired/hnah40/info.json b/keyboards/handwired/hnah40/info.json index a4ed0756e7a260a0441c0fab6ba23da48fc124ba..728d6dbc59db1e44461e3ae9a6d62d0ea77bedd3 100644 --- a/keyboards/handwired/hnah40/info.json +++ b/keyboards/handwired/hnah40/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x0000", - "device_version": "0.0.2" + "device_version": "0.0.2", + "max_power": 100 }, "matrix_pins": { "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1"], diff --git a/keyboards/handwired/lovelive9/config.h b/keyboards/handwired/lovelive9/config.h index e6499e9111af1d5c88b20df4596c1b682dc22b7e..092e83d9d55199245a93adf1fdd3a4036f14d4d1 100644 --- a/keyboards/handwired/lovelive9/config.h +++ b/keyboards/handwired/lovelive9/config.h @@ -19,6 +19,5 @@ #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 -#define USB_MAX_POWER_CONSUMPTION 400 #define TAPPING_TERM 200 diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/info.json index 25dc85704d06a20a1f5cedaae30993052426c62a..4000b543c3179d778b89611cdca528a4287a9acc 100644 --- a/keyboards/handwired/lovelive9/info.json +++ b/keyboards/handwired/lovelive9/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x0007", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 400 }, "matrix_pins": { "cols": ["B4", "B6", "B2", "D7", "B1", "F7", "F6", "F5", "F4"], diff --git a/keyboards/hotdox/config.h b/keyboards/hotdox/config.h index 56eda36984c024a5177df3e701e0da0c6d1cf4aa..4e801399da212fb317485bf4646ad357a1644c98 100644 --- a/keyboards/hotdox/config.h +++ b/keyboards/hotdox/config.h @@ -34,8 +34,6 @@ /* fix space cadet rollover issue */ #define DISABLE_SPACE_CADET_ROLLOVER -#define USB_MAX_POWER_CONSUMPTION 500 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/jkdlab/binary_monkey/config.h b/keyboards/jkdlab/binary_monkey/config.h deleted file mode 100644 index 3b83277d42e2060ed4a4ac473fc2cd157866f634..0000000000000000000000000000000000000000 --- a/keyboards/jkdlab/binary_monkey/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2021 JKDLAB. - * Copyright 2021 Jaehee - * - * 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 3 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 https://www.gnu.org/licenses/. - */ - -#pragma once - -#define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/jkdlab/binary_monkey/info.json b/keyboards/jkdlab/binary_monkey/info.json index 43ba14685415244faaacd73e2d9db161fd1d9329..50b92ff899b6ab10a7fa2f578d9c5e36258fa8e5 100644 --- a/keyboards/jkdlab/binary_monkey/info.json +++ b/keyboards/jkdlab/binary_monkey/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4934", "pid": "0x0101", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["D1", "D2", "D3"], diff --git a/keyboards/kagizaraya/chidori/config.h b/keyboards/kagizaraya/chidori/config.h index 51f8958e20f74037eaef047556011cf3f7834c68..eb719e95049ee6974a8b9549c36804618fd0e248 100644 --- a/keyboards/kagizaraya/chidori/config.h +++ b/keyboards/kagizaraya/chidori/config.h @@ -48,7 +48,6 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT /* USB config */ -#define USB_MAX_POWER_CONSUMPTION 100 #define USB_COUNT_SOF 0 #define USB_INTR_CFG_SET (1 << ISC01) #define USB_INTR_ENABLE_BIT INT0 diff --git a/keyboards/kagizaraya/chidori/info.json b/keyboards/kagizaraya/chidori/info.json index 16cd17f9422d4e5af9a3a1d20f95be3121e77e68..6603f54b0368baa9d727c74c0edaaaf7499e8a4b 100644 --- a/keyboards/kagizaraya/chidori/info.json +++ b/keyboards/kagizaraya/chidori/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x3942", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "processor": "atmega328p", "bootloader": "usbasploader", diff --git a/keyboards/keycapsss/plaid_pad/config.h b/keyboards/keycapsss/plaid_pad/config.h index 0ac7d2ee62ef0aecaead3fe54583429f757eb12a..984323f63c9e3bb12a588a237c1239d5c0f8e5ed 100644 --- a/keyboards/keycapsss/plaid_pad/config.h +++ b/keyboards/keycapsss/plaid_pad/config.h @@ -16,7 +16,5 @@ #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 - // Fix for volume controll with encoder (steadily in/decrease) #define TAP_CODE_DELAY 60 diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json index 6ff2d2cea2634208843480baa0e3cac0b717663c..9fe02448d02a26bdbd2c02c010f1b61e59694927 100644 --- a/keyboards/keycapsss/plaid_pad/info.json +++ b/keyboards/keycapsss/plaid_pad/info.json @@ -4,7 +4,8 @@ "maintainer": "BenRoe", "usb": { "vid": "0x7983", - "pid": "0x5050" + "pid": "0x5050", + "max_power": 100 }, "matrix_pins": { "cols": ["B0", "D7", "D6", "D5"], diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h deleted file mode 100644 index b81985f1ef1774dcf00c2e4178183daab3318f70..0000000000000000000000000000000000000000 --- a/keyboards/kinesis/kint2pp/config.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -// The Teensy 2++ consumes about 60 mA of current at its full speed of 16 MHz as -// per https://www.pjrc.com/teensy/low_power.html -#define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json index b2ddfb80b016f59786025f955e21543544773100..74d96d59e04545d1c35582bfdcad10fe104ac045 100644 --- a/keyboards/kinesis/kint2pp/info.json +++ b/keyboards/kinesis/kint2pp/info.json @@ -4,7 +4,8 @@ "usb": { "vid": "0xFEED", "pid": "0x6060", - "device_version": "0.0.2" + "device_version": "0.0.2", + "max_power": 100 }, "matrix_pins": { "cols": ["E7", "F0", "F7", "B1", "B3", "B0", "D5"], diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h index 8b291df88eba9d764d684ec1adf2312be75f103e..94e523e9ef2e5ae2ee4560fa25584e55e8d1c756 100644 --- a/keyboards/kinesis/kint36/config.h +++ b/keyboards/kinesis/kint36/config.h @@ -16,8 +16,4 @@ #pragma once -// The Teensy 3.6 consumes about 80 mA of current at its full speed of 180 MHz: -// https://forum.pjrc.com/threads/47256-What-is-the-power-consumption-of-the-Teensy-3-6 -#define USB_MAX_POWER_CONSUMPTION 100 - #define EEPROM_SIZE 4096 diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json index 2d71fc0eb3cf9e317e3cf4a837ca3eecf7298fd3..815b6cb8719951569fc9153172f20bf688d4d876 100644 --- a/keyboards/kinesis/kint36/info.json +++ b/keyboards/kinesis/kint36/info.json @@ -4,7 +4,8 @@ "usb": { "vid": "0x1209", "pid": "0x345C", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["B3", "D1", "C0", "D5", "C1", "B2", "D4"], diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h index 74d1a8a78f54d248b606e58106b7ee3b0cbd3e1d..e620abd09e6da6120c024df9c8cfe89b6d0cb88b 100644 --- a/keyboards/kinesis/kint41/config.h +++ b/keyboards/kinesis/kint41/config.h @@ -16,10 +16,6 @@ #pragma once -// The Teensy 4.1 consumes about 100 mA of current at its full speed of 600 MHz -// as per https://www.pjrc.com/store/teensy41.html -#define USB_MAX_POWER_CONSUMPTION 100 - /* We use the i.MX RT1060 high-speed GPIOs (GPIO6-9) which are connected to the * AHB bus (AHB_CLK_ROOT), which runs at the same speed as the ARM Core Clock, * i.e. 600 MHz. See MIMXRT1062, page 949, 12.1 Chip-specific GPIO information. diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/info.json index 0a6424641ad4791e870afb8298ccf51f5a445227..1901ed1d3bbbea0e972a069b938ff224f30bd66a 100644 --- a/keyboards/kinesis/kint41/info.json +++ b/keyboards/kinesis/kint41/info.json @@ -4,7 +4,8 @@ "usb": { "vid": "0x1209", "pid": "0x345C", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["LINE_PIN18", "LINE_PIN14", "LINE_PIN15", "LINE_PIN20", "LINE_PIN22", "LINE_PIN19", "LINE_PIN6"], diff --git a/keyboards/kinesis/kintlc/config.h b/keyboards/kinesis/kintlc/config.h index a5610a4c8cbbe5e9adbda4f32bc4e57cea3f3737..e620abd09e6da6120c024df9c8cfe89b6d0cb88b 100644 --- a/keyboards/kinesis/kintlc/config.h +++ b/keyboards/kinesis/kintlc/config.h @@ -16,11 +16,6 @@ #pragma once -// The Teensy LC power consumption is unknown as per -// https://www.pjrc.com/store/teensylc.html but since -// https://www.pjrc.com/store/teensy41.html says 100mA, let's go with half. -#define USB_MAX_POWER_CONSUMPTION 50 - /* We use the i.MX RT1060 high-speed GPIOs (GPIO6-9) which are connected to the * AHB bus (AHB_CLK_ROOT), which runs at the same speed as the ARM Core Clock, * i.e. 600 MHz. See MIMXRT1062, page 949, 12.1 Chip-specific GPIO information. diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json index 6c8938ab3591727a41594e3bdd6f7ad5ba0a0094..da8e8f7e45e44f7ef5d2ef3f12bd2338d202152e 100644 --- a/keyboards/kinesis/kintlc/info.json +++ b/keyboards/kinesis/kintlc/info.json @@ -4,7 +4,8 @@ "usb": { "vid": "0x1209", "pid": "0x345C", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 50 }, "matrix_pins": { "cols": ["LINE_PIN18", "LINE_PIN14", "LINE_PIN15", "LINE_PIN20", "LINE_PIN22", "LINE_PIN19", "LINE_PIN6"], diff --git a/keyboards/kprepublic/jj40/config.h b/keyboards/kprepublic/jj40/config.h index f26971a5a3ee7ca1c62af2bc691f6b2ac8c29028..d77984fc6992028709de3997500cee01578d968d 100644 --- a/keyboards/kprepublic/jj40/config.h +++ b/keyboards/kprepublic/jj40/config.h @@ -27,5 +27,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/kprepublic/jj40/info.json b/keyboards/kprepublic/jj40/info.json index c41c139606665033f62858dfe0f02832641b97e4..e5dacd90da8451cb0e2d85b43c785cca8c8d81c6 100644 --- a/keyboards/kprepublic/jj40/info.json +++ b/keyboards/kprepublic/jj40/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4B50", "pid": "0x0040", - "device_version": "2.0.0" + "device_version": "2.0.0", + "max_power": 100 }, "matrix_pins": { "cols": ["C4", "C5", "C6", "C7", "A4", "A5", "A6", "A7", "A3", "A2", "A1", "A0"], diff --git a/keyboards/kprepublic/jj4x4/config.h b/keyboards/kprepublic/jj4x4/config.h index c0220254b96424157055aba642447462cd217b51..5646d4c6536bc4b3a1d292ca0196a43e59b20a65 100644 --- a/keyboards/kprepublic/jj4x4/config.h +++ b/keyboards/kprepublic/jj4x4/config.h @@ -30,5 +30,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/kprepublic/jj4x4/info.json b/keyboards/kprepublic/jj4x4/info.json index 337b532f9737a62d3970355703558594f8feedc6..fce30c67b04d753c8c62d358010c2f1a9fe77c16 100644 --- a/keyboards/kprepublic/jj4x4/info.json +++ b/keyboards/kprepublic/jj4x4/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4B50", "pid": "0x0044", - "device_version": "2.0.0" + "device_version": "2.0.0", + "max_power": 100 }, "matrix_pins": { "cols": ["A1", "A0", "A2", "A3"], diff --git a/keyboards/littlealby/mute/config.h b/keyboards/littlealby/mute/config.h index bd2aa9c26b95cacb5ddb62a9e7e7e116904aa0fc..3a5b0356a94f53a59ace5a8bb14d94e478341d75 100644 --- a/keyboards/littlealby/mute/config.h +++ b/keyboards/littlealby/mute/config.h @@ -15,8 +15,6 @@ */ #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 - #ifdef RGBLIGHT_ENABLE #define RGBLED_NUM 1 #endif diff --git a/keyboards/littlealby/mute/info.json b/keyboards/littlealby/mute/info.json index 9d2a172116de64ed38124aecf9edb46edfca813e..a6392a76e78ca6a9ee259ddd4a34f24282820d8b 100644 --- a/keyboards/littlealby/mute/info.json +++ b/keyboards/littlealby/mute/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4142", "pid": "0x4D55", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "ws2812": { "pin": "B6" diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h index 3964ccec158527595fe21ef1e6e1af28391107d9..10987d87af5dfe94cadff4cf7d65e1cf7e4e7c76 100644 --- a/keyboards/orthocode/config.h +++ b/keyboards/orthocode/config.h @@ -16,8 +16,6 @@ along with this program. If not, see . #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 - #define TAP_CODE_DELAY 10 #define RGBLED_NUM 10 /*Change for the number of leds on the strip you attach*/ diff --git a/keyboards/orthocode/info.json b/keyboards/orthocode/info.json index 144075fde15efd0f44190baa2cd5d546949d2023..6b283da6cf175f740570f632ccada609352a3521 100644 --- a/keyboards/orthocode/info.json +++ b/keyboards/orthocode/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x3415", "pid": "0x0001", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["C4", "C3", "C2", "C1", "C0", "D7", "D6", "A7", "A4", "A5", "A6", "A3", "A2", "A1", "A0"], diff --git a/keyboards/p3d/glitch/config.h b/keyboards/p3d/glitch/config.h index 2db0b8566c3c22657e192847c0d6c1b629e8a01b..a7548280532c3fae4f3a33363f0a99c882be8b8e 100644 --- a/keyboards/p3d/glitch/config.h +++ b/keyboards/p3d/glitch/config.h @@ -29,8 +29,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define USB_MAX_POWER_CONSUMPTION 400 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/p3d/glitch/info.json b/keyboards/p3d/glitch/info.json index 9ff596476f4cb8e9bb46b839fbe642ee2c7cd728..25dc17b820d808f6351cc7c1028d54aab61b94db 100644 --- a/keyboards/p3d/glitch/info.json +++ b/keyboards/p3d/glitch/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x7033", "pid": "0x3568", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 400 }, "matrix_pins": { "cols": ["B2", "D2", "B3", "B7", "F5", "F4", "F1", "F0"], diff --git a/keyboards/peej/lumberjack/config.h b/keyboards/peej/lumberjack/config.h deleted file mode 100644 index 0079764d8e4fa13cbb5975ba4fdfdd1c8b9c57c4..0000000000000000000000000000000000000000 --- a/keyboards/peej/lumberjack/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Paul James - * - * 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 . - */ - -#pragma once - -#define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/peej/lumberjack/info.json b/keyboards/peej/lumberjack/info.json index c65c4bea47921fd4ec57e58329b1d3c548604757..83b4a6e6c225b3be06a0ef63e9c11d6760de4b0d 100644 --- a/keyboards/peej/lumberjack/info.json +++ b/keyboards/peej/lumberjack/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x706A", "pid": "0x0002", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["B0", "D7", "D6", "D5", "D4", "D1", "D0", "C1", "C2", "C3"], diff --git a/keyboards/peej/rosaline/config.h b/keyboards/peej/rosaline/config.h index 18505def82712fb68a1a2fa82e1b0b950ccb5e34..d36ddb96e93fb76e7b0e93544a39360dbbecfd76 100644 --- a/keyboards/peej/rosaline/config.h +++ b/keyboards/peej/rosaline/config.h @@ -16,7 +16,5 @@ #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 - #define LED1 C5 #define LED2 C4 diff --git a/keyboards/peej/rosaline/ortho/info.json b/keyboards/peej/rosaline/ortho/info.json index c175aafb4258ee02f3390bc42b231e6ce040211f..9fb9d3cb40d3d1d2c6b93eded29f68210f3d8b21 100644 --- a/keyboards/peej/rosaline/ortho/info.json +++ b/keyboards/peej/rosaline/ortho/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x706A", "pid": "0x0003", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"], diff --git a/keyboards/peej/rosaline/staggered/info.json b/keyboards/peej/rosaline/staggered/info.json index 0608f2a9f79af87644f2e8444b4809799252e4a2..99796675e16fcbd0d4193c16be506004e89d6f7c 100644 --- a/keyboards/peej/rosaline/staggered/info.json +++ b/keyboards/peej/rosaline/staggered/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x706A", "pid": "0x0003", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"], diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h index bc7e587ee774442a8b2d06d6ce94f8674cbdf166..9747969db48fbb2f84e688769f1afa4246838e17 100644 --- a/keyboards/ploopyco/mouse/config.h +++ b/keyboards/ploopyco/mouse/config.h @@ -23,8 +23,6 @@ #define UNUSABLE_PINS \ { B4, D6, F1, F5, F6, F7 } -#define USB_MAX_POWER_CONSUMPTION 100 - /* disable action features */ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json index 96b91d89a6a0484bfc52157c16f0996f074e1db0..e31a1eb4cd055c74037af343988818a8b613a3d1 100644 --- a/keyboards/ploopyco/mouse/info.json +++ b/keyboards/ploopyco/mouse/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x5043", "pid": "0x4D6F", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "bootmagic": { "matrix": [0, 3] diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h index de94eab9baf084cc1e98875ef3e9de890f5cb9fb..de0ed1ebece5c7d060667605b4a6a2f7cc0c1d45 100644 --- a/keyboards/ploopyco/trackball/config.h +++ b/keyboards/ploopyco/trackball/config.h @@ -23,8 +23,6 @@ //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define USB_MAX_POWER_CONSUMPTION 100 - #define ROTATIONAL_TRANSFORM_ANGLE 20 // If board has a debug LED, you can enable it by defining this diff --git a/keyboards/ploopyco/trackball/info.json b/keyboards/ploopyco/trackball/info.json index a1f9c53284537b10f53af1399bfcb6f8932a039c..ef6682f9e45a0571525ad5f93704b21b94a38f0c 100644 --- a/keyboards/ploopyco/trackball/info.json +++ b/keyboards/ploopyco/trackball/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x5043", "pid": "0x5442", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "bootmagic": { "matrix": [0, 3] diff --git a/keyboards/ploopyco/trackball_mini/config.h b/keyboards/ploopyco/trackball_mini/config.h index 2cb236fcd01c6a2b7de770213274822bab6d226a..789deb5a5f1430040ba42fbd180f6e95334ba19f 100644 --- a/keyboards/ploopyco/trackball_mini/config.h +++ b/keyboards/ploopyco/trackball_mini/config.h @@ -24,8 +24,6 @@ //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define USB_MAX_POWER_CONSUMPTION 100 - // If board has a debug LED, you can enable it by defining this // #define DEBUG_LED_PIN F7 diff --git a/keyboards/ploopyco/trackball_mini/info.json b/keyboards/ploopyco/trackball_mini/info.json index e3daea057573113b69c903fafc4a271b69e22303..7d040aa5bfe7ecc96c11a011824e9e56b403c1c6 100644 --- a/keyboards/ploopyco/trackball_mini/info.json +++ b/keyboards/ploopyco/trackball_mini/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x5043", "pid": "0x1EAB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "bootmagic": { "matrix": [0, 3] diff --git a/keyboards/ploopyco/trackball_nano/config.h b/keyboards/ploopyco/trackball_nano/config.h index c8e74cc271e620bdd5c3734f8f3d331f51afb020..e2ebde326354c1deac510c926c8264f550c7b95e 100644 --- a/keyboards/ploopyco/trackball_nano/config.h +++ b/keyboards/ploopyco/trackball_nano/config.h @@ -24,8 +24,6 @@ //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define USB_MAX_POWER_CONSUMPTION 100 - #define ADNS5050_SCLK_PIN B7 #define ADNS5050_SDIO_PIN C6 #define ADNS5050_CS_PIN B4 diff --git a/keyboards/ploopyco/trackball_nano/info.json b/keyboards/ploopyco/trackball_nano/info.json index 522ff43d9904cbdb6ae7f7edb30c840b6d83d013..529554857398562cff2a7c6d6eb2b5202bf19083 100644 --- a/keyboards/ploopyco/trackball_nano/info.json +++ b/keyboards/ploopyco/trackball_nano/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x5043", "pid": "0x54A3", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/punk75/config.h b/keyboards/punk75/config.h index a8b9af7999f403d5bd87af7602f1938fe96a255e..b314f6dae97ddaddbe8badec0f78e5def38a9afd 100644 --- a/keyboards/punk75/config.h +++ b/keyboards/punk75/config.h @@ -19,8 +19,6 @@ along with this program. If not, see . #define LED A0 -#define USB_MAX_POWER_CONSUMPTION 500 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h index f1b323bc178870460d9f6128e6c9b624a08db2c0..2bd147df5b3e05de36e9618d5eefd5b0bb829488 100644 --- a/keyboards/rgbkb/pan/config.h +++ b/keyboards/rgbkb/pan/config.h @@ -30,7 +30,6 @@ along with this program. If not, see . #define RGB_MATRIX_LED_COUNT RGBLED_NUM #define RGBLIGHT_LIMIT_VAL 120 -#define USB_MAX_POWER_CONSUMPTION 500 // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: diff --git a/keyboards/ryanskidmore/rskeys100/config.h b/keyboards/ryanskidmore/rskeys100/config.h index 84fd3381edab499a68161b3a8b027fe90d3c50c1..1ec96ddfdfbb93277149277546e5428c24fbce21 100644 --- a/keyboards/ryanskidmore/rskeys100/config.h +++ b/keyboards/ryanskidmore/rskeys100/config.h @@ -42,6 +42,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* Set the max power consumption for the keyboard, which is 500 mA. */ -#define USB_MAX_POWER_CONSUMPTION 500 diff --git a/keyboards/sendyyeah/pix/config.h b/keyboards/sendyyeah/pix/config.h index 2030d914d62eb4efb431c00e17573eef773273ca..88d255f6c0206f7944e1a8d24ce64af99f4da5fe 100644 --- a/keyboards/sendyyeah/pix/config.h +++ b/keyboards/sendyyeah/pix/config.h @@ -25,8 +25,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define USB_MAX_POWER_CONSUMPTION 500 - #define RGBLED_NUM 15 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h index 800cb31a2f68b06a6ba693dc7fb15b948815464e..dd58e34f08f20d95fc2770b0be69a52d243816e5 100644 --- a/keyboards/tokyokeyboard/tokyo60/config.h +++ b/keyboards/tokyokeyboard/tokyo60/config.h @@ -1,8 +1,5 @@ #pragma once -/* Set power consumption to work with mobile devices */ -#define USB_MAX_POWER_CONSUMPTION 100 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/info.json index cd2cfe2248ae9b4853a4c14d86b8d0aa83b994a4..aae81a4a6b6ef04c731dc6e82a1c2b68e320b445 100644 --- a/keyboards/tokyokeyboard/tokyo60/info.json +++ b/keyboards/tokyokeyboard/tokyo60/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x5436", "pid": "0x6060", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B2", "B5", "B4", "D7", "D6", "B3"], diff --git a/keyboards/torn/config.h b/keyboards/torn/config.h index 0b56ef812d1230b9b40901c63836ae5cb269032e..6025d55b1cd2b88816addb818dd06b75fb3e0cc0 100644 --- a/keyboards/torn/config.h +++ b/keyboards/torn/config.h @@ -45,6 +45,4 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define USB_MAX_POWER_CONSUMPTION 100 - #define OLED_TIMEOUT 60000 diff --git a/keyboards/torn/info.json b/keyboards/torn/info.json index c5294d14afc25259aa72f0bdefa9453444840e2d..c1b83188f061ae89b31711db07324826da4f80c1 100644 --- a/keyboards/torn/info.json +++ b/keyboards/torn/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x7274", "pid": "0x0001", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "encoder": { "rotary": [ diff --git a/keyboards/trashman/ketch/config.h b/keyboards/trashman/ketch/config.h index 64c34a8008b0f2c747606523d6e572c787202de6..0f391f70ba514e6d9df54ecb5c73a8c83dfe385d 100644 --- a/keyboards/trashman/ketch/config.h +++ b/keyboards/trashman/ketch/config.h @@ -22,7 +22,6 @@ SOFTWARE. #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json index 02dc364a35e60076c573d2216133a6175589b6e4..21f3bb7ec3a0f647a2380bb0a8874b0d855672d3 100644 --- a/keyboards/trashman/ketch/info.json +++ b/keyboards/trashman/ketch/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEAE", "pid": "0x8947", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "ws2812": { "pin": "F4" diff --git a/keyboards/tronguylabs/m122_3270/config.h b/keyboards/tronguylabs/m122_3270/config.h deleted file mode 100644 index 754e0977c4def946dbfe10f6e754399e01475779..0000000000000000000000000000000000000000 --- a/keyboards/tronguylabs/m122_3270/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 James R. Maynard III - * - * 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 . - */ - -#pragma once - - -// Both controllers draw 100 mA or less -#define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/tronguylabs/m122_3270/info.json b/keyboards/tronguylabs/m122_3270/info.json index 2dae824cc4f779e7790d0dbc3c9b8da647e0ee51..364ab250dccd64a15b977c171b80f064735ea25c 100644 --- a/keyboards/tronguylabs/m122_3270/info.json +++ b/keyboards/tronguylabs/m122_3270/info.json @@ -4,7 +4,8 @@ "maintainer": "jmaynard", "usb": { "vid": "0x1209", - "pid": "0x3270" + "pid": "0x3270", + "max_power": 100 }, "debounce": 15, "layouts": { diff --git a/keyboards/uranuma/config.h b/keyboards/uranuma/config.h index 39bb20f2a89079fafd79b61e613286117889cb65..7bc78f68d698af91ca00bae24cd8a9c49a31373d 100644 --- a/keyboards/uranuma/config.h +++ b/keyboards/uranuma/config.h @@ -1,9 +1,5 @@ #pragma once -// fix iPhone and iPad power adapter issue -// iOS device need lessthan 100 -#define USB_MAX_POWER_CONSUMPTION 100 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/uranuma/info.json b/keyboards/uranuma/info.json index 2dd2bd9e5343179aa2ee55cc8c11bc171baf2abd..f7019e0c8625254d7a81222c128a7a252fcacf5e 100644 --- a/keyboards/uranuma/info.json +++ b/keyboards/uranuma/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x112D", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D2", "D4"], diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h index 4d5bcf9dba28e0a61dae077785a9299e97c26c5f..93b3b541843ce110673d290762041b6d7b9c9b83 100644 --- a/keyboards/work_louder/loop/config.h +++ b/keyboards/work_louder/loop/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 - #define RGBLIGHT_DI_PIN E6 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json index 64aed890debeb22cfed955862abb971cd8a68ea9..be5d470382eca9514792379ffaf8d96716322de8 100644 --- a/keyboards/work_louder/loop/info.json +++ b/keyboards/work_louder/loop/info.json @@ -5,7 +5,8 @@ "maintainer": "Work Louder", "usb": { "vid": "0x574C", - "pid": "0x1DF9" + "pid": "0x1DF9", + "max_power": 100 }, "rgb_matrix": { "driver": "WS2812" diff --git a/keyboards/work_louder/micro/config.h b/keyboards/work_louder/micro/config.h index f23c5a4ef1472dc4f29cf5f324e089400022cdde..234b1de6023d21103d0fb0349ffe10e8a1792bb3 100644 --- a/keyboards/work_louder/micro/config.h +++ b/keyboards/work_louder/micro/config.h @@ -4,12 +4,6 @@ #pragma once -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ -#define USB_MAX_POWER_CONSUMPTION 100 - #define RGB_MATRIX_LED_COUNT 12 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 #define RGB_MATRIX_DISABLE_KEYCODES diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/info.json index f6b45226a0d72e64e38a3fcdca6c1f1ea28845a6..80c1c259f5d22f8b7f793c8ad336b3ba3a6ad986 100644 --- a/keyboards/work_louder/micro/info.json +++ b/keyboards/work_louder/micro/info.json @@ -49,7 +49,8 @@ "usb": { "device_version": "1.0.0", "pid": "0xE6E3", - "vid": "0x574C" + "vid": "0x574C", + "max_power": 100 }, "encoder": { "rotary": [ diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h index 265da302e573ef298102c93a976775733bb205a6..74427859cb6cc130d9dd2c4ba3b24b69c954be6e 100644 --- a/keyboards/work_louder/nano/config.h +++ b/keyboards/work_louder/nano/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 - #define RGBLIGHT_DI_PIN C7 #define RGBLED_NUM 6 //# define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json index 70da0e4cc481e7589b53cc536296b22049b8ccd2..097ad1f045d1863b33de7fb6d14b59df2c89af3f 100644 --- a/keyboards/work_louder/nano/info.json +++ b/keyboards/work_louder/nano/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x574C", "pid": "0xE6F0", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "rgb_matrix": { "driver": "WS2812" diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h index 8f392bd0507ff09dc678e7fa19b67854021f44f8..1d8feeff5897e39e88be53a8a415d9b172437cb3 100644 --- a/keyboards/work_louder/work_board/config.h +++ b/keyboards/work_louder/work_board/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 - #define RGBLIGHT_DI_PIN D2 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json index b79a1144a1ca76dd7e18b085819cdcdbead10623..1b3bd41520f995cc866c5c460d1a0b9a38ac24ac 100644 --- a/keyboards/work_louder/work_board/info.json +++ b/keyboards/work_louder/work_board/info.json @@ -5,7 +5,8 @@ "maintainer": "Work Louder", "usb": { "vid": "0x574C", - "pid": "0xDCD1" + "pid": "0xDCD1", + "max_power": 100 }, "rgb_matrix": { "driver": "WS2812" diff --git a/keyboards/yiancardesigns/barleycorn/config.h b/keyboards/yiancardesigns/barleycorn/config.h index 5eed7521ffce624921fb97ef615d4326f859a5f4..5e90dd35159f8a6e0c33ef170c024b23f0805425 100644 --- a/keyboards/yiancardesigns/barleycorn/config.h +++ b/keyboards/yiancardesigns/barleycorn/config.h @@ -41,9 +41,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define USB_MAX_POWER_CONSUMPTION 100 - - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/yiancardesigns/barleycorn/info.json b/keyboards/yiancardesigns/barleycorn/info.json index ad19574eae8e8d63526a4924cb82e5bc9cf27d56..99786319b3e23faa8bb173da8b5fd2c8f252cc6b 100644 --- a/keyboards/yiancardesigns/barleycorn/info.json +++ b/keyboards/yiancardesigns/barleycorn/info.json @@ -5,7 +5,8 @@ "usb": { "vid": "0x8968", "pid": "0x4749", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "processor": "atmega328p", "bootloader": "usbasploader", diff --git a/keyboards/yiancardesigns/gingham/config.h b/keyboards/yiancardesigns/gingham/config.h index cf19c1bb220dd05cdafa28503f8e2048ce598f13..fe06114dd56ecdfdcd6bef947b6f20a8409b3438 100644 --- a/keyboards/yiancardesigns/gingham/config.h +++ b/keyboards/yiancardesigns/gingham/config.h @@ -41,8 +41,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define USB_MAX_POWER_CONSUMPTION 100 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/yiancardesigns/gingham/info.json b/keyboards/yiancardesigns/gingham/info.json index c09db755647dc9856200686eb8b0c6f06805163f..c0b1644fea8c548aeedd8d2f370ff470ae7ef12a 100644 --- a/keyboards/yiancardesigns/gingham/info.json +++ b/keyboards/yiancardesigns/gingham/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x8968", "pid": "0x4748", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "processor": "atmega328p", "bootloader": "usbasploader", diff --git a/keyboards/yiancardesigns/seigaiha/config.h b/keyboards/yiancardesigns/seigaiha/config.h index de93e5ecb269406dc5ba7694ee26fc0baa82d08b..70ce1c29abf08c05942a5e2af4ebb021e344b7d9 100644 --- a/keyboards/yiancardesigns/seigaiha/config.h +++ b/keyboards/yiancardesigns/seigaiha/config.h @@ -41,8 +41,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define USB_MAX_POWER_CONSUMPTION 100 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/yiancardesigns/seigaiha/info.json b/keyboards/yiancardesigns/seigaiha/info.json index fca905283eada3586609fcdbbc44543dcc79ac14..26ab6ab528aae6f6ea956f33498311431d5c0fd6 100644 --- a/keyboards/yiancardesigns/seigaiha/info.json +++ b/keyboards/yiancardesigns/seigaiha/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x8968", "pid": "0x4750", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "bootmagic": { "matrix": [1, 0] diff --git a/keyboards/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h index 81bfa2e81a7117df2f774231eb906984efd959e8..e97ca9ea63cb187c6799008fbc6a2e11dcac953b 100644 --- a/keyboards/ymdk/np21/config.h +++ b/keyboards/ymdk/np21/config.h @@ -54,5 +54,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/ymdk/np21/info.json b/keyboards/ymdk/np21/info.json index 1c4651c94c45755cd235a218e1c74dffb62af515..62fdf7e20c7cfbcce457eba321d60b099db81ffa 100644 --- a/keyboards/ymdk/np21/info.json +++ b/keyboards/ymdk/np21/info.json @@ -5,7 +5,8 @@ "usb": { "vid": "0x594D", "pid": "0x5021", - "device_version": "2.0.0" + "device_version": "2.0.0", + "max_power": 100 }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5"], diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymdk/ymd96/config.h index 3b6ffded66619dac90dd42850a4a2d1c056af761..ecb03b59175e0179e229105beaa3c5d8be55576d 100644 --- a/keyboards/ymdk/ymd96/config.h +++ b/keyboards/ymdk/ymd96/config.h @@ -21,8 +21,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 3 -#define USB_MAX_POWER_CONSUMPTION 100 - /* RGB underglow */ #define RGBLED_NUM 18 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json index d24d4fa4cdc447ea596c2179fdac6ecc4a8e1629..96f83d34129ca3cfddc6f7dc1443cc0131e09c1b 100644 --- a/keyboards/ymdk/ymd96/info.json +++ b/keyboards/ymdk/ymd96/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x20A0", "pid": "0x422D", - "device_version": "2.0.0" + "device_version": "2.0.0", + "max_power": 100 }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],