aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authoryiancar <yiangosyiangou@cytanet.com.cy>2020-10-01 08:27:18 +0100
committerGitHub <noreply@github.com>2020-10-01 17:27:18 +1000
commit76e35e02cc6caf88eb5bb06c9780619b78725d16 (patch)
treec6f193bd757d6f74c714b5811440581334d78824 /keyboards
parent272b3309dd4121b49bc41e3c0213111aaf4962d7 (diff)
downloadfirmware-76e35e02cc6caf88eb5bb06c9780619b78725d16.tar.gz
firmware-76e35e02cc6caf88eb5bb06c9780619b78725d16.tar.bz2
firmware-76e35e02cc6caf88eb5bb06c9780619b78725d16.zip
Rename nebula65 -> nebula68 (#10490)
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/nebula68/chconf.h (renamed from keyboards/nebula65/chconf.h)0
-rwxr-xr-xkeyboards/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-xkeyboards/nebula68/info.json (renamed from keyboards/nebula65/info.json)2
-rwxr-xr-xkeyboards/nebula68/keymaps/default/keymap.c (renamed from keyboards/nebula65/keymaps/default/keymap.c)0
-rwxr-xr-xkeyboards/nebula68/keymaps/default/readme.md (renamed from keyboards/nebula65/keymaps/default/readme.md)4
-rwxr-xr-xkeyboards/nebula68/keymaps/via/keymap.c (renamed from keyboards/nebula65/keymaps/via/keymap.c)0
-rwxr-xr-xkeyboards/nebula68/keymaps/via/readme.md (renamed from keyboards/nebula65/keymaps/via/readme.md)4
-rwxr-xr-xkeyboards/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-xkeyboards/nebula68/nebula68.c (renamed from keyboards/nebula65/nebula65.c)6
-rwxr-xr-xkeyboards/nebula68/nebula68.h (renamed from keyboards/nebula65/nebula65.h)0
-rwxr-xr-xkeyboards/nebula68/readme.md (renamed from keyboards/nebula65/readme.md)8
-rwxr-xr-xkeyboards/nebula68/rules.mk (renamed from keyboards/nebula65/rules.mk)0
-rw-r--r--keyboards/wilba_tech/wt_rgb_backlight.c80
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/>.
#define PRODUCT_ID 0x5336
#define DEVICE_VER 0x0001
#define MANUFACTURER Yiancar-Designs
-#define PRODUCT NEBULA65
-#define DESCRIPTION "A 65-percent, tool-free RGB keyboard"
+#define PRODUCT NEBULA68
/* key matrix size */
#define MATRIX_ROWS 5
@@ -106,7 +105,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_BACKLIGHT_ENABLED 1
-#define RGB_BACKLIGHT_NEBULA65
+#define RGB_BACKLIGHT_NEBULA68
// they aren't really used if RGB_BACKLIGHT_NEBULA65 defined
#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 @@
{
- "keyboard_name": "NEBULA65",
+ "keyboard_name": "NEBULA68",
"url": "",
"maintainer": "yiancar",
"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 @@
-# The default keymap for Nebula65. VIA support disabled.
+# The default keymap for Nebula68. VIA support disabled.
![Layer 0](https://i.imgur.com/dXyRwb1.png)
![Layer 1](https://i.imgur.com/4izTAFa.png)
-Default layer is normal ANSI 65%
+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 @@
-# The default keymap for Nebula65. VIA support enabled.
+# The default keymap for Nebula68. VIA support enabled.
![Layer 0](https://i.imgur.com/dXyRwb1.png)
![Layer 1](https://i.imgur.com/4izTAFa.png)
-Default layer is normal ANSI 65%
+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 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RGB_BACKLIGHT_NEBULA65
-#error RGB_BACKLIGHT_NEBULA65 not defined, recheck config.h
+#ifndef RGB_BACKLIGHT_NEBULA68
+#error RGB_BACKLIGHT_NEBULA68 not defined, recheck config.h
#endif
-#include "nebula65.h"
+#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 @@
-# Nebula65
+# Nebula68
-This is a standard fixed layout 65% PCB. It supports VIA, full per-key RGB and underglow RGB.
+This is a standard fixed layout 68% PCB. It supports VIA, full per-key RGB and underglow RGB.
* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
-* Hardware Supported: A 65% keyboard with STM32F303CC
+* Hardware Supported: A 68% keyboard with STM32F303CC
* Hardware Availability: https://spaceholdings.net/
## Instructions
@@ -12,7 +12,7 @@ This is a standard fixed layout 65% PCB. It supports VIA, full per-key RGB and u
Make example for this keyboard (after setting up your build environment):
- make nebula65:via
+ make nebula68:via
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).
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 @@
defined(RGB_BACKLIGHT_NK65) || \
defined(RGB_BACKLIGHT_NK87) || \
defined(RGB_BACKLIGHT_NEBULA12) || \
- defined(RGB_BACKLIGHT_NEBULA65) || \
+ defined(RGB_BACKLIGHT_NEBULA68) || \
defined(RGB_BACKLIGHT_U80_A) || \
defined(RGB_BACKLIGHT_DAWN60) || \
defined(RGB_BACKLIGHT_WT60_B) || \
@@ -50,7 +50,7 @@
#include "wt_rgb_backlight_api.h"
#include "wt_rgb_backlight_keycodes.h"
-#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_NEBULA65) && !defined(RGB_BACKLIGHT_NEBULA12)
+#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12)
#include <avr/interrupt.h>
#include "drivers/avr/i2c_master.h"
#else
@@ -81,7 +81,7 @@ LED_TYPE g_ws2812_leds[WS2812_LED_TOTAL];
#elif defined(RGB_BACKLIGHT_HS60)
#include "drivers/issi/is31fl3733.h"
#define BACKLIGHT_LED_COUNT 64
-#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65)
+#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68)
#include "drivers/issi/is31fl3733.h"
#define BACKLIGHT_LED_COUNT 69
#elif defined(RGB_BACKLIGHT_NK87)
@@ -227,7 +227,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, K_16, J_16, L_16}, //LA64
};
-#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65) || defined(RGB_BACKLIGHT_NK87)
+#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NK87)
// This is a 7-bit address, that gets left-shifted and bit 0
// 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 = {
{255,255}, {255,255}, {255,255}, {255,255},
{200,196}, {192,192}, {184,196}, {213,74}
};
-#elif defined(RGB_BACKLIGHT_NEBULA65)
+#elif defined(RGB_BACKLIGHT_NEBULA68)
const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
// LA1..LA60
{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 = {
#elif defined(RGB_BACKLIGHT_M50_A)
const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
// LA0..LA17
- {255,255}, {104,16}, {88,16}, {72,16}, {56,16}, {40,16}, {24,16}, {255,255}, {255,255},
+ {255,255}, {104,16}, {88,16}, {72,16}, {56,16}, {40,16}, {24,16}, {255,255}, {255,255},
{104,0}, {88,0}, {72,0}, {56,0}, {40,0}, {24,0}, {0,0}, {0,16}, {255,255},
// LB0..LB17
{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 )
point->x = pgm_read_byte(addr);
point->y = pgm_read_byte(addr+1);
-#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)
+#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)
return;
#endif
@@ -1400,7 +1400,7 @@ const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
{ 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 },
{ 57-1, 58-1, 59-1, 255, 255, 255, 60-1, 255, 255, 255, 62-1, 63-1, 64-1, 56-1 }
};
-#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65)
+#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68)
//
// LA1, LA5, LA9, LA13, LA17, LA21, LA25, LA29, LA33, LA37, LA41, LA45, LA49, LA53, LB1,
// LA2, LA6, LA10, LA14, LA18, LA22, LA26, LA30, LA34, LA38, LA42, LA46, LA50, ---, LB2,
@@ -1504,7 +1504,7 @@ void backlight_update_pwm_buffers(void)
#elif defined(RGB_BACKLIGHT_HS60)
IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, 0 );
IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
-#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65) || defined(RGB_BACKLIGHT_NK87)
+#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NK87)
IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, 0 );
IS31FL3733_update_pwm_buffers( ISSI_ADDR_2, 1 );
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 )
{
#if defined(RGB_BACKLIGHT_M6_B)
IS31FL3218_set_color( index, red, green, blue );
-#elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65)
+#elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68)
IS31FL3733_set_color( index, red, green, blue );
#elif defined(RGB_BACKLIGHT_NK87)
// 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 )
{
#if defined(RGB_BACKLIGHT_M6_B)
IS31FL3218_set_color_all( red, green, blue );
-#elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65)
+#elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68)
// This is done to avoid indicator LEDs being set
for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) {
IS31FL3733_set_color(i, red, green, blue);
@@ -1601,7 +1601,7 @@ void backlight_set_key_hit(uint8_t row, uint8_t column)
g_any_key_hit = 0;
}
-#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA65) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87)
+#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87)
// This is (F_CPU/1024) / 20 Hz
// = 15625 Hz / 20 Hz
// = 781
@@ -1681,7 +1681,7 @@ void backlight_timer_disable(void)
{
gptStopTimer(&GPTD4);
}
-#endif //!defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA65) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87)
+#endif //!defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87)
void backlight_set_suspend_state(bool state)
{
@@ -1927,7 +1927,7 @@ void backlight_effect_cycle_all(void)
for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ )
{
uint16_t offset2 = g_key_hit[i]<<2;
-#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)
+#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)
// stabilizer LEDs use spacebar hits
if ( i == 36+6 || i == 54+13 || // LC6, LD13
( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14
@@ -1952,7 +1952,7 @@ void backlight_effect_cycle_left_right(void)
for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ )
{
uint16_t offset2 = g_key_hit[i]<<2;
-#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)
+#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)
// stabilizer LEDs use spacebar hits
if ( i == 36+6 || i == 54+13 || // LC6, LD13
( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14
@@ -1979,7 +1979,7 @@ void backlight_effect_cycle_up_down(void)
for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ )
{
uint16_t offset2 = g_key_hit[i]<<2;
-#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)
+#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)
// stabilizer LEDs use spacebar hits
if ( i == 36+6 || i == 54+13 || // LC6, LD13
( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14
@@ -2100,7 +2100,7 @@ void backlight_effect_indicators_set_colors( uint8_t index, HS color )
// do the same for the spacebar stabilizers
if ( index == 36+0 ) // LC0
{
-#if defined(RGB_BACKLIGHT_ZEAL65)
+#if defined(RGB_BACKLIGHT_ZEAL65)
backlight_set_color( 36+7, rgb.r, rgb.g, rgb.b ); // LC7
backlight_set_color( 54+14, rgb.r, rgb.g, rgb.b ); // LD14
#elif defined(RGB_BACKLIGHT_KOYU) || defined(RGB_BACKLIGHT_M65_B) || defined(RGB_BACKLIGHT_M65_BX)
@@ -2160,7 +2160,7 @@ void backlight_effect_indicators(void)
}
}
-#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA65) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87)
+#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87)
ISR(TIMER3_COMPA_vect)
#else //STM32 interrupt
static void gpt_backlight_timer_task(GPTDriver *gptp)
@@ -2687,7 +2687,7 @@ void backlight_init_drivers(void)
// This actually updates the LED drivers
IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 );
-#elif defined(RGB_BACKLIGHT_NEBULA65)
+#elif defined(RGB_BACKLIGHT_NEBULA68)
IS31FL3733_init( ISSI_ADDR_1, 0 );
IS31FL3733_init( ISSI_ADDR_2, 0 );
@@ -2808,30 +2808,30 @@ void backlight_init_drivers(void)
#elif defined(RGB_BACKLIGHT_M50_A)
bool enabled = !(
// LA0, LA7, LA8, LA17
- ( index == 0+0 ) ||
- ( index == 0+7 ) ||
- ( index == 0+8 ) ||
- ( index == 0+17 ) ||
+ ( index == 0+0 ) ||
+ ( index == 0+7 ) ||
+ ( index == 0+8 ) ||
+ ( index == 0+17 ) ||
// LB0, LB7, LB8, LB15, LB16, LB17,
- ( index == 18+0 ) ||
- ( index == 18+7 ) ||
- ( index == 18+8 ) ||
- ( index == 18+15 ) ||
- ( index == 18+16 ) ||
- ( index == 18+17 ) ||
+ ( index == 18+0 ) ||
+ ( index == 18+7 ) ||
+ ( index == 18+8 ) ||
+ ( index == 18+15 ) ||
+ ( index == 18+16 ) ||
+ ( index == 18+17 ) ||
// LC0, LC8, LC16, LC17
- ( index == 36+0 ) ||
- ( index == 36+8 ) ||
- ( index == 36+16 ) ||
- ( index == 36+17 ) ||
+ ( index == 36+0 ) ||
+ ( index == 36+8 ) ||
+ ( index == 36+16 ) ||
+ ( index == 36+17 ) ||
// LD0, LD7, LD8, LD9, LD15, LD16, LD17
- ( index == 54+0 ) ||
- ( index == 54+7 ) ||
- ( index == 54+8 ) ||
- ( index == 54+9 ) ||
- ( index == 54+15 ) ||
- ( index == 54+16 ) ||
+ ( index == 54+0 ) ||
+ ( index == 54+7 ) ||
+ ( index == 54+8 ) ||
+ ( index == 54+9 ) ||
+ ( index == 54+15 ) ||
+ ( index == 54+16 ) ||
( index == 54+17 ) );
#elif defined(RGB_BACKLIGHT_M10_C)
bool enabled = true;
@@ -2845,7 +2845,7 @@ void backlight_init_drivers(void)
#if !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_M10_C)
IS31FL3731_update_led_control_registers( ISSI_ADDR_2, 1 );
#endif
-#if defined(RGB_BACKLIGHT_U80_A)
+#if defined(RGB_BACKLIGHT_U80_A)
IS31FL3731_update_led_control_registers( ISSI_ADDR_3, 2 );
#endif
#endif