From 2944e938703e2049bb6262a0ab31e701d27e8ab3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 1 May 2023 17:37:12 +1000 Subject: Move `USB_MAX_POWER_CONSUMPTION` to data driven (#20648) --- 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 ++- 8 files changed, 8 insertions(+), 16 deletions(-) (limited to 'keyboards/work_louder') diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h index 4d5bcf9dba..93b3b54184 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 64aed890de..be5d470382 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 f23c5a4ef1..234b1de602 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 f6b45226a0..80c1c259f5 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 265da302e5..74427859cb 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 70da0e4cc4..097ad1f045 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 8f392bd050..1d8feeff58 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 b79a1144a1..1b3bd41520 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" -- cgit v1.2.3