orginized RGB config add corrected LED brightness
Some checks failed
Update API Data / api_data (push) Has been skipped
CLI CI / test (push) Failing after 4s
Update develop after master merge / develop_update (push) Has been skipped
Lint Format / lint (push) Failing after 5s
Regenerate Files / regen (push) Failing after 4s
Unit Tests / test (push) Failing after 2s
Close stale issues and PRs / stale (push) Successful in 3s
Automatic Approve / automatic_approve (push) Has been skipped

This commit is contained in:
locker98 2024-06-29 21:27:49 -04:00
parent 8938273360
commit 5977e2dba0
4 changed files with 72 additions and 71 deletions

View File

@ -23,107 +23,108 @@
///https://thomasbaart.nl/2018/12/01/reducing-firmware-size-in-qmk/
// #define MASTER_LEFT
//#define MASTER_RIGHT
#define MASTER_LEFT
// #define MASTER_RIGHT
// #define EE_HANDS
//#define SPLIT_USB_DETECT
// #define SPLIT_USB_DETECT
// Setup OLED Screen Fonts and Options
#define CUSTOM_FONT
#define CUSTOM_LAYER_READ //if you remove this it causes issues - needs better guarding
// Setup TAP Dance Settings
#define QUICK_TAP_TERM 0
#ifdef TAPPING_TERM
#undef TAPPING_TERM
#define TAPPING_TERM 200
#endif
// Encoder Settings
#define ENCODER_DIRECTION_FLIP
#define RGBLIGHT_SLEEP
//
#define RGBLIGHT_LAYERS
/* ws2812 RGB LED */
// Setting up RGB Lights
#define WS2812_DI_PIN D3
#define RGBLIGHT_LAYERS
#define RGBLIGHT_SLEEP
#ifdef RGB_MATRIX_ENABLE
#define RGBLIGHT_LED_COUNT 35 // Number of LEDs
#define RGBLIGHT_LED_COUNT 35 // Number of LEDs
#define RGB_MATRIX_LED_COUNT RGBLIGHT_LED_COUNT
#endif
// Settingup RGB Lighting
#ifdef RGBLIGHT_ENABLE
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_LED_COUNT 72
//#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
//#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
//#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_SNAKE
//#define RGBLIGHT_EFFECT_KNIGHT
//#define RGBLIGHT_EFFECT_CHRISTMAS
//#define RGBLIGHT_EFFECT_STATIC_GRADIENT
//#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
//#define RGBLIGHT_EFFECT_RGB_TEST
//#define RGBLIGHT_EFFECT_ALTERNATING
//#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_LED_COUNT 70
//#define RGBLED_SPLIT
//#define RGBLED_SPLIT { 35, 35 } // haven't figured out how to use this yet
#define RGBLED_SPLIT { 36, 36 } // haven't figured out how to use this yet
//#define RGBLIGHT_LED_COUNT 30
#define RGBLIGHT_LIMIT_VAL 255
#define RGBLIGHT_LIMIT_VAL 170
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
# define RGB_MATRIX_SLEEP // turn off effects when suspended
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_LED_COUNT 72 // Number of LEDs
#define RGB_MATRIX_LED_COUNT 72
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
#define RGB_MATRIX_SLEEP // turn off effects when suspended
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT
// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT
# define RGB_MATRIX_HUE_STEP 8
# define RGB_MATRIX_SAT_STEP 8
# define RGB_MATRIX_VAL_STEP 8
# define RGB_MATRIX_SPD_STEP 10
#define RGB_MATRIX_HUE_STEP 8
#define RGB_MATRIX_SAT_STEP 8
#define RGB_MATRIX_VAL_STEP 8
#define RGB_MATRIX_SPD_STEP 10
/* Disable the animations you don't want/need. You will need to disable a good number of these *
* because they take up a lot of space. Disable until you can successfully compile your firmware. */
// # undef ENABLE_RGB_MATRIX_ALPHAS_MODS
// # undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
// # undef ENABLE_RGB_MATRIX_BREATHING
// # undef ENABLE_RGB_MATRIX_CYCLE_ALL
// # undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
// # undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
// # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
// # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
// # undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
// # undef ENABLE_RGB_MATRIX_DUAL_BEACON
// # undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
// # undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
// # undef ENABLE_RGB_MATRIX_RAINDROPS
// # undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
// # undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
// # undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
// # undef ENABLE_RGB_MATRIX_SPLASH
// # undef ENABLE_RGB_MATRIX_MULTISPLASH
// # undef ENABLE_RGB_MATRIX_SOLID_SPLASH
// # undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
/* Disable the animations you don't want/need. You will need to disable a good number of these *
* because they take up a lot of space. Disable until you can successfully compile your firmware. */
// # undef ENABLE_RGB_MATRIX_ALPHAS_MODS
// # undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
// # undef ENABLE_RGB_MATRIX_BREATHING
// # undef ENABLE_RGB_MATRIX_CYCLE_ALL
// # undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
// # undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
// # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
// # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
// # undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
// # undef ENABLE_RGB_MATRIX_DUAL_BEACON
// # undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
// # undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
// # undef ENABLE_RGB_MATRIX_RAINDROPS
// # undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
// # undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
// # undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
// # undef ENABLE_RGB_MATRIX_SPLASH
// # undef ENABLE_RGB_MATRIX_MULTISPLASH
// # undef ENABLE_RGB_MATRIX_SOLID_SPLASH
// # undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#endif

View File

@ -19,7 +19,7 @@
#include QMK_KEYBOARD_H
#define INDICATOR_BRIGHTNESS 30
#define INDICATOR_BRIGHTNESS 80
#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override
#define HSV_OVERRIDE(hsv, Override) HSV_OVERRIDE_HELP(hsv,Override)
@ -28,6 +28,7 @@
#define SET_INDICATORS(hsv) \
{0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
{35+0, 1, hsv}
#define SET_UNDERGLOW(hsv) \
{1, 6, hsv}, \
{35+1, 6,hsv}
@ -62,7 +63,6 @@
{25, 2, hsv}, \
{35+ 25, 2, hsv}
enum sofle_layers {
_DEFAULTS = 0,
_QWERTY = 0,
@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_D_MUTE,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT,
//|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
KC_SPC, KC_LGUI, KC_LOWER, TD(TD_SHIFT_BACK), KC_ENT, KC_LSFT, KC_SPC , KC_RAISE, KC_RCTL, KC_RALT
KC_SPC, KC_LGUI, KC_LOWER, KC_BSPC, KC_ENT, KC_LSFT, KC_SPC , KC_RAISE, KC_RCTL, KC_RALT
// \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
),

View File

@ -70,7 +70,7 @@
#define RGBLIGHT_LED_COUNT 70
//#define RGBLED_SPLIT
#define RGBLED_SPLIT { 35, 35 } // haven't figured out how to use this yet
// #define RGBLED_SPLIT { 35, 35 } // haven't figured out how to use this yet
//#define RGBLIGHT_LED_COUNT 30
#define RGBLIGHT_LIMIT_VAL 120

View File

@ -4,4 +4,4 @@ CONSOLE_ENABLE = no
RGBLIGHT_ENABLE = yes
ENCODER_ENABLE = yes
LTO_ENABLE = yes
OLED_ENABLE = yes
OLED_ENABLE = no