DL-Mirrors/keychron-vial-shenanigans
0
0
Fork 0
mirror of https://github.com/nalf3in/vial-qmk.git synced 2025-12-22 03:30:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qmk/master' into merge-2023-09-08

Browse Source
This commit is contained in:
Ilya Zhuravlev
2023-09-08 20:53:27 -06:00
parent fbf1c160eb 4875bcecc2
commit e390a34128
6126 changed files with 113768 additions and 45875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
keyboards/ergodox_ez/config.h
View File

@@ -44,10 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED
#define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 200
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
@@ -67,21 +63,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#define LED_BRIGHTNESS_DEFAULT (LED_BRIGHTNESS_HI)
/* ws2812 RGB LED */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#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_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 255
#define RGBLIGHT_VAL_STEP 12
// Pick one of the modes
// Defaults to 15 mirror, for legacy behavior
@@ -94,8 +75,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBW
#define RGBLIGHT_SLEEP
/*
* The debounce filtering reports a key/switch change directly,
* without any extra delay. After that the debounce logic will filter
@@ -156,21 +135,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define ENABLE_RGB_MATRIX_PIXEL_FLOW
#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
#define ENABLE_RGB_MATRIX_SPLASH
#define ENABLE_RGB_MATRIX_MULTISPLASH
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
// #define ENABLE_RGB_MATRIX_SPLASH
// #define ENABLE_RGB_MATRIX_MULTISPLASH
// #define ENABLE_RGB_MATRIX_SOLID_SPLASH
// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
// #define RGBLIGHT_COLOR_LAYER_0 0x00, 0x00, 0xFF
/* #define RGBLIGHT_COLOR_LAYER_1 0x00, 0x00, 0xFF */

22
keyboards/ergodox_ez/ergodox_ez.h
View File

@@ -139,25 +139,3 @@ typedef union {
} keyboard_config_t;
extern keyboard_config_t keyboard_config;
/* ---- LEFT HAND ---- ---- RIGHT HAND ---- */
#define LED_LAYOUT_ergodox_pretty( \
L01,L02,L03,L04,L05, R01,R02,R03,R04,R05, \
L11,L12,L13,L14,L15, R11,R12,R13,R14,R15, \
L21,L22,L23,L24,L25, R21,R22,R23,R24,R25, \
L31,L32,L33,L34,L35, R31,R32,R33,R34,R35, \
L41,L42,L43,L44, R42,R43,R44,R45 ) \
\
/* matrix positions */ \
{ R01, R02, R03, R04, R05, \
R11, R12, R13, R14, R15, \
R21, R22, R23, R24, R25, \
R31, R32, R33, R34, R35, \
R42, R43, R44, R45, \
\
L05, L04, L03, L02, L01, \
L15, L14, L13, L12, L11, \
L25, L24, L23, L22, L21, \
L35, L34, L33, L32, L31, \
L44, L43, L42, L41 \
}

25
keyboards/ergodox_ez/info.json
View File

@@ -6,15 +6,38 @@
"vid": "0x3297",
"device_version": "0.0.1"
},
"rgblight": {
"hue_steps": 12,
"brightness_steps": 12,
"sleep": true,
"animations": {
"breathing": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"snake": true,
"knight": true,
"christmas": true,
"static_gradient": true,
"rgb_test": true,
"alternating": true,
"twinkle": true
}
},
"build": {
"debounce_type": "sym_eager_pr"
},
"ws2812": {
"pin": "D7"
},
"rgb_matrix": {
"driver": "IS31FL3731"
"driver": "is31fl3731"
},
"processor": "atmega32u4",
"bootloader": "halfkay",
"debounce": 30,
"tapping": {
"toggle": 1
},
"community_layouts": ["ergodox"],
"layouts": {
"LAYOUT_ergodox": {

20
keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c
View File

@@ -253,12 +253,7 @@ void matrix_scan_user(void) {
};
// The state of the LEDs requested by the system, as a bitmask.
static uint8_t sys_led_state = 0;
// Use these masks to read the system LEDs state.
static const uint8_t sys_led_mask_num_lock = 1 << USB_LED_NUM_LOCK;
static const uint8_t sys_led_mask_caps_lock = 1 << USB_LED_CAPS_LOCK;
static const uint8_t sys_led_mask_scroll_lock = 1 << USB_LED_SCROLL_LOCK;
static led_t sys_led_state = {0};
// Value to use to switch LEDs on. The default value of 255 is far too bright.
static const uint8_t max_led_value = 20;
@@ -294,25 +289,26 @@ void led_3_off(void) {
}
// Called when the computer wants to change the state of the keyboard LEDs.
void led_set_user(uint8_t usb_led) {
sys_led_state = usb_led;
bool led_update_user(led_t led_state) {
sys_led_state = led_state;
if (LAYER_ON(SYSLEDS)) {
if (sys_led_state & sys_led_mask_caps_lock) {
if (sys_led_state.caps_lock) {
led_1_on();
} else {
led_1_off();
}
if (sys_led_state & sys_led_mask_num_lock) {
if (sys_led_state.num_lock) {
led_2_on();
} else {
led_2_off();
}
if (sys_led_state & sys_led_mask_scroll_lock) {
if (sys_led_state.scroll_lock) {
led_3_on();
} else {
led_3_off();
}
}
return false;
}
layer_state_t layer_state_set_user(layer_state_t state) {
@@ -327,7 +323,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
}
if (LAYER_ON(SYSLEDS)) {
led_set_user(sys_led_state);
led_update_user(sys_led_state);
return state;
}

5
keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
View File

@@ -296,12 +296,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
void led_set_user(uint8_t usb_led) {
if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
bool led_update_user(led_t led_state) {
if (led_state.caps_lock) {
ergodox_right_led_1_on();
} else {
ergodox_right_led_1_off();
}
return false;
}

5
keyboards/ergodox_ez/keymaps/smurmann/keymap.c
View File

@@ -194,11 +194,12 @@ void matrix_scan_user(void) {
}
};
void led_set_user(uint8_t usb_led){
if (usb_led & (1 << USB_LED_CAPS_LOCK))
bool led_update_user(led_t led_state){
if (led_state.caps_lock)
{
capsOn = true;
}else {
capsOn = false;
}
return false;
}

1
keyboards/ergodox_ez/rules.mk
View File

@@ -17,7 +17,6 @@ UNICODE_ENABLE = no # Unicode
SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard
RGB_MATRIX_ENABLE = no # enable later
DEBOUNCE_TYPE = sym_eager_pr
# project specific files
SRC += matrix.c \