diff options
Diffstat (limited to 'users')
| -rw-r--r-- | users/bbaserdem/rules.mk | 3 | ||||
| -rw-r--r-- | users/bcat/rules.mk | 1 | ||||
| -rw-r--r-- | users/bocaj/wrappers.h | 14 | ||||
| -rw-r--r-- | users/brandonschlack/brandonschlack.h | 1 | ||||
| -rw-r--r-- | users/callum/callum.c | 4 | ||||
| -rw-r--r-- | users/drashna/readme_keycodes.md | 2 | ||||
| -rw-r--r-- | users/hvp/hvp.h | 3 | ||||
| -rwxr-xr-x | users/ishtob/config.h | 3 | ||||
| -rw-r--r-- | users/romus/rules.mk | 3 | ||||
| -rw-r--r-- | users/spidey3/config.h | 5 | ||||
| -rw-r--r-- | users/spidey3/init.c | 7 | ||||
| -rw-r--r-- | users/spidey3/layer_rgb.c | 397 | ||||
| -rw-r--r-- | users/spidey3/rules.mk | 2 | ||||
| -rw-r--r-- | users/spidey3/spidey3.c | 168 | ||||
| -rw-r--r-- | users/spidey3/spidey3.h | 5 | ||||
| -rw-r--r-- | users/spidey3/unicode.h | 2 | ||||
| -rw-r--r-- | users/yanfali/config.h | 2 |
17 files changed, 429 insertions, 193 deletions
diff --git a/users/bbaserdem/rules.mk b/users/bbaserdem/rules.mk index 24c98fdc9f..94f01cdffc 100644 --- a/users/bbaserdem/rules.mk +++ b/users/bbaserdem/rules.mk @@ -6,7 +6,7 @@ UNICODE_ENABLE = yes # Used for unicode character emulation EXTRAKEY_ENABLE = yes # OS signals like volume control # DISABLE -ifndef BLUETOOTH_ENABLE +ifndef BLUETOOTH_ENABLE BLUETOOTH_ENABLE = no # No bluetooth endif COMMAND_ENABLE = no # Some bootmagic thing i dont use @@ -15,7 +15,6 @@ CONSOLE_ENABLE = no # Allows console output with a command SLEEP_LED_ENABLE = no # Breathes LED's when computer is asleep. Untested. NKRO_ENABLE = no # Default is 6KRO which is plenty MIDI_ENABLE = no # Untested feature -FAUXCLICKY_ENABLE = no # Emulates clicks using speaker KEY_LOCK_ENABLE = no # Allows locking any key. Not used API_SYSEX_ENABLE = no # Allows OS to send signals. KEY_LOCK_ENABLE = no # Allows locking any key. Not used diff --git a/users/bcat/rules.mk b/users/bcat/rules.mk index f87974ed96..3442a78ac2 100644 --- a/users/bcat/rules.mk +++ b/users/bcat/rules.mk @@ -23,7 +23,6 @@ MOUSEKEY_ENABLE = no TERMINAL_ENABLE = no # Disable unused hardware options on all keyboards. -FAUXCLICKY_ENABLE = no MIDI_ENABLE = no SLEEP_LED_ENABLE = no diff --git a/users/bocaj/wrappers.h b/users/bocaj/wrappers.h index c76820f495..0f18d346a3 100644 --- a/users/bocaj/wrappers.h +++ b/users/bocaj/wrappers.h @@ -12,7 +12,7 @@ expanded before being used as arguments to the LAYOUT_xxx macro. // clang-format off #define WRAPPER_ergodox_pretty(...) LAYOUT_ergodox_pretty(__VA_ARGS__) -#define WRAPPER_ortho_4x12(...) LAYOUT_planck_mit(__VA_ARGS__) +#define WRAPPER_ortho_4x12(...) LAYOUT_ortho_4x12(__VA_ARGS__) /* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */ #define WRAPPER_ergodox_bocaj( \ @@ -62,25 +62,25 @@ expanded before being used as arguments to the LAYOUT_xxx macro. K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B \ + K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C \ )\ WRAPPER_ortho_4x12( \ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ K11, K12, SFT_T(K13), GUI_T(K14), ALT_T(K15), K16, K17, ALT_T(K18), GUI_T(K19), SFT_T(K1A), K1B, K1C, \ K21, CTL_T(K22), K23, K24, K25, K26, K27, K28, K29, K2A, CTL_T(K2B), K2C, \ - K31, K32, K33, K34, LT(_LOWER, K35), K36, LT(_RAISE, K37), K38, K39, K3A, K3B ) + K31, K32, K33, K34, LT(_LOWER, K35), K36, K37, LT(_RAISE, K38), K39, K3A, K3B, K3C ) #define WRAPPER_planck_bocaj_WIN( \ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B \ + K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C \ )\ WRAPPER_ortho_4x12( \ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ K11, K12, SFT_T(K13), CTL_T(K14), ALT_T(K15), K16, K17, ALT_T(K18), CTL_T(K19), SFT_T(K1A), K1B, K1C, \ K21, GUI_T(K22), K23, K24, K25, K26, K27, K28, K29, K2A, GUI_T(K2B), K2C, \ - K31, K32, K33, K34, LT(_LOWER, K35), K36, LT(_RAISE, K37), K38, K39, K3A, K3B ) + K31, K32, K33, K34, LT(_LOWER, K35), K36, K37, LT(_RAISE, K38), K39, K3A, K3B, K3C ) #define WRAPPER_planck_bocaj_base( \ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ @@ -91,7 +91,7 @@ expanded before being used as arguments to the LAYOUT_xxx macro. KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_MINS, \ KC_TAB, K11, K12, K13, K14, ALL_T(K15), MEH_T(K16), K17, K18, K19, K1A, KC_QUOT, \ KC_LSFT, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, _______, \ - _______, KC_LEAD, KC_UP, KC_LEFT, KC_BSPC, KC_SPC, KC_ENTER, KC_RIGHT, KC_DOWN, QWERTY, WORKMAN \ + _______, KC_LEAD, KC_UP, KC_LEFT, KC_BSPC, KC_SPC, KC_SPC, KC_ENTER, KC_RIGHT, KC_DOWN, QWERTY, WORKMAN \ ) #define WRAPPER_planck_bocaj_base_WIN( \ @@ -103,7 +103,7 @@ expanded before being used as arguments to the LAYOUT_xxx macro. KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_MINS, \ KC_TAB, K11, K12, K13, K14, ALL_T(K15), MEH_T(K16), K17, K18, K19, K1A, KC_QUOT, \ KC_LSFT, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, _______, \ - _______, KC_LEAD, KC_UP, KC_LEFT, KC_BSPC, KC_SPC, KC_ENTER, KC_RIGHT, KC_DOWN, QWERTY, WORKMAN \ + _______, KC_LEAD, KC_UP, KC_LEFT, KC_BSPC, KC_SPC, KC_SPC, KC_ENTER, KC_RIGHT, KC_DOWN, QWERTY, WORKMAN \ ) /* diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index d7dbc0ea4b..4fbf6906d8 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -46,6 +46,7 @@ enum bs_layers { _ADJUST = 15 // 15: Change keyboard settings }; +#define _MACRO _M1 #define _LOWER _FN1 #define _RAISE _FN2 diff --git a/users/callum/callum.c b/users/callum/callum.c index 4661902af5..b3254a9cfa 100644 --- a/users/callum/callum.c +++ b/users/callum/callum.c @@ -10,7 +10,7 @@ #define TABL G(S(KC_LBRC)) #define TABR G(S(KC_RBRC)) #define SPCL A(G(KC_LEFT)) -#define SPCR A(G(KC_RGHT)) +#define SPC_R A(G(KC_RGHT)) #define LA_SYM MO(SYM) #define LA_NAV MO(NAV) @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [NAV] = LAYOUT_callum( KC_TAB, SW_WIN, TABL, TABR, KC_VOLU, RESET, HOME, KC_UP, END, KC_DEL, OS_SHFT, OS_CTRL, OS_ALT, OS_CMD, KC_VOLD, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, - SPCL, SPCR, BACK, FWD, KC_MPLY, XXXXXXX, KC_PGDN, KC_PGUP, SW_LANG, KC_ENT, + SPCL, SPC_R, BACK, FWD, KC_MPLY, XXXXXXX, KC_PGDN, KC_PGUP, SW_LANG, KC_ENT, _______, _______, _______, _______ ), diff --git a/users/drashna/readme_keycodes.md b/users/drashna/readme_keycodes.md index f5e6fb271e..af4dd54bc0 100644 --- a/users/drashna/readme_keycodes.md +++ b/users/drashna/readme_keycodes.md @@ -5,6 +5,6 @@ Keycodes are defined in the drashna.h file and need to be included in the keymap A bunch of macros are present and are only included on boards that are not the Ergodox EZ or Orthodox, as they are not needed for those boards. -Included is a custom macro for compiling my keyboards. This includes the bootloader target (`:teensy`, `:avrdude`, or `:dfu`), and keeps RGBLIGHT, AUDIO and/or FAUXCLICKY enabled, if it previously was (regardless of the rules file). +Included is a custom macro for compiling my keyboards. This includes the bootloader target (`:teensy`, `:avrdude`, or `:dfu`), and keeps RGBLIGHT, AUDIO enabled, if it previously was (regardless of the rules file). This also includes a modified RESET keycode as well, that sets the underglow to red. diff --git a/users/hvp/hvp.h b/users/hvp/hvp.h index 99da258aaf..b016da9e25 100644 --- a/users/hvp/hvp.h +++ b/users/hvp/hvp.h @@ -5,8 +5,9 @@ #endif #include "quantum.h" +#undef TAPPING_TERM #define TAPPING_TERM 150 // Keys -#define D_NAVI MT(MOD_LCTL | MOD_LSFT, KC_D)
\ No newline at end of file +#define D_NAVI MT(MOD_LCTL | MOD_LSFT, KC_D) diff --git a/users/ishtob/config.h b/users/ishtob/config.h index 1f567f4a5b..6c07d2f2fd 100755 --- a/users/ishtob/config.h +++ b/users/ishtob/config.h @@ -50,9 +50,6 @@ * MIDI options */ -/* Prevent use of disabled MIDI features in the keymap */ -//#define MIDI_ENABLE_STRICT 1 - /* enable basic MIDI features: - MIDI notes can be sent when in Music mode is on */ diff --git a/users/romus/rules.mk b/users/romus/rules.mk index 78ce2e93f4..12bbabb020 100644 --- a/users/romus/rules.mk +++ b/users/romus/rules.mk @@ -6,7 +6,7 @@ UNICODE_ENABLE = yes # Used for unicode character emulation EXTRAKEY_ENABLE = yes # OS signals like volume control # DISABLE -ifndef BLUETOOTH_ENABLE +ifndef BLUETOOTH_ENABLE BLUETOOTH_ENABLE = no # No bluetooth endif COMMAND_ENABLE = no # Some bootmagic thing i dont use @@ -15,7 +15,6 @@ CONSOLE_ENABLE = no # Allows console output with a command SLEEP_LED_ENABLE = no # Breathes LED's when computer is asleep. Untested. NKRO_ENABLE = no # Default is 6KRO which is plenty MIDI_ENABLE = no # Untested feature -FAUXCLICKY_ENABLE = no # Emulates clicks using speaker KEY_LOCK_ENABLE = no # Allows locking any key. Not used API_SYSEX_ENABLE = no # Allows OS to send signals. diff --git a/users/spidey3/config.h b/users/spidey3/config.h index 053240718e..7062fde030 100644 --- a/users/spidey3/config.h +++ b/users/spidey3/config.h @@ -3,9 +3,10 @@ #define LED_DISABLE_WHEN_USB_SUSPENDED true #define RGB_DISABLE_WHEN_USB_SUSPENDED true #define RGBLIGHT_LAYERS -#define RGBLIGHT_MAX_LAYERS 16 +#define RGBLIGHT_MAX_LAYERS 17 #define RGBLIGHT_LAYER_BLINK #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF +#define RGBLIGHT_STARTUP_ANIMATION #undef RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_BREATHING @@ -17,6 +18,8 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE +#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX, UC_WINC + #define SPI_DEBUG_SCAN_RATE #undef MANUFACTURER diff --git a/users/spidey3/init.c b/users/spidey3/init.c index 273c2b2899..8db41a5f4c 100644 --- a/users/spidey3/init.c +++ b/users/spidey3/init.c @@ -18,11 +18,6 @@ void eeconfig_init_user(void) { #endif } -void shutdown_user() { #ifdef RGBLIGHT_ENABLE - clear_rgb_layers(); - rgblight_enable(); - rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - rgblight_sethsv_noeeprom(HSV_RED); +void shutdown_user(void) { shutdown_user_rgb(); } #endif -} diff --git a/users/spidey3/layer_rgb.c b/users/spidey3/layer_rgb.c index 160cc43174..37e59579cf 100644 --- a/users/spidey3/layer_rgb.c +++ b/users/spidey3/layer_rgb.c @@ -2,6 +2,7 @@ #include "spidey3.h" #include "velocikey.h" +#include <lib/lib8tion/lib8tion.h> uint32_t rgb_mode; uint16_t rgb_hue; @@ -9,10 +10,17 @@ uint8_t rgb_sat; uint8_t rgb_val; bool rgb_saved = 0; +extern bool spi_gflock; +extern uint16_t spi_replace_mode; + void spidey_glow(void) { rgblight_enable(); - rgblight_mode(RGBLIGHT_MODE_TWINKLE + 4); rgblight_sethsv(213, 255, 128); + if ((RGBLIGHT_MODE_TWINKLE <= rgblight_get_mode()) && (rgblight_get_mode() < RGBLIGHT_MODE_TWINKLE_end)) { + rgblight_step(); + } else { + rgblight_mode(RGBLIGHT_MODE_TWINKLE); + } #ifdef VELOCIKEY_ENABLE if (velocikey_enabled()) velocikey_toggle(); #endif @@ -23,6 +31,7 @@ void eeconfig_init_user_rgb(void) { spidey_glow(); } // clang-format off // Convenience macros +#define NONE { RGBLIGHT_END_SEGMENTS } #define CORNER_BL(color) { 0, 1, color } #define CORNER_BR(color) { RGBLED_NUM / 2 - 1, 1, color } #define CORNER_FR(color) { RGBLED_NUM / 2, 1, color } @@ -31,10 +40,12 @@ void eeconfig_init_user_rgb(void) { spidey_glow(); } #define FRONT(inset, color) { RGBLED_NUM / 2 + inset, RGBLED_NUM / 2 - 2 * inset, color } #define BACK(inset, color) { inset, RGBLED_NUM / 2 - 2 * inset, color } +const rgblight_segment_t PROGMEM _none[] = NONE; + #define LAYER_OFFSET 0 -const rgblight_segment_t PROGMEM _layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNER_BR(HSV_PURPLE)); -const rgblight_segment_t PROGMEM _layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNERS(HSV_MAGENTA)); -const rgblight_segment_t PROGMEM _layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNERS(HSV_GREEN)); +// No indicator for base layer +const rgblight_segment_t PROGMEM _layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNERS(HSV_MAGENTA)); // _NUMPAD +const rgblight_segment_t PROGMEM _layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNERS(HSV_GREEN)); // _FN #define LOCK_OFFSET 3 const rgblight_segment_t PROGMEM _numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(FRONT(3, HSV_YELLOW)); @@ -49,12 +60,20 @@ const rgblight_segment_t PROGMEM _glyphreplace_layer[] = RGBLIGHT_LAYER_SEGMENTS const rgblight_segment_t PROGMEM _no_layer[] = RGBLIGHT_LAYER_SEGMENTS(FRONT(1, HSV_RED)); const rgblight_segment_t PROGMEM _yes_layer[] = RGBLIGHT_LAYER_SEGMENTS(FRONT(1, HSV_GREEN)); const rgblight_segment_t PROGMEM _meh_layer[] = RGBLIGHT_LAYER_SEGMENTS(FRONT(1, HSV_YELLOW)); +const rgblight_segment_t PROGMEM _huh_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNERS(HSV_YELLOW), FRONT(1, HSV_BLUE), BACK(1, HSV_BLUE)); + +#define UNICODE_OFFSET 12 +const rgblight_segment_t PROGMEM _uc_mac_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNER_BR(HSV_PURPLE)); +// No indicator for UC_LNX +// UC_WIN disabled in config.h +// UC_BSD not implemented +const rgblight_segment_t PROGMEM _uc_winc_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNER_BR(HSV_CYAN)); // Now define the array of layers. Higher numbered layers take precedence. const rgblight_segment_t *const PROGMEM _rgb_layers[] = { - [LAYER_OFFSET + 0] = _layer1_layer, - [LAYER_OFFSET + 1] = _layer2_layer, - [LAYER_OFFSET + 2] = _layer3_layer, + [LAYER_OFFSET + _BASE] = _none, + [LAYER_OFFSET + _NUMPAD] = _layer1_layer, + [LAYER_OFFSET + _FN] = _layer2_layer, [LOCK_OFFSET + USB_LED_NUM_LOCK] = _numlock_layer, [LOCK_OFFSET + USB_LED_CAPS_LOCK] = _capslock_layer, @@ -66,11 +85,18 @@ const rgblight_segment_t *const PROGMEM _rgb_layers[] = { [ACK_OFFSET + ACK_NO] = _no_layer, [ACK_OFFSET + ACK_YES] = _yes_layer, [ACK_OFFSET + ACK_MEH] = _meh_layer, + [ACK_OFFSET + ACK_HUH] = _huh_layer, + + [UNICODE_OFFSET + UC_MAC] = _uc_mac_layer, + [UNICODE_OFFSET + UC_LNX] = _none, + [UNICODE_OFFSET + UC_WIN] = _none, + [UNICODE_OFFSET + UC_BSD] = _none, + [UNICODE_OFFSET + UC_WINC] = _uc_winc_layer, - [ACK_OFFSET + ACK_MEH + 1] = NULL + [UNICODE_OFFSET + UC__COUNT] = NULL }; -// clang-format on +// clang-format on const uint8_t PROGMEM _n_rgb_layers = sizeof(_rgb_layers) / sizeof(_rgb_layers[0]) - 1; @@ -84,118 +110,259 @@ void clear_rgb_layers() { void do_rgb_layers(layer_state_t state, uint8_t start, uint8_t end) { for (uint8_t i = start; i < end; i++) { bool is_on = layer_state_cmp(state, i); - dprintf("layer[%u]=%u\n", i, is_on); - rgblight_set_layer_state(LAYER_OFFSET + i - 1, is_on); + dprintf("layer[%u]=rl[%u]=%u\n", i, LAYER_OFFSET + i, is_on); + rgblight_set_layer_state(LAYER_OFFSET + i, is_on); } } +void do_rgb_unicode(void) { + uint8_t uc_mode = get_unicode_input_mode(); + for (uint8_t i = 0; i < UC__COUNT; i++) { + bool is_on = i == uc_mode; + dprintf("unicode[%u]=rl[%u]=%u\n", i, UNICODE_OFFSET + i, is_on); + rgblight_set_layer_state(UNICODE_OFFSET + i, is_on); + } +} + +void do_rgb_all(void) { + do_rgb_layers(default_layer_state, LAYER_BASE_DEFAULT, LAYER_BASE_REGULAR); + do_rgb_layers(layer_state, LAYER_BASE_REGULAR, LAYER_BASE_END); + do_rgb_unicode(); + rgblight_set_layer_state(MISC_OFFSET + 0, spi_gflock); + rgblight_set_layer_state(MISC_OFFSET + 1, spi_replace_mode != SPI_NORMAL); +} + +// flags. 0 = no change, 1 = increment, -1 = decrement. +int8_t change_hue = 0; +int8_t change_sat = 0; +int8_t change_val = 0; + +// timer to control color change speed +uint16_t change_timer = 0; +const uint16_t change_tick = 15; + extern rgblight_config_t rgblight_config; extern rgblight_status_t rgblight_status; -static bool startup_animation_done = false; + +#if defined(RGBLIGHT_STARTUP_ANIMATION) + +#define STARTUP_ANIMATION_SATURATION 200 +#define STARTUP_ANIMATION_VALUE 255 +#define STARTUP_ANIMATION_FADE_STEP 5 +#define STARTUP_ANIMATION_CYCLE_STEP 2 +#define STARTUP_ANIMATION_RAMP_TO_STEPS 70 +#define STARTUP_ANIMATION_STEP_TIME 10 +#define STARTUP_ANIMATION_INITIAL_DELAY 0 // milliseconds, must be < 255 * STEP_TIME + +typedef enum { + DISABLED, + WAITING, + RESTART, + START, + FADE_OLD, + FADE_IN, + CYCLE, + RAMP_DOWN, + RAMP_TO, + CLEAN_UP, + DONE +} startup_animation_state_t; + +static rgblight_config_t old_config; +static uint8_t old_base_mode; +static startup_animation_state_t startup_animation_state = DISABLED; +static uint16_t rgblight_startup_loop_timer; + +void startup_animation_init(void) { + old_config.raw = rgblight_config.raw; + old_base_mode = rgblight_status.base_mode; + + if (!old_config.enable) + rgblight_enable_noeeprom(); +} +#endif void keyboard_post_init_user_rgb(void) { // Enable the LED layers rgblight_layers = _rgb_layers; - do_rgb_layers(default_layer_state, LAYER_BASE_DEFAULT + 1, LAYER_BASE_REGULAR); - do_rgb_layers(layer_state, LAYER_BASE_REGULAR, LAYER_BASE_END); + do_rgb_all(); - // Startup animation - { - bool is_enabled = rgblight_config.enable; - uint8_t old_hue = rgblight_config.hue; - uint8_t old_sat = rgblight_config.sat; - uint8_t old_val = rgblight_config.val; - uint8_t old_mode = rgblight_config.mode; +#if defined(RGBLIGHT_STARTUP_ANIMATION) + startup_animation_init(); + startup_animation_state = STARTUP_ANIMATION_INITIAL_DELAY ? WAITING : START; +#endif +} - bool ramp_down = +void matrix_scan_user_rgb(void) { +#if defined(RGBLIGHT_STARTUP_ANIMATION) + if (startup_animation_state != DONE && is_keyboard_master()) { + if (startup_animation_state == START || timer_elapsed(rgblight_startup_loop_timer) > STARTUP_ANIMATION_STEP_TIME) { + static uint8_t counter; + rgblight_startup_loop_timer = timer_read(); + + switch (startup_animation_state) { + case WAITING: +#ifdef STARTUP_ANIMATION_DEBUG + dprintf("sua WAITING counter=%u\n", counter); +#endif + if (counter < STARTUP_ANIMATION_INITIAL_DELAY / STARTUP_ANIMATION_STEP_TIME) { + counter++; + } else { + startup_animation_state = START; + } + break; + + case RESTART: + dprintln("sua RESTART"); + startup_animation_init(); + case START: + dprintln("sua START"); + startup_animation_state = FADE_OLD; + counter = old_config.val; + // No break! Just roll into FADE_OLD in the same iteration... + + case FADE_OLD: +#ifdef STARTUP_ANIMATION_DEBUG + dprintf("sua FADE_OLD counter=%u\n", counter); +#endif + if (counter >= STARTUP_ANIMATION_FADE_STEP) { + rgblight_sethsv_noeeprom(old_config.hue, old_config.sat, counter); + counter -= STARTUP_ANIMATION_FADE_STEP; + } else { + counter = 0; + startup_animation_state = FADE_IN; + rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); + } + break; + + case FADE_IN: +#ifdef STARTUP_ANIMATION_DEBUG + dprintf("sua FADE_IN counter=%u\n", counter); +#endif + if (counter < STARTUP_ANIMATION_VALUE) { + rgblight_sethsv_noeeprom(old_config.hue, STARTUP_ANIMATION_SATURATION, counter); + counter += STARTUP_ANIMATION_FADE_STEP; + } else { + counter = 255; + startup_animation_state = CYCLE; + } + break; + + case CYCLE: +#ifdef STARTUP_ANIMATION_DEBUG + dprintf("sua CYCLE counter=%u\n", counter); +#endif + if (counter >= STARTUP_ANIMATION_CYCLE_STEP) { + rgblight_sethsv_noeeprom((counter + old_config.hue) % 255, STARTUP_ANIMATION_SATURATION, STARTUP_ANIMATION_VALUE); + counter -= STARTUP_ANIMATION_CYCLE_STEP; + } else { + if ( #ifdef RGBLIGHT_EFFECT_BREATHING - (rgblight_status.base_mode == RGBLIGHT_MODE_BREATHING) || + (old_base_mode == RGBLIGHT_MODE_BREATHING) || #endif #ifdef RGBLIGHT_EFFECT_SNAKE - (rgblight_status.base_mode == RGBLIGHT_MODE_SNAKE) || + (old_base_mode == RGBLIGHT_MODE_SNAKE) || #endif #ifdef RGBLIGHT_EFFECT_KNIGHT - (rgblight_status.base_mode == RGBLIGHT_MODE_KNIGHT) || + (old_base_mode == RGBLIGHT_MODE_KNIGHT) || #endif #ifdef RGBLIGHT_EFFECT_TWINKLE - (rgblight_status.base_mode == RGBLIGHT_MODE_TWINKLE) || + (old_base_mode == RGBLIGHT_MODE_TWINKLE) || #endif - !is_enabled; - - bool ramp_to = + !old_config.enable) { + counter = STARTUP_ANIMATION_VALUE; + startup_animation_state = RAMP_DOWN; + } else if ( #ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT - (rgblight_status.base_mode == RGBLIGHT_MODE_STATIC_GRADIENT) || + (old_base_mode == RGBLIGHT_MODE_STATIC_GRADIENT) || #endif #ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD - (rgblight_status.base_mode == RGBLIGHT_MODE_RAINBOW_MOOD) || + (old_base_mode == RGBLIGHT_MODE_RAINBOW_MOOD) || #endif #ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL - (rgblight_status.base_mode == RGBLIGHT_MODE_RAINBOW_SWIRL) || + (old_base_mode == RGBLIGHT_MODE_RAINBOW_SWIRL) || #endif #ifdef RGBLIGHT_EFFECT_RAINBOW_CHRISTMAS - (rgblight_status.base_mode == RGBLIGHT_MODE_CHRISTMAS) || + (old_base_mode == RGBLIGHT_MODE_CHRISTMAS) || #endif #ifdef RGBLIGHT_EFFECT_RAINBOW_RGB_TEST_ - (rgblight_status.base_mode == RGBLIGHT_MODE_RGB_TEST) || + (old_base_mode == RGBLIGHT_MODE_RGB_TEST) || #endif - (rgblight_status.base_mode == RGBLIGHT_MODE_STATIC_LIGHT); - -#define STARTUP_ANIMATION_SATURATION 200 -#define STARTUP_ANIMATION_VALUE 255 -#define STARTUP_ANIMATION_STEP 5 - - rgblight_enable_noeeprom(); - if (rgblight_config.enable) { - rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - for (uint8_t i = 0; i < STARTUP_ANIMATION_VALUE; i += STARTUP_ANIMATION_STEP) { - rgblight_sethsv_noeeprom(old_hue, STARTUP_ANIMATION_SATURATION, i); - matrix_scan(); - wait_ms(10); - } - for (uint8_t i = 255; i > 0; i -= STARTUP_ANIMATION_STEP) { - rgblight_sethsv_noeeprom((i + old_hue) % 255, STARTUP_ANIMATION_SATURATION, STARTUP_ANIMATION_VALUE); - matrix_scan(); - wait_ms(10); - } - - if (ramp_down) { - dprintln("ramp_down"); - for (uint8_t i = STARTUP_ANIMATION_VALUE; i > 0; i -= STARTUP_ANIMATION_STEP) { - rgblight_sethsv_noeeprom(old_hue, STARTUP_ANIMATION_SATURATION, i); - matrix_scan(); - wait_ms(10); - } - } else if (ramp_to) { - dprintf("ramp_to s=%u, v=%u\n", old_sat, old_val); - uint8_t steps = 50; - for (uint8_t i = 0; i < steps; i++) { - uint8_t s = STARTUP_ANIMATION_SATURATION + i * (((float)old_sat - STARTUP_ANIMATION_SATURATION) / (float)steps); - uint8_t v = STARTUP_ANIMATION_VALUE + i * (((float)old_val - STARTUP_ANIMATION_VALUE) / (float)steps); - rgblight_sethsv_noeeprom(old_hue, s, v); - matrix_scan(); - wait_ms(10); - } + (old_base_mode == RGBLIGHT_MODE_STATIC_LIGHT)) { + counter = 0; + startup_animation_state = RAMP_TO; + } else { + startup_animation_state = CLEAN_UP; + } + } + break; + + case RAMP_DOWN: +#ifdef STARTUP_ANIMATION_DEBUG + dprintf("sua RAMP_DOWN counter=%u\n", counter); +#endif + if (counter >= STARTUP_ANIMATION_FADE_STEP) { + rgblight_sethsv_noeeprom(old_config.hue, STARTUP_ANIMATION_SATURATION, counter); + counter -= STARTUP_ANIMATION_FADE_STEP; + } else { + startup_animation_state = CLEAN_UP; + } + break; + + case RAMP_TO: + { +#ifdef STARTUP_ANIMATION_DEBUG + dprintf("sua RAMP_TO s=%u, v=%u, counter=%u\n", old_config.sat, old_config.val, counter); +#endif + uint8_t steps = STARTUP_ANIMATION_RAMP_TO_STEPS; + if (counter < steps) { + uint8_t s = STARTUP_ANIMATION_SATURATION + counter * (((float)old_config.sat - STARTUP_ANIMATION_SATURATION) / (float)steps); + uint8_t v = STARTUP_ANIMATION_VALUE + counter * (((float)old_config.val - STARTUP_ANIMATION_VALUE) / (float)steps); + rgblight_sethsv_noeeprom(old_config.hue, s, v); + counter++; + } else { + startup_animation_state = CLEAN_UP; + } + } + break; + + case CLEAN_UP: + dprintln("sua CLEAN_UP"); + rgblight_reload_from_eeprom(); + startup_animation_state = DONE; + dprintln("sua DONE"); + break; + + default: + break; } - rgblight_mode_noeeprom(old_mode); } - if (is_enabled) { - rgblight_sethsv_noeeprom(old_hue, old_sat, old_val); - } else { - rgblight_disable_noeeprom(); - // Hack! - // rgblight_sethsv_noeeprom() doesn't update these if rgblight is disabled, - // but if do it before disabling we get an ugly flash. - rgblight_config.hue = old_hue; - rgblight_config.sat = old_sat; - rgblight_config.val = old_val; + } +#endif + + if (change_hue != 0 || change_val != 0 || change_sat != 0) { + if (timer_elapsed(change_timer) > change_tick) { + HSV hsv = rgblight_get_hsv(); + hsv.h += change_hue; + hsv.s = change_sat > 0 ? qadd8(hsv.s, (uint8_t) change_sat) : qsub8(hsv.s, (uint8_t) -change_sat); + hsv.v = change_val > 0 ? qadd8(hsv.v, (uint8_t) change_val) : qsub8(hsv.v, (uint8_t) -change_val); + rgblight_sethsv_noeeprom(hsv.h, hsv.s, hsv.v); + change_timer = timer_read(); } - dprint("done\n"); - startup_animation_done = true; + } +} + +void shutdown_user_rgb(void) { + clear_rgb_layers(); + rgblight_enable_noeeprom(); + rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); + for (int i = 0; i < RGBLED_NUM; i++) { + rgblight_setrgb_at(0xFF, 0x80 * (i % 2), 0, i); } } layer_state_t default_layer_state_set_user_rgb(layer_state_t state) { - do_rgb_layers(state, 1u, LAYER_BASE_REGULAR); + do_rgb_layers(state, LAYER_BASE_DEFAULT, LAYER_BASE_REGULAR); return state; } @@ -225,15 +392,45 @@ void rgb_layer_ack(layer_ack_t n) { extern keymap_config_t keymap_config; extern rgblight_config_t rgblight_config; -extern bool spi_gflock; -extern uint16_t spi_replace_mode; - bool process_record_user_rgb(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { switch (keycode) { case SPI_GLO: spidey_glow(); return false; + + // clang-format off + case RGB_HUI: change_timer = timer_read(); change_hue = 1; return false; + case RGB_HUD: change_timer = timer_read(); change_hue = -1; return false; + case RGB_SAI: change_timer = timer_read(); change_sat = 1; return false; + case RGB_SAD: change_timer = timer_read(); change_sat = -1; return false; + case RGB_VAI: change_timer = timer_read(); change_val = 1; return false; + case RGB_VAD: change_timer = timer_read(); change_val = -1; return false; + // clang-format on + } + } else { + bool rgb_done = false; + switch (keycode) { + case RGB_HUI: + case RGB_HUD: + change_hue = 0; + rgb_done = true; + break; + case RGB_SAI: + case RGB_SAD: + change_sat = 0; + rgb_done = true; + break; + case RGB_VAI: + case RGB_VAD: + change_val = 0; + rgb_done = true; + break; + } + + if (rgb_done) { + HSV final = rgblight_get_hsv(); + rgblight_sethsv(final.h, final.s, final.v); } } @@ -244,13 +441,12 @@ void post_process_record_user_rgb(uint16_t keycode, keyrecord_t *record) { switch (keycode) { // Acks follow... case DEBUG: - rgb_layer_ack_yn(debug_enable); - break; - - case SPI_LNX: - case SPI_OSX: - case SPI_WIN: - rgb_layer_ack(ACK_MEH); + if (debug_matrix || debug_keyboard) + rgb_layer_ack(ACK_HUH); + else if (debug_enable) + rgb_layer_ack(ACK_YES); + else + rgb_layer_ack(ACK_NO); break; case SPI_GFLOCK: @@ -280,5 +476,16 @@ void post_process_record_user_rgb(uint16_t keycode, keyrecord_t *record) { rgb_layer_ack_yn(keymap_config.nkro); break; #endif + +#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE) + case SPI_LNX: + case SPI_OSX: + case SPI_WIN: + case UC_MOD: + case UC_RMOD: + rgb_layer_ack(ACK_MEH); + do_rgb_unicode(); + break; +#endif } } diff --git a/users/spidey3/rules.mk b/users/spidey3/rules.mk index 2d4da22946..bd378f545e 100644 --- a/users/spidey3/rules.mk +++ b/users/spidey3/rules.mk @@ -1,4 +1,6 @@ BOOTMAGIC_ENABLE = lite +CONSOLE_ENABLE = yes # Console for debug +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality LTO_ENABLE = yes SRC += init.c diff --git a/users/spidey3/spidey3.c b/users/spidey3/spidey3.c index a8dafcb7b5..df73c903d0 100644 --- a/users/spidey3/spidey3.c +++ b/users/spidey3/spidey3.c @@ -14,49 +14,44 @@ static uint32_t matrix_scan_count = 0; static bool reported_version = false; # if defined(SPI_DEBUG_SCAN_RATE) -static uint32_t matrix_timer = 0; -static uint32_t last_matrix_scan_count = 0; +static uint32_t matrix_timer = 0; # endif +void report_version(void) { + uprintln(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE); + reported_version = true; +} +#endif + void matrix_scan_user(void) { +#if defined(CONSOLE_ENABLE) && !defined(NO_DEBUG) # if defined(SPI_DEBUG_SCAN_RATE) matrix_scan_count++; if (debug_enable) { uint32_t timer_now = timer_read32(); if (matrix_timer == 0) { - matrix_timer = timer_now; - last_matrix_scan_count = matrix_scan_count; - matrix_scan_count = 0; + matrix_timer = timer_now; + matrix_scan_count = 0; } else if (TIMER_DIFF_32(timer_now, matrix_timer) > SPI_SCAN_RATE_INTERVAL * 1000) { - matrix_timer = timer_now; - last_matrix_scan_count = matrix_scan_count; - matrix_scan_count = 0; - if (!repor |