aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMakotoKurauchi <pluis@me.com>2018-03-10 03:15:37 +0900
committerJack Humbert <jack.humb@gmail.com>2018-03-09 13:15:37 -0500
commit33134730047934639c98b766edf8e971833e930f (patch)
treee3afabaec13e0b920a2c6ed0db9bf35f9223b60c
parent3f1d147529233ebcc918cd3e4c96a8d249c321ce (diff)
downloadqmk_firmware-33134730047934639c98b766edf8e971833e930f.tar.gz
qmk_firmware-33134730047934639c98b766edf8e971833e930f.zip
Usb max power (#2502)
* add some comment about Helix customize and auto-setup RGBLIGHT_LIMIT_VAL * add define USB_MAX_POWER_CONSUMPTION
-rw-r--r--keyboards/helix/rev2/keymaps/default/config.h27
-rw-r--r--keyboards/helix/rev2/keymaps/default/rules.mk2
2 files changed, 28 insertions, 1 deletions
diff --git a/keyboards/helix/rev2/keymaps/default/config.h b/keyboards/helix/rev2/keymaps/default/config.h
index 5d8e37f64..53ff0b3ca 100644
--- a/keyboards/helix/rev2/keymaps/default/config.h
+++ b/keyboards/helix/rev2/keymaps/default/config.h
@@ -35,6 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
35// #define MASTER_RIGHT 35// #define MASTER_RIGHT
36// #define EE_HANDS 36// #define EE_HANDS
37 37
38// Helix keyboard OLED support
38//#define SSD1306OLED 39//#define SSD1306OLED
39 40
40/* Select rows configuration */ 41/* Select rows configuration */
@@ -64,9 +65,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
64 65
65#undef RGBLED_NUM 66#undef RGBLED_NUM
66#define RGBLIGHT_ANIMATIONS 67#define RGBLIGHT_ANIMATIONS
68// Helix keyboard : see ./rules.mk: RGBLIGHT_ENABLE = yes or no
69// Helix keyboard : RGBLED_NUM 6 or 32
67#define RGBLED_NUM 6 70#define RGBLED_NUM 6
68#define RGBLIGHT_LIMIT_VAL 255 71#if RGBLED_NUM <= 6
72 #define RGBLIGHT_LIMIT_VAL 255
73#else
74 #if HELIX_ROWS == 5
75 #define RGBLIGHT_LIMIT_VAL 120
76 #else
77 #define RGBLIGHT_LIMIT_VAL 130
78 #endif
79#endif
69#define RGBLIGHT_HUE_STEP 10 80#define RGBLIGHT_HUE_STEP 10
70#define RGBLIGHT_SAT_STEP 17 81#define RGBLIGHT_SAT_STEP 17
71#define RGBLIGHT_VAL_STEP 17 82#define RGBLIGHT_VAL_STEP 17
72#endif 83#endif
84
85#ifdef RGBLIGHT_ENABLE
86// USB_MAX_POWER_CONSUMPTION value for Helix keyboard
87// 120 RGBoff, OLEDoff
88// 120 OLED
89// 330 RGB 6
90// 300 RGB 32
91// 310 OLED & RGB 32
92 #define USB_MAX_POWER_CONSUMPTION 330
93#else
94 // fix iPhone and iPad power adapter issue
95 // iOS device need lessthan 100
96 #define USB_MAX_POWER_CONSUMPTION 100
97#endif
diff --git a/keyboards/helix/rev2/keymaps/default/rules.mk b/keyboards/helix/rev2/keymaps/default/rules.mk
index ce3ef6cd9..f4d345435 100644
--- a/keyboards/helix/rev2/keymaps/default/rules.mk
+++ b/keyboards/helix/rev2/keymaps/default/rules.mk
@@ -14,6 +14,8 @@ MIDI_ENABLE = no # MIDI controls
14AUDIO_ENABLE = no # Audio output on port C6 14AUDIO_ENABLE = no # Audio output on port C6
15UNICODE_ENABLE = no # Unicode 15UNICODE_ENABLE = no # Unicode
16BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 16BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
17# Helix keyboard : see ./config.h: RGBLED_NUM 6 or 32
18# Helix keyboard : RGBLIGHT_ENABLE = no or yes
17RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. 19RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
18ONEHAND_ENABLE = no # Enable one-hand typing 20ONEHAND_ENABLE = no # Enable one-hand typing
19 21