Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
zvecr
2024-02-29 02:07:27 +00:00
16 changed files with 1353 additions and 1169 deletions
@@ -4,7 +4,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_65_ansi_blocker(
KC_ESC, 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_ESC, SE_UNLK, 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_HOME,
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_PGUP,
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_PGDN,
+2 -7
View File
@@ -140,7 +140,6 @@
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
"pixel_fractal": true,
"pixel_flow": true,
"pixel_rain": true,
"typing_heatmap": true,
@@ -148,15 +147,11 @@
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_wide": true,
"solid_reactive_multiwide": true,
"solid_reactive_cross": true,
"solid_reactive_multicross": true,
"solid_reactive_nexus": true,
"solid_reactive_multinexus": true,
"splash": true,
"multisplash": true,
"solid_splash": true,
"solid_multisplash": true
"solid_splash": true
},
"default": {
"val": 128
@@ -270,4 +265,4 @@
]
}
}
}
}
@@ -1,2 +1 @@
VIA_ENABLE = yes
LTO_ENABLE = yes
+4 -2
View File
@@ -1,6 +1,5 @@
{
"manufacturer": "Qwertykeys",
"url": "",
"maintainer": "Qwertykeys",
"usb": {
"vid": "0x4F53"
@@ -17,6 +16,9 @@
"rgblight": true,
"nkro": true
},
"build": {
"lto": true
},
"processor": "STM32F103",
"bootloader": "stm32duino",
"ws2812": {
@@ -47,4 +49,4 @@
"dynamic_keymap": {
"layer_count": 2
}
}
}