-
-
Notifications
You must be signed in to change notification settings - Fork 40.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Keyboard] Zinc: fix RGBLED_NUM bug (#13287)
- Loading branch information
1 parent
1a494da
commit 85a14ac
Showing
4 changed files
with
174 additions
and
144 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| /* | ||
| Copyright 2012 Jun Wako <[email protected]> | ||
| Copyright 2015 Jack Humbert | ||
| Copyright 2018 monksoffunk | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
|
|
@@ -59,76 +58,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| /* ws2812 RGB LED */ | ||
| #define RGB_DI_PIN D3 | ||
|
|
||
| // RGB LED support | ||
| //#define RGBLIGHT_ANIMATIONS : see ./rules.mk: LED_ANIMATIONS = yes or no | ||
| // see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes | ||
| #ifdef RGBLIGHT_ENABLE | ||
| #define RGBLIGHT_SPLIT | ||
| #ifdef RGBLED_BACK | ||
| #ifdef RGBLED_CONT | ||
| #define RGBLED_NUM 48 | ||
| #define RGBLED_SPLIT { 24, 24 } | ||
| #else | ||
| #define RGBLED_NUM 24 | ||
| #endif | ||
| #else | ||
| #ifdef RGBLED_BOTH | ||
| #ifdef RGBLED_CONT | ||
| #define RGBLED_NUM 60 | ||
| #define RGBLED_SPLIT { 30, 30 } | ||
| // #define RGBLIGHT_LED_MAP {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29} | ||
| #else | ||
| #define RGBLED_NUM 30 | ||
| #endif | ||
| #else | ||
| #ifdef RGBLED_CONT | ||
| #define RGBLED_NUM 12 | ||
| #define RGBLED_SPLIT { 6, 6 } | ||
| #else | ||
| #define RGBLED_NUM 6 | ||
| #endif | ||
| #endif | ||
| #endif | ||
| #endif | ||
|
|
||
| #ifndef IOS_DEVICE_ENABLE | ||
| #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12)) | ||
| #define RGBLIGHT_LIMIT_VAL 255 | ||
| #else | ||
| #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32)) | ||
| #define RGBLIGHT_LIMIT_VAL 130 | ||
| #else | ||
| #define RGBLIGHT_LIMIT_VAL 120 | ||
| #endif | ||
| #endif | ||
| #define RGBLIGHT_VAL_STEP 17 | ||
| #else | ||
| #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12)) | ||
| #define RGBLIGHT_LIMIT_VAL 90 | ||
| #else | ||
| #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32)) | ||
| #define RGBLIGHT_LIMIT_VAL 45 | ||
| #else | ||
| #define RGBLIGHT_LIMIT_VAL 35 | ||
| #endif | ||
| #endif | ||
| #define RGBLIGHT_VAL_STEP 4 | ||
| #endif | ||
| #define RGBLIGHT_HUE_STEP 10 | ||
| #define RGBLIGHT_SAT_STEP 17 | ||
|
|
||
| #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) | ||
| // USB_MAX_POWER_CONSUMPTION value | ||
| // 120 RGBoff | ||
| // 330 RGB 6 | ||
| // 300 RGB 32 | ||
| #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 | ||
|
|
||
| /* | ||
| * Feature disable options | ||
| * These options are also useful to firmware size reduction. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| Copyright 2021 monksoffunk | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation, either version 2 of the License, or | ||
| (at your option) any later version. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
| You should have received a copy of the GNU General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| // RGB LED support | ||
| //#define RGBLIGHT_ANIMATIONS : see ./rules.mk: LED_ANIMATIONS = yes or no | ||
| // see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes | ||
| #ifdef RGBLIGHT_ENABLE | ||
| #define RGBLIGHT_SPLIT | ||
| #ifdef RGBLED_BACK | ||
| #ifdef RGBLED_CONT | ||
| #define RGBLED_NUM 48 | ||
| #define RGBLED_SPLIT { 24, 24 } | ||
| #else | ||
| #define RGBLED_NUM 24 | ||
| #endif | ||
| #else | ||
| #ifdef RGBLED_BOTH | ||
| #ifdef RGBLED_CONT | ||
| #define RGBLED_NUM 60 | ||
| #define RGBLED_SPLIT { 30, 30 } | ||
| // #define RGBLIGHT_LED_MAP {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29} | ||
| #else | ||
| #define RGBLED_NUM 30 | ||
| #endif | ||
| #else | ||
| #ifdef RGBLED_CONT | ||
| #define RGBLED_NUM 12 | ||
| #define RGBLED_SPLIT { 6, 6 } | ||
| #else | ||
| #define RGBLED_NUM 6 | ||
| #endif | ||
| #endif | ||
| #endif | ||
| #endif | ||
|
|
||
| #ifndef IOS_DEVICE_ENABLE | ||
| #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12)) | ||
| #define RGBLIGHT_LIMIT_VAL 255 | ||
| #else | ||
| #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32)) | ||
| #define RGBLIGHT_LIMIT_VAL 130 | ||
| #else | ||
| #define RGBLIGHT_LIMIT_VAL 120 | ||
| #endif | ||
| #endif | ||
| #define RGBLIGHT_VAL_STEP 17 | ||
| #else | ||
| #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12)) | ||
| #define RGBLIGHT_LIMIT_VAL 90 | ||
| #else | ||
| #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32)) | ||
| #define RGBLIGHT_LIMIT_VAL 45 | ||
| #else | ||
| #define RGBLIGHT_LIMIT_VAL 35 | ||
| #endif | ||
| #endif | ||
| #define RGBLIGHT_VAL_STEP 4 | ||
| #endif | ||
| #define RGBLIGHT_HUE_STEP 10 | ||
| #define RGBLIGHT_SAT_STEP 17 | ||
|
|
||
| #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) | ||
| // USB_MAX_POWER_CONSUMPTION value | ||
| // 120 RGBoff | ||
| // 330 RGB 6 | ||
| // 300 RGB 32 | ||
| #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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| /* | ||
| Copyright 2012 Jun Wako <[email protected]> | ||
| Copyright 2015 Jack Humbert | ||
| Copyright 2018 monksoffunk | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
|
|
@@ -59,76 +58,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| /* ws2812 RGB LED */ | ||
| #define RGB_DI_PIN D3 | ||
|
|
||
| // RGB LED support | ||
| //#define RGBLIGHT_ANIMATIONS : see ./rules.mk: LED_ANIMATIONS = yes or no | ||
| // see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes | ||
| #ifdef RGBLIGHT_ENABLE | ||
| #define RGBLIGHT_SPLIT | ||
| #ifdef RGBLED_BACK | ||
| #ifdef RGBLED_CONT | ||
| #define RGBLED_NUM 48 | ||
| #define RGBLED_SPLIT { 24, 24 } | ||
| #else | ||
| #define RGBLED_NUM 24 | ||
| #endif | ||
| #else | ||
| #ifdef RGBLED_BOTH | ||
| #ifdef RGBLED_CONT | ||
| #define RGBLED_NUM 60 | ||
| #define RGBLED_SPLIT { 30, 30 } | ||
| // #define RGBLIGHT_LED_MAP {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29} | ||
| #else | ||
| #define RGBLED_NUM 30 | ||
| #endif | ||
| #else | ||
| #ifdef RGBLED_CONT | ||
| #define RGBLED_NUM 12 | ||
| #define RGBLED_SPLIT { 6, 6 } | ||
| #else | ||
| #define RGBLED_NUM 6 | ||
| #endif | ||
| #endif | ||
| #endif | ||
| #endif | ||
|
|
||
| #ifndef IOS_DEVICE_ENABLE | ||
| #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12)) | ||
| #define RGBLIGHT_LIMIT_VAL 255 | ||
| #else | ||
| #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32)) | ||
| #define RGBLIGHT_LIMIT_VAL 130 | ||
| #else | ||
| #define RGBLIGHT_LIMIT_VAL 120 | ||
| #endif | ||
| #endif | ||
| #define RGBLIGHT_VAL_STEP 17 | ||
| #else | ||
| #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12)) | ||
| #define RGBLIGHT_LIMIT_VAL 90 | ||
| #else | ||
| #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32)) | ||
| #define RGBLIGHT_LIMIT_VAL 45 | ||
| #else | ||
| #define RGBLIGHT_LIMIT_VAL 35 | ||
| #endif | ||
| #endif | ||
| #define RGBLIGHT_VAL_STEP 4 | ||
| #endif | ||
| #define RGBLIGHT_HUE_STEP 10 | ||
| #define RGBLIGHT_SAT_STEP 17 | ||
|
|
||
| #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) | ||
| // USB_MAX_POWER_CONSUMPTION value | ||
| // 120 RGBoff | ||
| // 330 RGB 6 | ||
| // 300 RGB 32 | ||
| #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 | ||
|
|
||
| /* | ||
| * Feature disable options | ||
| * These options are also useful to firmware size reduction. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| Copyright 2021 monksoffunk | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation, either version 2 of the License, or | ||
| (at your option) any later version. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
| You should have received a copy of the GNU General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| // RGB LED support | ||
| //#define RGBLIGHT_ANIMATIONS : see ./rules.mk: LED_ANIMATIONS = yes or no | ||
| // see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes | ||
| #ifdef RGBLIGHT_ENABLE | ||
| #define RGBLIGHT_SPLIT | ||
| #ifdef RGBLED_BACK | ||
| #ifdef RGBLED_CONT | ||
| #define RGBLED_NUM 48 | ||
| #define RGBLED_SPLIT { 24, 24 } | ||
| #else | ||
| #define RGBLED_NUM 24 | ||
| #endif | ||
| #else | ||
| #ifdef RGBLED_BOTH | ||
| #ifdef RGBLED_CONT | ||
| #define RGBLED_NUM 60 | ||
| #define RGBLED_SPLIT { 30, 30 } | ||
| // #define RGBLIGHT_LED_MAP {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29} | ||
| #else | ||
| #define RGBLED_NUM 30 | ||
| #endif | ||
| #else | ||
| #ifdef RGBLED_CONT | ||
| #define RGBLED_NUM 12 | ||
| #define RGBLED_SPLIT { 6, 6 } | ||
| #else | ||
| #define RGBLED_NUM 6 | ||
| #endif | ||
| #endif | ||
| #endif | ||
| #endif | ||
|
|
||
| #ifndef IOS_DEVICE_ENABLE | ||
| #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12)) | ||
| #define RGBLIGHT_LIMIT_VAL 255 | ||
| #else | ||
| #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32)) | ||
| #define RGBLIGHT_LIMIT_VAL 130 | ||
| #else | ||
| #define RGBLIGHT_LIMIT_VAL 120 | ||
| #endif | ||
| #endif | ||
| #define RGBLIGHT_VAL_STEP 17 | ||
| #else | ||
| #if (RGBLED_NUM <= 6) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 12)) | ||
| #define RGBLIGHT_LIMIT_VAL 90 | ||
| #else | ||
| #if (RGBLED_NUM <= 16) || (defined(RGBLED_CONT) && (RGBLED_NUM <= 32)) | ||
| #define RGBLIGHT_LIMIT_VAL 45 | ||
| #else | ||
| #define RGBLIGHT_LIMIT_VAL 35 | ||
| #endif | ||
| #endif | ||
| #define RGBLIGHT_VAL_STEP 4 | ||
| #endif | ||
| #define RGBLIGHT_HUE_STEP 10 | ||
| #define RGBLIGHT_SAT_STEP 17 | ||
|
|
||
| #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) | ||
| // USB_MAX_POWER_CONSUMPTION value | ||
| // 120 RGBoff | ||
| // 330 RGB 6 | ||
| // 300 RGB 32 | ||
| #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 |