diff options
| author | Joshua Diamond <josh@windowoffire.com> | 2021-02-14 20:26:22 -0500 |
|---|---|---|
| committer | Joshua Diamond <josh@windowoffire.com> | 2021-02-14 20:26:22 -0500 |
| commit | 0b63fb5e819495f4515001cd367a279eaf9eaaa2 (patch) | |
| tree | 492c2b5de31d6ee1176371829b10a8fb419b4f8d /drivers | |
| parent | 328a8322f4134fdec2f29b8dd58501c99b4de876 (diff) | |
| parent | 9ee12820197f38f6618b78f92481f3ffd2d8b7e5 (diff) | |
| download | qmk_firmware-0b63fb5e819495f4515001cd367a279eaf9eaaa2.tar.gz qmk_firmware-0b63fb5e819495f4515001cd367a279eaf9eaaa2.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/issi/is31fl3731-simple.c | 4 | ||||
| -rw-r--r-- | drivers/issi/is31fl3731-simple.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/issi/is31fl3731-simple.c b/drivers/issi/is31fl3731-simple.c index 7c86841f1..d295772f5 100644 --- a/drivers/issi/is31fl3731-simple.c +++ b/drivers/issi/is31fl3731-simple.c | |||
| @@ -186,7 +186,7 @@ void IS31FL3731_init(uint8_t addr) { | |||
| 186 | } | 186 | } |
| 187 | 187 | ||
| 188 | void IS31FL3731_set_value(int index, uint8_t value) { | 188 | void IS31FL3731_set_value(int index, uint8_t value) { |
| 189 | if (index >= 0 && index < LED_DRIVER_LED_COUNT) { | 189 | if (index >= 0 && index < DRIVER_LED_TOTAL) { |
| 190 | is31_led led = g_is31_leds[index]; | 190 | is31_led led = g_is31_leds[index]; |
| 191 | 191 | ||
| 192 | // Subtract 0x24 to get the second index of g_pwm_buffer | 192 | // Subtract 0x24 to get the second index of g_pwm_buffer |
| @@ -196,7 +196,7 @@ void IS31FL3731_set_value(int index, uint8_t value) { | |||
| 196 | } | 196 | } |
| 197 | 197 | ||
| 198 | void IS31FL3731_set_value_all(uint8_t value) { | 198 | void IS31FL3731_set_value_all(uint8_t value) { |
| 199 | for (int i = 0; i < LED_DRIVER_LED_COUNT; i++) { | 199 | for (int i = 0; i < DRIVER_LED_TOTAL; i++) { |
| 200 | IS31FL3731_set_value(i, value); | 200 | IS31FL3731_set_value(i, value); |
| 201 | } | 201 | } |
| 202 | } | 202 | } |
diff --git a/drivers/issi/is31fl3731-simple.h b/drivers/issi/is31fl3731-simple.h index 85b458753..9665d6ed3 100644 --- a/drivers/issi/is31fl3731-simple.h +++ b/drivers/issi/is31fl3731-simple.h | |||
| @@ -26,7 +26,7 @@ typedef struct is31_led { | |||
| 26 | uint8_t v; | 26 | uint8_t v; |
| 27 | } __attribute__((packed)) is31_led; | 27 | } __attribute__((packed)) is31_led; |
| 28 | 28 | ||
| 29 | extern const is31_led g_is31_leds[LED_DRIVER_LED_COUNT]; | 29 | extern const is31_led g_is31_leds[DRIVER_LED_TOTAL]; |
| 30 | 30 | ||
| 31 | void IS31FL3731_init(uint8_t addr); | 31 | void IS31FL3731_init(uint8_t addr); |
| 32 | void IS31FL3731_write_register(uint8_t addr, uint8_t reg, uint8_t data); | 32 | void IS31FL3731_write_register(uint8_t addr, uint8_t reg, uint8_t data); |
