Merge branch 'develop' into bk_dilemma_3x5_3

This commit is contained in:
casuanoob 2023-12-02 20:43:20 +11:00 committed by GitHub
commit 8533d7484e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
61 changed files with 809 additions and 358 deletions

View File

@ -69,10 +69,29 @@ The Analog Joystick is an analog (ADC) driven sensor. There are a variety of jo
| `ANALOG_JOYSTICK_Y_AXIS_PIN` | (Required) The pin used for the horizontal/Y axis. | _not defined_ |
| `ANALOG_JOYSTICK_AXIS_MIN` | (Optional) Sets the lower range to be considered movement. | `0` |
| `ANALOG_JOYSTICK_AXIS_MAX` | (Optional) Sets the upper range to be considered movement. | `1023` |
| `ANALOG_JOYSTICK_AUTO_AXIS` | (Optional) Sets ranges to be considered movement automatically. | _not defined_ |
| `ANALOG_JOYSTICK_SPEED_REGULATOR` | (Optional) The divisor used to slow down movement. (lower makes it faster) | `20` |
| `ANALOG_JOYSTICK_READ_INTERVAL` | (Optional) The interval in milliseconds between reads. | `10` |
| `ANALOG_JOYSTICK_SPEED_MAX` | (Optional) The maximum value used for motion. | `2` |
| `ANALOG_JOYSTICK_CLICK_PIN` | (Optional) The pin wired up to the press switch of the analog stick. | _not defined_ |
| `ANALOG_JOYSTICK_WEIGHTS` | (Optional) Use custom weights for lever positions. | _not defined_ |
| `ANALOG_JOYSTICK_CUTOFF` | (Optional) Cut off movement when joystick returns to start position. | _not defined_ |
If `ANALOG_JOYSTICK_AUTO_AXIS` is used, then `ANALOG_JOYSTICK_AXIS_MIN` and `ANALOG_JOYSTICK_AXIS_MAX` are ignored.
By default analog joystick implementation uses `x^2` weighting for lever positions. `ANALOG_JOYSTICK_WEIGHTS` allows to experiment with different configurations that might feel better.
E.g. This is weights for `((x-0.4)^3+0.064)/0.282`:
```c
#define ANALOG_JOYSTICK_WEIGHTS {0,2,4,5,7,8,9,10,12,13,14,15,15,16,17,18,18,19,19,20,20,21,21,21,22,22,22,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,24,24,24,24,24,25,25,25,26,26,26,27,28,28,29,29,30,31,32,33,34,35,36,37,38,40,41,43,44,46,48,49,51,53,56,58,60,62,65,68,70,73,76,79,82,85,89,92,96,100}
```
You can use following JS code to generate weights for different formulas:
```js
JSON.stringify(Array.from(Array(101).keys()).map(x => Math.ceil((((x/100-0.4)**3+0.064)/0.282*100))))
```
### Azoteq IQS5XX Trackpad

View File

