summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorJoshua Diamond <josh@windowoffire.com>2021-02-14 20:26:22 -0500
committerJoshua Diamond <josh@windowoffire.com>2021-02-14 20:26:22 -0500
commit0b63fb5e819495f4515001cd367a279eaf9eaaa2 (patch)
tree492c2b5de31d6ee1176371829b10a8fb419b4f8d /keyboards
parent328a8322f4134fdec2f29b8dd58501c99b4de876 (diff)
parent9ee12820197f38f6618b78f92481f3ffd2d8b7e5 (diff)
Merge branch 'master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/clueboard/66_hotswap/gen1/config.h2
-rw-r--r--keyboards/clueboard/66_hotswap/gen1/gen1.c2
-rwxr-xr-xkeyboards/fallacy/config.h2
-rwxr-xr-xkeyboards/fallacy/indicators.c4
-rw-r--r--keyboards/terrazzo/config.h2
-rw-r--r--keyboards/terrazzo/terrazzo.c8
6 files changed, 10 insertions, 10 deletions
diff --git a/keyboards/clueboard/66_hotswap/gen1/config.h b/keyboards/clueboard/66_hotswap/gen1/config.h
index 1471af63dc..5ed3c5b272 100644
--- a/keyboards/clueboard/66_hotswap/gen1/config.h
+++ b/keyboards/clueboard/66_hotswap/gen1/config.h
@@ -107,7 +107,7 @@
#define I2C1_SDA 9
#define LED_DRIVER_COUNT 1
-#define LED_DRIVER_LED_COUNT 71
+#define DRIVER_LED_TOTAL 71
#define AUDIO_PIN A5
#define AUDIO_PIN_ALT A4
diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.c b/keyboards/clueboard/66_hotswap/gen1/gen1.c
index 4bee38dc4e..dd399317c1 100644
--- a/keyboards/clueboard/66_hotswap/gen1/gen1.c
+++ b/keyboards/clueboard/66_hotswap/gen1/gen1.c
@@ -18,7 +18,7 @@
#ifdef LED_MATRIX_ENABLE
#include "is31fl3731-simple.h"
-const is31_led g_is31_leds[LED_DRIVER_LED_COUNT] = {
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
* driver
* | LED address
diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h
index 559b6292b4..379d25d9db 100755
--- a/keyboards/fallacy/config.h
+++ b/keyboards/fallacy/config.h
@@ -45,7 +45,7 @@
*/
#define LED_DRIVER_ADDR_1 0b1110100
#define LED_DRIVER_COUNT 1
-#define LED_DRIVER_LED_COUNT 3
+#define DRIVER_LED_TOTAL 3
/* Set 0 if debouncing isn't needed
*/
diff --git a/keyboards/fallacy/indicators.c b/keyboards/fallacy/indicators.c
index deda752faa..6c80f31678 100755
--- a/keyboards/fallacy/indicators.c
+++ b/keyboards/fallacy/indicators.c
@@ -25,7 +25,7 @@ void init_fallacy_leds(void) {
i2c_init();
IS31FL3731_init(LED_DRIVER_ADDR_1);
- for (int i = 0; i < LED_DRIVER_LED_COUNT; i++) {
+ for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
IS31FL3731_set_led_control_register(i, true);
}
@@ -54,7 +54,7 @@ void set_fallacy_led(int index, bool state) {
/* define LED matrix
*/
-const is31_led g_is31_leds[LED_DRIVER_LED_COUNT] = {
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C1_1},
{0, C2_1},
{0, C3_1},
diff --git a/keyboards/terrazzo/config.h b/keyboards/terrazzo/config.h
index 4b1dac7064..e13a1e0dba 100644
--- a/keyboards/terrazzo/config.h
+++ b/keyboards/terrazzo/config.h
@@ -85,7 +85,7 @@ so there is only one configuration. */
#define LED_DRIVER_ADDR_1 0x74
#define LED_DRIVER_COUNT 1
-#define LED_DRIVER_LED_COUNT 105
+#define DRIVER_LED_TOTAL 105
#define LED_MATRIX_ROWS 15
#define LED_MATRIX_COLS 7
#define LED_MATRIX_MAXIMUM_BRIGHTNESS 20
diff --git a/keyboards/terrazzo/terrazzo.c b/keyboards/terrazzo/terrazzo.c
index e8a4e03fc6..f079ded4d7 100644
--- a/keyboards/terrazzo/terrazzo.c
+++ b/keyboards/terrazzo/terrazzo.c
@@ -22,7 +22,7 @@
#include "print.h"
#include "quantum.h"
-const is31_led g_is31_leds[LED_DRIVER_LED_COUNT] = {
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
* https://cdn-learn.adafruit.com/downloads/pdf/adafruit-15x7-7x15-charlieplex-led-matrix-charliewing-featherwing.pdf
*/
@@ -58,7 +58,7 @@ uint8_t terrazzo_effect = 1;
void terrazzo_set_pixel(uint8_t x, uint8_t y, uint8_t value) {
uint8_t target = y * LED_MATRIX_COLS + x;
- if (target < LED_DRIVER_LED_COUNT && target >= 0) {
+ if (target < DRIVER_LED_TOTAL && target >= 0) {
led_matrix_set_index_value(y * LED_MATRIX_COLS + x, value);
}
}
@@ -85,10 +85,10 @@ void terrazzo_scroll_pixel(bool clockwise) {
terrazzo_led_index = terrazzo_led_index - 1;
}
- if (terrazzo_led_index >= LED_DRIVER_LED_COUNT) {
+ if (terrazzo_led_index >= DRIVER_LED_TOTAL) {
terrazzo_led_index = 0;
} else if (terrazzo_led_index <= 0 ) {
- terrazzo_led_index = LED_DRIVER_LED_COUNT - 1;
+ terrazzo_led_index = DRIVER_LED_TOTAL - 1;
}
}