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

This commit is contained in:
QMK Bot
2023-09-13 12:45:53 +00:00
58 changed files with 328 additions and 277 deletions
@@ -3,6 +3,9 @@
"usb": {
"device_version": "1.0.0"
},
"eeprom": {
"driver": "spi"
},
"rgb_matrix": {
"driver": "ws2812"
},
@@ -23,5 +23,4 @@ POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
KEYBOARD_SHARED_EP = yes
EEPROM_DRIVER = spi
SERIAL_DRIVER = usart
@@ -3,6 +3,9 @@
"usb": {
"device_version": "1.0.0"
},
"eeprom": {
"driver": "spi"
},
"rgb_matrix": {
"driver": "ws2812"
},
@@ -23,5 +23,4 @@ POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
KEYBOARD_SHARED_EP = yes
EEPROM_DRIVER = spi
SERIAL_DRIVER = usart
@@ -3,6 +3,9 @@
"usb": {
"device_version": "1.0.0"
},
"eeprom": {
"driver": "spi"
},
"rgb_matrix": {
"driver": "ws2812"
},
@@ -23,5 +23,4 @@ POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
KEYBOARD_SHARED_EP = yes
EEPROM_DRIVER = spi
SERIAL_DRIVER = usart
@@ -3,6 +3,9 @@
"usb": {
"device_version": "1.0.0"
},
"eeprom": {
"driver": "spi"
},
"rgb_matrix": {
"driver": "ws2812"
},
@@ -21,5 +21,4 @@ SPLIT_KEYBOARD = yes
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
KEYBOARD_SHARED_EP = yes
EEPROM_DRIVER = spi
SERIAL_DRIVER = usart
@@ -3,6 +3,9 @@
"usb": {
"device_version": "1.0.0"
},
"eeprom": {
"driver": "spi"
},
"rgb_matrix": {
"driver": "ws2812"
},
@@ -21,5 +21,4 @@ SPLIT_KEYBOARD = yes
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
KEYBOARD_SHARED_EP = yes
EEPROM_DRIVER = spi
SERIAL_DRIVER = usart
@@ -3,6 +3,9 @@
"usb": {
"device_version": "1.0.0"
},
"eeprom": {
"driver": "spi"
},
"rgb_matrix": {
"driver": "ws2812"
},
@@ -21,5 +21,4 @@ SPLIT_KEYBOARD = yes
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
KEYBOARD_SHARED_EP = yes
EEPROM_DRIVER = spi
SERIAL_DRIVER = usart
+3
View File
@@ -4,6 +4,9 @@
"maintainer": "customMK",
"bootloader": "stm32-dfu",
"diode_direction": "ROW2COL",
"eeprom": {
"driver": "spi"
},
"features": {
"bootmagic": true,
"command": false,
-2
View File
@@ -1,3 +1 @@
EEPROM_DRIVER = spi
AUDIO_DRIVER = pwm_hardware
+3
View File
@@ -24,6 +24,9 @@
"device_version": "1.0.0"
},
"diode_direction": "ROW2COL",
"eeprom": {
"driver": "spi"
},
"processor": "STM32F411",
"bootloader": "stm32-dfu",
"rgblight": {
-2
View File
@@ -3,8 +3,6 @@ AUDIO_DRIVER = pwm_hardware
# project specific files
SRC += matrix.c
EEPROM_DRIVER = spi
QUANTUM_PAINTER_DRIVERS = st7735_spi
CUSTOM_MATRIX = lite
+1 -1
View File
@@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE
const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
const aw20216s_led g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
+1 -1
View File
@@ -12,7 +12,7 @@
"tap_keycode_delay": 10
},
"rgb_matrix": {
"driver": "aw20216"
"driver": "aw20216s"
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+5 -5
View File
@@ -29,12 +29,12 @@
#define SPI_MOSI_PIN B15
#define SPI_MISO_PIN B14
#define DRIVER_1_CS A15
#define DRIVER_2_CS B9
#define DRIVER_1_EN C13
#define DRIVER_2_EN C13
#define AW20216S_DRIVER_1_CS A15
#define AW20216S_DRIVER_2_CS B9
#define AW20216S_DRIVER_1_EN C13
#define AW20216S_DRIVER_2_EN C13
#define DRIVER_COUNT 2
#define AW20216S_DRIVER_COUNT 2
#define DRIVER_1_LED_TOTAL 54
#define DRIVER_2_LED_TOTAL 34
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+1 -1
View File
@@ -12,7 +12,7 @@
"tap_keycode_delay": 10
},
"rgb_matrix": {
"driver": "aw20216"
"driver": "aw20216s"
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+1 -1
View File
@@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE
const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
const aw20216s_led g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
+1 -1
View File
@@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE
const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
const aw20216s_led g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
+1 -1
View File
@@ -12,7 +12,7 @@
"tap_keycode_delay": 10
},
"rgb_matrix": {
"driver": "aw20216"
"driver": "aw20216s"
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+5 -5
View File
@@ -33,12 +33,12 @@
#define SPI_MOSI_PIN A7
#define SPI_MISO_PIN A6
#define DRIVER_1_CS A15
#define DRIVER_2_CS B15
#define DRIVER_1_EN C13
#define DRIVER_2_EN C13
#define AW20216S_DRIVER_1_CS A15
#define AW20216S_DRIVER_2_CS B15
#define AW20216S_DRIVER_1_EN C13
#define AW20216S_DRIVER_2_EN C13
#define DRIVER_COUNT 2
#define AW20216S_DRIVER_COUNT 2
#define DRIVER_1_LED_TOTAL 66
#define DRIVER_2_LED_TOTAL 54
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+1 -1
View File
@@ -12,7 +12,7 @@
"tap_keycode_delay": 10
},
"rgb_matrix": {
"driver": "aw20216"
"driver": "aw20216s"
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+1 -1
View File
@@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE
const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
const aw20216s_led g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
+4 -4
View File
@@ -28,11 +28,11 @@
#define SPI_MOSI_PIN B5
#define SPI_MISO_PIN B4
#define DRIVER_1_CS B12
#define DRIVER_1_EN A15
#define DRIVER_1_PW_EN B13
#define AW20216S_DRIVER_1_CS B12
#define AW20216S_DRIVER_1_EN A15
#define AW20216S_DRIVER_1_PW_EN B13
#define DRIVER_COUNT 1
#define AW20216S_DRIVER_COUNT 1
#define RGB_MATRIX_LED_COUNT 31
+1 -1
View File
@@ -20,7 +20,7 @@
]
},
"rgb_matrix": {
"driver": "aw20216"
"driver": "aw20216s"
},
"processor": "WB32F3G71",
"bootloader": "wb32-dfu",
+6 -6
View File
@@ -19,10 +19,10 @@
#ifdef RGB_MATRIX_ENABLE
const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
/* Each AW20216 channel is controlled by a register at some offset between 0x00
const aw20216s_led g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
/* Each AW20216S channel is controlled by a register at some offset between 0x00
* and 0xD7 inclusive.
* See drivers/awinic/aw20216.h for the mapping between register offsets and
* See drivers/led/aw20216s.h for the mapping between register offsets and
* driver pin locations.
* driver
* | R location
@@ -110,12 +110,12 @@ led_config_t g_led_config = {{
2, 2, 2, 2, 2, 2, 2
} };
# ifdef DRIVER_1_PW_EN
# ifdef AW20216S_DRIVER_1_PW_EN
void keyboard_pre_init_user(void) {
wait_ms(2000);
setPinOutput(DRIVER_1_PW_EN);
writePinHigh(DRIVER_1_PW_EN);
setPinOutput(AW20216S_DRIVER_1_PW_EN);
writePinHigh(AW20216S_DRIVER_1_PW_EN);
}
# endif
+5 -5
View File
@@ -26,12 +26,12 @@
#define SPI_MOSI_PIN A6
#define SPI_MISO_PIN A7
#define DRIVER_1_CS B13
#define DRIVER_2_CS B14
#define DRIVER_1_EN C13
#define DRIVER_2_EN C13
#define AW20216S_DRIVER_1_CS B13
#define AW20216S_DRIVER_2_CS B14
#define AW20216S_DRIVER_1_EN C13
#define AW20216S_DRIVER_2_EN C13
#define DRIVER_COUNT 2
#define AW20216S_DRIVER_COUNT 2
#define RGB_DISABLE_WHEN_USB_SUSPENDED
+1 -1
View File
@@ -136,7 +136,7 @@ led_config_t g_led_config = {{
4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
}};
const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
const aw20216s_led g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
{0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, ESC, k13
{0, CS4_SW1, CS5_SW1, CS6_SW1}, // 1, ~, k16
{0, CS7_SW1, CS8_SW1, CS9_SW1}, // 2, Tab, k11
+1 -1
View File
@@ -9,7 +9,7 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
"driver": "aw20216"
"driver": "aw20216s"
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
@@ -136,7 +136,7 @@ led_config_t PROGMEM g_led_config = {{
4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
}};
const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
const aw20216s_led g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
{0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, ESC, k13
{0, CS4_SW1, CS5_SW1, CS6_SW1}, // 1, ~, k16
{0, CS7_SW1, CS8_SW1, CS9_SW1}, // 2, Tab, k11
+1 -1
View File
@@ -9,7 +9,7 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
"driver": "aw20216"
"driver": "aw20216s"
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+1 -1
View File
@@ -137,7 +137,7 @@ led_config_t g_led_config = {{
2, 4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
}};
const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
const aw20216s_led g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
{0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, ESC, k13
{0, CS4_SW1, CS5_SW1, CS6_SW1}, // 1, ~, k16
{0, CS7_SW1, CS8_SW1, CS9_SW1}, // 2, Tab, k11
+1 -1
View File
@@ -136,7 +136,7 @@ led_config_t g_led_config = {{
4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
}};
const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
const aw20216s_led g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
{0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, ESC, k13
{0, CS4_SW1, CS5_SW1, CS6_SW1}, // 1, ~, k16
{0, CS7_SW1, CS8_SW1, CS9_SW1}, // 2, Tab, k11
+1 -1
View File
@@ -9,7 +9,7 @@
"device_version": "0.0.2"
},
"rgb_matrix": {
"driver": "aw20216"
"driver": "aw20216s"
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+1 -1
View File
@@ -9,7 +9,7 @@
"device_version": "0.0.2"
},
"rgb_matrix": {
"driver": "aw20216"
"driver": "aw20216s"
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+1 -1
View File
@@ -137,7 +137,7 @@ led_config_t g_led_config = {{
2, 4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
}};
const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
const aw20216s_led g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
{0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, ESC, k13
{0, CS4_SW1, CS5_SW1, CS6_SW1}, // 1, ~, k16
{0, CS7_SW1, CS8_SW1, CS9_SW1}, // 2, Tab, k11
@@ -5,6 +5,9 @@
"rows": ["B10", "B11", "B12", "A14", "A13", "A15"]
},
"diode_direction": "COL2ROW",
"eeprom": {
"driver": "spi"
},
"rgblight": {
"led_count": 20,
"split_count": [10, 10]
@@ -1,6 +1,5 @@
# KEYBOARD_SHARED_EP = yes
CONSOLE_ENABLE = yes
EEPROM_DRIVER = spi
SERIAL_DRIVER = usart
AUDIO_DRIVER = dac_additive
@@ -5,6 +5,9 @@
"rows": ["B12", "B13", "B14", "B15", "A8", "A10"]
},
"diode_direction": "COL2ROW",
"eeprom": {
"driver": "spi"
},
"rgblight": {
"led_count": 57,
"split_count": [26, 31]
@@ -2,6 +2,5 @@ KEYBOARD_SHARED_EP = yes
CONSOLE_ENABLE = yes
MOUSE_SHARED_EP = yes
EEPROM_DRIVER = spi
SERIAL_DRIVER = usart
AUDIO_DRIVER = pwm_hardware
@@ -33,10 +33,10 @@
#define SPI_MOSI_PIN A7
#define SPI_MISO_PIN A6
#define DRIVER_1_CS A15
#define DRIVER_2_CS B15
#define DRIVER_1_EN C13
#define DRIVER_2_EN C13
#define AW20216S_DRIVER_1_CS A15
#define AW20216S_DRIVER_2_CS B15
#define AW20216S_DRIVER_1_EN C13
#define AW20216S_DRIVER_2_EN C13
#define DRIVER_COUNT 1
#define AW20216S_DRIVER_COUNT 1
#define RGB_MATRIX_LED_COUNT 71
@@ -80,7 +80,7 @@
"solid_multisplash": true
},
"center_point": [76, 25],
"driver": "aw20216",
"driver": "aw20216s",
"layout": [
{ "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
{ "flags": 4, "matrix": [1, 7], "x": 10, "y": 0 },
@@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE
const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
const aw20216s_led g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
+3
View File
@@ -9,6 +9,9 @@
"build": {
"lto": true
},
"eeprom": {
"driver": "spi"
},
"features": {
"audio": true,
"backlight": true,
-2
View File
@@ -4,8 +4,6 @@ SERIAL_DRIVER = usart
CIE1931_CURVE = yes
EEPROM_DRIVER = spi
AUDIO_DRIVER = pwm_software
QUANTUM_PAINTER_DRIVERS = ili9341_spi
+3
View File
@@ -5,6 +5,9 @@
"build": {
"lto": true
},
"eeprom": {
"driver": "spi"
},
"features": {
"bootmagic": true,
"console": true,
-1
View File
@@ -1,5 +1,4 @@
CUSTOM_MATRIX = lite
EEPROM_DRIVER = spi
QUANTUM_PAINTER_DRIVERS = ssd1351_spi
DEFAULT_FOLDER = tzarc/ghoul/rev1/stm32