diff options
| author | Takeshi ISHII <2170248+mtei@users.noreply.github.com> | 2018-04-16 01:54:56 +0900 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-04-15 09:54:56 -0700 |
| commit | e2fb3079c7168ba109dfeeec20931ad75870186a (patch) | |
| tree | 33b9b4787204e03fa5c1c66dc4128be0fd237f67 /keyboards/helix/rev2/keymaps/five_rows/config.h | |
| parent | 13cdfb465d5f6a1833866c3bccde39db70054a85 (diff) | |
| download | qmk_firmware-e2fb3079c7168ba109dfeeec20931ad75870186a.tar.gz qmk_firmware-e2fb3079c7168ba109dfeeec20931ad75870186a.zip | |
update Helix keymap 'five_rows' (#2635)
* add 'HELIX=' option for build
* add IOS_DEVICE_ENABLE for iPad
* shrink size to helix five_rows keymap.c
* shrink size. _ADJUST number change
* add KEYPAD layer
* modify keypad leyer
* display RGB mode on slave side OLED
* fix Colemak, Dvorak center DEL to BS
* change LEFT BS to LEFT SP and add AUX layer for try old map
* update update_base_layer()
* add right keypad and keypad func layer
* use MO() macro insted of LOWER,RAISE,ADJUST custom key-code
* remove LOWER,RAISE,ADJUST custom key-code
* use MO(_LOWER|_RAISE|_ADJUST)
* relayout ADJUST layer
* modify Function Layer. PGUP,PGDN swap HOME,END
* add Keypad aux layer for '00' send
* update README.md, README_jp.md
* fix README.md
* fix README.md, README_jp.md
Diffstat (limited to 'keyboards/helix/rev2/keymaps/five_rows/config.h')
| -rw-r--r-- | keyboards/helix/rev2/keymaps/five_rows/config.h | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/keyboards/helix/rev2/keymaps/five_rows/config.h b/keyboards/helix/rev2/keymaps/five_rows/config.h index 8b1f00d9c0..10d9fc1c4b 100644 --- a/keyboards/helix/rev2/keymaps/five_rows/config.h +++ b/keyboards/helix/rev2/keymaps/five_rows/config.h @@ -78,30 +78,45 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLED_NUM 6 #endif -#if RGBLED_NUM <= 6 - #define RGBLIGHT_LIMIT_VAL 255 +#ifndef IOS_DEVICE_ENABLE + #if RGBLED_NUM <= 6 + #define RGBLIGHT_LIMIT_VAL 255 + #else + #if HELIX_ROWS == 5 + #define RGBLIGHT_LIMIT_VAL 120 + #else + #define RGBLIGHT_LIMIT_VAL 130 + #endif + #endif + #define RGBLIGHT_VAL_STEP 17 #else - #if HELIX_ROWS == 5 - #define RGBLIGHT_LIMIT_VAL 120 + #if RGBLED_NUM <= 6 + #define RGBLIGHT_LIMIT_VAL 90 #else - #define RGBLIGHT_LIMIT_VAL 130 + #if HELIX_ROWS == 5 + #define RGBLIGHT_LIMIT_VAL 35 + #else + #define RGBLIGHT_LIMIT_VAL 45 + #endif #endif + #define RGBLIGHT_VAL_STEP 4 #endif #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 -#define RGBLIGHT_VAL_STEP 17 -#endif -#ifdef RGBLIGHT_ENABLE + +#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) // USB_MAX_POWER_CONSUMPTION value for Helix keyboard // 120 RGBoff, OLEDoff // 120 OLED // 330 RGB 6 // 300 RGB 32 // 310 OLED & RGB 32 - #define USB_MAX_POWER_CONSUMPTION 330 + #define USB_MAX_POWER_CONSUMPTION 400 #else // fix iPhone and iPad power adapter issue // iOS device need lessthan 100 #define USB_MAX_POWER_CONSUMPTION 100 #endif + +#endif /* CONFIG_USER_H */ |