@ -22,17 +22,28 @@
#include <stdlib.h>
// Set Parameters
#ifndef ANALOG_JOYSTICK_AUTO_AXIS
uint16_t minAxisValue = ANALOG_JOYSTICK_AXIS_MIN;
uint16_t maxAxisValue = ANALOG_JOYSTICK_AXIS_MAX;
#else
int16_t minAxisValues[2];
int16_t maxAxisValues[2];
#endif
uint8_t maxCursorSpeed = ANALOG_JOYSTICK_SPEED_MAX;
uint8_t speedRegulator = ANALOG_JOYSTICK_SPEED_REGULATOR; // Lower Values Create Faster Movement
#ifdef ANALOG_JOYSTICK_WEIGHTS
int8_t weights[101] = ANALOG_JOYSTICK_WEIGHTS;
#endif
int16_t xOrigin, yOrigin;
uint16_t lastCursor = 0;
int16_t axisCoordinate(pin_t pin, uint16_t origin) {
uint8_t prevValues[2] = {0, 0};
int16_t axisCoordinate(pin_t pin, uint16_t origin, uint8_t axis) {
int8_t direction;
int16_t distanceFromOrigin;
int16_t range;
@ -43,11 +54,26 @@ int16_t axisCoordinate(pin_t pin, uint16_t origin) {
return 0;
} else if (origin > position) {
distanceFromOrigin = origin - position;
#ifdef ANALOG_JOYSTICK_AUTO_AXIS
if (position < minAxisValues[axis]) {
minAxisValues[axis] = position;
}
range = origin - minAxisValues[axis];
#else
range = origin - minAxisValue;
#endif
direction = -1;
} else {
distanceFromOrigin = position - origin;
#ifdef ANALOG_JOYSTICK_AUTO_AXIS
if (position > maxAxisValues[axis]) {
maxAxisValues[axis] = position;
}
range = maxAxisValues[axis] - origin;
#else
range = maxAxisValue - origin;
#endif
direction = 1;
}
@ -62,14 +88,29 @@ int16_t axisCoordinate(pin_t pin, uint16_t origin) {
}
}
int8_t axisToMouseComponent(pin_t pin, int16_t origin, uint8_t maxSpeed) {
int16_t coordinate = axisCoordinate(pin, origin);
int8_t axisToMouseComponent(pin_t pin, int16_t origin, uint8_t maxSpeed, uint8_t axis) {
int16_t coordinate = axisCoordinate(pin, origin, axis);
int8_t result;
#ifndef ANALOG_JOYSTICK_WEIGHTS
if (coordinate != 0) {
float percent = (float)coordinate / 100;
return percent * maxCursorSpeed * (abs(coordinate) / speedRegulator);
result = percent * maxCursorSpeed * (abs(coordinate) / speedRegulator);
} else {
return 0;
}
#else
result = weights[abs(coordinate)] * (coordinate < 0 ? -1 : 1) * maxCursorSpeed / speedRegulator;
#endif
#ifdef ANALOG_JOYSTICK_CUTOFF
uint8_t pv = prevValues[axis];
prevValues[axis] = abs(result);
if (pv > abs(result)) {
return 0;
}
#endif
return result;
}
report_analog_joystick_t analog_joystick_read(void) {
@ -77,8 +118,8 @@ report_analog_joystick_t analog_joystick_read(void) {
if (timer_elapsed(lastCursor) > ANALOG_JOYSTICK_READ_INTERVAL) {
lastCursor = timer_read();
report.x = axisToMouseComponent(ANALOG_JOYSTICK_X_AXIS_PIN, xOrigin, maxCursorSpeed);
report.y = axisToMouseComponent(ANALOG_JOYSTICK_Y_AXIS_PIN, yOrigin, maxCursorSpeed);
report.x = axisToMouseComponent(ANALOG_JOYSTICK_X_AXIS_PIN, xOrigin, maxCursorSpeed, 0);
report.y = axisToMouseComponent(ANALOG_JOYSTICK_Y_AXIS_PIN, yOrigin, maxCursorSpeed, 1);
}
#ifdef ANALOG_JOYSTICK_CLICK_PIN
report.button = !readPin(ANALOG_JOYSTICK_CLICK_PIN);
@ -93,4 +134,11 @@ void analog_joystick_init(void) {
// Account for drift
xOrigin = analogReadPin(ANALOG_JOYSTICK_X_AXIS_PIN);
yOrigin = analogReadPin(ANALOG_JOYSTICK_Y_AXIS_PIN);
#ifdef ANALOG_JOYSTICK_AUTO_AXIS
minAxisValues[0] = xOrigin - 100;
minAxisValues[1] = yOrigin - 100;
maxAxisValues[0] = xOrigin + 100;
maxAxisValues[1] = yOrigin + 100;
#endif
}

View File

@ -8,7 +8,6 @@
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BREATHING
#define RGB_MATRIX_DEFAULT_HUE 152
#define RGB_MATRIX_DEFAULT_SAT 232
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_DEFAULT_SPD 50
#define ENABLE_RGB_MATRIX_BREATHING

View File

@ -27,9 +27,7 @@
#define RGB_DISABLE_WHEN_USB_SUSPENDED true
#define RGB_MATRIX_LED_COUNT 96
#define RGB_MATRIX_DEFAULT_HUE 170
#define RGB_MATRIX_DEFAULT_SAT 255
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom, speed controls how much gradient changes

View File

@ -35,7 +35,6 @@
# define LED_HITS_TO_REMEMBER 10
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_DEFAULT_SPD 127
// the above brighness setting has no effect on rgb_matrix_set_color().
// Use darker colors instead.
/* RGB darker COLORS */

View File

@ -41,8 +41,6 @@
# define RGB_MATRIX_KEYPRESSES
// Startup values.
# define RGB_MATRIX_DEFAULT_HUE 0
# define RGB_MATRIX_DEFAULT_SAT 255
# define RGB_MATRIX_DEFAULT_VAL 64
// Rainbow swirl as startup mode.

View File

@ -24,7 +24,6 @@
# define RGB_MATRIX_LED_COUNT 58
# define RGB_MATRIX_SPLIT { 29, 29 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
#endif

View File

@ -24,7 +24,6 @@
# define RGB_MATRIX_LED_COUNT 36
# define RGB_MATRIX_SPLIT { 18, 18 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
#endif

View File

@ -24,7 +24,6 @@
# define RGB_MATRIX_LED_COUNT 42
# define RGB_MATRIX_SPLIT { 21, 21 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES
#endif

View File

@ -0,0 +1,43 @@
/* Copyright 2022 LXF-YZP(yuezp)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "quantum.h"
#ifdef RGBLIGHT_ENABLE
const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
{0, 1, HSV_RED}
);
const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
my_capslock_layer
);
bool led_update_kb(led_t led_state) {
if (!led_update_user(led_state)) { return false; }
rgblight_set_layer_state(0, led_state.caps_lock);
return true;
}
void keyboard_post_init_kb(void) {
rgblight_layers = my_rgb_layers;
keyboard_post_init_user();
}
#endif
void board_init(void) {
AFIO->MAPR |= AFIO_MAPR_TIM2_REMAP_PARTIALREMAP2;
}

View File

@ -0,0 +1,22 @@
/* Copyright 2022 LXF-YZP(yuezp)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#define WS2812_PWM_DRIVER PWMD2
#define WS2812_PWM_CHANNEL 4
#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
#define WS2812_DMA_CHANNEL 2

View File

@ -0,0 +1,21 @@
/* Copyright 2022 LXF-YZP(yuezp)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#define HAL_USE_PWM TRUE
#include_next <halconf.h>

212
keyboards/bestway/info.json Normal file
View File

@ -0,0 +1,212 @@
{
"manufacturer": "meet_lab",
"keyboard_name": "Best",
"maintainer": "yuezp",
"development_board": "bluepill",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"extrakey": true,
"nkro": true,
"rgblight": true
},
"matrix_pins": {
"cols": ["B3", "B9", "B8", "B7", "B6", "B5", "B4", "B10", "A7", "A3", "A4", "A5", "A6", "B0", "B12", "B13", "B14"],
"rows": ["A15", "A10", "A8", "A9", "B15"]
},
"rgblight": {
"animations": {
"alternating": true,
"breathing": true,
"christmas": true,
"knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"rgb_test": true,
"snake": true,
"static_gradient": true,
"twinkle": true
},
"layers": {
"enabled": true,
"override_rgb": false
},
"brightness_steps": 10,
"led_count": 3,
"saturation_steps": 8
},
"url": "",
"usb": {
"device_version": "1.0.0",
"pid": "0xBB05",
"vid": "0xAA05"
},
"ws2812": {
"driver": "pwm",
"pin": "B11"
},
"community_layouts": ["tkl_nofrow_ansi"],
"layout_aliases": {
"LAYOUT": "LAYOUT_all"
},
"layouts": {
"LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [0, 9], "x": 9, "y": 0},
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
{"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
{"matrix": [0, 14], "x": 15.25, "y": 0},
{"matrix": [0, 15], "x": 16.25, "y": 0},
{"matrix": [0, 16], "x": 17.25, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
{"matrix": [1, 3], "x": 3.5, "y": 1},
{"matrix": [1, 4], "x": 4.5, "y": 1},
{"matrix": [1, 5], "x": 5.5, "y": 1},
{"matrix": [1, 6], "x": 6.5, "y": 1},
{"matrix": [1, 7], "x": 7.5, "y": 1},
{"matrix": [1, 8], "x": 8.5, "y": 1},
{"matrix": [1, 9], "x": 9.5, "y": 1},
{"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1},
{"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
{"matrix": [1, 14], "x": 15.25, "y": 1},
{"matrix": [1, 15], "x": 16.25, "y": 1},
{"matrix": [1, 16], "x": 17.25, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 3], "x": 3.75, "y": 2},
{"matrix": [2, 4], "x": 4.75, "y": 2},
{"matrix": [2, 5], "x": 5.75, "y": 2},
{"matrix": [2, 6], "x": 6.75, "y": 2},
{"matrix": [2, 7], "x": 7.75, "y": 2},
{"matrix": [2, 8], "x": 8.75, "y": 2},
{"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [2, 11], "x": 11.75, "y": 2},
{"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"matrix": [3, 1], "x": 2.25, "y": 3},
{"matrix": [3, 2], "x": 3.25, "y": 3},
{"matrix": [3, 3], "x": 4.25, "y": 3},
{"matrix": [3, 4], "x": 5.25, "y": 3},
{"matrix": [3, 5], "x": 6.25, "y": 3},
{"matrix": [3, 6], "x": 7.25, "y": 3},
{"matrix": [3, 7], "x": 8.25, "y": 3},
{"matrix": [3, 8], "x": 9.25, "y": 3},
{"matrix": [3, 9], "x": 10.25, "y": 3},
{"matrix": [3, 10], "x": 11.25, "y": 3},
{"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
{"matrix": [3, 15], "x": 16.25, "y": 3},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
{"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
{"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
{"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25},
{"matrix": [4, 14], "x": 15.25, "y": 4},
{"matrix": [4, 15], "x": 16.25, "y": 4},
{"matrix": [4, 16], "x": 17.25, "y": 4}
]
},
"LAYOUT_tkl_nofrow_ansi": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [0, 9], "x": 9, "y": 0},
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
{"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
{"matrix": [0, 14], "x": 15.25, "y": 0},
{"matrix": [0, 15], "x": 16.25, "y": 0},
{"matrix": [0, 16], "x": 17.25, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
{"matrix": [1, 3], "x": 3.5, "y": 1},
{"matrix": [1, 4], "x": 4.5, "y": 1},
{"matrix": [1, 5], "x": 5.5, "y": 1},
{"matrix": [1, 6], "x": 6.5, "y": 1},
{"matrix": [1, 7], "x": 7.5, "y": 1},
{"matrix": [1, 8], "x": 8.5, "y": 1},
{"matrix": [1, 9], "x": 9.5, "y": 1},
{"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1},
{"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
{"matrix": [1, 14], "x": 15.25, "y": 1},
{"matrix": [1, 15], "x": 16.25, "y": 1},
{"matrix": [1, 16], "x": 17.25, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 3], "x": 3.75, "y": 2},
{"matrix": [2, 4], "x": 4.75, "y": 2},
{"matrix": [2, 5], "x": 5.75, "y": 2},
{"matrix": [2, 6], "x": 6.75, "y": 2},
{"matrix": [2, 7], "x": 7.75, "y": 2},
{"matrix": [2, 8], "x": 8.75, "y": 2},
{"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [2, 11], "x": 11.75, "y": 2},
{"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"matrix": [3, 1], "x": 2.25, "y": 3},
{"matrix": [3, 2], "x": 3.25, "y": 3},
{"matrix": [3, 3], "x": 4.25, "y": 3},
{"matrix": [3, 4], "x": 5.25, "y": 3},
{"matrix": [3, 5], "x": 6.25, "y": 3},
{"matrix": [3, 6], "x": 7.25, "y": 3},
{"matrix": [3, 7], "x": 8.25, "y": 3},
{"matrix": [3, 8], "x": 9.25, "y": 3},
{"matrix": [3, 9], "x": 10.25, "y": 3},
{"matrix": [3, 10], "x": 11.25, "y": 3},
{"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
{"matrix": [3, 15], "x": 16.25, "y": 3},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
{"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
{"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
{"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25},
{"matrix": [4, 14], "x": 15.25, "y": 4},
{"matrix": [4, 15], "x": 16.25, "y": 4},
{"matrix": [4, 16], "x": 17.25, "y": 4}
]
}
}
}

View File

@ -0,0 +1,35 @@
/* Copyright 2022 LXF-YZP(yuezp)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
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_INS, KC_HOME, KC_PGUP,
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_DEL, KC_END, KC_PGDN,
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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, KC_RALT, MO(1), KC_APP, KC_LEFT, KC_DOWN, KC_RGHT),
[1] = LAYOUT_all(
KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};

View File

@ -0,0 +1,35 @@
/* Copyright 2022 LXF-YZP(yuezp)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
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_INS, KC_HOME, KC_PGUP,
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_DEL, KC_END, KC_PGDN,
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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, KC_RALT, MO(1), KC_APP, KC_LEFT, KC_DOWN, KC_RGHT),
[1] = LAYOUT_all(
KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};

View File

@ -0,0 +1 @@
VIA_ENABLE = yes

View File

@ -0,0 +1,19 @@
# Matrix Diagram for Best
```
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D ││0E │0F │0G │
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤ ┌─────┐
│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D ││1E │1F │1G │ │ │
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘ ┌──┴┐2C │ ISO Enter
│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │ │1D │ │
├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ └───┴────┘
│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3C │ │3F │
├────────┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
│40 │41 │42 │45 │49 │4A │4B │4C ││4E │4F │4G │
└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
│40 │41 │42 │45 │4A │4B │4C │ Tsangan/WKL
└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
```

View File

@ -0,0 +1,21 @@
/* Copyright 2022 LXF-YZP(yuezp)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include_next <mcuconf.h>
#undef STM32_PWM_USE_TIM2
#define STM32_PWM_USE_TIM2 TRUE

View File

@ -0,0 +1,27 @@
# Best - PCB
![bestway](https://i.imgur.com/5q7i7ayh.jpg)
A 71 keys keyboard with rgb.
This keyboard use 16mhz HSE and STM32F103 as MCU.
* Keyboard Maintainer: https://github.com/LXF-YZP
* Hardware Supported: bestway PCB
Make example for this keyboard (after setting up your build environment):
make bestway:default
Flashing example for this keyboard:
make bestway:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
## Bootloader
Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

View File

@ -0,0 +1 @@
# This file intentionally left blank

View File

@ -35,10 +35,6 @@
#define RGB_MATRIX_LED_FLUSH_LIMIT 16
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
#define RGB_MATRIX_DEFAULT_HUE 0
#define RGB_MATRIX_DEFAULT_SAT 255
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_DEFAULT_SPD 127

View File

@ -27,8 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// for all fingers used at once.
# define LED_HITS_TO_REMEMBER 10
# define RGB_MATRIX_DEFAULT_SPD 127
// the above brighness setting has no effect on rgb_matrix_set_color().
// Use darker colors instead.
/* RGB darker COLORS */

View File

@ -43,96 +43,101 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label": "5,14", "matrix": [5, 14], "x": 0.75, "y": 0.25},
{"label": "0,0", "matrix": [0, 0], "x": 2.25, "y": 0.25},
{"label": "0,1", "matrix": [0, 1], "x": 3.25, "y": 0.25},
{"label": "0,2", "matrix": [0, 2], "x": 4.75, "y": 0.25},
{"label": "0,3", "matrix": [0, 3], "x": 5.75, "y": 0.13},
{"label": "0,4", "matrix": [0, 4], "x": 6.75, "y": 0.25},
{"label": "0,5", "matrix": [0, 5], "x": 7.75, "y": 0.38},
{"label": "0,6", "matrix": [0, 6], "x": 11.5, "y": 0.38},
{"label": "0,7", "matrix": [0, 7], "x": 12.5, "y": 0.25},
{"label": "0,8", "matrix": [0, 8], "x": 13.5, "y": 0.13},
{"label": "0,9", "matrix": [0, 9], "x": 14.5, "y": 0.25},
{"label": "0,10", "matrix": [0, 10], "x": 16, "y": 0.25},
{"label": "0,11", "matrix": [0, 11], "x": 17, "y": 0.25},
{"label": "0,12", "matrix": [0, 12], "x": 18.13, "y": 0.25},
{"label": "0,13", "matrix": [0, 13], "x": 19.13, "y": 0.25},
{"label": "0,14", "matrix": [0, 14], "x": 21, "y": 0.25},
{"label": "1,0", "matrix": [1, 0], "x": 2, "y": 1.5},
{"label": "1,1", "matrix": [1, 1], "x": 3, "y": 1.5},
{"label": "1,2", "matrix": [1, 2], "x": 4.75, "y": 1.5},
{"label": "1,3", "matrix": [1, 3], "x": 5.75, "y": 1.38},
{"label": "1,4", "matrix": [1, 4], "x": 6.75, "y": 1.5},
{"label": "1,5", "matrix": [1, 5], "x": 7.75, "y": 1.63},
{"label": "1,6", "matrix": [1, 6], "x": 11.5, "y": 1.63},
{"label": "1,7", "matrix": [1, 7], "x": 12.5, "y": 1.5},
{"label": "1,8", "matrix": [1, 8], "x": 13.5, "y": 1.38},
{"label": "1,9", "matrix": [1, 9], "x": 14.5, "y": 1.5},
{"label": "1,10", "matrix": [1, 10], "x": 16.25, "y": 1.5},
{"label": "1,11", "matrix": [1, 11], "x": 17.25, "y": 1.5},
{"label": "1,12", "matrix": [1, 12], "x": 18.25, "y": 1.5},
{"label": "1,13", "matrix": [1, 13], "x": 19.25, "y": 1.5},
{"label": "1,14", "matrix": [1, 14], "x": 20.25, "y": 1.5},
{"label": "2,14", "matrix": [2, 14], "x": 21.75, "y": 1.5},
{"label": "2,0", "matrix": [2, 0], "x": 1.25, "y": 2.5, "w": 1.5},
{"label": "2,1", "matrix": [2, 1], "x": 2.75, "y": 2.5},
{"label": "2,2", "matrix": [2, 2], "x": 4.75, "y": 2.5},
{"label": "2,3", "matrix": [2, 3], "x": 5.75, "y": 2.38},
{"label": "2,4", "matrix": [2, 4], "x": 6.75, "y": 2.5},
{"label": "2,5", "matrix": [2, 5], "x": 7.75, "y": 2.63},
{"label": "2,6", "matrix": [2, 6], "x": 11.5, "y": 2.63},
{"label": "2,7", "matrix": [2, 7], "x": 12.5, "y": 2.5},
{"label": "2,8", "matrix": [2, 8], "x": 13.5, "y": 2.38},
{"label": "2,9", "matrix": [2, 9], "x": 14.5, "y": 2.5},
{"label": "2,10", "matrix": [2, 10], "x": 16.5, "y": 2.5},
{"label": "2,11", "matrix": [2, 11], "x": 17.5, "y": 2.5},
{"label": "2,12", "matrix": [2, 12], "x": 18.5, "y": 2.5},
{"label": "2,13", "matrix": [2, 13], "x": 19.5, "y": 2.5, "w": 1.5},
{"label": "3,13", "matrix": [3, 13], "x": 21.5, "y": 2.5},
{"label": "3,0", "matrix": [3, 0], "x": 0.75, "y": 3.5, "w": 1.75},
{"label": "3,1", "matrix": [3, 1], "x": 2.5, "y": 3.5},
{"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3.5},
{"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3.38},
{"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3.5},
{"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3.63},
{"label": "3,6", "matrix": [3, 6], "x": 11.5, "y": 3.63},
{"label": "3,7", "matrix": [3, 7], "x": 12.5, "y": 3.5},
{"label": "3,8", "matrix": [3, 8], "x": 13.5, "y": 3.38},
{"label": "3,9", "matrix": [3, 9], "x": 14.5, "y": 3.5},
{"label": "3,10", "matrix": [3, 10], "x": 16.75, "y": 3.5},
{"label": "3,11", "matrix": [3, 11], "x": 17.75, "y": 3.5},
{"label": "3,12", "matrix": [3, 12], "x": 18.75, "y": 3.5, "w": 2.25},
{"label": "3,14", "matrix": [3, 14], "x": 21.25, "y": 3.5},
{"label": "4,14", "matrix": [4, 14], "x": 0, "y": 4.5, "w": 1.25},
{"label": "4,0", "matrix": [4, 0], "x": 1.25, "y": 4.5},
{"label": "4,1", "matrix": [4, 1], "x": 2.25, "y": 4.5},
{"label": "4,2", "matrix": [4, 2], "x": 4.75, "y": 4.5},
{"label": "4,3", "matrix": [4, 3], "x": 5.75, "y": 4.38},
{"label": "4,4", "matrix": [4, 4], "x": 6.75, "y": 4.5},
{"label": "4,5", "matrix": [4, 5], "x": 7.75, "y": 4.63},
{"label": "5,5", "matrix": [5, 5], "x": 8.75, "y": 4.63},
{"label": "5,6", "matrix": [5, 6], "x": 10.5, "y": 4.63},
{"label": "4,6", "matrix": [4, 6], "x": 11.5, "y": 4.63},
{"label": "4,7", "matrix": [4, 7], "x": 12.5, "y": 4.5},
{"label": "4,8", "matrix": [4, 8], "x": 13.5, "y": 4.38},
{"label": "4,9", "matrix": [4, 9], "x": 14.5, "y": 4.5},
{"label": "4,10", "matrix": [4, 10], "x": 17, "y": 4.5},
{"label": "4,11", "matrix": [4, 11], "x": 18, "y": 4.5},
{"label": "4,12", "matrix": [4, 12], "x": 19, "y": 4.5, "w": 1.25},
{"label": "4,13", "matrix": [4, 13], "x": 20.5, "y": 4.75},
{"label": "5,0", "matrix": [5, 0], "x": 0.5, "y": 5.5, "w": 1.25},
{"label": "5,1", "matrix": [5, 1], "x": 1.75, "y": 5.5, "w": 1.25},
{"label": "5,2", "matrix": [5, 2], "x": 5.25, "y": 5.5, "w": 1.25},
{"label": "5,3", "matrix": [5, 3], "x": 6.5, "y": 5.5, "w": 1.25},
{"label": "5,4", "matrix": [5, 4], "x": 7.75, "y": 5.63, "w": 2},
{"label": "5,7", "matrix": [5, 7], "x": 10.5, "y": 5.63, "w": 2.75},
{"label": "5,8", "matrix": [5, 8], "x": 13.25, "y": 5.5, "w": 1.25},
{"label": "5,9", "matrix": [5, 9], "x": 16.75, "y": 5.5, "w": 1.25},
{"label": "5,10", "matrix": [5, 10], "x": 18, "y": 5.5, "w": 1.25},
{"label": "5,11", "matrix": [5, 11], "x": 19.5, "y": 5.75},
{"label": "5,12", "matrix": [5, 12], "x": 20.5, "y": 5.75},
{"label": "5,13", "matrix": [5, 13], "x": 21.5, "y": 5.75}
{"label": "5,14", "matrix": [5, 14], "x": 0.75, "y": 0.12},
{"label": "0,0", "matrix": [0, 0], "x": 2.25, "y": 0.12},
{"label": "0,1", "matrix": [0, 1], "x": 3.25, "y": 0.12},
{"label": "0,2", "matrix": [0, 2], "x": 4.75, "y": 0.12},
{"label": "0,3", "matrix": [0, 3], "x": 5.75, "y": 0},
{"label": "0,4", "matrix": [0, 4], "x": 6.75, "y": 0.12},
{"label": "0,5", "matrix": [0, 5], "x": 7.75, "y": 0.25},
{"label": "0,6", "matrix": [0, 6], "x": 11.5, "y": 0.25},
{"label": "0,7", "matrix": [0, 7], "x": 12.5, "y": 0.12},
{"label": "0,8", "matrix": [0, 8], "x": 13.5, "y": 0},
{"label": "0,9", "matrix": [0, 9], "x": 14.5, "y": 0.12},
{"label": "0,10", "matrix": [0, 10], "x": 16, "y": 0.12},
{"label": "0,11", "matrix": [0, 11], "x": 17, "y": 0.12},
{"label": "0,12", "matrix": [0, 12], "x": 18.13, "y": 0.12},
{"label": "0,13", "matrix": [0, 13], "x": 19.13, "y": 0.12},
{"label": "0,14", "matrix": [0, 14], "x": 21, "y": 0.12},
{"label": "1,0", "matrix": [1, 0], "x": 2, "y": 1.37},
{"label": "1,1", "matrix": [1, 1], "x": 3, "y": 1.37},
{"label": "1,2", "matrix": [1, 2], "x": 4.75, "y": 1.37},
{"label": "1,3", "matrix": [1, 3], "x": 5.75, "y": 1.25},
{"label": "1,4", "matrix": [1, 4], "x": 6.75, "y": 1.37},
{"label": "1,5", "matrix": [1, 5], "x": 7.75, "y": 1.5},
{"label": "1,6", "matrix": [1, 6], "x": 11.5, "y": 1.5},
{"label": "1,7", "matrix": [1, 7], "x": 12.5, "y": 1.37},
{"label": "1,8", "matrix": [1, 8], "x": 13.5, "y": 1.25},
{"label": "1,9", "matrix": [1, 9], "x": 14.5, "y": 1.37},
{"label": "1,10", "matrix": [1, 10], "x": 16.25, "y": 1.37},
{"label": "1,11", "matrix": [1, 11], "x": 17.25, "y": 1.37},
{"label": "1,12", "matrix": [1, 12], "x": 18.25, "y": 1.37},
{"label": "1,13", "matrix": [1, 13], "x": 19.25, "y": 1.37},
{"label": "1,14", "matrix": [1, 14], "x": 20.25, "y": 1.37},
{"label": "2,14", "matrix": [2, 14], "x": 21.75, "y": 1.37},
{"label": "2,0", "matrix": [2, 0], "x": 1.25, "y": 2.37, "w": 1.5},
{"label": "2,1", "matrix": [2, 1], "x": 2.75, "y": 2.37},
{"label": "2,2", "matrix": [2, 2], "x": 4.75, "y": 2.37},
{"label": "2,3", "matrix": [2, 3], "x": 5.75, "y": 2.25},
{"label": "2,4", "matrix": [2, 4], "x": 6.75, "y": 2.37},
{"label": "2,5", "matrix": [2, 5], "x": 7.75, "y": 2.5},
{"label": "2,6", "matrix": [2, 6], "x": 11.5, "y": 2.5},
{"label": "2,7", "matrix": [2, 7], "x": 12.5, "y": 2.37},
{"label": "2,8", "matrix": [2, 8], "x": 13.5, "y": 2.25},
{"label": "2,9", "matrix": [2, 9], "x": 14.5, "y": 2.37},
{"label": "2,10", "matrix": [2, 10], "x": 16.5, "y": 2.37},
{"label": "2,11", "matrix": [2, 11], "x": 17.5, "y": 2.37},
{"label": "2,12", "matrix": [2, 12], "x": 18.5, "y": 2.37},
{"label": "2,13", "matrix": [2, 13], "x": 19.5, "y": 2.37, "w": 1.5},
{"label": "3,13", "matrix": [3, 13], "x": 21.5, "y": 2.37},
{"label": "3,0", "matrix": [3, 0], "x": 0.75, "y": 3.37, "w": 1.75},
{"label": "3,1", "matrix": [3, 1], "x": 2.5, "y": 3.37},
{"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3.37},
{"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3.25},
{"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3.37},
{"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3.5},
{"label": "3,6", "matrix": [3, 6], "x": 11.5, "y": 3.5},
{"label": "3,7", "matrix": [3, 7], "x": 12.5, "y": 3.37},
{"label": "3,8", "matrix": [3, 8], "x": 13.5, "y": 3.25},
{"label": "3,9", "matrix": [3, 9], "x": 14.5, "y": 3.37},
{"label": "3,10", "matrix": [3, 10], "x": 16.75, "y": 3.37},
{"label": "3,11", "matrix": [3, 11], "x": 17.75, "y": 3.37},
{"label": "3,12", "matrix": [3, 12], "x": 18.75, "y": 3.37, "w": 2.25},
{"label": "3,14", "matrix": [3, 14], "x": 21.25, "y": 3.37},
{"label": "4,14", "matrix": [4, 14], "x": 0, "y": 4.37, "w": 1.25},
{"label": "4,0", "matrix": [4, 0], "x": 1.25, "y": 4.37},
{"label": "4,1", "matrix": [4, 1], "x": 2.25, "y": 4.37},
{"label": "4,2", "matrix": [4, 2], "x": 4.75, "y": 4.37},
{"label": "4,3", "matrix": [4, 3], "x": 5.75, "y": 4.25},
{"label": "4,4", "matrix": [4, 4], "x": 6.75, "y": 4.37},
{"label": "4,5", "matrix": [4, 5], "x": 7.75, "y": 4.5},
{"label": "5,5", "matrix": [5, 5], "x": 8.75, "y": 4.5},
{"label": "5,6", "matrix": [5, 6], "x": 10.5, "y": 4.5},
{"label": "4,6", "matrix": [4, 6], "x": 11.5, "y": 4.5},
{"label": "4,7", "matrix": [4, 7], "x": 12.5, "y": 4.37},
{"label": "4,8", "matrix": [4, 8], "x": 13.5, "y": 4.25},
{"label": "4,9", "matrix": [4, 9], "x": 14.5, "y": 4.37},
{"label": "4,10", "matrix": [4, 10], "x": 17, "y": 4.37},
{"label": "4,11", "matrix": [4, 11], "x": 18, "y": 4.37},
{"label": "4,12", "matrix": [4, 12], "x": 19, "y": 4.37, "w": 1.25},
{"label": "4,13", "matrix": [4, 13], "x": 20.5, "y": 4.62},
{"label": "5,0", "matrix": [5, 0], "x": 0.5, "y": 5.37, "w": 1.25},
{"label": "5,1", "matrix": [5, 1], "x": 1.75, "y": 5.37, "w": 1.25},
{"label": "5,2", "matrix": [5, 2], "x": 5.25, "y": 5.37, "w": 1.25},
{"label": "5,3", "matrix": [5, 3], "x": 6.5, "y": 5.37, "w": 1.25},
{"label": "5,4", "matrix": [5, 4], "x": 7.75, "y": 5.5, "w": 2},
{"label": "5,7", "matrix": [5, 7], "x": 10.5, "y": 5.5, "w": 2.75},
{"label": "5,8", "matrix": [5, 8], "x": 13.25, "y": 5.37, "w": 1.25},
{"label": "5,9", "matrix": [5, 9], "x": 16.75, "y": 5.37, "w": 1.25},
{"label": "5,10", "matrix": [5, 10], "x": 18, "y": 5.37, "w": 1.25},
{"label": "5,11", "matrix": [5, 11], "x": 19.5, "y": 5.62},
{"label": "5,12", "matrix": [5, 12], "x": 20.5, "y": 5.62},
{"label": "5,13", "matrix": [5, 13], "x": 21.5, "y": 5.62}
]
}
}

View File

@ -26,10 +26,6 @@
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
#define RGB_MATRIX_DEFAULT_HUE 0
#define RGB_MATRIX_DEFAULT_SAT 255
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_DEFAULT_SPD 127
// Enable Effects
// == Regular Effects ==
#define ENABLE_RGB_MATRIX_ALPHAS_MODS

View File

@ -24,7 +24,6 @@
/* RGB Matrix config */
#define RGB_MATRIX_LED_COUNT 16
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN
#define RGB_MATRIX_KEYPRESSES

View File

@ -31,7 +31,6 @@
/* RGB Matrix config */
#define RGB_MATRIX_LED_COUNT 16
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN
#define RGB_MATRIX_KEYPRESSES

View File

@ -38,7 +38,6 @@
/* RGB Matrix config */
#define RGB_MATRIX_LED_COUNT 36
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES

View File

@ -13,7 +13,6 @@
#define ENABLE_RGB_MATRIX_BREATHING
#define ENABLE_RGB_MATRIX_CYCLE_ALL
#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
/*
* Feature disable options

View File

@ -27,200 +27,212 @@
"layouts": {
"LAYOUT_60_ansi": {
"layout": [
{"label": "0,0", "matrix": [0, 0], "x": 2.5, "y": 0},
{"label": "0,1", "matrix": [0, 1], "x": 3.5, "y": 0},
{"label": "0,2", "matrix": [0, 2], "x": 4.5, "y": 0},
{"label": "0,3", "matrix": [0, 3], "x": 5.5, "y": 0},
{"label": "0,4", "matrix": [0, 4], "x": 6.5, "y": 0},
{"label": "0,5", "matrix": [0, 5], "x": 7.5, "y": 0},
{"label": "0,6", "matrix": [0, 6], "x": 8.5, "y": 0},
{"label": "0,7", "matrix": [0, 7], "x": 9.5, "y": 0},
{"label": "0,8", "matrix": [0, 8], "x": 10.5, "y": 0},
{"label": "0,9", "matrix": [0, 9], "x": 11.5, "y": 0},
{"label": "0,10", "matrix": [0, 10], "x": 12.5, "y": 0},
{"label": "0,11", "matrix": [0, 11], "x": 13.5, "y": 0},
{"label": "0,12", "matrix": [0, 12], "x": 14.5, "y": 0},
{"label": "0,14", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2},
{"label": "1,0", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
{"label": "1,2", "matrix": [1, 2], "x": 4, "y": 1},
{"label": "1,3", "matrix": [1, 3], "x": 5, "y": 1},
{"label": "1,4", "matrix": [1, 4], "x": 6, "y": 1},
{"label": "1,5", "matrix": [1, 5], "x": 7, "y": 1},
{"label": "1,6", "matrix": [1, 6], "x": 8, "y": 1},
{"label": "1,7", "matrix": [1, 7], "x": 9, "y": 1},
{"label": "1,8", "matrix": [1, 8], "x": 10, "y": 1},
{"label": "1,9", "matrix": [1, 9], "x": 11, "y": 1},
{"label": "1,10", "matrix": [1, 10], "x": 12, "y": 1},
{"label": "1,11", "matrix": [1, 11], "x": 13, "y": 1},
{"label": "1,12", "matrix": [1, 12], "x": 14, "y": 1},
{"label": "1,13", "matrix": [1, 13], "x": 15, "y": 1},
{"label": "1,14", "matrix": [1, 14], "x": 16, "y": 1, "w": 1.5},
{"label": "2,0", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
{"label": "2,2", "matrix": [2, 2], "x": 4.25, "y": 2},
{"label": "2,3", "matrix": [2, 3], "x": 5.25, "y": 2},
{"label": "2,4", "matrix": [2, 4], "x": 6.25, "y": 2},
{"label": "2,5", "matrix": [2, 5], "x": 7.25, "y": 2},
{"label": "2,6", "matrix": [2, 6], "x": 8.25, "y": 2},
{"label": "2,7", "matrix": [2, 7], "x": 9.25, "y": 2},
{"label": "2,8", "matrix": [2, 8], "x": 10.25, "y": 2},
{"label": "2,9", "matrix": [2, 9], "x": 11.25, "y": 2},
{"label": "2,10", "matrix": [2, 10], "x": 12.25, "y": 2},
{"label": "2,11", "matrix": [2, 11], "x": 13.25, "y": 2},
{"label": "2,12", "matrix": [2, 12], "x": 14.25, "y": 2},
{"label": "Enter", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25},
{"label": "3,0", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 2.25},
{"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3},
{"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3},
{"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3},
{"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3},
{"label": "3,6", "matrix": [3, 6], "x": 8.75, "y": 3},
{"label": "3,7", "matrix": [3, 7], "x": 9.75, "y": 3},
{"label": "3,8", "matrix": [3, 8], "x": 10.75, "y": 3},
{"label": "3,9", "matrix": [3, 9], "x": 11.75, "y": 3},
{"label": "3,10", "matrix": [3, 10], "x": 12.75, "y": 3},
{"label": "3,11", "matrix": [3, 11], "x": 13.75, "y": 3},
{"label": "3,13", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.75},
{"label": "4,0", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25},
{"label": "4,1", "matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25},
{"label": "4,3", "matrix": [4, 3], "x": 5, "y": 4, "w": 1.25},
{"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4, "w": 6.25},
{"label": "4,10", "matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
{"label": "4,11", "matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
{"label": "4,13", "matrix": [4, 13], "x": 15, "y": 4, "w": 1.25},
{"label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4, "w": 1.25}
{"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
{"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
{"label": "0,14", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
{"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "1,2", "matrix": [1, 2], "x": 1.5, "y": 1},
{"label": "1,3", "matrix": [1, 3], "x": 2.5, "y": 1},
{"label": "1,4", "matrix": [1, 4], "x": 3.5, "y": 1},
{"label": "1,5", "matrix": [1, 5], "x": 4.5, "y": 1},
{"label": "1,6", "matrix": [1, 6], "x": 5.5, "y": 1},
{"label": "1,7", "matrix": [1, 7], "x": 6.5, "y": 1},
{"label": "1,8", "matrix": [1, 8], "x": 7.5, "y": 1},
{"label": "1,9", "matrix": [1, 9], "x": 8.5, "y": 1},
{"label": "1,10", "matrix": [1, 10], "x": 9.5, "y": 1},
{"label": "1,11", "matrix": [1, 11], "x": 10.5, "y": 1},
{"label": "1,12", "matrix": [1, 12], "x": 11.5, "y": 1},
{"label": "1,13", "matrix": [1, 13], "x": 12.5, "y": 1},
{"label": "1,14", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
{"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "2,2", "matrix": [2, 2], "x": 1.75, "y": 2},
{"label": "2,3", "matrix": [2, 3], "x": 2.75, "y": 2},
{"label": "2,4", "matrix": [2, 4], "x": 3.75, "y": 2},
{"label": "2,5", "matrix": [2, 5], "x": 4.75, "y": 2},
{"label": "2,6", "matrix": [2, 6], "x": 5.75, "y": 2},
{"label": "2,7", "matrix": [2, 7], "x": 6.75, "y": 2},
{"label": "2,8", "matrix": [2, 8], "x": 7.75, "y": 2},
{"label": "2,9", "matrix": [2, 9], "x": 8.75, "y": 2},
{"label": "2,10", "matrix": [2, 10], "x": 9.75, "y": 2},
{"label": "2,11", "matrix": [2, 11], "x": 10.75, "y": 2},
{"label": "2,12", "matrix": [2, 12], "x": 11.75, "y": 2},
{"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
{"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3},
{"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3},
{"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3},
{"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3},
{"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3},
{"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3},
{"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3},
{"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3},
{"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3},
{"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3},
{"label": "3,13", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
{"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"label": "4,3", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
{"label": "4,6", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
{"label": "4,10", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
{"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
{"label": "4,13", "matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
{"label": "4,14", "matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_60_iso": {
"layout": [
{"label": "0,0", "matrix": [0, 0], "x": 2.5, "y": 0},
{"label": "0,1", "matrix": [0, 1], "x": 3.5, "y": 0},
{"label": "0,2", "matrix": [0, 2], "x": 4.5, "y": 0},
{"label": "0,3", "matrix": [0, 3], "x": 5.5, "y": 0},
{"label": "0,4", "matrix": [0, 4], "x": 6.5, "y": 0},
{"label": "0,5", "matrix": [0, 5], "x": 7.5, "y": 0},
{"label": "0,6", "matrix": [0, 6], "x": 8.5, "y": 0},
{"label": "0,7", "matrix": [0, 7], "x": 9.5, "y": 0},
{"label": "0,8", "matrix": [0, 8], "x": 10.5, "y": 0},
{"label": "0,9", "matrix": [0, 9], "x": 11.5, "y": 0},
{"label": "0,10", "matrix": [0, 10], "x": 12.5, "y": 0},
{"label": "0,11", "matrix": [0, 11], "x": 13.5, "y": 0},
{"label": "0,12", "matrix": [0, 12], "x": 14.5, "y": 0},
{"label": "0,14", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2},
{"label": "1,0", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
{"label": "1,2", "matrix": [1, 2], "x": 4, "y": 1},
{"label": "1,3", "matrix": [1, 3], "x": 5, "y": 1},
{"label": "1,4", "matrix": [1, 4], "x": 6, "y": 1},
{"label": "1,5", "matrix": [1, 5], "x": 7, "y": 1},
{"label": "1,6", "matrix": [1, 6], "x": 8, "y": 1},
{"label": "1,7", "matrix": [1, 7], "x": 9, "y": 1},
{"label": "1,8", "matrix": [1, 8], "x": 10, "y": 1},
{"label": "1,9", "matrix": [1, 9], "x": 11, "y": 1},
{"label": "1,10", "matrix": [1, 10], "x": 12, "y": 1},
{"label": "1,11", "matrix": [1, 11], "x": 13, "y": 1},
{"label": "1,12", "matrix": [1, 12], "x": 14, "y": 1},
{"label": "1,13", "matrix": [1, 13], "x": 15, "y": 1},
{"label": "2,0", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
{"label": "2,2", "matrix": [2, 2], "x": 4.25, "y": 2},
{"label": "2,3", "matrix": [2, 3], "x": 5.25, "y": 2},
{"label": "2,4", "matrix": [2, 4], "x": 6.25, "y": 2},
{"label": "2,5", "matrix": [2, 5], "x": 7.25, "y": 2},
{"label": "2,6", "matrix": [2, 6], "x": 8.25, "y": 2},
{"label": "2,7", "matrix": [2, 7], "x": 9.25, "y": 2},
{"label": "2,8", "matrix": [2, 8], "x": 10.25, "y": 2},
{"label": "2,9", "matrix": [2, 9], "x": 11.25, "y": 2},
{"label": "2,10", "matrix": [2, 10], "x": 12.25, "y": 2},
{"label": "2,11", "matrix": [2, 11], "x": 13.25, "y": 2},
{"label": "2,12", "matrix": [2, 12], "x": 14.25, "y": 2},
{"label": "2,13", "matrix": [2, 13], "x": 15.25, "y": 2},
{"label": "Enter", "matrix": [2, 14], "x": 16.25, "y": 1, "w": 1.25, "h": 2},
{"label": "3,0", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 1.25},
{"label": "3,1", "matrix": [3, 1], "x": 3.75, "y": 3},
{"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3},
{"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3},
{"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3},
{"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3},
{"label": "3,6", "matrix": [3, 6], "x": 8.75, "y": 3},
{"label": "3,7", "matrix": [3, 7], "x": 9.75, "y": 3},
{"label": "3,8", "matrix": [3, 8], "x": 10.75, "y": 3},
{"label": "3,9", "matrix": [3, 9], "x": 11.75, "y": 3},
{"label": "3,10", "matrix": [3, 10], "x": 12.75, "y": 3},
{"label": "3,11", "matrix": [3, 11], "x": 13.75, "y": 3},
{"label": "3,13", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.75},
{"label": "4,0", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25},
{"label": "4,1", "matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25},
{"label": "4,3", "matrix": [4, 3], "x": 5, "y": 4, "w": 1.25},
{"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4, "w": 6.25},
{"label": "4,10", "matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
{"label": "4,11", "matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
{"label": "4,13", "matrix": [4, 13], "x": 15, "y": 4, "w": 1.25},
{"label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4, "w": 1.25}
{"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
{"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
{"label": "0,14", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
{"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "1,2", "matrix": [1, 2], "x": 1.5, "y": 1},
{"label": "1,3", "matrix": [1, 3], "x": 2.5, "y": 1},
{"label": "1,4", "matrix": [1, 4], "x": 3.5, "y": 1},
{"label": "1,5", "matrix": [1, 5], "x": 4.5, "y": 1},
{"label": "1,6", "matrix": [1, 6], "x": 5.5, "y": 1},
{"label": "1,7", "matrix": [1, 7], "x": 6.5, "y": 1},
{"label": "1,8", "matrix": [1, 8], "x": 7.5, "y": 1},
{"label": "1,9", "matrix": [1, 9], "x": 8.5, "y": 1},
{"label": "1,10", "matrix": [1, 10], "x": 9.5, "y": 1},
{"label": "1,11", "matrix": [1, 11], "x": 10.5, "y": 1},
{"label": "1,12", "matrix": [1, 12], "x": 11.5, "y": 1},
{"label": "1,13", "matrix": [1, 13], "x": 12.5, "y": 1},
{"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "2,2", "matrix": [2, 2], "x": 1.75, "y": 2},
{"label": "2,3", "matrix": [2, 3], "x": 2.75, "y": 2},
{"label": "2,4", "matrix": [2, 4], "x": 3.75, "y": 2},
{"label": "2,5", "matrix": [2, 5], "x": 4.75, "y": 2},
{"label": "2,6", "matrix": [2, 6], "x": 5.75, "y": 2},
{"label": "2,7", "matrix": [2, 7], "x": 6.75, "y": 2},
{"label": "2,8", "matrix": [2, 8], "x": 7.75, "y": 2},
{"label": "2,9", "matrix": [2, 9], "x": 8.75, "y": 2},
{"label": "2,10", "matrix": [2, 10], "x": 9.75, "y": 2},
{"label": "2,11", "matrix": [2, 11], "x": 10.75, "y": 2},
{"label": "2,12", "matrix": [2, 12], "x": 11.75, "y": 2},
{"label": "2,13", "matrix": [2, 13], "x": 12.75, "y": 2},
{"label": "Enter", "matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
{"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3},
{"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3},
{"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3},
{"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3},
{"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3},
{"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3},
{"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3},
{"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3},
{"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3},
{"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3},
{"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3},
{"label": "3,13", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
{"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"label": "4,3", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
{"label": "4,6", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
{"label": "4,10", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
{"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
{"label": "4,13", "matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
{"label": "4,14", "matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
]
},
"LAYOUT_all": {
"layout": [
{"label": "0,0", "matrix": [0, 0], "x": 2.5, "y": 0},
{"label": "0,1", "matrix": [0, 1], "x": 3.5, "y": 0},
{"label": "0,2", "matrix": [0, 2], "x": 4.5, "y": 0},
{"label": "0,3", "matrix": [0, 3], "x": 5.5, "y": 0},
{"label": "0,4", "matrix": [0, 4], "x": 6.5, "y": 0},
{"label": "0,5", "matrix": [0, 5], "x": 7.5, "y": 0},
{"label": "0,6", "matrix": [0, 6], "x": 8.5, "y": 0},
{"label": "0,7", "matrix": [0, 7], "x": 9.5, "y": 0},
{"label": "0,8", "matrix": [0, 8], "x": 10.5, "y": 0},
{"label": "0,9", "matrix": [0, 9], "x": 11.5, "y": 0},
{"label": "0,10", "matrix": [0, 10], "x": 12.5, "y": 0},
{"label": "0,11", "matrix": [0, 11], "x": 13.5, "y": 0},
{"label": "0,12", "matrix": [0, 12], "x": 14.5, "y": 0},
{"label": "0,14", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2},
{"label": "1,0", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
{"label": "1,2", "matrix": [1, 2], "x": 4, "y": 1},
{"label": "1,3", "matrix": [1, 3], "x": 5, "y": 1},
{"label": "1,4", "matrix": [1, 4], "x": 6, "y": 1},
{"label": "1,5", "matrix": [1, 5], "x": 7, "y": 1},
{"label": "1,6", "matrix": [1, 6], "x": 8, "y": 1},
{"label": "1,7", "matrix": [1, 7], "x": 9, "y": 1},
{"label": "1,8", "matrix": [1, 8], "x": 10, "y": 1},
{"label": "1,9", "matrix": [1, 9], "x": 11, "y": 1},
{"label": "1,10", "matrix": [1, 10], "x": 12, "y": 1},
{"label": "1,11", "matrix": [1, 11], "x": 13, "y": 1},
{"label": "1,12", "matrix": [1, 12], "x": 14, "y": 1},
{"label": "1,13", "matrix": [1, 13], "x": 15, "y": 1},
{"label": "1,14", "matrix": [1, 14], "x": 16, "y": 1, "w": 1.5},
{"label": "2,0", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
{"label": "2,2", "matrix": [2, 2], "x": 4.25, "y": 2},
{"label": "2,3", "matrix": [2, 3], "x": 5.25, "y": 2},
{"label": "2,4", "matrix": [2, 4], "x": 6.25, "y": 2},
{"label": "2,5", "matrix": [2, 5], "x": 7.25, "y": 2},
{"label": "2,6", "matrix": [2, 6], "x": 8.25, "y": 2},
{"label": "2,7", "matrix": [2, 7], "x": 9.25, "y": 2},
{"label": "2,8", "matrix": [2, 8], "x": 10.25, "y": 2},
{"label": "2,9", "matrix": [2, 9], "x": 11.25, "y": 2},
{"label": "2,10", "matrix": [2, 10], "x": 12.25, "y": 2},
{"label": "2,11", "matrix": [2, 11], "x": 13.25, "y": 2},
{"label": "2,12", "matrix": [2, 12], "x": 14.25, "y": 2},
{"label": "2,13", "matrix": [2, 13], "x": 15.25, "y": 2},
{"label": "Enter", "matrix": [2, 14], "x": 16.25, "y": 2, "w": 1.25},
{"label": "3,0", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 1.25},
{"label": "3,1", "matrix": [3, 1], "x": 3.75, "y": 3},
{"label": "3,2", "matrix": [3, 2], "x": 4.75, "y": 3},
{"label": "3,3", "matrix": [3, 3], "x": 5.75, "y": 3},
{"label": "3,4", "matrix": [3, 4], "x": 6.75, "y": 3},
{"label": "3,5", "matrix": [3, 5], "x": 7.75, "y": 3},
{"label": "3,6", "matrix": [3, 6], "x": 8.75, "y": 3},
{"label": "3,7", "matrix": [3, 7], "x": 9.75, "y": 3},
{"label": "3,8", "matrix": [3, 8], "x": 10.75, "y": 3},
{"label": "3,9", "matrix": [3, 9], "x": 11.75, "y": 3},
{"label": "3,10", "matrix": [3, 10], "x": 12.75, "y": 3},
{"label": "3,11", "matrix": [3, 11], "x": 13.75, "y": 3},
{"label": "3,13", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.75},
{"label": "4,0", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25},
{"label": "4,1", "matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25},
{"label": "4,3", "matrix": [4, 3], "x": 5, "y": 4, "w": 1.25},
{"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4, "w": 6.25},
{"label": "4,10", "matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
{"label": "4,11", "matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
{"label": "4,13", "matrix": [4, 13], "x": 15, "y": 4, "w": 1.25},
{"label": "4,14", "matrix": [4, 14], "x": 16.25, "y": 4, "w": 1.25}
{"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
{"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
{"label": "0,14", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
{"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "1,2", "matrix": [1, 2], "x": 1.5, "y": 1},
{"label": "1,3", "matrix": [1, 3], "x": 2.5, "y": 1},
{"label": "1,4", "matrix": [1, 4], "x": 3.5, "y": 1},
{"label": "1,5", "matrix": [1, 5], "x": 4.5, "y": 1},
{"label": "1,6", "matrix": [1, 6], "x": 5.5, "y": 1},
{"label": "1,7", "matrix": [1, 7], "x": 6.5, "y": 1},
{"label": "1,8", "matrix": [1, 8], "x": 7.5, "y": 1},
{"label": "1,9", "matrix": [1, 9], "x": 8.5, "y": 1},
{"label": "1,10", "matrix": [1, 10], "x": 9.5, "y": 1},
{"label": "1,11", "matrix": [1, 11], "x": 10.5, "y": 1},
{"label": "1,12", "matrix": [1, 12], "x": 11.5, "y": 1},
{"label": "1,13", "matrix": [1, 13], "x": 12.5, "y": 1},
{"label": "1,14", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
{"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "2,2", "matrix": [2, 2], "x": 1.75, "y": 2},
{"label": "2,3", "matrix": [2, 3], "x": 2.75, "y": 2},
{"label": "2,4", "matrix": [2, 4], "x": 3.75, "y": 2},
{"label": "2,5", "matrix": [2, 5], "x": 4.75, "y": 2},
{"label": "2,6", "matrix": [2, 6], "x": 5.75, "y": 2},
{"label": "2,7", "matrix": [2, 7], "x": 6.75, "y": 2},
{"label": "2,8", "matrix": [2, 8], "x": 7.75, "y": 2},
{"label": "2,9", "matrix": [2, 9], "x": 8.75, "y": 2},
{"label": "2,10", "matrix": [2, 10], "x": 9.75, "y": 2},
{"label": "2,11", "matrix": [2, 11], "x": 10.75, "y": 2},
{"label": "2,12", "matrix": [2, 12], "x": 11.75, "y": 2},
{"label": "2,13", "matrix": [2, 13], "x": 12.75, "y": 2},
{"label": "Enter", "matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
{"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3},
{"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3},
{"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3},
{"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3},
{"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3},
{"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3},
{"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3},
{"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3},
{"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3},
{"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3},
{"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3},
{"label": "3,13", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
{"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"label": "4,3", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
{"label": "4,6", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
{"label": "4,10", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
{"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
{"label": "4,13", "matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
{"label": "4,14", "matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
]
}
}

View File

@ -20,7 +20,6 @@
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

View File

@ -40,8 +40,5 @@
#define ENABLE_RGB_MATRIX_PIXEL_FLOW
#define RGB_MATRIX_LED_FLUSH_LIMIT 16
#define RGB_MATRIX_DEFAULT_HUE 0
#define RGB_MATRIX_DEFAULT_SAT 255
#define RGB_MATRIX_DEFAULT_SPD 191
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON

View File

@ -30,8 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_DEFAULT_SPD 127
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:

View File

@ -23,7 +23,6 @@
/* RGB Matrix config */
#define RGB_MATRIX_LED_COUNT 100
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_KEYPRESSES
/* RGB Matrix effect */

View File

@ -19,7 +19,6 @@
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 86
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

View File

@ -43,7 +43,6 @@
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 24
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
/* RGB Matrix effect */
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN

View File

@ -18,6 +18,5 @@
/* RGB Matrix config */
#define RGB_MATRIX_LED_COUNT 67
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

View File

@ -45,7 +45,6 @@
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_LED_COUNT 32
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_KEYPRESSES

View File

@ -55,7 +55,6 @@
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_LED_COUNT 96
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

View File

@ -61,7 +61,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_LED_COUNT 68
# define RGB_MATRIX_SPLIT { 34, 34 }
# define RGB_DISABLE_WHEN_USB_SUSPENDED

View File

@ -61,7 +61,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//# define ENABLE_RGB_MATRIX_SOLID_SPLASH
//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_LED_COUNT 68
# define RGB_MATRIX_SPLIT { 34, 34 }
# define RGB_DISABLE_WHEN_USB_SUSPENDED

View File

@ -16,7 +16,6 @@
#define I2C1_SCL_PIN GP11
// RGB Matrix
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_LED_COUNT 68
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

View File

@ -16,7 +16,6 @@
#define I2C0_SCL_PIN GP5
// RGB Matrix
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_LED_COUNT 72
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

View File

@ -67,7 +67,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_LED_COUNT 113
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

View File

@ -64,7 +64,6 @@
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_LED_COUNT 117
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

View File

@ -36,7 +36,6 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT_full_wtf": {
"layout": [

View File

@ -27,10 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
#define RGB_MATRIX_DEFAULT_HUE 0 // Sets the default hue value, if none has been set
#define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
#define RGB_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set
// #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature)
#define ENABLE_RGB_MATRIX_ALPHAS_MODS

View File

@ -19,7 +19,6 @@
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 3
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_KEYPRESSES
/* RGB Matrix effect */

View File

@ -20,7 +20,6 @@
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 75
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

View File

@ -20,7 +20,6 @@
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 76
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

View File

@ -18,7 +18,6 @@
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
#define RGB_MATRIX_LED_PROCESS_LIMIT 20
#define RGB_MATRIX_LED_FLUSH_LIMIT 26

View File

@ -17,4 +17,3 @@
#pragma once
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS

View File

@ -19,7 +19,6 @@
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 83
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_KEYPRESSES
/* RGB Matrix effect */

View File

@ -17,7 +17,6 @@
#pragma once
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_LED_COUNT 97
#define RGB_MATRIX_KEYPRESSES

View File

@ -17,7 +17,6 @@
#pragma once
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_LED_COUNT 21
#define ENABLE_RGB_MATRIX_ALPHAS_MODS

View File

@ -22,6 +22,3 @@
#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS

View File

@ -18,7 +18,6 @@
#ifdef RGB_MATRIX_ENABLE
/* RGB Matrix config */
#define RGB_MATRIX_LED_COUNT 84
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#endif

View File

@ -28,10 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
#define RGB_MATRIX_DEFAULT_HUE 0
#define RGB_MATRIX_DEFAULT_SAT 255
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_DEFAULT_SPD 127
#define RGB_DISABLE_WHEN_USB_SUSPENDED
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:

View File

@ -19,7 +19,6 @@
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
#define RGB_MATRIX_LED_PROCESS_LIMIT 20
#define RGB_MATRIX_LED_FLUSH_LIMIT 26

View File

@ -20,7 +20,7 @@
#define CAPS_COLOR_B 0xFF
void keyboard_post_init_kb(void) {
rgblight_set_effect_range(0,29);
rgblight_set_effect_range(1,29);
keyboard_post_init_user();
}

View File

@ -24,10 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
#define RGB_MATRIX_DEFAULT_HUE 108 // Sets the default hue value, if none has been set
#define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
#define RGB_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:

View File

@ -27,9 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// # 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 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
// HSV_TEAL
// #define RGB_MATRIX_DEFAULT_HUE 128
// #define RGB_MATRIX_DEFAULT_SAT 255
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#endif
#define RGBLIGHT_LAYERS