summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-05-01 17:37:12 +1000
committerGitHub <noreply@github.com>2023-05-01 17:37:12 +1000
commit2944e938703e2049bb6262a0ab31e701d27e8ab3 (patch)
treea73caa75fafe8b7926e18886d603c032d246fcac
parent12d42cedd2624db0d5cfe6f538211f9dfcd19822 (diff)
Move `USB_MAX_POWER_CONSUMPTION` to data driven (#20648)
-rw-r--r--keyboards/barleycorn_smd/config.h3
-rw-r--r--keyboards/barleycorn_smd/info.json3
-rw-r--r--keyboards/basketweave/config.h2
-rw-r--r--keyboards/basketweave/info.json3
-rw-r--r--keyboards/chavdai40/rev1/config.h3
-rw-r--r--keyboards/chavdai40/rev1/info.json3
-rw-r--r--keyboards/chavdai40/rev2/config.h3
-rw-r--r--keyboards/chavdai40/rev2/info.json3
-rw-r--r--keyboards/coseyfannitutti/discipad/config.h2
-rw-r--r--keyboards/coseyfannitutti/discipad/info.json3
-rw-r--r--keyboards/coseyfannitutti/discipline/config.h2
-rw-r--r--keyboards/coseyfannitutti/discipline/info.json3
-rw-r--r--keyboards/crimsonkeyboards/resume1800/config.h2
-rw-r--r--keyboards/crimsonkeyboards/resume1800/info.json3
-rw-r--r--keyboards/dm9records/plaid/config.h2
-rw-r--r--keyboards/dm9records/plaid/info.json3
-rw-r--r--keyboards/ericrlau/numdiscipline/rev1/config.h2
-rw-r--r--keyboards/ericrlau/numdiscipline/rev1/info.json3
-rw-r--r--keyboards/gboards/ergotaco/config.h2
-rw-r--r--keyboards/gboards/georgi/config.h2
-rw-r--r--keyboards/gboards/gergo/config.h2
-rw-r--r--keyboards/handwired/dactyl/config.h2
-rw-r--r--keyboards/handwired/dc/mc/001/config.h2
-rw-r--r--keyboards/handwired/dc/mc/001/info.json3
-rw-r--r--keyboards/handwired/frenchdev/config.h2
-rw-r--r--keyboards/handwired/hnah40/config.h2
-rw-r--r--keyboards/handwired/hnah40/info.json3
-rw-r--r--keyboards/handwired/lovelive9/config.h1
-rw-r--r--keyboards/handwired/lovelive9/info.json3
-rw-r--r--keyboards/hotdox/config.h2
-rw-r--r--keyboards/jkdlab/binary_monkey/config.h21
-rw-r--r--keyboards/jkdlab/binary_monkey/info.json3
-rw-r--r--keyboards/kagizaraya/chidori/config.h1
-rw-r--r--keyboards/kagizaraya/chidori/info.json3
-rw-r--r--keyboards/keycapsss/plaid_pad/config.h2
-rw-r--r--keyboards/keycapsss/plaid_pad/info.json3
-rw-r--r--keyboards/kinesis/kint2pp/config.h5
-rw-r--r--keyboards/kinesis/kint2pp/info.json3
-rw-r--r--keyboards/kinesis/kint36/config.h4
-rw-r--r--keyboards/kinesis/kint36/info.json3
-rw-r--r--keyboards/kinesis/kint41/config.h4
-rw-r--r--keyboards/kinesis/kint41/info.json3
-rw-r--r--keyboards/kinesis/kintlc/config.h5
-rw-r--r--keyboards/kinesis/kintlc/info.json3
-rw-r--r--keyboards/kprepublic/jj40/config.h2
-rw-r--r--keyboards/kprepublic/jj40/info.json3
-rw-r--r--keyboards/kprepublic/jj4x4/config.h2
-rw-r--r--keyboards/kprepublic/jj4x4/info.json3
-rw-r--r--keyboards/littlealby/mute/config.h2
-rw-r--r--keyboards/littlealby/mute/info.json3
-rw-r--r--keyboards/orthocode/config.h2
-rw-r--r--keyboards/orthocode/info.json3
-rw-r--r--keyboards/p3d/glitch/config.h2
-rw-r--r--keyboards/p3d/glitch/info.json3
-rw-r--r--keyboards/peej/lumberjack/config.h19
-rw-r--r--keyboards/peej/lumberjack/info.json3
-rw-r--r--keyboards/peej/rosaline/config.h2
-rw-r--r--keyboards/peej/rosaline/ortho/info.json3
-rw-r--r--keyboards/peej/rosaline/staggered/info.json3
-rw-r--r--keyboards/ploopyco/mouse/config.h2
-rw-r--r--keyboards/ploopyco/mouse/info.json3
-rw-r--r--keyboards/ploopyco/trackball/config.h2
-rw-r--r--keyboards/ploopyco/trackball/info.json3
-rw-r--r--keyboards/ploopyco/trackball_mini/config.h2
-rw-r--r--keyboards/ploopyco/trackball_mini/info.json3
-rw-r--r--keyboards/ploopyco/trackball_nano/config.h2
-rw-r--r--keyboards/ploopyco/trackball_nano/info.json3
-rw-r--r--keyboards/punk75/config.h2
-rw-r--r--keyboards/rgbkb/pan/config.h1
-rw-r--r--keyboards/ryanskidmore/rskeys100/config.h3
-rw-r--r--keyboards/sendyyeah/pix/config.h2
-rw-r--r--keyboards/tokyokeyboard/tokyo60/config.h3
-rw-r--r--keyboards/tokyokeyboard/tokyo60/info.json3
-rw-r--r--keyboards/torn/config.h2
-rw-r--r--keyboards/torn/info.json3
-rw-r--r--keyboards/trashman/ketch/config.h1
-rw-r--r--keyboards/trashman/ketch/info.json3
-rw-r--r--keyboards/tronguylabs/m122_3270/config.h21
-rw-r--r--keyboards/tronguylabs/m122_3270/info.json3
-rw-r--r--keyboards/uranuma/config.h4
-rw-r--r--keyboards/uranuma/info.json3
-rw-r--r--keyboards/work_louder/loop/config.h2
-rw-r--r--keyboards/work_louder/loop/info.json3
-rw-r--r--keyboards/work_louder/micro/config.h6
-rw-r--r--keyboards/work_louder/micro/info.json3
-rw-r--r--keyboards/work_louder/nano/config.h2
-rw-r--r--keyboards/work_louder/nano/info.json3
-rw-r--r--keyboards/work_louder/work_board/config.h2
-rw-r--r--keyboards/work_louder/work_board/info.json3
-rw-r--r--keyboards/yiancardesigns/barleycorn/config.h3
-rw-r--r--keyboards/yiancardesigns/barleycorn/info.json3
-rw-r--r--keyboards/yiancardesigns/gingham/config.h2
-rw-r--r--keyboards/yiancardesigns/gingham/info.json3
-rw-r--r--keyboards/yiancardesigns/seigaiha/config.h2
-rw-r--r--keyboards/yiancardesigns/seigaiha/info.json3
-rw-r--r--keyboards/ymdk/np21/config.h2
-rw-r--r--keyboards/ymdk/np21/info.json3
-rw-r--r--keyboards/ymdk/ymd96/config.h2
-rw-r--r--keyboards/ymdk/ymd96/info.json3
99 files changed, 90 insertions, 226 deletions
diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h
index 2d53b280f7..167c3b5c87 100644
--- a/keyboards/barleycorn_smd/config.h
+++ b/keyboards/barleycorn_smd/config.h
@@ -54,9 +54,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* 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 b37d4003f7..0f759e5f4d 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 87864e2bf4..36054e7bb6 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 825364424b..8f9be9b406 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 277219f16d..8f5f5496a2 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 511dff4ad1..67705c25bb 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 277219f16d..8f5f5496a2 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 97cd474fa0..acefcabdc7 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 edcaedfb79..31a3fe8cb0 100644
--- a/keyboards/coseyfannitutti/discipad/config.h
+++ b/keyboards/coseyfannitutti/discipad/config.h
@@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 d7291698b3..9ce76c840a 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 d43ae80cb9..0acee7345a 100644
--- a/keyboards/coseyfannitutti/discipline/config.h
+++ b/keyboards/coseyfannitutti/discipline/config.h
@@ -16,8 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 e699bc0a46..f28e0cd4d8 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 7c66ab16c6..bdc484a3b3 100644
--- a/keyboards/crimsonkeyboards/resume1800/config.h
+++ b/keyboards/crimsonkeyboards/resume1800/config.h
@@ -16,8 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 b8cd36dbed..664a69e22e 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 b4b541dbfc..71400c3cf8 100644
--- a/keyboards/dm9records/plaid/config.h
+++ b/keyboards/dm9records/plaid/config.h
@@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 cedf1fae5d..a18de0accd 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 d5c2b1438e..055e8afe38 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 <http://www.gnu.org/licenses/>.
#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 dd5a8a7a16..efcbcf2ab0 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"
+ "dev