summaryrefslogtreecommitdiff
path: root/keyboards/xbows/woody
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/xbows/woody')
-rw-r--r--keyboards/xbows/woody/config.h3
-rw-r--r--keyboards/xbows/woody/keymaps/default/keymap.c8
-rw-r--r--keyboards/xbows/woody/woody.c69
3 files changed, 34 insertions, 46 deletions
diff --git a/keyboards/xbows/woody/config.h b/keyboards/xbows/woody/config.h
index d6b7f32c68..c2945cadf6 100644
--- a/keyboards/xbows/woody/config.h
+++ b/keyboards/xbows/woody/config.h
@@ -10,7 +10,6 @@
#define RGB_MATRIX_LED_PROCESS_LIMIT 4
#define RGB_MATRIX_LED_FLUSH_LIMIT 26
#define DEBOUNCE 3
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
@@ -69,5 +68,5 @@
# define DRIVER_COUNT 2
# define DRIVER_1_LED_TOTAL 35
# define DRIVER_2_LED_TOTAL 32
-# define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
#endif
diff --git a/keyboards/xbows/woody/keymaps/default/keymap.c b/keyboards/xbows/woody/keymaps/default/keymap.c
index 820b5315ef..ea2cf42e2e 100644
--- a/keyboards/xbows/woody/keymaps/default/keymap.c
+++ b/keyboards/xbows/woody/keymaps/default/keymap.c
@@ -2,15 +2,15 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_INS,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[1] = LAYOUT( /* FN */
- KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
- KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, QK_BOOT, KC_HOME,
- KC_CAPS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_END,
+ QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
+ KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_HOME,
+ KC_CAPS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_END,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT)
};
diff --git a/keyboards/xbows/woody/woody.c b/keyboards/xbows/woody/woody.c
index 41601d39a9..1f85907f95 100644
--- a/keyboards/xbows/woody/woody.c
+++ b/keyboards/xbows/woody/woody.c
@@ -1,30 +1,30 @@
#include "woody.h"
#ifdef RGB_MATRIX_ENABLE
-const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
-
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+
{0, C8_8, C7_8, C6_8}, // LA17
{0, C9_8, C7_7, C6_7}, // LA16
- {0, C9_7, C8_7, C6_6}, // LA15
+ {0, C9_7, C8_7, C6_6}, // LA15
{0, C9_6, C8_6, C7_6}, // LA14
- {0, C9_5, C8_5, C7_5}, // LA13
- {0, C9_4, C8_4, C7_4}, // LA12
- {0, C9_3, C8_3, C7_3}, // LA11
- {0, C9_2, C8_2, C7_2}, // LA10
- {0, C9_1, C8_1, C7_1}, // LA9
+ {0, C9_5, C8_5, C7_5}, // LA13
+ {0, C9_4, C8_4, C7_4}, // LA12
+ {0, C9_3, C8_3, C7_3}, // LA11
+ {0, C9_2, C8_2, C7_2}, // LA10
+ {0, C9_1, C8_1, C7_1}, // LA9
{0, C2_9, C3_9, C4_9}, // LB0
{0, C1_9, C3_10, C4_10}, // LB1
{0, C1_10, C2_10, C4_11}, // LB2
{0, C1_11, C2_11, C3_11}, // LB3
{0, C1_13, C2_13, C3_13}, // LB5
{0, C1_14, C2_14, C3_14}, // LB6
-
+
{0, C1_7, C2_7, C3_7}, // LA7
- {0, C1_6, C2_6, C3_6}, // LA6
- {0, C1_5, C2_5, C3_5}, // LA5
- {0, C1_4, C2_4, C3_4}, // LA4
- {0, C1_3, C2_3, C3_3}, // LA3
- {0, C1_2, C2_2, C4_3}, // LA2
- {0, C1_1, C3_2, C4_2}, // LA1
+ {0, C1_6, C2_6, C3_6}, // LA6
+ {0, C1_5, C2_5, C3_5}, // LA5
+ {0, C1_4, C2_4, C3_4}, // LA4
+ {0, C1_3, C2_3, C3_3}, // LA3
+ {0, C1_2, C2_2, C4_3}, // LA2
+ {0, C1_1, C3_2, C4_2}, // LA1
{0, C2_1, C3_1, C4_1}, // LA0
{0, C9_9, C8_9, C7_9}, // LB9
{0, C9_10, C8_10, C7_10}, // LB10
@@ -36,10 +36,10 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C1_8, C2_8, C3_8}, // LA8
{1, C9_6, C8_6, C7_6}, // LC14
- {1, C9_5, C8_5, C7_5}, // LC13
- {1, C9_4, C8_4, C7_4}, // LC12
- {1, C9_3, C8_3, C7_3}, // LC11
- {1, C9_2, C8_2, C7_2}, // LC10
+ {1, C9_5, C8_5, C7_5}, // LC13
+ {1, C9_4, C8_4, C7_4}, // LC12
+ {1, C9_3, C8_3, C7_3}, // LC11
+ {1, C9_2, C8_2, C7_2}, // LC10
{1, C9_1, C8_1, C7_1}, // LC9
{1, C2_9, C3_9, C4_9}, // LD0
{1, C1_9, C3_10, C4_10}, // LD1
@@ -52,8 +52,8 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{1, C9_8, C7_7, C6_7}, // LC16
{1, C1_5, C2_5, C3_5}, // LC5
{1, C1_4, C2_4, C3_4}, // LC4
- {1, C1_3, C2_3, C3_3}, // LC3
- {1, C1_2, C2_2, C4_3}, // LC2
+ {1, C1_3, C2_3, C3_3}, // LC3
+ {1, C1_2, C2_2, C4_3}, // LC2
{1, C1_1, C3_2, C4_2}, // LC1
{1, C9_9, C8_9, C7_9}, // LD9
{1, C9_10, C8_10, C7_10}, // LD10
@@ -65,7 +65,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C9_15, C8_15, C6_14}, // LB15
{1, C8_8, C7_8, C6_8}, // LC17
- {1, C1_8, C2_8, C3_8}, // LC8
+ {1, C1_8, C2_8, C3_8}, // LC8
{1, C1_7, C2_7, C3_7}, // LC7
{1, C2_1, C3_1, C4_1}, // LC0
{1, C9_14, C8_14, C7_14}, // LD14
@@ -91,29 +91,18 @@ led_config_t g_led_config = { {
}, {
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4,
4, 4, 4, 4, 4, 4, 1, 1, 1
} };
#endif
-void suspend_power_down_kb(void)
-{
- rgb_matrix_set_suspend_state(true);
- suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void)
-{
- rgb_matrix_set_suspend_state(false);
- suspend_wakeup_init_user();
-}
-__attribute__ ((weak))
-
-void rgb_matrix_indicators_user(void)
-{
- if (IS_LED_ON(host_keyboard_leds(), USB_LED_CAPS_LOCK))
- {
+bool rgb_matrix_indicators_kb(void) {
+ if (!rgb_matrix_indicators_user()) {
+ return false;
+ }
+ if (IS_LED_ON(host_keyboard_leds(), USB_LED_CAPS_LOCK)) {
rgb_matrix_set_color(30, 0xFF, 0x00, 0x00);
}
+ return true;
}