summaryrefslogtreecommitdiff
path: root/keyboards/idobao
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/idobao')
-rwxr-xr-xkeyboards/idobao/id42/config.h2
-rwxr-xr-xkeyboards/idobao/id42/id42.c2
-rw-r--r--keyboards/idobao/id63/config.h4
-rw-r--r--keyboards/idobao/id63/keymaps/idobao/keymap.c3
-rw-r--r--keyboards/idobao/id67/config.h4
-rw-r--r--keyboards/idobao/id67/keymaps/idobao/keymap.c3
-rw-r--r--keyboards/idobao/id67/keymaps/thewerther/keymap.c2
-rw-r--r--keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c23
-rw-r--r--keyboards/idobao/id75/v2/config.h2
-rw-r--r--keyboards/idobao/id80/v3/ansi/config.h2
-rw-r--r--keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c3
-rw-r--r--keyboards/idobao/id87/v2/config.h2
-rw-r--r--keyboards/idobao/id87/v2/keymaps/idobao/keymap.c3
-rwxr-xr-xkeyboards/idobao/montex/v1rgb/config.h2
-rwxr-xr-xkeyboards/idobao/montex/v2/config.h4
15 files changed, 25 insertions, 36 deletions
diff --git a/keyboards/idobao/id42/config.h b/keyboards/idobao/id42/config.h
index a95578a9b3..bef9120005 100755
--- a/keyboards/idobao/id42/config.h
+++ b/keyboards/idobao/id42/config.h
@@ -19,7 +19,7 @@
#ifdef RGB_MATRIX_ENABLE
#define RGB_DI_PIN B3
- #define DRIVER_LED_TOTAL 42
+ #define RGB_MATRIX_LED_COUNT 42
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/idobao/id42/id42.c b/keyboards/idobao/id42/id42.c
index ea3dccdfed..15cc0b41b0 100755
--- a/keyboards/idobao/id42/id42.c
+++ b/keyboards/idobao/id42/id42.c
@@ -20,7 +20,7 @@
*/
led_config_t g_led_config = { {
// Key Matrix to LED Index
- // WS2812 LED strings are addressed from 0 (1st) to DRIVER_LED_TOTAL-1 (last)
+ // WS2812 LED strings are addressed from 0 (1st) to RGB_MATRIX_LED_COUNT-1 (last)
{ 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30 },
{ 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, __, 19 },
{ 18, 17, 16, 15, 14, 13, 12, 11, 10, __, 9, 8 },
diff --git a/keyboards/idobao/id63/config.h b/keyboards/idobao/id63/config.h
index 10fb9d5f08..052f7f3bad 100644
--- a/keyboards/idobao/id63/config.h
+++ b/keyboards/idobao/id63/config.h
@@ -22,9 +22,9 @@
*
* */
#ifndef ID63_DISABLE_UNDERGLOW
- #define DRIVER_LED_TOTAL 75
+ #define RGB_MATRIX_LED_COUNT 75
#else
- #define DRIVER_LED_TOTAL (75 - 12)
+ #define RGB_MATRIX_LED_COUNT (75 - 12)
#endif
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/idobao/id63/keymaps/idobao/keymap.c b/keyboards/idobao/id63/keymaps/idobao/keymap.c
index f49304fb24..df40dfa5a3 100644
--- a/keyboards/idobao/id63/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id63/keymaps/idobao/keymap.c
@@ -196,7 +196,7 @@ void eeconfig_init_user(void) {
id63_update_rgb_mode();
}
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
// Caps Lock key stuff
if (host_keyboard_led_state().caps_lock) {
@@ -214,6 +214,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
} else if (user_config.rgb_disable_perkey) {
rgb_matrix_set_color(ID63_CAPS_LOCK_KEY_INDEX, HSV_OFF); // off
}
+ return false;
}
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id67/config.h b/keyboards/idobao/id67/config.h
index 59e34654b5..dcb2de2a32 100644
--- a/keyboards/idobao/id67/config.h
+++ b/keyboards/idobao/id67/config.h
@@ -12,9 +12,9 @@
// RGB Matrix config
#if defined(RGB_MATRIX_ENABLE)
#ifndef ID67_DISABLE_UNDERGLOW
- #define DRIVER_LED_TOTAL 77
+ #define RGB_MATRIX_LED_COUNT 77
#else
- #define DRIVER_LED_TOTAL (77 - 10)
+ #define RGB_MATRIX_LED_COUNT (77 - 10)
#endif
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/idobao/id67/keymaps/idobao/keymap.c b/keyboards/idobao/id67/keymaps/idobao/keymap.c
index 55ff6e5730..aadad80fb2 100644
--- a/keyboards/idobao/id67/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id67/keymaps/idobao/keymap.c
@@ -198,7 +198,7 @@ void eeconfig_init_user(void) {
id67_update_rgb_mode();
}
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
// Caps Lock key stuff
if (host_keyboard_led_state().caps_lock) {
@@ -216,6 +216,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
} else if (user_config.rgb_disable_perkey) {
rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, HSV_OFF); // off
}
+ return false;
}
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id67/keymaps/thewerther/keymap.c b/keyboards/idobao/id67/keymaps/thewerther/keymap.c
index ef37b210f5..a47a54db37 100644
--- a/keyboards/idobao/id67/keymaps/thewerther/keymap.c
+++ b/keyboards/idobao/id67/keymaps/thewerther/keymap.c
@@ -34,7 +34,7 @@ void matrix_scan_user(void) {
if (current_effect >= RGB_MATRIX_SOLID_REACTIVE_SIMPLE && current_effect <= RGB_MATRIX_SOLID_MULTISPLASH) {
// set all underglow leds to current color
RGB current_color = hsv_to_rgb(rgb_matrix_get_hsv());
- for (int i = DRIVER_LED_TOTAL - DRIVER_LED_UNDERGLOW; i < DRIVER_LED_TOTAL; i++) {
+ for (int i = RGB_MATRIX_LED_COUNT - DRIVER_LED_UNDERGLOW; i < RGB_MATRIX_LED_COUNT; i++) {
rgb_matrix_set_color(i, current_color.r, current_color.g, current_color.b);
}
}
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
index 1bf6971730..c90f1bf471 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#define LED_FLAG_ALPHA_KEY 0x10 // Alpha keys (for Caps Lock)
#define LED_FLAG_LAYER_IND 0x20 // Layer indicator
-const uint8_t g_led_config_new_flags[DRIVER_LED_TOTAL] = {
+const uint8_t g_led_config_new_flags[RGB_MATRIX_LED_COUNT] = {
// Extended LED Index to Flag
// ** Remember: on ID67 this is in reverse order
0x21, 0x01, 0x01, 0x01, 0x01, 0x04, 0x01, 0x01, 0x21, // Spc row
@@ -147,18 +147,14 @@ static uint16_t recording_timer;
void keyboard_pre_init_user(void) {
// override `config.h` flags with new values
- for (int i = 0; i < DRIVER_LED_TOTAL; i++) g_led_config.flags[i] = g_led_config_new_flags[i];
+ for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) g_led_config.flags[i] = g_led_config_new_flags[i];
}
void keyboard_post_init_user(void) {
isRGBOff = false;
}
-void rgb_matrix_indicators_user(void) {
- // do nothing, override base <<weak>> function to disable it
-}
-
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
uint8_t v = MIN( rgblight_get_val() + RGB_BRIGHTER_BY, 0xFF );
uint8_t current_layer = get_highest_layer(layer_state);
@@ -239,18 +235,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
}
break;
}
-}
-
-/*
- * Sleep mode stuff (untested)
- */
-
-void suspend_power_down_user(void) {
- rgb_matrix_set_suspend_state(true);
-}
-
-void suspend_wakeup_init_user(void) {
- rgb_matrix_set_suspend_state(false);
+ return false;
}
#endif
diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h
index 4029d80bf8..62c25486c5 100644
--- a/keyboards/idobao/id75/v2/config.h
+++ b/keyboards/idobao/id75/v2/config.h
@@ -41,7 +41,7 @@
#undef RGB_DI_PIN
#define RGB_DI_PIN F0
#ifdef RGB_MATRIX_ENABLE
-# define DRIVER_LED_TOTAL 85 /* 10 Bottom 75 top*/
+# define RGB_MATRIX_LED_COUNT 85 /* 10 Bottom 75 top*/
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/idobao/id80/v3/ansi/config.h b/keyboards/idobao/id80/v3/ansi/config.h
index 1b99fd7908..50ca039a06 100644
--- a/keyboards/idobao/id80/v3/ansi/config.h
+++ b/keyboards/idobao/id80/v3/ansi/config.h
@@ -22,7 +22,7 @@
// RGB Matrix config
#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
- #define DRIVER_LED_TOTAL 94
+ #define RGB_MATRIX_LED_COUNT 94
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
index e0d786e5e2..947863653c 100644
--- a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
@@ -196,7 +196,7 @@ void eeconfig_init_user(void) {
id80_update_rgb_mode();
}
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
// Caps Lock key stuff
if (host_keyboard_led_state().caps_lock) {
@@ -214,6 +214,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
} else if (user_config.rgb_disable_perkey) {
rgb_matrix_set_color(ID80_CAPS_LOCK_KEY_INDEX, HSV_OFF); // off
}
+ return false;
}
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h
index 8f1a9ddf03..08ce4f0af4 100644
--- a/keyboards/idobao/id87/v2/config.h
+++ b/keyboards/idobao/id87/v2/config.h
@@ -14,7 +14,7 @@
// RGB Matrix config
#if defined(RGB_MATRIX_ENABLE)
- #define DRIVER_LED_TOTAL 103
+ #define RGB_MATRIX_LED_COUNT 103
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
diff --git a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
index 59b60b7e1d..31787a2e42 100644
--- a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
@@ -180,7 +180,7 @@ void eeconfig_init_user(void) {
id87_update_rgb_mode();
}
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
// Caps Lock key stuff
if (host_keyboard_led_state().caps_lock) {
@@ -198,6 +198,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
} else if (user_config.rgb_disable_perkey) {
rgb_matrix_set_color(ID87_CAPS_LOCK_KEY_INDEX, HSV_OFF); // off
}
+ return false;
}
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h
index 670b43462b..8a3b3029d4 100755
--- a/keyboards/idobao/montex/v1rgb/config.h
+++ b/keyboards/idobao/montex/v1rgb/config.h
@@ -28,7 +28,7 @@
#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
// The number of LEDs connected
- #define DRIVER_LED_TOTAL 31
+ #define RGB_MATRIX_LED_COUNT 31
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v2/config.h
index 98ba567203..eaed5dde7a 100755
--- a/keyboards/idobao/montex/v2/config.h
+++ b/keyboards/idobao/montex/v2/config.h
@@ -10,9 +10,9 @@
#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
#ifndef ID27_DISABLE_UNDERGLOW
- #define DRIVER_LED_TOTAL 31 // The number of LEDs connected
+ #define RGB_MATRIX_LED_COUNT 31 // The number of LEDs connected
#else
- #define DRIVER_LED_TOTAL 27 // -4 disabled underglow LEDs
+ #define RGB_MATRIX_LED_COUNT 27 // -4 disabled underglow LEDs
#endif
// #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // don't use, too few key to make it look good