aboutsummaryrefslogtreecommitdiff
path: root/keyboards/wilba_tech
diff options
context:
space:
mode:
authoryiancar <yiangosyiangou@cytanet.com.cy>2020-06-16 22:02:01 +0100
committerGitHub <noreply@github.com>2020-06-16 14:02:01 -0700
commit0b7b74f56a68bdae82e74c61de22f9eae42488d7 (patch)
treeb4fc45bec829f9adf9e1f81d88e867d2a2aca957 /keyboards/wilba_tech
parent80b2b710da1795940ec519909594bd19872346ec (diff)
downloadqmk_firmware-0b7b74f56a68bdae82e74c61de22f9eae42488d7.tar.gz
qmk_firmware-0b7b74f56a68bdae82e74c61de22f9eae42488d7.zip
Nebula65 (#9368)
* Initial nebula65 commit * Use PWM driver * Polishing * Remove random rgblight settings * Spelling fix * Update keyboards/nebula65/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/nebula65/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/nebula65/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/nebula65/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Clean includes in .h file * Update keyboards/nebula65/readme.md Co-authored-by: Drashna Jaelre <drashna@live.com> * Further cleanup Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
Diffstat (limited to 'keyboards/wilba_tech')
-rw-r--r--keyboards/wilba_tech/wt_rgb_backlight.c164
1 files changed, 101 insertions, 63 deletions
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index 1a8bd8981..221d924c4 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -21,6 +21,7 @@
21 defined(RGB_BACKLIGHT_KOYU) || \ 21 defined(RGB_BACKLIGHT_KOYU) || \
22 defined(RGB_BACKLIGHT_HS60) || \ 22 defined(RGB_BACKLIGHT_HS60) || \
23 defined(RGB_BACKLIGHT_NK65) || \ 23 defined(RGB_BACKLIGHT_NK65) || \
24 defined(RGB_BACKLIGHT_NEBULA65) || \
24 defined(RGB_BACKLIGHT_U80_A) || \ 25 defined(RGB_BACKLIGHT_U80_A) || \
25 defined(RGB_BACKLIGHT_DAWN60) || \ 26 defined(RGB_BACKLIGHT_DAWN60) || \
26 defined(RGB_BACKLIGHT_WT60_B) || \ 27 defined(RGB_BACKLIGHT_WT60_B) || \
@@ -43,7 +44,7 @@
43#include "wt_rgb_backlight_api.h" 44#include "wt_rgb_backlight_api.h"
44#include "wt_rgb_backlight_keycodes.h" 45#include "wt_rgb_backlight_keycodes.h"
45 46
46#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) 47#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA65)
47#include <avr/interrupt.h> 48#include <avr/interrupt.h>
48#include "drivers/avr/i2c_master.h" 49#include "drivers/avr/i2c_master.h"
49#else 50#else
@@ -74,7 +75,7 @@ LED_TYPE g_ws2812_leds[WS2812_LED_TOTAL];
74#elif defined(RGB_BACKLIGHT_HS60) 75#elif defined(RGB_BACKLIGHT_HS60)
75#include "drivers/issi/is31fl3733.h" 76#include "drivers/issi/is31fl3733.h"
76#define BACKLIGHT_LED_COUNT 64 77#define BACKLIGHT_LED_COUNT 64
77#elif defined(RGB_BACKLIGHT_NK65) 78#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65)
78#include "drivers/issi/is31fl3733.h" 79#include "drivers/issi/is31fl3733.h"
79#define BACKLIGHT_LED_COUNT 69 80#define BACKLIGHT_LED_COUNT 69
80#else 81#else
@@ -211,7 +212,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
211 {0, K_16, J_16, L_16}, //LA64 212 {0, K_16, J_16, L_16}, //LA64
212}; 213};
213 214
214#elif defined(RGB_BACKLIGHT_NK65) 215#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65)
215 216
216// This is a 7-bit address, that gets left-shifted and bit 0 217// This is a 7-bit address, that gets left-shifted and bit 0
217// set to 0 for write, 1 for read (as per I2C protocol) 218// set to 0 for write, 1 for read (as per I2C protocol)
@@ -498,7 +499,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
498 * | | G location 499 * | | G location
499 * | | | B location 500 * | | | B location
500 * | | | | */ 501 * | | | | */
501 {0, C1_1, C3_2, C4_2}, //A1 502 {0, C1_1, C3_2, C4_2}, //A1
502 {0, C1_2, C2_2, C4_3}, //A2 503 {0, C1_2, C2_2, C4_3}, //A2
503 {0, C1_3, C2_3, C3_3}, //A3 504 {0, C1_3, C2_3, C3_3}, //A3
504 {0, C1_4, C2_4, C3_4}, //A4 505 {0, C1_4, C2_4, C3_4}, //A4
@@ -564,7 +565,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
564 {1, C9_13, C8_13, C7_13}, //D13 565 {1, C9_13, C8_13, C7_13}, //D13
565 {1, C9_14, C8_14, C7_14}, //D14 566 {1, C9_14, C8_14, C7_14}, //D14
566 {1, C9_15, C8_15, C6_14}, //D15 567 {1, C9_15, C8_15, C6_14}, //D15
567 {1, C9_16, C7_15, C6_15} //D16 568 {1, C9_16, C7_15, C6_15} //D16
568}; 569};
569#elif !defined(RGB_BACKLIGHT_M6_B) 570#elif !defined(RGB_BACKLIGHT_M6_B)
570// This is a 7-bit address, that gets left-shifted and bit 0 571// This is a 7-bit address, that gets left-shifted and bit 0
@@ -808,7 +809,7 @@ const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
808const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = { 809const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
809 // LA0..LA17 810 // LA0..LA17
810 {59,129}, {69,129}, {80,138}, {88,154}, {95,175}, {100,200}, {104,227}, {107,255}, {128,226}, 811 {59,129}, {69,129}, {80,138}, {88,154}, {95,175}, {100,200}, {104,227}, {107,255}, {128,226},
811 {59,255}, {64,255}, {69,255}, {75,255}, {80,255}, {84,255}, {88,255}, {91,255}, {95,255}, 812 {59,255}, {64,255}, {69,255}, {75,255}, {80,255}, {84,255}, {88,255}, {91,255}, {95,255},
812 // LB0..LB17 813 // LB0..LB17
813 {53,255}, {48,255}, {44,255}, {40,255}, {35,255}, {255,255}, {255,255}, {255,255}, {255,255}, 814 {53,255}, {48,255}, {44,255}, {40,255}, {35,255}, {255,255}, {255,255}, {255,255}, {255,255},
814 {48,138}, {40,154}, {33,175}, {28,200}, {24,227}, {21,255}, {255,255}, {255,255}, {255,255}, 815 {48,138}, {40,154}, {33,175}, {28,200}, {24,227}, {21,255}, {255,255}, {255,255}, {255,255},
@@ -819,7 +820,7 @@ const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
819 {0,26}, {0,60}, {0,94}, {0,128}, {0,162}, {0,218}, {227,193}, {234,245}, {255,255}, 820 {0,26}, {0,60}, {0,94}, {0,128}, {0,162}, {0,218}, {227,193}, {234,245}, {255,255},
820 {195,128}, {205,135}, {214,149}, {221,169}, {255,255}, {210,244}, {213,255}, {218,255}, {222,255}, 821 {195,128}, {205,135}, {214,149}, {221,169}, {255,255}, {210,244}, {213,255}, {218,255}, {222,255},
821 // LE0..LE17 822 // LE0..LE17
822 {255,255}, {255,255}, {255,255}, {255,255}, {255,255}, {255,255}, {255,255}, {255,255}, {255,255}, 823 {255,255}, {255,255}, {255,255}, {255,255}, {255,255}, {255,255}, {255,255}, {255,255}, {255,255},
823 {70,255}, {66,255}, {62,255}, {59,255}, {56,255}, {73,255}, {76,255}, {79,255}, {84,255}, 824 {70,255}, {66,255}, {62,255}, {59,255}, {56,255}, {73,255}, {76,255}, {79,255}, {84,255},
824 // LF0..LF17 825 // LF0..LF17
825 {52,255}, {49,255}, {47,255}, {44,255}, {41,255}, {38,255}, {37,255}, {25,255}, {14,255}, 826 {52,255}, {49,255}, {47,255}, {44,255}, {41,255}, {38,255}, {37,255}, {25,255}, {14,255},
@@ -883,7 +884,7 @@ const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
883const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = { 884const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
884 // LA1..LA50 885 // LA1..LA50
885 {0,0}, {4,16}, {6,32}, {2,48}, {16,0}, {24,16}, {28,32}, {36,48}, {32,0}, {40,16}, {44,32}, {52,48}, {48,0}, 886 {0,0}, {4,16}, {6,32}, {2,48}, {16,0}, {24,16}, {28,32}, {36,48}, {32,0}, {40,16}, {44,32}, {52,48}, {48,0},
886 {56,16}, {60,32}, {68,48}, {64,0}, {72,16}, {76,32}, {84,48}, {80,0}, {88,16}, {92,32}, {100,48}, {96,0}, {104,16}, 887 {56,16}, {60,32}, {68,48}, {64,0}, {72,16}, {76,32}, {84,48}, {80,0}, {88,16}, {92,32}, {100,48}, {96,0}, {104,16},
887 {108,32}, {116,48}, {112,0}, {120,16}, {124,32}, {132,48}, {128,0}, {136,16}, {140,32}, {148,48}, {144,0}, {152,16}, 888 {108,32}, {116,48}, {112,0}, {120,16}, {124,32}, {132,48}, {128,0}, {136,16}, {140,32}, {148,48}, {144,0}, {152,16},
888 {156,32}, {164,48}, {160,0}, {168,16}, {172,32}, {180,48}, {176,0}, {184, 16}, {188,32}, {20,48}, {192,0}, {200,16}, 889 {156,32}, {164,48}, {160,0}, {168,16}, {172,32}, {180,48}, {176,0}, {184, 16}, {188,32}, {20,48}, {192,0}, {200,16},
889 {255,255},// LA51 does not exit, dummy 890 {255,255},// LA51 does not exit, dummy
@@ -896,7 +897,7 @@ const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
896 // LA1..LA50 897 // LA1..LA50
897 {96,255}, {109,255}, {128,242}, {147,255}, {93,255}, {105,238}, {128,192}, {154,216}, {89,255}, {101,208}, {128,155}, {159,188}, {85,255}, 898 {96,255}, {109,255}, {128,242}, {147,255}, {93,255}, {105,238}, {128,192}, {154,216}, {89,255}, {101,208}, {128,155}, {159,188}, {85,255},
898 {96,181}, {128,119}, {165,163}, {81,255}, {89,157}, {128,82}, {173,143}, {75,255}, {81,139}, {128,46}, {183,131}, {70,255}, {70,129}, 899 {96,181}, {128,119}, {165,163}, {81,255}, {89,157}, {128,82}, {173,143}, {75,255}, {81,139}, {128,46}, {183,131}, {70,255}, {70,129},
899 {129,9}, {195,128}, {64,255}, {58,129}, {255,27}, {206,136}, {58,255}, {47,139}, {255,64}, {215,152}, {53,255}, {39,157}, {255,101}, 900 {129,9}, {195,128}, {64,255}, {58,129}, {255,27}, {206,136}, {58,255}, {47,139}, {255,64}, {215,152}, {53,255}, {39,157}, {255,101},
900 {222,175}, {47,255}, {32,181}, {255,137}, {228,201}, {43,255}, {27,208}, {255, 174}, {150,246}, {39,255}, {23,238}, 901 {222,175}, {47,255}, {32,181}, {255,137}, {228,201}, {43,255}, {27,208}, {255, 174}, {150,246}, {39,255}, {23,238},
901 {255,255},// LA51 does not exit, dummy 902 {255,255},// LA51 does not exit, dummy
902 // LA52..LA60 903 // LA52..LA60
@@ -927,6 +928,29 @@ const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
927 //LA62..LB5 928 //LA62..LB5
928 {221,255}, {225,255}, {229,255}, {22,255}, {12,255}, {244,255}, {234,255}, {255,255} 929 {221,255}, {225,255}, {229,255}, {22,255}, {12,255}, {244,255}, {234,255}, {255,255}
929}; 930};
931#elif defined(RGB_BACKLIGHT_NEBULA65)
932const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
933 // LA1..LA60
934 {0,0}, {4,16}, {6,31}, {10,47}, {16,0}, {24,16}, {27,31}, {35,47}, {31,0}, {39,16}, {43,31}, {51,47},
935 {47,0}, {55,16}, {59,31}, {67,47}, {63,0}, {71,16}, {75,31}, {82,47}, {79,0}, {86,16}, {90,31}, {98,47},
936 {94,0}, {102,16}, {106,31}, {114,47}, {110,0}, {118,16}, {122,31}, {130,47}, {126,0}, {133,16}, {137,31},
937 {145,47}, {141,0}, {149,16}, {153,31}, {161,47}, {157,0}, {165,16}, {169,31}, {177,47}, {173,0}, {181, 16}, {184,31},
938 {159,63}, {188,0}, {196,16}, {206,47}, {220,47}, {212,0}, {216,16}, {210,31}, {220,63}, {2,63}, {22,63}, {41,63}, {100,63},
939 {255,255},// LA61 does not exit, dummy
940 //LA62..LB5
941 {179,63}, {198,63}, {224,63}, {239,0}, {239,16}, {255,16}, {255,63}, {255,0}
942};
943const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
944 // LA1..LA60
945 {96,255}, {109,255}, {128,244}, {148,255}, {93,255}, {106,245}, {128,201}, {153,225}, {80,255}, {103,219}, {128,169}, {156,200},
946 {87,255}, {99,194}, {128,138}, {161,177}, {83,255}, {94,171}, {128,106}, {167,157}, {79,255}, {87,152}, {128,75}, {174,141}, {74,255},
947 {80,138}, {128,43}, {183,131}, {70,255}, {70,129}, {129,12}, {193,128}, {65,255}, {60,128}, {255,20}, {203,133}, {60,255},
948 {51,135}, {255,51}, {212,145}, {55,255}, {42,148}, {255,83}, {219,162}, {50,255}, {36,166}, {255,114},
949 {202,255}, {46,255}, {30,188}, {228,203}, {231,225}, {40,255}, {25,219}, {255,165}, {217,255}, {160,255}, {164,255}, {168,255}, {183,255},
950 {255,255},// LA61 does not exit, dummy
951 //LA62..LB5
952 {207,255}, {213,255}, {218,255}, {35,255}, {21,255}, {19,255}, {224,255}, {32,255}
953};
930#elif defined(RGB_BACKLIGHT_M6_B) 954#elif defined(RGB_BACKLIGHT_M6_B)
931// M6-B is really simple: 955// M6-B is really simple:
932// 0 3 5 956// 0 3 5
@@ -940,45 +964,45 @@ const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
940#elif defined(RGB_BACKLIGHT_DAWN60) 964#elif defined(RGB_BACKLIGHT_DAWN60)
941const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = { 965const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
942 // LA1..LA16 966 // LA1..LA16
943 {104, 16}, {88 , 16}, {72 , 16}, {56 , 16}, {40 , 16}, {24 , 16}, {4 , 16}, {6 , 32}, 967 {104, 16}, {88 , 16}, {72 , 16}, {56 , 16}, {40 , 16}, {24 , 16}, {4 , 16}, {6 , 32},
944 {112, 0}, {96 , 0}, {80 , 0}, {64 , 0}, {48 , 0}, {32 , 0}, {16 , 0}, {0 , 0}, 968 {112, 0}, {96 , 0}, {80 , 0}, {64 , 0}, {48 , 0}, {32 , 0}, {16 , 0}, {0 , 0},
945 969
946 // LB1..LB16 970 // LB1..LB16
947 {128, 0}, {144, 0}, {160, 0}, {176, 0}, {192, 0}, {208, 0}, {224, 0}, {214, 32}, 971 {128, 0}, {144, 0}, {160, 0}, {176, 0}, {192, 0}, {208, 0}, {224, 0}, {214, 32},
948 {120, 16}, {136, 16}, {152, 16}, {168, 16}, {184, 16}, {200, 16}, {220, 16}, {224, 48}, 972 {120, 16}, {136, 16}, {152, 16}, {168, 16}, {184, 16}, {200, 16}, {220, 16}, {224, 48},
949 973
950 // LC1..LC16 974 // LC1..LC16
951 {100, 48}, {84 , 48}, {68 , 48}, {52 , 48}, {36 , 48}, {102, 64}, {42 , 64}, {22 , 64}, 975 {100, 48}, {84 , 48}, {68 , 48}, {52 , 48}, {36 , 48}, {102, 64}, {42 , 64}, {22 , 64},
952 {108, 32}, {92 , 32}, {76 , 32}, {60 , 32}, {44 , 32}, {28 , 32}, {10 , 48}, {2 , 64}, 976 {108, 32}, {92 , 32}, {76 , 32}, {60 , 32}, {44 , 32}, {28 , 32}, {10 , 48}, {2 , 64},
953 977
954 // LD1..LD16 978 // LD1..LD16
955 {124, 32}, {140, 32}, {156, 32}, {172, 32}, {188, 32}, {180, 48}, {202, 48}, {224, 64}, 979 {124, 32}, {140, 32}, {156, 32}, {172, 32}, {188, 32}, {180, 48}, {202, 48}, {224, 64},
956 {116, 48}, {132, 48}, {148, 48}, {164, 48}, {160, 64}, {176, 64}, {192, 64}, {208, 64}, 980 {116, 48}, {132, 48}, {148, 48}, {164, 48}, {160, 64}, {176, 64}, {192, 64}, {208, 64},
957 981
958 //RGB UNDERGLOW 982 //RGB UNDERGLOW
959 {27 , 3}, {64 , 3}, {100, 3}, {137, 3}, {173, 3}, {209, 3}, {242, 4}, {255, 8}, {255,32}, {255,64}, 983 {27 , 3}, {64 , 3}, {100, 3}, {137, 3}, {173, 3}, {209, 3}, {242, 4}, {255, 8}, {255,32}, {255,64},
960 {241,64}, {212,64}, {173,64}, {137,64}, {100,64}, {63 ,64}, {28 ,64}, {0 ,64}, {0 ,32}, {0 , 8}, //20 984 {241,64}, {212,64}, {173,64}, {137,64}, {100,64}, {63 ,64}, {28 ,64}, {0 ,64}, {0 ,32}, {0 , 8}, //20
961}; 985};
962 986
963const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = { 987const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
964 //LA1..LA16 988 //LA1..LA16
965 {70,129}, {80,139}, {89,157}, {96,181}, {101,208}, {105,238}, {109,255}, {128,247}, 989 {70,129}, {80,139}, {89,157}, {96,181}, {101,208}, {105,238}, {109,255}, {128,247},
966 {64,255}, {70,255}, {75,255}, {80,255}, {85,255}, {89,255}, {93,255}, {96,255}, 990 {64,255}, {70,255}, {75,255}, {80,255}, {85,255}, {89,255}, {93,255}, {96,255},
967 //LB1..LB16 991 //LB1..LB16
968 {58,255}, {53,255}, {48,255}, {43,255}, {39,255}, {34,255}, {32,255}, {255,233}, 992 {58,255}, {53,255}, {48,255}, {43,255}, {39,255}, {34,255}, {32,255}, {255,233},
969 {58,129}, {48,139}, {39,157}, {32,181}, {27,208}, {23,238}, {19,255}, {237,255}, 993 {58,129}, {48,139}, {39,157}, {32,181}, {27,208}, {23,238}, {19,255}, {237,255},
970 //LC1..LC16 994 //LC1..LC16
971 {183,131}, {173,143}, {165,163}, {159,188}, {154,216}, {188,255}, {170,255}, {165,255}, 995 {183,131}, {173,143}, {165,163}, {159,188}, {154,216}, {188,255}, {170,255}, {165,255},
972 {128,9}, {128,46}, {128,82}, {128,119}, {128,155}, {128,192}, {147,255}, {161,255}, 996 {128,9}, {128,46}, {128,82}, {128,119}, {128,155}, {128,192}, {147,255}, {161,255},
973 //LD1..LD16 997 //LD1..LD16
974 {0,27}, {0,64}, {0,101}, {0,137}, {0,174}, {228,201}, {235,255}, {224,255}, 998 {0,27}, {0,64}, {0,101}, {0,137}, {0,174}, {228,201}, {235,255}, {224,255},
975 {195,128}, {206,136}, {215,152}, {222,175}, {208,255}, {213,255}, {217, 255}, {222,225}, 999 {195,128}, {206,136}, {215,152}, {222,175}, {208,255}, {213,255}, {217, 255}, {222,225},
976 1000
977 //UNDERGLOW, {A,D} 1001 //UNDERGLOW, {A,D}
978 //1 - 10 1002 //1 - 10
979 {91,255}, {84,255}, {74,255}, {60,255}, {48,255}, {39,255}, {32,255}, {27,255}, {0,255}, {236,255}, 1003 {91,255}, {84,255}, {74,255}, {60,255}, {48,255}, {39,255}, {32,255}, {27,255}, {0,255}, {236,255},
980 //11 - 20 1004 //11 - 20
981 {234,255}, {222,255}, {213,255}, {197,255}, {180,255}, {167,255}, {152,255}, {147,255}, {128,255}, {101,255} 1005 {234,255}, {222,255}, {213,255}, {197,255}, {180,255}, {167,255}, {152,255}, {147,255}, {128,255}, {101,255}
982}; 1006};
983 1007
984#endif 1008#endif
@@ -994,7 +1018,7 @@ void map_led_to_point( uint8_t index, Point *point )
994 point->x = pgm_read_byte(addr); 1018 point->x = pgm_read_byte(addr);
995 point->y = pgm_read_byte(addr+1); 1019 point->y = pgm_read_byte(addr+1);
996 1020
997#if defined(RGB_BACKLIGHT_M6_B) || defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) 1021#if defined(RGB_BACKLIGHT_M6_B) || defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65)
998 return; 1022 return;
999#endif 1023#endif
1000 1024
@@ -1181,7 +1205,7 @@ const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
1181 { 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 }, 1205 { 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 },
1182 { 57-1, 58-1, 59-1, 255, 255, 255, 60-1, 255, 255, 255, 62-1, 63-1, 64-1, 56-1 } 1206 { 57-1, 58-1, 59-1, 255, 255, 255, 60-1, 255, 255, 255, 62-1, 63-1, 64-1, 56-1 }
1183}; 1207};
1184#elif defined(RGB_BACKLIGHT_NK65) 1208#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65)
1185// 1209//
1186// LA1, LA5, LA9, LA13, LA17, LA21, LA25, LA29, LA33, LA37, LA41, LA45, LA49, LA53, LB1, 1210// LA1, LA5, LA9, LA13, LA17, LA21, LA25, LA29, LA33, LA37, LA41, LA45, LA49, LA53, LB1,
1187// LA2, LA6, LA10, LA14, LA18, LA22, LA26, LA30, LA34, LA38, LA42, LA46, LA50, ---, LB2, 1211// LA2, LA6, LA10, LA14, LA18, LA22, LA26, LA30, LA34, LA38, LA42, LA46, LA50, ---, LB2,
@@ -1207,15 +1231,15 @@ const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
1207// A16, A15, A14, A13, A12, A11, A10, A9, B1, B2, B3, B4, B5, B6, 1231// A16, A15, A14, A13, A12, A11, A10, A9, B1, B2, B3, B4, B5, B6,
1208// A7, A6, A5, A4, A3, A2, A1, B9, B10, B11, B12, B13, B14, B15, 1232// A7, A6, A5, A4, A3, A2, A1, B9, B10, B11, B12, B13, B14, B15,
1209// A8, C14, C13, C12, C11, C10, C9, D1, D2, D3, D4, D5, B8, B7, 1233// A8, C14, C13, C12, C11, C10, C9, D1, D2, D3, D4, D5, B8, B7,
1210// C15, C5, C4, C3, C2, C1, D9, D10, D11, D12, ---, D6, D7, B16, 1234// C15, C5, C4, C3, C2, C1, D9, D10, D11, D12, ---, D6, D7, B16,
1211// C16, C8, C7, ---, ---, C6, ---, ---, ---, D13, D14, D15, D16, D8, 1235// C16, C8, C7, ---, ---, C6, ---, ---, ---, D13, D14, D15, D16, D8,
1212const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = { 1236const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
1213 { -1+16, -1+15, -1+14, -1+13, -1+12, -1+11, -1+10, -1+9 , 15+1 , 15+2 , 15+3 , 15+4 , 15+5 , 15+6 }, 1237 { -1+16, -1+15, -1+14, -1+13, -1+12, -1+11, -1+10, -1+9 , 15+1 , 15+2 , 15+3 , 15+4 , 15+5 , 15+6 },
1214 { -1+7 , -1+6 , -1+5 , -1+4 , -1+3 , -1+2 , -1 +1, 15+9 , 15+10, 15+11, 15+12, 15+13, 15+14, 15+15}, 1238 { -1+7 , -1+6 , -1+5 , -1+4 , -1+3 , -1+2 , -1 +1, 15+9 , 15+10, 15+11, 15+12, 15+13, 15+14, 15+15},
1215 { -1+8 , 31+14, 31+13, 31+12, 31+11, 31+10, 31+9 , 47+1 , 47+2 , 47+3 , 47+4 , 47+5 , 15+8 , 15+7 }, 1239 { -1+8 , 31+14, 31+13, 31+12, 31+11, 31+10, 31+9 , 47+1 , 47+2 , 47+3 , 47+4 , 47+5 , 15+8 , 15+7 },
1216 { 31+15, 31+5 , 31+4 , 31+3 , 31+2 , 31+1 , 47+9 , 47+10, 47+11, 47+12, 255 ,47+6 , 47+7 , 15+16}, 1240 { 31+15, 31+5 , 31+4 , 31+3 , 31+2 , 31+1 , 47+9 , 47+10, 47+11, 47+12, 255 ,47+6 , 47+7 , 15+16},
1217 { 31+16, 31+8 , 31+7 , 255 , 255 , 31+6 , 255 , 255 , 255 , 47+13, 47+14, 47+15, 47+16, 47+8 } 1241 { 31+16, 31+8 , 31+7 , 255 , 255 , 31+6 , 255 , 255 , 255 , 47+13, 47+14, 47+15, 47+16, 47+8 }
1218}; 1242};
1219#endif 1243#endif
1220 1244
1221void map_row_column_to_led( uint8_t row, uint8_t column, uint8_t *led ) 1245void map_row_column_to_led( uint8_t row, uint8_t column, uint8_t *led )
@@ -1234,7 +1258,7 @@ void backlight_update_pwm_buffers(void)
1234#elif defined(RGB_BACKLIGHT_HS60) 1258#elif defined(RGB_BACKLIGHT_HS60)
1235 IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, 0 ); 1259 IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, 0 );
1236 IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 ); 1260 IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
1237#elif defined(RGB_BACKLIGHT_NK65) 1261#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65)
1238 IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, 0 ); 1262 IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, 0 );
1239 IS31FL3733_update_pwm_buffers( ISSI_ADDR_2, 1 ); 1263 IS31FL3733_update_pwm_buffers( ISSI_ADDR_2, 1 );
1240 IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 ); 1264 IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
@@ -1269,7 +1293,7 @@ void backlight_set_color( int index, uint8_t red, uint8_t green, uint8_t blue )
1269{ 1293{
1270#if defined(RGB_BACKLIGHT_M6_B) 1294#if defined(RGB_BACKLIGHT_M6_B)
1271 IS31FL3218_set_color( index, red, green, blue ); 1295 IS31FL3218_set_color( index, red, green, blue );
1272#elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) 1296#elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65)
1273 IS31FL3733_set_color( index, red, green, blue ); 1297 IS31FL3733_set_color( index, red, green, blue );
1274#elif defined(RGB_BACKLIGHT_DAWN60) 1298#elif defined(RGB_BACKLIGHT_DAWN60)
1275 if( index < DRIVER_LED_TOTAL ) { 1299 if( index < DRIVER_LED_TOTAL ) {
@@ -1278,7 +1302,7 @@ void backlight_set_color( int index, uint8_t red, uint8_t green, uint8_t blue )
1278 g_ws2812_leds[index - DRIVER_LED_TOTAL].r = red; 1302 g_ws2812_leds[index - DRIVER_LED_TOTAL].r = red;
1279 g_ws2812_leds[index - DRIVER_LED_TOTAL].g = green; 1303 g_ws2812_leds[index - DRIVER_LED_TOTAL].g = green;
1280 g_ws2812_leds[index - DRIVER_LED_TOTAL].b = blue; 1304 g_ws2812_leds[index - DRIVER_LED_TOTAL].b = blue;
1281 ws2812_setleds(g_ws2812_leds, WS2812_LED_TOTAL); 1305 ws2812_setleds(g_ws2812_leds, WS2812_LED_TOTAL);
1282 } 1306 }
1283#else 1307#else
1284 IS31FL3731_set_color( index, red, green, blue ); 1308 IS31FL3731_set_color( index, red, green, blue );
@@ -1289,7 +1313,7 @@ void backlight_set_color_all( uint8_t red, uint8_t green, uint8_t blue )
1289{ 1313{
1290#if defined(RGB_BACKLIGHT_M6_B) 1314#if defined(RGB_BACKLIGHT_M6_B)
1291 IS31FL3218_set_color_all( red, green, blue ); 1315 IS31FL3218_set_color_all( red, green, blue );
1292#elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) 1316#elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA65)
1293 // This is done to avoid indicator LEDs being set 1317 // This is done to avoid indicator LEDs being set
1294 for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) { 1318 for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) {
1295 IS31FL3733_set_color(i, red, green, blue); 1319 IS31FL3733_set_color(i, red, green, blue);
@@ -1301,7 +1325,7 @@ void backlight_set_color_all( uint8_t red, uint8_t green, uint8_t blue )
1301 g_ws2812_leds[i].g = green; 1325 g_ws2812_leds[i].g = green;
1302 g_ws2812_leds[i].b = blue; 1326 g_ws2812_leds[i].b = blue;
1303 } 1327 }
1304 ws2812_setleds(g_ws2812_leds, WS2812_LED_TOTAL); 1328 ws2812_setleds(g_ws2812_leds, WS2812_LED_TOTAL);
1305#else 1329#else
1306 IS31FL3731_set_color_all( red, green, blue ); 1330 IS31FL3731_set_color_all( red, green, blue );
1307#endif 1331#endif
@@ -1316,7 +1340,7 @@ void backlight_set_key_hit(uint8_t row, uint8_t column)
1316 g_any_key_hit = 0; 1340 g_any_key_hit = 0;
1317} 1341}
1318 1342
1319#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) 1343#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA65)
1320// This is (F_CPU/1024) / 20 Hz 1344// This is (F_CPU/1024) / 20 Hz
1321// = 15625 Hz / 20 Hz 1345// = 15625 Hz / 20 Hz
1322// = 781 1346// = 781
@@ -1508,15 +1532,15 @@ void backlight_effect_alphas_mods(void)
1508 } 1532 }
1509 } 1533 }
1510 } 1534 }
1511#if defined(RGB_BACKLIGHT_DAWN60) 1535#if defined(RGB_BACKLIGHT_DAWN60)
1512 for (int i = 0; i < WS2812_LED_TOTAL; i++) { 1536 for (int i = 0; i < WS2812_LED_TOTAL; i++) {
1513 if ((RGB_UNDERGLOW_ALPHA_TOP_START <= i && i <= RGB_UNDERGLOW_ALPHA_TOP_END) || 1537 if ((RGB_UNDERGLOW_ALPHA_TOP_START <= i && i <= RGB_UNDERGLOW_ALPHA_TOP_END) ||
1514 (RGB_UNDERGLOW_ALPHA_BOT_START <= i && i <= RGB_UNDERGLOW_ALPHA_BOT_END)) { 1538 (RGB_UNDERGLOW_ALPHA_BOT_START <= i && i <= RGB_UNDERGLOW_ALPHA_BOT_END)) {
1515 backlight_set_color(i + DRIVER_LED_TOTAL, rgb1.r, rgb1.g, rgb1.b); 1539 backlight_set_color(i + DRIVER_LED_TOTAL, rgb1.r, rgb1.g, rgb1.b);
1516 } else { 1540 } else {
1517 backlight_set_color(i + DRIVER_LED_TOTAL, rgb2.r, rgb2.g, rgb2.b); 1541 backlight_set_color(i + DRIVER_LED_TOTAL, rgb2.r, rgb2.g, rgb2.b);
1518 } 1542 }
1519 } 1543 }
1520#endif 1544#endif
1521} 1545}
1522 1546
@@ -1611,7 +1635,7 @@ void backlight_effect_cycle_all(void)
1611 for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ ) 1635 for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ )
1612 { 1636 {
1613 uint16_t offset2 = g_key_hit[i]<<2; 1637 uint16_t offset2 = g_key_hit[i]<<2;
1614#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) 1638#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA65)
1615 // stabilizer LEDs use spacebar hits 1639 // stabilizer LEDs use spacebar hits
1616 if ( i == 36+6 || i == 54+13 || // LC6, LD13 1640 if ( i == 36+6 || i == 54+13 || // LC6, LD13
1617 ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14 1641 ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14
@@ -1636,7 +1660,7 @@ void backlight_effect_cycle_left_right(void)
1636 for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ ) 1660 for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ )
1637 { 1661 {
1638 uint16_t offset2 = g_key_hit[i]<<2; 1662 uint16_t offset2 = g_key_hit[i]<<2;
1639#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) 1663#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA65)
1640 // stabilizer LEDs use spacebar hits 1664 // stabilizer LEDs use spacebar hits
1641 if ( i == 36+6 || i == 54+13 || // LC6, LD13 1665 if ( i == 36+6 || i == 54+13 || // LC6, LD13
1642 ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14 1666 ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14
@@ -1663,7 +1687,7 @@ void backlight_effect_cycle_up_down(void)
1663 for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ ) 1687 for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ )
1664 { 1688 {
1665 uint16_t offset2 = g_key_hit[i]<<2; 1689 uint16_t offset2 = g_key_hit[i]<<2;
1666#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) 1690#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA65)
1667 // stabilizer LEDs use spacebar hits 1691 // stabilizer LEDs use spacebar hits
1668 if ( i == 36+6 || i == 54+13 || // LC6, LD13 1692 if ( i == 36+6 || i == 54+13 || // LC6, LD13
1669 ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14 1693 ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14
@@ -1837,7 +1861,7 @@ void backlight_effect_indicators(void)
1837 } 1861 }
1838} 1862}
1839 1863
1840#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) 1864#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA65)
1841ISR(TIMER3_COMPA_vect) 1865ISR(TIMER3_COMPA_vect)
1842#else //STM32 interrupt 1866#else //STM32 interrupt
1843static void gpt_backlight_timer_task(GPTDriver *gptp) 1867static void gpt_backlight_timer_task(GPTDriver *gptp)
@@ -2334,6 +2358,20 @@ void backlight_init_drivers(void)
2334 // This actually updates the LED drivers 2358 // This actually updates the LED drivers
2335 IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 ); 2359 IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
2336 IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 ); 2360 IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 );
2361#elif defined(RGB_BACKLIGHT_NEBULA65)
2362 IS31FL3733_init( ISSI_ADDR_1, 0 );
2363 IS31FL3733_init( ISSI_ADDR_2, 0 );
2364
2365 for ( int index = 0; index < DRIVER_LED_TOTAL; index++ )
2366 {
2367 bool enabled = !( ( index == 61-1 ) || //LA61
2368 ( index > 5+64-1 ) ); //LB6-LB64
2369 // This only caches it for later
2370 IS31FL3733_set_led_control_register( index, enabled, enabled, enabled );
2371 }
2372 // This actually updates the LED drivers
2373 IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
2374 IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 );
2337#else 2375#else
2338 IS31FL3731_init( ISSI_ADDR_1 ); 2376 IS31FL3731_init( ISSI_ADDR_1 );
2339 IS31FL3731_init( ISSI_ADDR_2 ); 2377 IS31FL3731_init( ISSI_ADDR_2 );
@@ -2430,7 +2468,7 @@ void backlight_init_drivers(void)
2430 // This actually updates the LED drivers 2468 // This actually updates the LED drivers
2431 IS31FL3731_update_led_control_registers( ISSI_ADDR_1, 0 ); 2469 IS31FL3731_update_led_control_registers( ISSI_ADDR_1, 0 );
2432 IS31FL3731_update_led_control_registers( ISSI_ADDR_2, 1 ); 2470 IS31FL3731_update_led_control_registers( ISSI_ADDR_2, 1 );
2433#if defined(RGB_BACKLIGHT_U80_A) 2471#if defined(RGB_BACKLIGHT_U80_A)
2434 IS31FL3731_update_led_control_registers( ISSI_ADDR_3, 2 ); 2472 IS31FL3731_update_led_control_registers( ISSI_ADDR_3, 2 );
2435#endif 2473#endif
2436#endif // !defined(RGB_BACKLIGHT_M6_B) 2474#endif // !defined(RGB_BACKLIGHT_M6_B)