diff options
| author | yiancar <yiangosyiangou@cytanet.com.cy> | 2020-10-01 08:27:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-01 17:27:18 +1000 |
| commit | 76e35e02cc6caf88eb5bb06c9780619b78725d16 (patch) | |
| tree | c6f193bd757d6f74c714b5811440581334d78824 | |
| parent | 272b3309dd4121b49bc41e3c0213111aaf4962d7 (diff) | |
| download | qmk_firmware-76e35e02cc6caf88eb5bb06c9780619b78725d16.tar.gz qmk_firmware-76e35e02cc6caf88eb5bb06c9780619b78725d16.zip | |
Rename nebula65 -> nebula68 (#10490)
Co-authored-by: Ryan <fauxpark@gmail.com>
| -rw-r--r-- | keyboards/nebula68/chconf.h (renamed from keyboards/nebula65/chconf.h) | 0 | ||||
| -rwxr-xr-x | keyboards/nebula68/config.h (renamed from keyboards/nebula65/config.h) | 5 | ||||
| -rw-r--r-- | keyboards/nebula68/halconf.h (renamed from keyboards/nebula65/halconf.h) | 0 | ||||
| -rwxr-xr-x | keyboards/nebula68/info.json (renamed from keyboards/nebula65/info.json) | 2 | ||||
| -rwxr-xr-x | keyboards/nebula68/keymaps/default/keymap.c (renamed from keyboards/nebula65/keymaps/default/keymap.c) | 0 | ||||
| -rwxr-xr-x | keyboards/nebula68/keymaps/default/readme.md (renamed from keyboards/nebula65/keymaps/default/readme.md) | 4 | ||||
| -rwxr-xr-x | keyboards/nebula68/keymaps/via/keymap.c (renamed from keyboards/nebula65/keymaps/via/keymap.c) | 0 | ||||
| -rwxr-xr-x | keyboards/nebula68/keymaps/via/readme.md (renamed from keyboards/nebula65/keymaps/via/readme.md) | 4 | ||||
| -rwxr-xr-x | keyboards/nebula68/keymaps/via/rules.mk (renamed from keyboards/nebula65/keymaps/via/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/nebula68/mcuconf.h (renamed from keyboards/nebula65/mcuconf.h) | 0 | ||||
| -rwxr-xr-x | keyboards/nebula68/nebula68.c (renamed from keyboards/nebula65/nebula65.c) | 6 | ||||
| -rwxr-xr-x | keyboards/nebula68/nebula68.h (renamed from keyboards/nebula65/nebula65.h) | 0 | ||||
| -rwxr-xr-x | keyboards/nebula68/readme.md (renamed from keyboards/nebula65/readme.md) | 8 | ||||
| -rwxr-xr-x | keyboards/nebula68/rules.mk (renamed from keyboards/nebula65/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/wilba_tech/wt_rgb_backlight.c | 80 |
15 files changed, 54 insertions, 55 deletions
diff --git a/keyboards/nebula65/chconf.h b/keyboards/nebula68/chconf.h index aac330370..aac330370 100644 --- a/keyboards/nebula65/chconf.h +++ b/keyboards/nebula68/chconf.h | |||
diff --git a/keyboards/nebula65/config.h b/keyboards/nebula68/config.h index efd413328..1d6cb5e91 100755 --- a/keyboards/nebula65/config.h +++ b/keyboards/nebula68/config.h | |||
| @@ -24,8 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 24 | #define PRODUCT_ID 0x5336 | 24 | #define PRODUCT_ID 0x5336 |
| 25 | #define DEVICE_VER 0x0001 | 25 | #define DEVICE_VER 0x0001 |
| 26 | #define MANUFACTURER Yiancar-Designs | 26 | #define MANUFACTURER Yiancar-Designs |
| 27 | #define PRODUCT NEBULA65 | 27 | #define PRODUCT NEBULA68 |
| 28 | #define DESCRIPTION "A 65-percent, tool-free RGB keyboard" | ||
| 29 | 28 | ||
| 30 | /* key matrix size */ | 29 | /* key matrix size */ |
| 31 | #define MATRIX_ROWS 5 | 30 | #define MATRIX_ROWS 5 |
| @@ -106,7 +105,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 106 | 105 | ||
| 107 | #define RGB_BACKLIGHT_ENABLED 1 | 106 | #define RGB_BACKLIGHT_ENABLED 1 |
| 108 | 107 | ||
| 109 | #define RGB_BACKLIGHT_NEBULA65 | 108 | #define RGB_BACKLIGHT_NEBULA68 |
| 110 | 109 | ||
| 111 | // they aren't really used if RGB_BACKLIGHT_NEBULA65 defined | 110 | // they aren't really used if RGB_BACKLIGHT_NEBULA65 defined |
| 112 | #define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0 | 111 | #define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0 |
diff --git a/keyboards/nebula65/halconf.h b/keyboards/nebula68/halconf.h index e4952ece8..e4952ece8 100644 --- a/keyboards/nebula65/halconf.h +++ b/keyboards/nebula68/halconf.h | |||
diff --git a/keyboards/nebula65/info.json b/keyboards/nebula68/info.json index c68e11dda..2cabbd616 100755 --- a/keyboards/nebula65/info.json +++ b/keyboards/nebula68/info.json | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | { | 1 | { |
| 2 | "keyboard_name": "NEBULA65", | 2 | "keyboard_name": "NEBULA68", |
| 3 | "url": "", | 3 | "url": "", |
| 4 | "maintainer": "yiancar", | 4 | "maintainer": "yiancar", |
| 5 | "width": 17.25, | 5 | "width": 17.25, |
diff --git a/keyboards/nebula65/keymaps/default/keymap.c b/keyboards/nebula68/keymaps/default/keymap.c index da4479f89..da4479f89 100755 --- a/keyboards/nebula65/keymaps/default/keymap.c +++ b/keyboards/nebula68/keymaps/default/keymap.c | |||
diff --git a/keyboards/nebula65/keymaps/default/readme.md b/keyboards/nebula68/keymaps/default/readme.md index 324676b64..a8ae2ac8c 100755 --- a/keyboards/nebula65/keymaps/default/readme.md +++ b/keyboards/nebula68/keymaps/default/readme.md | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # The default keymap for Nebula65. VIA support disabled. | 1 | # The default keymap for Nebula68. VIA support disabled. |
| 2 | 2 | ||
| 3 |  | 3 |  |
| 4 | 4 | ||
| 5 |  | 5 |  |
| 6 | 6 | ||
| 7 | Default layer is normal ANSI 65% | 7 | Default layer is normal ANSI 68% |
diff --git a/keyboards/nebula65/keymaps/via/keymap.c b/keyboards/nebula68/keymaps/via/keymap.c index da4479f89..da4479f89 100755 --- a/keyboards/nebula65/keymaps/via/keymap.c +++ b/keyboards/nebula68/keymaps/via/keymap.c | |||
diff --git a/keyboards/nebula65/keymaps/via/readme.md b/keyboards/nebula68/keymaps/via/readme.md index d15266ea7..e45ec36bb 100755 --- a/keyboards/nebula65/keymaps/via/readme.md +++ b/keyboards/nebula68/keymaps/via/readme.md | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # The default keymap for Nebula65. VIA support enabled. | 1 | # The default keymap for Nebula68. VIA support enabled. |
| 2 | 2 | ||
| 3 |  | 3 |  |
| 4 | 4 | ||
| 5 |  | 5 |  |
| 6 | 6 | ||
| 7 | Default layer is normal ANSI 65% | 7 | Default layer is normal ANSI 68% |
diff --git a/keyboards/nebula65/keymaps/via/rules.mk b/keyboards/nebula68/keymaps/via/rules.mk index 1e5b99807..1e5b99807 100755 --- a/keyboards/nebula65/keymaps/via/rules.mk +++ b/keyboards/nebula68/keymaps/via/rules.mk | |||
diff --git a/keyboards/nebula65/mcuconf.h b/keyboards/nebula68/mcuconf.h index 3b1301f08..3b1301f08 100644 --- a/keyboards/nebula65/mcuconf.h +++ b/keyboards/nebula68/mcuconf.h | |||
diff --git a/keyboards/nebula65/nebula65.c b/keyboards/nebula68/nebula68.c index b3e7cc663..054a269bf 100755 --- a/keyboards/nebula65/nebula65.c +++ b/keyboards/nebula68/nebula68.c | |||
| @@ -13,8 +13,8 @@ | |||
| 13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | #ifndef RGB_BACKLIGHT_NEBULA65 | 16 | #ifndef RGB_BACKLIGHT_NEBULA68 |
| 17 | #error RGB_BACKLIGHT_NEBULA65 not defined, recheck config.h | 17 | #error RGB_BACKLIGHT_NEBULA68 not defined, recheck config.h |
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | #include "nebula65.h" | 20 | #include "nebula68.h" |
diff --git a/keyboards/nebula65/nebula65.h b/keyboards/nebula68/nebula68.h index db9c7f26c..db9c7f26c 100755 --- a/keyboards/nebula65/nebula65.h +++ b/keyboards/nebula68/nebula68.h | |||
diff --git a/keyboards/nebula65/readme.md b/keyboards/nebula68/readme.md index 5189c049c..b990ed20d 100755 --- a/keyboards/nebula65/readme.md +++ b/keyboards/nebula68/readme.md | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | # Nebula65 | 1 | # Nebula68 |
| 2 | 2 | ||
| 3 | This is a standard fixed layout 65% PCB. It supports VIA, full per-key RGB and underglow RGB. | 3 | This is a standard fixed layout 68% PCB. It supports VIA, full per-key RGB and underglow RGB. |
| 4 | 4 | ||
| 5 | * Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar) | 5 | * Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar) |
| 6 | * Hardware Supported: A 65% keyboard with STM32F303CC | 6 | * Hardware Supported: A 68% keyboard with STM32F303CC |
| 7 | * Hardware Availability: https://spaceholdings.net/ | 7 | * Hardware Availability: https://spaceholdings.net/ |
| 8 | 8 | ||
| 9 | ## Instructions | 9 | ## Instructions |
| @@ -12,7 +12,7 @@ This is a standard fixed layout 65% PCB. It supports VIA, full per-key RGB and u | |||
| 12 | 12 | ||
| 13 | Make example for this keyboard (after setting up your build environment): | 13 | Make example for this keyboard (after setting up your build environment): |
| 14 | 14 | ||
| 15 | make nebula65:via | 15 | make nebula68:via |
| 16 | 16 | ||
| 17 | See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). | 17 | See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). |
| 18 | 18 | ||
diff --git a/keyboards/nebula65/rules.mk b/keyboards/nebula68/rules.mk index 399385b3e..399385b3e 100755 --- a/keyboards/nebula65/rules.mk +++ b/keyboards/nebula68/rules.mk | |||
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c index 30c9c4c56..cd3fdd200 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight.c +++ b/keyboards/wilba_tech/wt_rgb_backlight.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | defined(RGB_BACKLIGHT_NK65) || \ | 26 | defined(RGB_BACKLIGHT_NK65) || \ |
| 27 | defined(RGB_BACKLIGHT_NK87) || \ | 27 | defined(RGB_BACKLIGHT_NK87) || \ |
| 28 | defined(RGB_BACKLIGHT_NEBULA12) || \ | 28 | defined(RGB_BACKLIGHT_NEBULA12) || \ |
| 29 | defined(RGB_BACKLIGHT_NEBULA65) || \ | 29 | defined(RGB_BACKLIGHT_NEBULA68) || \ |
| 30 | defined(RGB_BACKLIGHT_U80_A) || \ | 30 | defined(RGB_BACKLIGHT_U80_A) || \ |
| 31 | defined(RGB_BACKLIGHT_DAWN60) || \ | 31 | defined(RGB_BACKLIGHT_DAWN60) || \ |
| 32 | defined(RGB_BACKLIGHT_WT60_B) || \ | 32 | defined(RGB_BACKLIGHT_WT60_B) || \ |
| @@ -50,7 +50,7 @@ | |||
| 50 | #include "wt_rgb_backlight_api.h" | 50 | #include "wt_rgb_backlight_api.h" |
| 51 | #include "wt_rgb_backlight_keycodes.h" | 51 | #include "wt_rgb_backlight_keycodes.h" |
| 52 | 52 | ||
| 53 | #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_NEBULA65) && !defined(RGB_BACKLIGHT_NEBULA12) | 53 | #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) |
| 54 | #include <avr/interrupt.h> | 54 | #include <avr/interrupt.h> |
| 55 | #include "drivers/avr/i2c_master.h" | 55 | #include "drivers/avr/i2c_master.h" |
| 56 | #else | 56 | #else |
| @@ -81,7 +81,7 @@ LED_TYPE g_ws2812_leds[WS2812_LED_TOTAL]; | |||
| 81 | #elif defined(RGB_BACKLIGHT_HS60) | 81 | #elif defined(RGB_BACKLIGHT_HS60) |
| 82 | #include "drivers/issi/is31fl3733.h" | 82 | #include "drivers/issi/is31fl3733.h" |
| 83 | #define BACKLIGHT_LED_COUNT 64 | 83 | #define BACKLIGHT_LED_COUNT 64 |
| 84 | #elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65) | 84 | #elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) |
| 85 | #include "drivers/issi/is31fl3733.h" | 85 | #include "drivers/issi/is31fl3733.h" |
| 86 | #define BACKLIGHT_LED_COUNT 69 | 86 | #define BACKLIGHT_LED_COUNT 69 |
| 87 | #elif defined(RGB_BACKLIGHT_NK87) | 87 | #elif defined(RGB_BACKLIGHT_NK87) |
| @@ -227,7 +227,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 227 | {0, K_16, J_16, L_16}, //LA64 | 227 | {0, K_16, J_16, L_16}, //LA64 |
| 228 | }; | 228 | }; |
| 229 | 229 | ||
| 230 | #elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65) || defined(RGB_BACKLIGHT_NK87) | 230 | #elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NK87) |
| 231 | 231 | ||
| 232 | // This is a 7-bit address, that gets left-shifted and bit 0 | 232 | // This is a 7-bit address, that gets left-shifted and bit 0 |
| 233 | // set to 0 for write, 1 for read (as per I2C protocol) | 233 | // set to 0 for write, 1 for read (as per I2C protocol) |
| @@ -1061,7 +1061,7 @@ const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = { | |||
| 1061 | {255,255}, {255,255}, {255,255}, {255,255}, | 1061 | {255,255}, {255,255}, {255,255}, {255,255}, |
| 1062 | {200,196}, {192,192}, {184,196}, {213,74} | 1062 | {200,196}, {192,192}, {184,196}, {213,74} |
| 1063 | }; | 1063 | }; |
| 1064 | #elif defined(RGB_BACKLIGHT_NEBULA65) | 1064 | #elif defined(RGB_BACKLIGHT_NEBULA68) |
| 1065 | const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = { | 1065 | const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = { |
| 1066 | // LA1..LA60 | 1066 | // LA1..LA60 |
| 1067 | {0,0}, {4,16}, {6,31}, {10,47}, {16,0}, {24,16}, {27,31}, {35,47}, {31,0}, {39,16}, {43,31}, {51,47}, | 1067 | {0,0}, {4,16}, {6,31}, {10,47}, {16,0}, {24,16}, {27,31}, {35,47}, {31,0}, {39,16}, {43,31}, {51,47}, |
| @@ -1158,7 +1158,7 @@ const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = { | |||
| 1158 | #elif defined(RGB_BACKLIGHT_M50_A) | 1158 | #elif defined(RGB_BACKLIGHT_M50_A) |
| 1159 | const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = { | 1159 | const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = { |
| 1160 | // LA0..LA17 | 1160 | // LA0..LA17 |
| 1161 | {255,255}, {104,16}, {88,16}, {72,16}, {56,16}, {40,16}, {24,16}, {255,255}, {255,255}, | 1161 | {255,255}, {104,16}, {88,16}, {72,16}, {56,16}, {40,16}, {24,16}, {255,255}, {255,255}, |
| 1162 | {104,0}, {88,0}, {72,0}, {56,0}, {40,0}, {24,0}, {0,0}, {0,16}, {255,255}, | 1162 | {104,0}, {88,0}, {72,0}, {56,0}, {40,0}, {24,0}, {0,0}, {0,16}, {255,255}, |
| 1163 | // LB0..LB17 | 1163 | // LB0..LB17 |
| 1164 | {255,255}, {120,0}, {136,0}, {152,0}, {168,0}, {184,0}, {200,0}, {255,255}, {255,255}, | 1164 | {255,255}, {120,0}, {136,0}, {152,0}, {168,0}, {184,0}, {200,0}, {255,255}, {255,255}, |
| @@ -1197,7 +1197,7 @@ void map_led_to_point( uint8_t index, Point *point ) | |||
| 1197 | point->x = pgm_read_byte(addr); | 1197 | point->x = pgm_read_byte(addr); |
| 1198 | point->y = pgm_read_byte(addr+1); | 1198 | point->y = pgm_read_byte(addr+1); |
| 1199 | 1199 | ||
| 1200 | #if defined(RGB_BACKLIGHT_M6_B) || defined(RGB_BACKLIGHT_M10_C) || defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NK87) || defined(RGB_BACKLIGHT_NEBULA65) || defined(RGB_BACKLIGHT_NEBULA12) | 1200 | #if defined(RGB_BACKLIGHT_M6_B) || defined(RGB_BACKLIGHT_M10_C) || defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NK87) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NEBULA12) |
| 1201 | return; | 1201 | return; |
| 1202 | #endif | 1202 | #endif |
| 1203 | 1203 | ||
| @@ -1400,7 +1400,7 @@ const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | |||
| 1400 | { 4-1, 48-1, 8-1, 12-1, 16-1, 20-1, 24-1, 28-1, 32-1, 36-1, 40-1, 44-1, 255, 52-1 }, | 1400 | { 4-1, 48-1, 8-1, 12-1, 16-1, 20-1, 24-1, 28-1, 32-1, 36-1, 40-1, 44-1, 255, 52-1 }, |
| 1401 | { 57-1, 58-1, 59-1, 255, 255, 255, 60-1, 255, 255, 255, 62-1, 63-1, 64-1, 56-1 } | 1401 | { 57-1, 58-1, 59-1, 255, 255, 255, 60-1, 255, 255, 255, 62-1, 63-1, 64-1, 56-1 } |
| 1402 | }; | 1402 | }; |
| 1403 | #elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65) | 1403 | #elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) |
| 1404 | // | 1404 | // |
| 1405 | // LA1, LA5, LA9, LA13, LA17, LA21, LA25, LA29, LA33, LA37, LA41, LA45, LA49, LA53, LB1, | 1405 | // LA1, LA5, LA9, LA13, LA17, LA21, LA25, LA29, LA33, LA37, LA41, LA45, LA49, LA53, LB1, |
| 1406 | // LA2, LA6, LA10, LA14, LA18, LA22, LA26, LA30, LA34, LA38, LA42, LA46, LA50, ---, LB2, | 1406 | // LA2, LA6, LA10, LA14, LA18, LA22, LA26, LA30, LA34, LA38, LA42, LA46, LA50, ---, LB2, |
| @@ -1504,7 +1504,7 @@ void backlight_update_pwm_buffers(void) | |||
| 1504 | #elif defined(RGB_BACKLIGHT_HS60) | 1504 | #elif defined(RGB_BACKLIGHT_HS60) |
| 1505 | IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, 0 ); | 1505 | IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, 0 ); |
| 1506 | IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 ); | 1506 | IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 ); |
| 1507 | #elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65) || defined(RGB_BACKLIGHT_NK87) | 1507 | #elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NK87) |
| 1508 | IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, 0 ); | 1508 | IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, 0 ); |
| 1509 | IS31FL3733_update_pwm_buffers( ISSI_ADDR_2, 1 ); | 1509 | IS31FL3733_update_pwm_buffers( ISSI_ADDR_2, 1 ); |
| 1510 | IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 ); | 1510 | IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 ); |
| @@ -1542,7 +1542,7 @@ void backlight_set_color( int index, uint8_t red, uint8_t green, uint8_t blue ) | |||
| 1542 | { | 1542 | { |
| 1543 | #if defined(RGB_BACKLIGHT_M6_B) | 1543 | #if defined(RGB_BACKLIGHT_M6_B) |
| 1544 | IS31FL3218_set_color( index, red, green, blue ); | 1544 | IS31FL3218_set_color( index, red, green, blue ); |
| 1545 | #elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65) | 1545 | #elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) |
| 1546 | IS31FL3733_set_color( index, red, green, blue ); | 1546 | IS31FL3733_set_color( index, red, green, blue ); |
| 1547 | #elif defined(RGB_BACKLIGHT_NK87) | 1547 | #elif defined(RGB_BACKLIGHT_NK87) |
| 1548 | // This is done to avoid indicator LEDs being set | 1548 | // This is done to avoid indicator LEDs being set |
| @@ -1567,7 +1567,7 @@ void backlight_set_color_all( uint8_t red, uint8_t green, uint8_t blue ) | |||
| 1567 | { | 1567 | { |
| 1568 | #if defined(RGB_BACKLIGHT_M6_B) | 1568 | #if defined(RGB_BACKLIGHT_M6_B) |
| 1569 | IS31FL3218_set_color_all( red, green, blue ); | 1569 | IS31FL3218_set_color_all( red, green, blue ); |
| 1570 | #elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65) | 1570 | #elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) |
| 1571 | // This is done to avoid indicator LEDs being set | 1571 | // This is done to avoid indicator LEDs being set |
| 1572 | for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) { | 1572 | for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) { |
| 1573 | IS31FL3733_set_color(i, red, green, blue); | 1573 | IS31FL3733_set_color(i, red, green, blue); |
| @@ -1601,7 +1601,7 @@ void backlight_set_key_hit(uint8_t row, uint8_t column) | |||
| 1601 | g_any_key_hit = 0; | 1601 | g_any_key_hit = 0; |
| 1602 | } | 1602 | } |
| 1603 | 1603 | ||
| 1604 | #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA65) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) | 1604 | #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) |
| 1605 | // This is (F_CPU/1024) / 20 Hz | 1605 | // This is (F_CPU/1024) / 20 Hz |
| 1606 | // = 15625 Hz / 20 Hz | 1606 | // = 15625 Hz / 20 Hz |
| 1607 | // = 781 | 1607 | // = 781 |
| @@ -1681,7 +1681,7 @@ void backlight_timer_disable(void) | |||
| 1681 | { | 1681 | { |
| 1682 | gptStopTimer(&GPTD4); | 1682 | gptStopTimer(&GPTD4); |
| 1683 | } | 1683 | } |
| 1684 | #endif //!defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA65) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) | 1684 | #endif //!defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) |
| 1685 | 1685 | ||
| 1686 | void backlight_set_suspend_state(bool state) | 1686 | void backlight_set_suspend_state(bool state) |
| 1687 | { | 1687 | { |
| @@ -1927,7 +1927,7 @@ void backlight_effect_cycle_all(void) | |||
| 1927 | for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ ) | 1927 | for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ ) |
| 1928 | { | 1928 | { |
| 1929 | uint16_t offset2 = g_key_hit[i]<<2; | 1929 | uint16_t offset2 = g_key_hit[i]<<2; |
| 1930 | #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA65) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) | 1930 | #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) |
| 1931 | // stabilizer LEDs use spacebar hits | 1931 | // stabilizer LEDs use spacebar hits |
| 1932 | if ( i == 36+6 || i == 54+13 || // LC6, LD13 | 1932 | if ( i == 36+6 || i == 54+13 || // LC6, LD13 |
| 1933 | ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14 | 1933 | ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14 |
| @@ -1952,7 +1952,7 @@ void backlight_effect_cycle_left_right(void) | |||
| 1952 | for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ ) | 1952 | for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ ) |
| 1953 | { | 1953 | { |
| 1954 | uint16_t offset2 = g_key_hit[i]<<2; | 1954 | uint16_t offset2 = g_key_hit[i]<<2; |
| 1955 | #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA65) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) | 1955 | #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) |
| 1956 | // stabilizer LEDs use spacebar hits | 1956 | // stabilizer LEDs use spacebar hits |
| 1957 | if ( i == 36+6 || i == 54+13 || // LC6, LD13 | 1957 | if ( i == 36+6 || i == 54+13 || // LC6, LD13 |
| 1958 | ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14 | 1958 | ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14 |
| @@ -1979,7 +1979,7 @@ void backlight_effect_cycle_up_down(void) | |||
| 1979 | for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ ) | 1979 | for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ ) |
| 1980 | { | 1980 | { |
| 1981 | uint16_t offset2 = g_key_hit[i]<<2; | 1981 | uint16_t offset2 = g_key_hit[i]<<2; |
| 1982 | #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA65) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) | 1982 | #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) |
| 1983 | // stabilizer LEDs use spacebar hits | 1983 | // stabilizer LEDs use spacebar hits |
| 1984 | if ( i == 36+6 || i == 54+13 || // LC6, LD13 | 1984 | if ( i == 36+6 || i == 54+13 || // LC6, LD13 |
| 1985 | ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14 | 1985 | ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14 |
| @@ -2100,7 +2100,7 @@ void backlight_effect_indicators_set_colors( uint8_t index, HS color ) | |||
| 2100 | // do the same for the spacebar stabilizers | 2100 | // do the same for the spacebar stabilizers |
| 2101 | if ( index == 36+0 ) // LC0 | 2101 | if ( index == 36+0 ) // LC0 |
| 2102 | { | 2102 | { |
| 2103 | #if defined(RGB_BACKLIGHT_ZEAL65) | 2103 | #if defined(RGB_BACKLIGHT_ZEAL65) |
| 2104 | backlight_set_color( 36+7, rgb.r, rgb.g, rgb.b ); // LC7 | 2104 | backlight_set_color( 36+7, rgb.r, rgb.g, rgb.b ); // LC7 |
| 2105 | backlight_set_color( 54+14, rgb.r, rgb.g, rgb.b ); // LD14 | 2105 | backlight_set_color( 54+14, rgb.r, rgb.g, rgb.b ); // LD14 |
| 2106 | #elif defined(RGB_BACKLIGHT_KOYU) || defined(RGB_BACKLIGHT_M65_B) || defined(RGB_BACKLIGHT_M65_BX) | 2106 | #elif defined(RGB_BACKLIGHT_KOYU) || defined(RGB_BACKLIGHT_M65_B) || defined(RGB_BACKLIGHT_M65_BX) |
| @@ -2160,7 +2160,7 @@ void backlight_effect_indicators(void) | |||
| 2160 | } | 2160 | } |
| 2161 | } | 2161 | } |
| 2162 | 2162 | ||
| 2163 | #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA65) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) | 2163 | #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) |
| 2164 | ISR(TIMER3_COMPA_vect) | 2164 | ISR(TIMER3_COMPA_vect) |
| 2165 | #else //STM32 interrupt | 2165 | #else //STM32 interrupt |
| 2166 | static void gpt_backlight_timer_task(GPTDriver *gptp) | 2166 | static void gpt_backlight_timer_task(GPTDriver *gptp) |
| @@ -2687,7 +2687,7 @@ void backlight_init_drivers(void) | |||
| 2687 | // This actually updates the LED drivers | 2687 | // This actually updates the LED drivers |
| 2688 | IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 ); | 2688 | IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 ); |
| 2689 | IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 ); | 2689 | IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 ); |
| 2690 | #elif defined(RGB_BACKLIGHT_NEBULA65) | 2690 | #elif defined(RGB_BACKLIGHT_NEBULA68) |
| 2691 | IS31FL3733_init( ISSI_ADDR_1, 0 ); | 2691 | IS31FL3733_init( ISSI_ADDR_1, 0 ); |
| 2692 | IS31FL3733_init( ISSI_ADDR_2, 0 ); | 2692 | IS31FL3733_init( ISSI_ADDR_2, 0 ); |
| 2693 | 2693 | ||
| @@ -2808,30 +2808,30 @@ void backlight_init_drivers(void) | |||
| 2808 | #elif defined(RGB_BACKLIGHT_M50_A) | 2808 | #elif defined(RGB_BACKLIGHT_M50_A) |
| 2809 | bool enabled = !( | 2809 | bool enabled = !( |
| 2810 | // LA0, LA7, LA8, LA17 | 2810 | // LA0, LA7, LA8, LA17 |
| 2811 | ( index == 0+0 ) || | 2811 | ( index == 0+0 ) || |
| 2812 | ( index == 0+7 ) || | 2812 | ( index == 0+7 ) || |
| 2813 | ( index == 0+8 ) || | 2813 | ( index == 0+8 ) || |
| 2814 | ( index == 0+17 ) || | 2814 | ( index == 0+17 ) || |
| 2815 | 2815 | ||
| 2816 | // LB0, LB7, LB8, LB15, LB16, LB17, | 2816 | // LB0, LB7, LB8, LB15, LB16, LB17, |
| 2817 | ( index == 18+0 ) || | 2817 | ( index == 18+0 ) || |
| 2818 | ( index == 18+7 ) || | 2818 | ( index == 18+7 ) || |
| 2819 | ( index == 18+8 ) || | 2819 | ( index == 18+8 ) || |
| 2820 | ( index == 18+15 ) || | 2820 | ( index == 18+15 ) || |
| 2821 | ( index == 18+16 ) || | 2821 | ( index == 18+16 ) || |
| 2822 | ( index == 18+17 ) || | 2822 | ( index == 18+17 ) || |
| 2823 | // LC0, LC8, LC16, LC17 | 2823 | // LC0, LC8, LC16, LC17 |
| 2824 | ( index == 36+0 ) || | 2824 | ( index == 36+0 ) || |
| 2825 | ( index == 36+8 ) || | 2825 | ( index == 36+8 ) || |
| 2826 | ( index == 36+16 ) || | 2826 | ( index == 36+16 ) || |
| 2827 | ( index == 36+17 ) || | 2827 | ( index == 36+17 ) || |
| 2828 | // LD0, LD7, LD8, LD9, LD15, LD16, LD17 | 2828 | // LD0, LD7, LD8, LD9, LD15, LD16, LD17 |
| 2829 | ( index == 54+0 ) || | 2829 | ( index == 54+0 ) || |
| 2830 | ( index == 54+7 ) || | 2830 | ( index == 54+7 ) || |
| 2831 | ( index == 54+8 ) || | 2831 | ( index == 54+8 ) || |
| 2832 | ( index == 54+9 ) || | 2832 | ( index == 54+9 ) || |
| 2833 | ( index == 54+15 ) || | 2833 | ( index == 54+15 ) || |
| 2834 | ( index == 54+16 ) || | 2834 | ( index == 54+16 ) || |
| 2835 | ( index == 54+17 ) ); | 2835 | ( index == 54+17 ) ); |
| 2836 | #elif defined(RGB_BACKLIGHT_M10_C) | 2836 | #elif defined(RGB_BACKLIGHT_M10_C) |
| 2837 | bool enabled = true; | 2837 | bool enabled = true; |
| @@ -2845,7 +2845,7 @@ void backlight_init_drivers(void) | |||
| 2845 | #if !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_M10_C) | 2845 | #if !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_M10_C) |
| 2846 | IS31FL3731_update_led_control_registers( ISSI_ADDR_2, 1 ); | 2846 | IS31FL3731_update_led_control_registers( ISSI_ADDR_2, 1 ); |
| 2847 | #endif | 2847 | #endif |
| 2848 | #if defined(RGB_BACKLIGHT_U80_A) | 2848 | #if defined(RGB_BACKLIGHT_U80_A) |
| 2849 | IS31FL3731_update_led_control_registers( ISSI_ADDR_3, 2 ); | 2849 | IS31FL3731_update_led_control_registers( ISSI_ADDR_3, 2 ); |
| 2850 | #endif | 2850 | #endif |
| 2851 | #endif | 2851 | #endif |
