Remove use of __flash due to LTO issues (#15268)

master
Joel Challis 2021-11-24 07:38:49 +00:00 committed by GitHub
parent 80f91f7b9a
commit 282e916d86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
99 changed files with 131 additions and 117 deletions

View File

@ -54,7 +54,7 @@ For split keyboards using `LED_MATRIX_SPLIT` with an LED driver, you can either
Define these arrays listing all the LEDs in your `<keyboard>.c`: Define these arrays listing all the LEDs in your `<keyboard>.c`:
```c ```c
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | LED address * | LED address

View File

@ -55,7 +55,7 @@ For split keyboards using `RGB_MATRIX_SPLIT` with an LED driver, you can either
Define these arrays listing all the LEDs in your `<keyboard>.c`: Define these arrays listing all the LEDs in your `<keyboard>.c`:
```c ```c
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location
@ -140,7 +140,7 @@ Currently only 4 drivers are supported, but it would be trivial to support all 8
Define these arrays listing all the LEDs in your `<keyboard>.c`: Define these arrays listing all the LEDs in your `<keyboard>.c`:
```c ```c
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location
@ -218,7 +218,7 @@ Currently only 2 drivers are supported, but it would be trivial to support all 4
Define these arrays listing all the LEDs in your `<keyboard>.c`: Define these arrays listing all the LEDs in your `<keyboard>.c`:
```c ```c
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location
@ -319,7 +319,7 @@ Here is an example using 2 drivers.
Define these arrays listing all the LEDs in your `<keyboard>.c`: Define these arrays listing all the LEDs in your `<keyboard>.c`:
```c ```c
const aw_led __flash g_aw_leds[DRIVER_LED_TOTAL] = { const aw_led PROGMEM g_aw_leds[DRIVER_LED_TOTAL] = {
/* Each AW20216 channel is controlled by a register at some offset between 0x00 /* Each AW20216 channel is controlled by a register at some offset between 0x00
* and 0xD7 inclusive. * and 0xD7 inclusive.
* See drivers/awinic/aw20216.h for the mapping between register offsets and * See drivers/awinic/aw20216.h for the mapping between register offsets and

View File

@ -52,7 +52,7 @@ I2C IS31FL3731 RGB コントローラを使ったアドレス指定可能な LED
`<keyboard>.c` に全ての LED を列挙する配列を定義します: `<keyboard>.c` に全ての LED を列挙する配列を定義します:
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* これらの位置については IS31 マニュアルを参照してください /* これらの位置については IS31 マニュアルを参照してください
* driver * driver
* | LED address * | LED address

View File

@ -119,7 +119,8 @@ void AW20216_init(pin_t cs_pin, pin_t en_pin) {
} }
void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
aw_led led = g_aw_leds[index]; aw_led led;
memcpy_P(&led, (&g_aw_leds[index]), sizeof(led));
g_pwm_buffer[led.driver][led.r] = red; g_pwm_buffer[led.driver][led.r] = red;
g_pwm_buffer[led.driver][led.g] = green; g_pwm_buffer[led.driver][led.g] = green;

View File

@ -28,7 +28,7 @@ typedef struct aw_led {
uint8_t b; uint8_t b;
} aw_led; } aw_led;
extern const aw_led __flash g_aw_leds[DRIVER_LED_TOTAL]; extern const aw_led PROGMEM g_aw_leds[DRIVER_LED_TOTAL];
void AW20216_init(pin_t cs_pin, pin_t en_pin); void AW20216_init(pin_t cs_pin, pin_t en_pin);
void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue); void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);

View File

@ -141,8 +141,9 @@ void CKLED2001_init(uint8_t addr) {
} }
void CKLED2001_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { void CKLED2001_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
ckled2001_led led;
if (index >= 0 && index < DRIVER_LED_TOTAL) { if (index >= 0 && index < DRIVER_LED_TOTAL) {
ckled2001_led led = g_ckled2001_leds[index]; memcpy_P(&led, (&g_ckled2001_leds[index]), sizeof(led));
g_pwm_buffer[led.driver][led.r] = red; g_pwm_buffer[led.driver][led.r] = red;
g_pwm_buffer[led.driver][led.g] = green; g_pwm_buffer[led.driver][led.g] = green;
@ -158,7 +159,8 @@ void CKLED2001_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
} }
void CKLED2001_set_led_control_register(uint8_t index, bool red, bool green, bool blue) { void CKLED2001_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
ckled2001_led led = g_ckled2001_leds[index]; ckled2001_led led;
memcpy_P(&led, (&g_ckled2001_leds[index]), sizeof(led));
uint8_t control_register_r = led.r / 8; uint8_t control_register_r = led.r / 8;
uint8_t control_register_g = led.g / 8; uint8_t control_register_g = led.g / 8;

View File

@ -27,7 +27,7 @@ typedef struct ckled2001_led {
uint8_t b; uint8_t b;
} __attribute__((packed)) ckled2001_led; } __attribute__((packed)) ckled2001_led;
extern const ckled2001_led __flash g_ckled2001_leds[DRIVER_LED_TOTAL]; extern const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL];
void CKLED2001_init(uint8_t addr); void CKLED2001_init(uint8_t addr);
bool CKLED2001_write_register(uint8_t addr, uint8_t reg, uint8_t data); bool CKLED2001_write_register(uint8_t addr, uint8_t reg, uint8_t data);

View File

@ -193,8 +193,9 @@ void IS31FL3731_init(uint8_t addr) {
} }
void IS31FL3731_set_value(int index, uint8_t value) { void IS31FL3731_set_value(int index, uint8_t value) {
is31_led led;
if (index >= 0 && index < DRIVER_LED_TOTAL) { if (index >= 0 && index < DRIVER_LED_TOTAL) {
is31_led led = g_is31_leds[index]; memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
// Subtract 0x24 to get the second index of g_pwm_buffer // Subtract 0x24 to get the second index of g_pwm_buffer
g_pwm_buffer[led.driver][led.v - 0x24] = value; g_pwm_buffer[led.driver][led.v - 0x24] = value;
@ -209,7 +210,8 @@ void IS31FL3731_set_value_all(uint8_t value) {
} }
void IS31FL3731_set_led_control_register(uint8_t index, bool value) { void IS31FL3731_set_led_control_register(uint8_t index, bool value) {
is31_led led = g_is31_leds[index]; is31_led led;
memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
uint8_t control_register = (led.v - 0x24) / 8; uint8_t control_register = (led.v - 0x24) / 8;
uint8_t bit_value = (led.v - 0x24) % 8; uint8_t bit_value = (led.v - 0x24) % 8;

View File

@ -27,7 +27,7 @@ typedef struct is31_led {
uint8_t v; uint8_t v;
} __attribute__((packed)) is31_led; } __attribute__((packed)) is31_led;
extern const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL]; extern const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL];
void IS31FL3731_init(uint8_t addr); void IS31FL3731_init(uint8_t addr);
void IS31FL3731_write_register(uint8_t addr, uint8_t reg, uint8_t data); void IS31FL3731_write_register(uint8_t addr, uint8_t reg, uint8_t data);

View File

@ -181,8 +181,9 @@ void IS31FL3731_init(uint8_t addr) {
} }
void IS31FL3731_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { void IS31FL3731_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
is31_led led;
if (index >= 0 && index < DRIVER_LED_TOTAL) { if (index >= 0 && index < DRIVER_LED_TOTAL) {
is31_led led = g_is31_leds[index]; memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
// Subtract 0x24 to get the second index of g_pwm_buffer // Subtract 0x24 to get the second index of g_pwm_buffer
g_pwm_buffer[led.driver][led.r - 0x24] = red; g_pwm_buffer[led.driver][led.r - 0x24] = red;
@ -199,7 +200,8 @@ void IS31FL3731_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
} }
void IS31FL3731_set_led_control_register(uint8_t index, bool red, bool green, bool blue) { void IS31FL3731_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
is31_led led = g_is31_leds[index]; is31_led led;
memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
uint8_t control_register_r = (led.r - 0x24) / 8; uint8_t control_register_r = (led.r - 0x24) / 8;
uint8_t control_register_g = (led.g - 0x24) / 8; uint8_t control_register_g = (led.g - 0x24) / 8;

View File

@ -28,7 +28,7 @@ typedef struct is31_led {
uint8_t b; uint8_t b;
} __attribute__((packed)) is31_led; } __attribute__((packed)) is31_led;
extern const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL]; extern const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL];
void IS31FL3731_init(uint8_t addr); void IS31FL3731_init(uint8_t addr);
void IS31FL3731_write_register(uint8_t addr, uint8_t reg, uint8_t data); void IS31FL3731_write_register(uint8_t addr, uint8_t reg, uint8_t data);

View File

@ -181,8 +181,9 @@ void IS31FL3733_init(uint8_t addr, uint8_t sync) {
} }
void IS31FL3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { void IS31FL3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
is31_led led;
if (index >= 0 && index < DRIVER_LED_TOTAL) { if (index >= 0 && index < DRIVER_LED_TOTAL) {
is31_led led = g_is31_leds[index]; memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
g_pwm_buffer[led.driver][led.r] = red; g_pwm_buffer[led.driver][led.r] = red;
g_pwm_buffer[led.driver][led.g] = green; g_pwm_buffer[led.driver][led.g] = green;
@ -198,7 +199,8 @@ void IS31FL3733_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
} }
void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue) { void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
is31_led led = g_is31_leds[index]; is31_led led;
memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
uint8_t control_register_r = led.r / 8; uint8_t control_register_r = led.r / 8;
uint8_t control_register_g = led.g / 8; uint8_t control_register_g = led.g / 8;

View File

@ -30,7 +30,7 @@ typedef struct is31_led {
uint8_t b; uint8_t b;
} __attribute__((packed)) is31_led; } __attribute__((packed)) is31_led;
extern const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL]; extern const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL];
void IS31FL3733_init(uint8_t addr, uint8_t sync); void IS31FL3733_init(uint8_t addr, uint8_t sync);
bool IS31FL3733_write_register(uint8_t addr, uint8_t reg, uint8_t data); bool IS31FL3733_write_register(uint8_t addr, uint8_t reg, uint8_t data);

View File

@ -163,8 +163,9 @@ void IS31FL3736_init(uint8_t addr) {
} }
void IS31FL3736_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { void IS31FL3736_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
is31_led led;
if (index >= 0 && index < DRIVER_LED_TOTAL) { if (index >= 0 && index < DRIVER_LED_TOTAL) {
is31_led led = g_is31_leds[index]; memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
g_pwm_buffer[led.driver][led.r] = red; g_pwm_buffer[led.driver][led.r] = red;
g_pwm_buffer[led.driver][led.g] = green; g_pwm_buffer[led.driver][led.g] = green;
@ -180,7 +181,8 @@ void IS31FL3736_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
} }
void IS31FL3736_set_led_control_register(uint8_t index, bool red, bool green, bool blue) { void IS31FL3736_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
is31_led led = g_is31_leds[index]; is31_led led;
memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
// IS31FL3733 // IS31FL3733
// The PWM register for a matrix position (0x00 to 0xBF) can be // The PWM register for a matrix position (0x00 to 0xBF) can be

View File

@ -39,7 +39,7 @@ typedef struct is31_led {
uint8_t b; uint8_t b;
} __attribute__((packed)) is31_led; } __attribute__((packed)) is31_led;
extern const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL]; extern const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL];
void IS31FL3736_init(uint8_t addr); void IS31FL3736_init(uint8_t addr);
void IS31FL3736_write_register(uint8_t addr, uint8_t reg, uint8_t data); void IS31FL3736_write_register(uint8_t addr, uint8_t reg, uint8_t data);

View File

@ -166,8 +166,9 @@ void IS31FL3737_init(uint8_t addr) {
} }
void IS31FL3737_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { void IS31FL3737_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
is31_led led;
if (index >= 0 && index < DRIVER_LED_TOTAL) { if (index >= 0 && index < DRIVER_LED_TOTAL) {
is31_led led = g_is31_leds[index]; memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
g_pwm_buffer[led.driver][led.r] = red; g_pwm_buffer[led.driver][led.r] = red;
g_pwm_buffer[led.driver][led.g] = green; g_pwm_buffer[led.driver][led.g] = green;
@ -183,7 +184,8 @@ void IS31FL3737_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
} }
void IS31FL3737_set_led_control_register(uint8_t index, bool red, bool green, bool blue) { void IS31FL3737_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
is31_led led = g_is31_leds[index]; is31_led led;
memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
uint8_t control_register_r = led.r / 8; uint8_t control_register_r = led.r / 8;
uint8_t control_register_g = led.g / 8; uint8_t control_register_g = led.g / 8;

View File

@ -30,7 +30,7 @@ typedef struct is31_led {
uint8_t b; uint8_t b;
} __attribute__((packed)) is31_led; } __attribute__((packed)) is31_led;
extern const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL]; extern const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL];
void IS31FL3737_init(uint8_t addr); void IS31FL3737_init(uint8_t addr);
void IS31FL3737_write_register(uint8_t addr, uint8_t reg, uint8_t data); void IS31FL3737_write_register(uint8_t addr, uint8_t reg, uint8_t data);

View File

@ -174,8 +174,9 @@ void IS31FL3741_init(uint8_t addr) {
} }
void IS31FL3741_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { void IS31FL3741_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
is31_led led;
if (index >= 0 && index < DRIVER_LED_TOTAL) { if (index >= 0 && index < DRIVER_LED_TOTAL) {
is31_led led = g_is31_leds[index]; memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
g_pwm_buffer[led.driver][led.r] = red; g_pwm_buffer[led.driver][led.r] = red;
g_pwm_buffer[led.driver][led.g] = green; g_pwm_buffer[led.driver][led.g] = green;
@ -191,7 +192,8 @@ void IS31FL3741_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
} }
void IS31FL3741_set_led_control_register(uint8_t index, bool red, bool green, bool blue) { void IS31FL3741_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
is31_led led = g_is31_leds[index]; is31_led led;
memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
if (red) { if (red) {
g_scaling_registers[led.driver][led.r] = 0xFF; g_scaling_registers[led.driver][led.r] = 0xFF;

View File

@ -30,7 +30,7 @@ typedef struct is31_led {
uint32_t b : 10; uint32_t b : 10;
} __attribute__((packed)) is31_led; } __attribute__((packed)) is31_led;
extern const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL]; extern const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL];
void IS31FL3741_init(uint8_t addr); void IS31FL3741_init(uint8_t addr);
void IS31FL3741_write_register(uint8_t addr, uint8_t reg, uint8_t data); void IS31FL3741_write_register(uint8_t addr, uint8_t reg, uint8_t data);

View File

@ -16,7 +16,7 @@
#include "canary60rgb.h" #include "canary60rgb.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{ 0, J_14, K_14, L_14 }, { 0, J_14, K_14, L_14 },
{ 0, J_13, K_13, L_13 }, { 0, J_13, K_13, L_13 },
{ 0, J_12, K_12, L_12 }, { 0, J_12, K_12, L_12 },

View File

@ -16,7 +16,7 @@
#include "gen1.h" #include "gen1.h"
#ifdef LED_MATRIX_ENABLE #ifdef LED_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | LED address * | LED address

View File

@ -17,7 +17,7 @@
#include "dp60.h" #include "dp60.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -19,7 +19,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -1,7 +1,7 @@
#include "dz60rgb.h" #include "dz60rgb.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{ 0, K_14, J_14, L_14 }, { 0, K_14, J_14, L_14 },
{ 0, K_13, J_13, L_13 }, { 0, K_13, J_13, L_13 },
{ 0, K_12, J_12, L_12 }, { 0, K_12, J_12, L_12 },

View File

@ -1,7 +1,7 @@
#include "dz60rgb_ansi.h" #include "dz60rgb_ansi.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{ 0, K_14, J_14, L_14 }, { 0, K_14, J_14, L_14 },
{ 0, K_13, J_13, L_13 }, { 0, K_13, J_13, L_13 },
{ 0, K_12, J_12, L_12 }, { 0, K_12, J_12, L_12 },

View File

@ -1,7 +1,7 @@
#include "dz60rgb_wkl.h" #include "dz60rgb_wkl.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{ 0, H_15, G_15, I_15 }, { 0, H_15, G_15, I_15 },
{ 0, K_14, J_14, L_14 }, { 0, K_14, J_14, L_14 },
{ 0, K_13, J_13, L_13 }, { 0, K_13, J_13, L_13 },

View File

@ -16,7 +16,7 @@
#include "v1.h" #include "v1.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{ 0, C8_8, C7_8, C6_8 }, { 0, C8_8, C7_8, C6_8 },
{ 0, C9_8, C7_7, C6_7 }, { 0, C9_8, C7_7, C6_7 },
{ 0, C9_7, C8_7, C6_6 }, { 0, C9_7, C8_7, C6_6 },

View File

@ -16,7 +16,7 @@
#include "v2.h" #include "v2.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{ 0, C8_8, C7_8, C6_8 }, { 0, C8_8, C7_8, C6_8 },
{ 0, C9_8, C7_7, C6_7 }, { 0, C9_8, C7_7, C6_7 },
{ 0, C9_7, C8_7, C6_6 }, { 0, C9_7, C8_7, C6_6 },

View File

@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS21_SW1, CS20_SW1, CS19_SW1}, {0, CS21_SW1, CS20_SW1, CS19_SW1},
{0, CS21_SW2, CS20_SW2, CS19_SW2}, {0, CS21_SW2, CS20_SW2, CS19_SW2},
{0, CS21_SW3, CS20_SW3, CS19_SW3}, {0, CS21_SW3, CS20_SW3, CS19_SW3},

View File

@ -243,7 +243,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
// clang-format off // clang-format off
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* driver /* driver
* | R location * | R location
* | | G location * | | G location

View File

@ -174,7 +174,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
#endif #endif
#ifdef LED_MATRIX_ENABLE #ifdef LED_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
// The numbers in the comments are the led numbers DXX on the PCB // The numbers in the comments are the led numbers DXX on the PCB
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver

View File

@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "rev5.h" #include "rev5.h"
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -11,7 +11,7 @@ void matrix_init_kb(void) {
matrix_init_user(); matrix_init_user();
} }
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -54,7 +54,7 @@ void set_fallacy_led(int index, bool state) {
/* define LED matrix /* define LED matrix
*/ */
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C1_1}, {0, C1_1},
{0, C2_1}, {0, C2_1},
{0, C3_1}, {0, C3_1},

View File

@ -1,5 +1,5 @@
#include "tester.h" #include "tester.h"
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -18,7 +18,7 @@
#include "ansi.h" #include "ansi.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
led_config_t __flash g_led_config = {{ led_config_t PROGMEM g_led_config = {{
{ 4, NO_LED, NO_LED, 95, 65, 79, 5, 28 }, { 4, NO_LED, NO_LED, 95, 65, 79, 5, 28 },
{ 8, 2, 9, 0, 10, 75, 1, 7 }, { 8, 2, 9, 0, 10, 75, 1, 7 },
{ 14, 3, 15, NO_LED, 16, 86, 6, 13 }, { 14, 3, 15, NO_LED, 16, 86, 6, 13 },

View File

@ -91,7 +91,7 @@ void raw_hid_receive( uint8_t *data, uint8_t length )
#ifdef HS60_ANSI #ifdef HS60_ANSI
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location
@ -199,7 +199,7 @@ led_config_t g_led_config = { {
#else #else
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -20,7 +20,7 @@
#include "hotswap.h" #include "hotswap.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -20,7 +20,7 @@
#include "universal.h" #include "universal.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -28,7 +28,7 @@ typedef struct is31_led {
uint8_t b; uint8_t b;
} __attribute__((packed)) is31_led; } __attribute__((packed)) is31_led;
extern const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL]; extern const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL];
void IS31FL3733_init(uint8_t bus, uint8_t addr, uint8_t sync); void IS31FL3733_init(uint8_t bus, uint8_t addr, uint8_t sync);
bool IS31FL3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data); bool IS31FL3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data);

View File

@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "is31fl3733-dual.h" #include "is31fl3733-dual.h"
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{ 0, B_1, A_1, C_1 }, { 0, B_1, A_1, C_1 },
{ 0, B_2, A_2, C_2 }, { 0, B_2, A_2, C_2 },
{ 0, B_3, A_3, C_3 }, { 0, B_3, A_3, C_3 },

View File

@ -15,7 +15,7 @@
*/ */
#include "rgb.h" #include "rgb.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB6 */ {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB6 */
{0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB32 */ {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB32 */
{0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB45 */ {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB45 */

View File

@ -15,7 +15,7 @@
*/ */
#include "rgb_iso.h" #include "rgb_iso.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB6 */ {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB6 */
{0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB32 */ {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB32 */
{0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB45 */ {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB45 */

View File

@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS21_SW1, CS20_SW1, CS19_SW1}, {0, CS21_SW1, CS20_SW1, CS19_SW1},
{0, CS21_SW2, CS20_SW2, CS19_SW2}, {0, CS21_SW2, CS20_SW2, CS19_SW2},
{0, CS21_SW3, CS20_SW3, CS19_SW3}, {0, CS21_SW3, CS20_SW3, CS19_SW3},

View File

@ -16,7 +16,7 @@
#include "v1.h" #include "v1.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C8_8, C7_8, C6_8}, // LA17 {0, C8_8, C7_8, C6_8}, // LA17
{0, C9_8, C7_7, C6_7}, // LA16 {0, C9_8, C7_7, C6_7}, // LA16

View File

@ -16,7 +16,7 @@
#include "v2.h" #include "v2.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C8_8, C7_8, C6_8}, // LA17 {0, C8_8, C7_8, C6_8}, // LA17
{0, C9_8, C7_7, C6_7}, // LA16 {0, C9_8, C7_7, C6_7}, // LA16

View File

@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS21_SW1, CS20_SW1, CS19_SW1}, {0, CS21_SW1, CS20_SW1, CS19_SW1},
{0, CS21_SW2, CS20_SW2, CS19_SW2}, {0, CS21_SW2, CS20_SW2, CS19_SW2},
{0, CS21_SW3, CS20_SW3, CS19_SW3}, {0, CS21_SW3, CS20_SW3, CS19_SW3},

View File

@ -1,6 +1,6 @@
#include "kbdmini.h" #include "kbdmini.h"
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{ 0, B_9, A_9, C_9 }, //LA33 { 0, B_9, A_9, C_9 }, //LA33
{ 0, B_10, A_10, C_10 }, //LA37 { 0, B_10, A_10, C_10 }, //LA37
{ 0, B_11, A_11, C_11 }, //LA41 { 0, B_11, A_11, C_11 }, //LA41

View File

@ -1,6 +1,6 @@
#include "maja.h" #include "maja.h"
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C2_1, C3_1, C4_1}, // LA0 {0, C2_1, C3_1, C4_1}, // LA0
{0, C1_1, C3_2, C4_2}, // LA1 {0, C1_1, C3_2, C4_2}, // LA1
{0, C1_2, C2_2, C4_3}, // LA2 {0, C1_2, C2_2, C4_3}, // LA2

View File

@ -17,7 +17,7 @@
#include "quantum.h" #include "quantum.h"
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -17,7 +17,7 @@
#include "quantum.h" #include "quantum.h"
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -17,7 +17,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -16,7 +16,7 @@
#include "latin60rgb.h" #include "latin60rgb.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{ 0, K_13, J_13, L_13 }, { 0, K_13, J_13, L_13 },
{ 0, K_12, J_12, L_12 }, { 0, K_12, J_12, L_12 },
{ 0, K_11, J_11, L_11 }, { 0, K_11, J_11, L_11 },

View File

@ -17,7 +17,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -30,7 +30,7 @@
#endif #endif
// rgb ring leds setting // rgb ring leds setting
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -58,7 +58,7 @@ void matrix_scan_kb(void) {
} }
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -17,7 +17,7 @@
#include "adelais.h" #include "adelais.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C2_1, C3_1, C4_1}, //D102-A0-0 {0, C2_1, C3_1, C4_1}, //D102-A0-0
{0, C5_1, C6_1, C7_1}, //D108-A1-1 {0, C5_1, C6_1, C7_1}, //D108-A1-1

View File

@ -17,7 +17,7 @@
#include "rev3.h" #include "rev3.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS3_SW5, CS2_SW5, CS1_SW5}, /* D9-K31-00 */ {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* D9-K31-00 */
{0, CS6_SW5, CS5_SW5, CS4_SW5}, /* D46-K00-01 */ {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* D46-K00-01 */
{0, CS6_SW9, CS5_SW9, CS4_SW9}, /* D59-K01-02 */ {0, CS6_SW9, CS5_SW9, CS4_SW9}, /* D59-K01-02 */

View File

@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
// left CA // left CA
{0, C5_2, C6_2, C7_2}, //D2-0 {0, C5_2, C6_2, C7_2}, //D2-0
{0, C1_1, C3_2, C4_2}, //D20-1 {0, C1_1, C3_2, C4_2}, //D20-1

View File

@ -17,7 +17,7 @@
#include "rev2.h" #include "rev2.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -17,7 +17,7 @@
#include "rgb_rev1.h" #include "rgb_rev1.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS34_SW1, CS35_SW1, CS36_SW1}, //D92-K00-0 {0, CS34_SW1, CS35_SW1, CS36_SW1}, //D92-K00-0
{0, CS37_SW1, CS38_SW1, CS39_SW1}, //D94-K01-1 {0, CS37_SW1, CS38_SW1, CS39_SW1}, //D94-K01-1
{0, CS31_SW1, CS32_SW1, CS33_SW1}, //D96-K02-2 {0, CS31_SW1, CS32_SW1, CS33_SW1}, //D96-K02-2

View File

@ -19,7 +19,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
{0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
{0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */

View File

@ -17,7 +17,7 @@
#include "mj61.h" #include "mj61.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB1 */ {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB1 */
{0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB2 */ {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB2 */
{0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB3 */ {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB3 */

View File

@ -19,7 +19,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
{0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB3 */ {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB3 */
{0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB4 */ {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB4 */

View File

@ -19,7 +19,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
{0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
{0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */

View File

@ -19,7 +19,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
{0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB3 */ {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB3 */
{0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB4 */ {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB4 */

View File

@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
{0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
{0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */

View File

@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
{0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
{0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */

View File

@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
{0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB3 */ {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB3 */
{0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB4 */ {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB4 */

View File

@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
{0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
{0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */

View File

@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */ {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
{0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */ {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
{0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */ {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */

View File

@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB1 */ {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB1 */
{0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB2 */ {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB2 */
{0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB3 */ {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB3 */

View File

@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS28_SW1, CS30_SW1, CS29_SW1}, /* RGB10 */ {0, CS28_SW1, CS30_SW1, CS29_SW1}, /* RGB10 */
{0, CS28_SW2, CS30_SW2, CS29_SW2}, /* RGB11 */ {0, CS28_SW2, CS30_SW2, CS29_SW2}, /* RGB11 */
{0, CS28_SW3, CS30_SW3, CS29_SW3}, /* RGB12 */ {0, CS28_SW3, CS30_SW3, CS29_SW3}, /* RGB12 */

View File

@ -1,7 +1,7 @@
#include "gm862.h" #include "gm862.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, B_1, A_1, C_1}, {0, B_1, A_1, C_1},
{0, B_2, A_2, C_2}, {0, B_2, A_2, C_2},
{0, B_3, A_3, C_3}, {0, B_3, A_3, C_3},

View File

@ -203,7 +203,7 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
// clang-format off // clang-format off
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -16,7 +16,7 @@
#include "mt64rgb.h" #include "mt64rgb.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -16,7 +16,7 @@
#include "mt84.h" #include "mt84.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -187,7 +187,7 @@ static void self_testing(void)
update_ticks(); update_ticks();
} }
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -17,7 +17,7 @@
#include "rev1.h" #include "rev1.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -21,7 +21,7 @@
keyboard_config_t keyboard_config; keyboard_config_t keyboard_config;
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -16,7 +16,7 @@
#include "light.h" #include "light.h"
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -17,7 +17,7 @@
#include "pk64rgb.h" #include "pk64rgb.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -17,7 +17,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -21,7 +21,7 @@
#include "print.h" #include "print.h"
#include "quantum.h" #include "quantum.h"
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* https://cdn-learn.adafruit.com/downloads/pdf/adafruit-15x7-7x15-charlieplex-led-matrix-charliewing-featherwing.pdf * https://cdn-learn.adafruit.com/downloads/pdf/adafruit-15x7-7x15-charlieplex-led-matrix-charliewing-featherwing.pdf
*/ */

View File

@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{ 0, C2_1, C3_1, C4_1 }, { 0, C2_1, C3_1, C4_1 },
{ 0, C1_1, C3_2, C4_2 }, { 0, C1_1, C3_2, C4_2 },
{ 0, C1_2, C2_2, C4_3 }, { 0, C1_2, C2_2, C4_3 },

View File

@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "whitefox.h" #include "whitefox.h"
#ifdef LED_MATRIX_ENABLE #ifdef LED_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
// The numbers in the comments are the led numbers DXX on the PCB // The numbers in the comments are the led numbers DXX on the PCB
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver

View File

@ -158,7 +158,7 @@ uint32_t g_any_key_hit = 0;
// ADDR_2 is not needed. it is here as a dummy // ADDR_2 is not needed. it is here as a dummy
#define ISSI_ADDR_1 0x50 #define ISSI_ADDR_1 0x50
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location
@ -239,7 +239,7 @@ const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
#define ISSI_ADDR_1 0x50 #define ISSI_ADDR_1 0x50
#define ISSI_ADDR_2 0x52 #define ISSI_ADDR_2 0x52
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location
@ -382,7 +382,7 @@ const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
// set to 0 for write, 1 for read (as per I2C protocol) // set to 0 for write, 1 for read (as per I2C protocol)
#define ISSI_ADDR_1 0x74 #define ISSI_ADDR_1 0x74
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location
@ -414,7 +414,7 @@ const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
#define ISSI_ADDR_2 0x76 // 11101[10] <- SDA #define ISSI_ADDR_2 0x76 // 11101[10] <- SDA
#define ISSI_ADDR_3 0x75 // 11101[01] <- SCL #define ISSI_ADDR_3 0x75 // 11101[01] <- SCL
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location
@ -541,7 +541,7 @@ const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
#define ISSI_ADDR_1 0x74 #define ISSI_ADDR_1 0x74
#define ISSI_ADDR_2 0x76 #define ISSI_ADDR_2 0x76
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location
@ -622,7 +622,7 @@ const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
#define ISSI_ADDR_1 0x74 #define ISSI_ADDR_1 0x74
#define ISSI_ADDR_2 0x77 #define ISSI_ADDR_2 0x77
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location
@ -709,7 +709,7 @@ const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
#define ISSI_ADDR_1 0x74 #define ISSI_ADDR_1 0x74
#define ISSI_ADDR_2 #define ISSI_ADDR_2
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C1_9, C3_10, C4_10}, // LB1 {0, C1_9, C3_10, C4_10}, // LB1
{0, C1_10, C2_10, C4_11}, // LB2 {0, C1_10, C2_10, C4_11}, // LB2
{0, C1_11, C2_11, C3_11}, // LB3 {0, C1_11, C2_11, C3_11}, // LB3
@ -729,7 +729,7 @@ const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
#define ISSI_ADDR_1 0x74 #define ISSI_ADDR_1 0x74
#define ISSI_ADDR_2 0x76 #define ISSI_ADDR_2 0x76
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -15,7 +15,7 @@
*/ */
#include "knight.h" #include "knight.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C1_3, C2_3, C3_3}, // L01 {0, C1_3, C2_3, C3_3}, // L01
{0, C1_4, C2_4, C3_4}, // L02 {0, C1_4, C2_4, C3_4}, // L02

View File

@ -15,7 +15,7 @@
*/ */
#include "knight_plus.h" #include "knight_plus.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C1_3, C2_3, C3_3}, // L01 {0, C1_3, C2_3, C3_3}, // L01
{0, C1_4, C2_4, C3_4}, // L02 {0, C1_4, C2_4, C3_4}, // L02

View File

@ -15,7 +15,7 @@
*/ */
#include "nature.h" #include "nature.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C1_3, C2_3, C3_3}, // L01 {0, C1_3, C2_3, C3_3}, // L01
{0, C1_4, C2_4, C3_4}, // L02 {0, C1_4, C2_4, C3_4}, // L02

View File

@ -15,7 +15,7 @@
*/ */
#include "numpad.h" #include "numpad.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C3_3, C2_3, C1_3}, // L01 {0, C3_3, C2_3, C1_3}, // L01
{0, C3_4, C2_4, C1_4}, // L02 {0, C3_4, C2_4, C1_4}, // L02

View File

@ -15,7 +15,7 @@
*/ */
#include "ranger.h" #include "ranger.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C3_3, C2_3, C1_3}, // L01 {0, C3_3, C2_3, C1_3}, // L01
{0, C3_4, C2_4, C1_4}, // L02 {0, C3_4, C2_4, C1_4}, // L02

View File

@ -1,6 +1,6 @@
#include "woody.h" #include "woody.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C8_8, C7_8, C6_8}, // LA17 {0, C8_8, C7_8, C6_8}, // LA17
{0, C9_8, C7_7, C6_7}, // LA16 {0, C9_8, C7_7, C6_7}, // LA16

View File

@ -25,7 +25,7 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
LED_TYPE rgb_matrix_ws2812_array[WS2812_LED_TOTAL]; LED_TYPE rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -22,7 +22,7 @@ void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
#include "i2c_master.h" #include "i2c_master.h"
#include "drivers/led/issi/is31fl3741.h" #include "drivers/led/issi/is31fl3741.h"
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -22,7 +22,7 @@ void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
#include "i2c_master.h" #include "i2c_master.h"
#include "drivers/led/issi/is31fl3741.h" #include "drivers/led/issi/is31fl3741.h"
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* Refer to IS31 manual for these locations
* driver * driver
* | R location * | R location

View File

@ -5,7 +5,6 @@
#else #else
# include <string.h> # include <string.h>
# define PROGMEM # define PROGMEM
# define __flash
# define PSTR(x) x # define PSTR(x) x
# define PGM_P const char* # define PGM_P const char*
# define memcpy_P(dest, src, n) memcpy(dest, src, n) # define memcpy_P(dest, src, n) memcpy(dest, src, n)