Move USB_MAX_POWER_CONSUMPTION to data driven (qmk#20648)

freznel10 · May 1, 2023 · 2944e93 · 2944e93
1 parent 12d42ce
commit 2944e93
Show file tree

Hide file tree

Showing 99 changed files with 90 additions and 226 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -43,5 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* 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
@@ -51,5 +51,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     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
@@ -55,5 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     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
@@ -49,5 +49,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* 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
@@ -32,5 +32,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
@@ -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
@@ -25,8 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
@@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -48,7 +48,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,6 +19,3 @@


		#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE

		/* usb power settings */
		#define USB_MAX_POWER_CONSUMPTION 100
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,5 +43,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

		/* key combination for command */
		#define IS_COMMAND() (get_mods() == MOD_MASK_CTRL \|\| get_mods() == MOD_MASK_SHIFT)

		#define USB_MAX_POWER_CONSUMPTION 500
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,5 +49,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

		/* fix space cadet rollover issue */
		#define DISABLE_SPACE_CADET_ROLLOVER

		#define USB_MAX_POWER_CONSUMPTION 500