#include "drashna.h"
#include "rgb_stuff.h"
+#include "eeprom.h"
+#if defined(RGBLIGHT_ENABLE)
extern rgblight_config_t rgblight_config;
-extern userspace_config_t userspace_config;
+#elif defined(RGB_MATRIX_ENABLE)
+extern rgb_config_t rgb_matrix_config;
+#endif
#ifdef RGBLIGHT_ENABLE
void rgblight_sethsv_default_helper(uint8_t index) {
#endif // RGBLIGHT_ENABLE
#ifdef INDICATOR_LIGHTS
-uint8_t last_mod;
-uint8_t last_led;
-uint8_t last_osm;
-uint8_t current_mod;
-uint8_t current_led;
-uint8_t current_osm;
-
-
void set_rgb_indicators(uint8_t this_mod, uint8_t this_led, uint8_t this_osm) {
if (userspace_config.rgb_layer_change && biton32(layer_state) == 0) {
if (this_mod & MODS_SHIFT_MASK || this_led & (1<<USB_LED_CAPS_LOCK) || this_osm & MODS_SHIFT_MASK) {
- rgblight_sethsv_at(0, 255, 255, SHFT_LED1);
- rgblight_sethsv_at(0, 255, 255, SHFT_LED2);
+ #ifdef SHFT_LED1
+ rgblight_sethsv_at(120, 255, 255, SHFT_LED1);
+ #endif // SHFT_LED1
+ #ifdef SHFT_LED2
+ rgblight_sethsv_at(120, 255, 255, SHFT_LED2);
+ #endif // SHFT_LED2
} else {
- rgblight_sethsv_default_helper(SHFT_LED1);
- rgblight_sethsv_default_helper(SHFT_LED2);
+ #ifdef SHFT_LED1
+ rgblight_sethsv_default_helper(SHFT_LED1);
+ #endif // SHFT_LED1
+ #ifdef SHFT_LED2
+ rgblight_sethsv_default_helper(SHFT_LED2);
+ #endif // SHFT_LED2
}
if (this_mod & MODS_CTRL_MASK || this_osm & MODS_CTRL_MASK) {
- rgblight_sethsv_at(51, 255, 255, CTRL_LED1);
- rgblight_sethsv_at(51, 255, 255, CTRL_LED2);
+ #ifdef CTRL_LED1
+ rgblight_sethsv_at(0, 255, 255, CTRL_LED1);
+ #endif // CTRL_LED1
+ #ifdef CTRL_LED2
+ rgblight_sethsv_at(0, 255, 255, CTRL_LED2);
+ #endif // CTRL_LED2
} else {
- rgblight_sethsv_default_helper(CTRL_LED1);
- rgblight_sethsv_default_helper(CTRL_LED2);
+ #ifdef CTRL_LED1
+ rgblight_sethsv_default_helper(CTRL_LED1);
+ #endif // CTRL_LED1
+ #ifdef CTRL_LED2
+ rgblight_sethsv_default_helper(CTRL_LED2);
+ #endif // CTRL_LED2
}
if (this_mod & MODS_GUI_MASK || this_osm & MODS_GUI_MASK) {
- rgblight_sethsv_at(120, 255, 255, GUI_LED1);
- rgblight_sethsv_at(120, 255, 255, GUI_LED2);
+ #ifdef GUI_LED1
+ rgblight_sethsv_at(51, 255, 255, GUI_LED1);
+ #endif // GUI_LED1
+ #ifdef GUI_LED2
+ rgblight_sethsv_at(51, 255, 255, GUI_LED2);
+ #endif // GUI_LED2
+ } else {
+ #ifdef GUI_LED1
+ rgblight_sethsv_default_helper(GUI_LED1);
+ #endif // GUI_LED1
+ #ifdef GUI_LED2
+ rgblight_sethsv_default_helper(GUI_LED2);
+ #endif // GUI_LED2
+ }
+ if (this_mod & MODS_ALT_MASK || this_osm & MODS_ALT_MASK) {
+ #ifdef ALT_LED1
+ rgblight_sethsv_at(240, 255, 255, ALT_LED1);
+ #endif // ALT_LED1
+ #ifdef GUI_LED2
+ rgblight_sethsv_at(240, 255, 255, ALT_LED2);
+ #endif // GUI_LED2
} else {
- rgblight_sethsv_default_helper(GUI_LED1);
- rgblight_sethsv_default_helper(GUI_LED2);
+ #ifdef GUI_LED1
+ rgblight_sethsv_default_helper(ALT_LED1);
+ #endif // GUI_LED1
+ #ifdef GUI_LED2
+ rgblight_sethsv_default_helper(ALT_LED2);
+ #endif // GUI_LED2
}
}
}
void matrix_scan_indicator(void) {
- current_mod = get_mods();
- current_led = host_keyboard_leds();
- current_osm = get_oneshot_mods();
-
- set_rgb_indicators(current_mod, current_led, current_osm);
-
- last_mod = current_mod;
- last_led = current_led;
- last_osm = current_osm;
-
+ set_rgb_indicators(get_mods(), host_keyboard_leds(), get_oneshot_mods());
}
#endif //INDICATOR_LIGHTS
static rgblight_fadeout lights[RGBLED_NUM];
__attribute__ ((weak))
-bool indicator_is_this_led_used(uint8_t index) { return false; }
+bool rgblight_twinkle_is_led_used_keymap(uint8_t index) { return false; }
+
+bool rgblight_twinkle_is_led_used(uint8_t index) {
+ switch (index) {
+#ifdef INDICATOR_LIGHTS
+#ifdef SHFT_LED1
+ case SHFT_LED1:
+ return true;
+#endif //SHFT_LED1
+#ifdef SHFT_LED2
+ case SHFT_LED2:
+ return true;
+#endif //SHFT_LED2
+#ifdef CTRL_LED1
+ case CTRL_LED1:
+ return true;
+#endif //CTRL_LED1
+#ifdef CTRL_LED2
+ case CTRL_LED2:
+ return true;
+#endif //CTRL_LED2
+#ifdef GUI_LED1
+ case GUI_LED1:
+ return true;
+#endif //GUI_LED1
+#ifdef GUI_LED2
+ case GUI_LED2:
+ return true;
+#endif //GUI_LED2
+#ifdef ALT_LED1
+ case ALT_LED1:
+ return true;
+#endif //ALT_LED1
+#ifdef ALT_LED2
+ case ALT_LED2:
+ return true;
+#endif //ALT_LED2
+#endif //INDICATOR_LIGHTS
+ default:
+ return rgblight_twinkle_is_led_used_keymap(index);
+ }
+}
void scan_rgblight_fadeout(void) { // Don't effing change this function .... rgblight_sethsv is supppppper intensive
bool litup = false;
uint8_t min_life = 0xFF;
uint8_t min_life_index = -1;
for (uint8_t index = 0 ; index < RGBLED_NUM ; ++index ) {
- if (indicator_is_this_led_used(index)) { continue; }
+ if (rgblight_twinkle_is_led_used(index)) { continue; }
if (lights[index].enabled) {
if (min_life_index == -1 ||
lights[index].life < min_life)
bool process_record_user_rgb(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
+ if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
+ keycode = keycode & 0xFF;
+ }
+ switch (keycode) {
#ifdef RGBLIGHT_TWINKLE
case KC_A ... KC_SLASH:
case KC_F1 ... KC_F12:
return true; break;
#endif // RGBLIGHT_TWINKLE
case KC_RGB_T: // This allows me to use underglow as layer indication, or as normal
-#ifdef RGBLIGHT_ENABLE
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
if (record->event.pressed) {
userspace_config.rgb_layer_change ^= 1;
xprintf("rgblight layer change [EEPROM]: %u\n", userspace_config.rgb_layer_change);
- eeprom_update_byte(EECONFIG_USERSPACE, userspace_config.raw);
+ eeconfig_update_user(userspace_config.raw);
if (userspace_config.rgb_layer_change) {
layer_state_set(layer_state); // This is needed to immediately set the layer color (looks better)
}
if (userspace_config.rgb_layer_change) {
userspace_config.rgb_layer_change = false;
xprintf("rgblight layer change [EEPROM]: %u\n", userspace_config.rgb_layer_change);
- eeprom_update_byte(EECONFIG_USERSPACE, userspace_config.raw);
+ eeconfig_update_user(userspace_config.raw);
}
}
return true; break;
-void matrix_init_rgb(void) {
-#ifdef INDICATOR_LIGHTS
- current_mod = last_mod = get_mods();
- current_led = last_led = host_keyboard_leds();
- current_osm = last_osm = get_oneshot_mods();
-#endif
+void keyboard_post_init_rgb(void) {
+#ifdef RGBLIGHT_ENABLE
if (userspace_config.rgb_layer_change) {
- uint8_t default_layer = eeconfig_read_default_layer();
rgblight_enable_noeeprom();
- if (default_layer & (1UL << _COLEMAK)) {
- rgblight_sethsv_magenta();
- } else if (default_layer & (1UL << _DVORAK)) {
- rgblight_sethsv_green();
- } else if (default_layer & (1UL << _WORKMAN)) {
- rgblight_sethsv_goldenrod();
- } else {
- rgblight_sethsv_cyan();
+ switch (biton32(eeconfig_read_default_layer())) {
+ case _COLEMAK:
+ rgblight_sethsv_noeeprom_magenta(); break;
+ case _DVORAK:
+ rgblight_sethsv_noeeprom_springgreen(); break;
+ case _WORKMAN:
+ rgblight_sethsv_noeeprom_goldenrod(); break;
+ default:
+ rgblight_sethsv_noeeprom_cyan(); break;
}
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
}
+#endif
}
void matrix_scan_rgb(void) {
uint32_t layer_state_set_rgb(uint32_t state) {
#ifdef RGBLIGHT_ENABLE
- uint8_t default_layer = eeconfig_read_default_layer();
if (userspace_config.rgb_layer_change) {
switch (biton32(state)) {
case _MACROS:
rgblight_sethsv_noeeprom_orange();
- userspace_config.is_overwatch ? rgblight_mode_noeeprom(17) : rgblight_mode_noeeprom(18);
+ userspace_config.is_overwatch ? rgblight_effect_snake(RGBLIGHT_MODE_SNAKE + 2) : rgblight_effect_snake(RGBLIGHT_MODE_SNAKE + 3);
break;
case _MEDIA:
rgblight_sethsv_noeeprom_chartreuse();
- rgblight_mode_noeeprom(22);
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 1);
break;
case _GAMEPAD:
rgblight_sethsv_noeeprom_orange();
- rgblight_mode_noeeprom(17);
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_SNAKE + 2);
break;
case _DIABLO:
rgblight_sethsv_noeeprom_red();
- rgblight_mode_noeeprom(5);
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
break;
case _RAISE:
rgblight_sethsv_noeeprom_yellow();
- rgblight_mode_noeeprom(5);
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
break;
case _LOWER:
- rgblight_sethsv_noeeprom_orange();
- rgblight_mode_noeeprom(5);
+ rgblight_sethsv_noeeprom_green();
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
break;
case _ADJUST:
rgblight_sethsv_noeeprom_red();
- rgblight_mode_noeeprom(23);
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
break;
default: // for any other layers, or the default layer
- if (default_layer & (1UL << _COLEMAK)) {
- rgblight_sethsv_noeeprom_magenta();
- } else if (default_layer & (1UL << _DVORAK)) {
- rgblight_sethsv_noeeprom_green();
- } else if (default_layer & (1UL << _WORKMAN)) {
- rgblight_sethsv_noeeprom_goldenrod();
- } else {
- rgblight_sethsv_noeeprom_cyan();
+ switch (biton32(default_layer_state)) {
+ case _COLEMAK:
+ rgblight_sethsv_noeeprom_magenta(); break;
+ case _DVORAK:
+ rgblight_sethsv_noeeprom_springgreen(); break;
+ case _WORKMAN:
+ rgblight_sethsv_noeeprom_goldenrod(); break;
+ case _NORMAN:
+ rgblight_sethsv_noeeprom_coral(); break;
+ case _MALTRON:
+ rgblight_sethsv_noeeprom_yellow(); break;
+ case _EUCALYN:
+ rgblight_sethsv_noeeprom_pink(); break;
+ case _CARPLAX:
+ rgblight_sethsv_noeeprom_blue(); break;
+ default:
+ rgblight_sethsv_noeeprom_cyan(); break;
}
- biton32(state) == _MODS ? rgblight_mode_noeeprom(2) : rgblight_mode_noeeprom(1); // if _MODS layer is on, then breath to denote it
+ biton32(state) == _MODS ? rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING) : rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); // if _MODS layer is on, then breath to denote it
break;
}
// layer_state_set_indicator(); // Runs every scan, so need to call this here .... since I can't get it working "right" anyhow
return state;
}
+
+#if 0
+uint32_t default_layer_state_set_rgb(uint32_t state) {
+#ifdef RGBLIGHT_ENABLE
+ if (userspace_config.rgb_layer_change) {
+ rgblight_config_t temp_rgblight_config = rgblight_config;
+ switch (biton32(state)) {
+ case _COLEMAK:
+ temp_rgblight_config.hue = 300;
+ temp_rgblight_config.val = 255;
+ temp_rgblight_config.sat = 255;
+ temp_rgblight_config.mode = 1;
+ break;
+ case _DVORAK:
+ temp_rgblight_config.hue = 150;
+ temp_rgblight_config.val = 255;
+ temp_rgblight_config.sat = 255;
+ temp_rgblight_config.mode = 1;
+ case _WORKMAN:
+ temp_rgblight_config.hue = 43;
+ temp_rgblight_config.val = 218;
+ temp_rgblight_config.sat = 218;
+ temp_rgblight_config.mode = 1;
+ default:
+ temp_rgblight_config.hue = 180;
+ temp_rgblight_config.val = 255;
+ temp_rgblight_config.sat = 255;
+ temp_rgblight_config.mode = 1;
+ }
+ if (temp_rgblight_config.raw != eeconfig_read_rgblight()) {
+ xprintf("rgblight set default layer hsv [EEPROM]: %u,%u,%u,%u\n", temp_rgblight_config.hue, temp_rgblight_config.sat, temp_rgblight_config.val, temp_rgblight_config.mode);
+ eeconfig_update_rgblight(temp_rgblight_config.raw);
+ }
+ }
+#endif // RGBLIGHT_ENABLE
+ return state;
+}
+#endif
projects / qmk_firmware.git / blobdiff