Move miscellaneous defines to data driven (#21382)

master
Ryan 2023-07-03 07:40:13 +10:00 committed by GitHub
parent 9ab16e62f7
commit 023035f462
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
69 changed files with 103 additions and 236 deletions

View File

@ -1,20 +0,0 @@
/* Copyright 2020 Steven Nguyen
*
* 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 LEADER_TIMEOUT 250
#define LEADER_PER_KEY_TIMING 150

View File

@ -21,6 +21,10 @@
"qmk": { "qmk": {
"tap_keycode_delay": 16 "tap_keycode_delay": 16
}, },
"leader_key": {
"timeout": 250,
"timing": true
},
"processor": "atmega328p", "processor": "atmega328p",
"bootloader": "usbasploader", "bootloader": "usbasploader",
"layouts": { "layouts": {

View File

@ -26,7 +26,6 @@ void keyboard_post_init_kb(void){
palSetLineMode(BACKLIGHT_PIN, PAL_MODE_ALTERNATE(BACKLIGHT_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_OSPEED_HIGHEST | PAL_STM32_PUPDR_FLOATING); palSetLineMode(BACKLIGHT_PIN, PAL_MODE_ALTERNATE(BACKLIGHT_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_OSPEED_HIGHEST | PAL_STM32_PUPDR_FLOATING);
} }
#define LED_PIN_ON_STATE 1
void led_init_ports(void) { void led_init_ports(void) {
palSetLineMode(LED_CAPS_LOCK_PIN, PAL_MODE_OUTPUT_OPENDRAIN | PAL_STM32_PUPDR_FLOATING); palSetLineMode(LED_CAPS_LOCK_PIN, PAL_MODE_OUTPUT_OPENDRAIN | PAL_STM32_PUPDR_FLOATING);
} }

View File

@ -16,7 +16,6 @@
#include "quantum.h" #include "quantum.h"
#define LED_PIN_ON_STATE 1
// Inits all indicator LEDs as push-pull outputs // Inits all indicator LEDs as push-pull outputs
void led_init_ports(void) { void led_init_ports(void) {
palSetLineMode(LED1_PIN, PAL_MODE_OUTPUT_PUSHPULL); palSetLineMode(LED1_PIN, PAL_MODE_OUTPUT_PUSHPULL);

View File

@ -19,7 +19,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Ensure we jump to bootloader if the RESET keycode was pressed */ /* Ensure we jump to bootloader if the RESET keycode was pressed */
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
/* Indicator LEDs */
#define LED_CAPS_LOCK_PIN B6
#define LED_PIN_ON_STATE 0

View File

@ -8,6 +8,10 @@
"pid": "0x414C", "pid": "0x414C",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"indicators": {
"caps_lock": "B6",
"on_state": 0
},
"matrix_pins": { "matrix_pins": {
"cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"], "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"],
"rows": ["A2", "B9", "B8", "B5", "B4"] "rows": ["A2", "B9", "B8", "B5", "B4"]

View File

@ -1,25 +0,0 @@
/* Copyright 2019 angelbirth
*
* 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"
bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) {
writePin(NUM_LOCK_LED_PIN, !led_state.num_lock);
writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock);
writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock);
}
return true;
}

View File

@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#define NUM_LOCK_LED_PIN E6
#define CAPS_LOCK_LED_PIN F0
#define SCROLL_LOCK_LED_PIN F7
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */

View File

@ -7,6 +7,12 @@
"pid": "0x1800", "pid": "0x1800",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"indicators": {
"caps_lock": "F0",
"num_lock": "E6",
"scroll_lock": "F7",
"on_state": 0
},
"matrix_pins": { "matrix_pins": {
"cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"], "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
"rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"] "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]

View File

@ -1,25 +0,0 @@
/* Copyright 2020 sh_xguitar
*
* 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"
bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) {
writePin(NUM_LOCK_LED_PIN, led_state.num_lock);
writePin(CAPS_LOCK_LED_PIN, led_state.caps_lock);
writePin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock);
}
return true;
}

View File

@ -14,10 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#define NUM_LOCK_LED_PIN E6
#define CAPS_LOCK_LED_PIN F0
#define SCROLL_LOCK_LED_PIN F7
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE

View File

@ -8,6 +8,12 @@
"pid": "0x14BC", "pid": "0x14BC",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"indicators": {
"caps_lock": "F0",
"num_lock": "E6",
"scroll_lock": "F7",
"on_state": 0
},
"matrix_pins": { "matrix_pins": {
"cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"], "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
"rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"] "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]

View File

@ -23,7 +23,6 @@
#define MATRIX_COLS 8 #define MATRIX_COLS 8
// HID Liberation Device uses custom matrix code to accomodate a 74HC238 3 to 8 decoder on pins B1, B2 and B3. // HID Liberation Device uses custom matrix code to accomodate a 74HC238 3 to 8 decoder on pins B1, B2 and B3.
//#define DIODE_DIRECTION
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE

View File

@ -16,8 +16,5 @@
#pragma once #pragma once
#define ENCODERS_PAD_A { GP5 }
#define ENCODERS_PAD_B { GP4 }
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U

View File

@ -9,6 +9,11 @@
"vid": "0xCB3A", "vid": "0xCB3A",
"device_version": "1.1.0" "device_version": "1.1.0"
}, },
"encoder": {
"rotary": [
{"pin_a": "GP5", "pin_b": "GP4"}
]
},
"matrix_pins": { "matrix_pins": {
"direct": [ "direct": [
["GP8", "GP7", "GP6"] ["GP8", "GP7", "GP6"]

View File

@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Cleanup RGB // Cleanup RGB
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_TIMEOUT 300000 // 5 minutes (5 * 60 * 1000ms)
#define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain

View File

@ -6,7 +6,8 @@
"device_version": "0.1.0" "device_version": "0.1.0"
}, },
"rgb_matrix": { "rgb_matrix": {
"driver": "WS2812" "driver": "WS2812",
"timeout": 300000
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["C6", "D7", "E6", "B4", "B5"], "cols": ["C6", "D7", "E6", "B4", "B5"],

View File

@ -1,20 +0,0 @@
/* Copyright 2023 Eason <xiaoxuxk@yeah.net>
*
* 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 LED_CAPS_LOCK_PIN F0
#define LED_PIN_ON_STATE 0

View File

@ -8,6 +8,10 @@
"pid": "0x998F", "pid": "0x998F",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"indicators": {
"caps_lock": "F0",
"on_state": 0
},
"matrix_pins": { "matrix_pins": {
"cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "F7", "F6", "F5", "F4", "B0", "B1", "B2", "B3"], "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "F7", "F6", "F5", "F4", "B0", "B1", "B2", "B3"],
"rows": ["D0", "D1", "D2", "D3", "D5", "D4"] "rows": ["D0", "D1", "D2", "D3", "D5", "D4"]

View File

@ -4,8 +4,6 @@
#pragma once #pragma once
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
# define WS2812_DI_PIN B0
# define RGB_DI_PIN B0
# define RGB_MATRIX_LED_COUNT 82 # define RGB_MATRIX_LED_COUNT 82
/* RGB Matrix effect */ /* RGB Matrix effect */

View File

@ -165,6 +165,9 @@
"pid": "0x3663", "pid": "0x3663",
"vid": "0xECED" "vid": "0xECED"
}, },
"ws2812": {
"pin": "B0"
},
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -23,8 +23,6 @@
/** public parameter **/ /** public parameter **/
/*************************************/ /*************************************/
#define MATRIX_IO_DELAY 15 // default 30
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE

View File

@ -10,7 +10,8 @@
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D4", "C6", "D7", "E6", "B4", "B5"] "rows": ["D4", "C6", "D7", "E6", "B4", "B5"],
"io_delay": 15
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"split": { "split": {

View File

@ -20,8 +20,6 @@
#define MATRIX_ROWS 13 #define MATRIX_ROWS 13
#define MATRIX_COLS 4 #define MATRIX_COLS 4
//#define DIODE_DIRECTION
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */

View File

@ -15,8 +15,6 @@
*/ */
#pragma once #pragma once
#define MATRIX_IO_DELAY 5
#define SELECT_SOFT_SERIAL_SPEED 1 #define SELECT_SOFT_SERIAL_SPEED 1
// Feature diable options // Feature diable options

View File

@ -1,7 +1,8 @@
{ {
"matrix_pins": { "matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7", "E6", "B4"] "rows": ["D4", "C6", "D7", "E6", "B4"],
"io_delay": 5
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"split": { "split": {

View File

@ -21,8 +21,6 @@
#define AUDIO_PIN_ALT A4 #define AUDIO_PIN_ALT A4
#define AUDIO_PIN_ALT_AS_NEGATIVE #define AUDIO_PIN_ALT_AS_NEGATIVE
#define MATRIX_IO_DELAY 5
#define SELECT_SOFT_SERIAL_SPEED 1 #define SELECT_SOFT_SERIAL_SPEED 1
#define SERIAL_USART_DRIVER SD1 #define SERIAL_USART_DRIVER SD1
#define SERIAL_USART_TX_PAL_MODE 7 #define SERIAL_USART_TX_PAL_MODE 7

View File

@ -1,7 +1,8 @@
{ {
"matrix_pins": { "matrix_pins": {
"cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9"], "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9"],
"rows": ["B5", "B4", "B3", "B2", "B1"] "rows": ["B5", "B4", "B3", "B2", "B1"],
"io_delay": 5
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"split": { "split": {

View File

@ -35,9 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { B1, B6, D0, C7, C6, C5 } #define MATRIX_ROW_PINS { B1, B6, D0, C7, C6, C5 }
#define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, B5, B4, B3, B2 } #define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, B5, B4, B3, B2 }
//EITHERWAY is supported through a custom matrix
//#define DIODE_DIRECTION EITHERWAY
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View File

@ -3,10 +3,6 @@
#pragma once #pragma once
/* Change the USB polling rate [default = 1000Hz (1ms)] and
* use larger value of keys per scan for elite games */
#define USB_POLLING_INTERVAL_MS 2 // 500Hz
/* LED Matrix & Animations */ /* LED Matrix & Animations */
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE

View File

@ -30,7 +30,8 @@
"vid": "0x6964", "vid": "0x6964",
"pid": "0x0042", "pid": "0x0042",
"device_version": "1.0.0", "device_version": "1.0.0",
"force_nkro": true "force_nkro": true,
"polling_interval": 2
}, },
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {

View File

@ -21,7 +21,6 @@
#define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_TIMEOUT 90000
#define RGB_MATRIX_LED_PROCESS_LIMIT 4 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
#define RGB_MATRIX_LED_FLUSH_LIMIT 26 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL

View File

@ -10,7 +10,8 @@
"pin": "F0" "pin": "F0"
}, },
"rgb_matrix": { "rgb_matrix": {
"driver": "WS2812" "driver": "WS2812",
"timeout": 90000
}, },
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",

View File

@ -37,10 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 } #define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
#define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 } #define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
/* COL2ROW, ROW2COL*/
// No need to define DIODE_DIRECTION for Jones' custom Round-Robin matrix.
//#define DIODE_DIRECTION COL2ROW
/* Audio */ /* Audio */
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
#define AUDIO_PIN C6 #define AUDIO_PIN C6

View File

@ -37,10 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 } #define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
#define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 } #define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
/* COL2ROW, ROW2COL*/
// No need to define DIODE_DIRECTION for Jones' custom Round-Robin matrix.
//#define DIODE_DIRECTION COL2ROW
/* Audio */ /* Audio */
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
#define AUDIO_PIN C6 #define AUDIO_PIN C6

View File

@ -8,6 +8,11 @@
"pid": "0x4A13", "pid": "0x4A13",
"device_version": "1.0.0" "device_version": "1.0.0"
}, },
"matrix_pins": {
"cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7"],
"rows": ["GP8", "GP9", "GP10", "GP11", "GP12"]
},
"diode_direction": "COL2ROW",
"ws2812": { "ws2812": {
"pin": "GP15", "pin": "GP15",
"driver": "vendor" "driver": "vendor"
@ -15,6 +20,22 @@
"rgb_matrix": { "rgb_matrix": {
"driver": "WS2812" "driver": "WS2812"
}, },
"encoder": {
"rotary": [
{"pin_a": "GP16", "pin_b": "GP17"},
{"pin_a": "GP14", "pin_b": "GP13"}
]
},
"split": {
"encoder": {
"right": {
"rotary": [
{"pin_a": "GP14", "pin_b": "GP13"},
{"pin_a": "GP16", "pin_b": "GP17"}
]
}
}
},
"processor": "RP2040", "processor": "RP2040",
"bootloader": "rp2040", "bootloader": "rp2040",
"layouts": { "layouts": {

View File

@ -3,13 +3,6 @@
#pragma once #pragma once
// Electrical Wiring Stuff
#define MATRIX_ROW_PINS \
{ GP8, GP9, GP10, GP11, GP12 }
#define MATRIX_COL_PINS \
{ GP2, GP3, GP4, GP5, GP6, GP7 }
#define DIODE_DIRECTION COL2ROW
// Split Keyboard Stuff // Split Keyboard Stuff
#define EE_HANDS // Sets the keyboards handedness using EEPROM #define EE_HANDS // Sets the keyboards handedness using EEPROM
#define SERIAL_USART_FULL_DUPLEX // Use full duplex communication (TRRS) #define SERIAL_USART_FULL_DUPLEX // Use full duplex communication (TRRS)
@ -24,19 +17,3 @@
{ 37, 37 } // 37 LEDs on each side { 37, 37 } // 37 LEDs on each side
#endif #endif
/* Rotary Encoders Definition */
// Indexing goes from physical leftmost to rightmost
// 0: left-half left | 1: left-half right | 2: right-half left | 3: right-half right
#ifdef ENCODER_ENABLE
# define ENCODERS_PAD_A \
{ GP16, GP14 }
# define ENCODERS_PAD_B \
{ GP17, GP13 }
# define ENCODERS_PAD_A_RIGHT \
{ GP14, GP16 }
# define ENCODERS_PAD_B_RIGHT \
{ GP13, GP17 }
#endif

View File

@ -56,7 +56,6 @@
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define WS2812_DI_PIN GP18
#define RGB_MATRIX_LED_COUNT 96 #define RGB_MATRIX_LED_COUNT 96
#define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_FRAMEBUFFER_EFFECTS

View File

@ -120,6 +120,9 @@
] ]
} }
}, },
"ws2812": {
"pin": "GP18"
},
"rgb_matrix": { "rgb_matrix": {
"driver": "WS2812", "driver": "WS2812",
"split_count": [48, 48], "split_count": [48, 48],

View File

@ -32,9 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS \ #define MATRIX_COL_PINS \
{ B6, C6, C7, F1, F0, B5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } { B6, C6, C7, F1, F0, B5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
/* COL2ROW, ROW2COL*/
//#define DIODE_DIRECTION
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */

View File

@ -30,9 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { E2, D0, D1, D2, D3, D5 } #define MATRIX_ROW_PINS { E2, D0, D1, D2, D3, D5 }
#define MATRIX_COL_PINS { C7, C6, B6, B5 } #define MATRIX_COL_PINS { C7, C6, B6, B5 }
/* COL2ROW, ROW2COL*/
// #define DIODE_DIRECTION COL2ROW
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */

View File

@ -28,6 +28,3 @@
*/ */
#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
#define MATRIX_COL_PINS { } #define MATRIX_COL_PINS { }
/* COL2ROW, ROW2COL*/
//#define DIODE_DIRECTION

View File

@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
//#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) //#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
//#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_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_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_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255

View File

@ -1,20 +0,0 @@
/* Copyright 2021 TW59420 <https://github.com/TW59420>
*
* 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
/* 将USB 轮询速率更改为 1000hz 并为精英游戏每次扫描使用更大的密钥*/
#define USB_POLLING_INTERVAL_MS 2

View File

@ -7,7 +7,8 @@
"vid": "0x7BA1", "vid": "0x7BA1",
"pid": "0x6505", "pid": "0x6505",
"device_version": "0.0.1", "device_version": "0.0.1",
"force_nkro": true "force_nkro": true,
"polling_interval": 2
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["B1", "F0", "F1", "F4", "F5", "F6", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "cols": ["B1", "F0", "F1", "F4", "F5", "F6", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],

View File

@ -21,7 +21,6 @@ void board_init(void) {
setPinInput(B10); setPinInput(B10);
} }
#define LED_PIN_ON_STATE 1
void led_init_ports(void) { void led_init_ports(void) {
/** If the OPENDRAIN_INDICATORS option is not defined in config.h, the indicator /** If the OPENDRAIN_INDICATORS option is not defined in config.h, the indicator

View File

@ -21,7 +21,6 @@ void board_init(void) {
setPinInput(B10); setPinInput(B10);
} }
#define LED_PIN_ON_STATE 1
void led_init_ports(void) { void led_init_ports(void) {
/** If the OPENDRAIN_INDICATORS option is not defined in config.h, the indicator /** If the OPENDRAIN_INDICATORS option is not defined in config.h, the indicator

View File

@ -21,7 +21,6 @@ void board_init(void) {
setPinInput(B10); setPinInput(B10);
} }
#define LED_PIN_ON_STATE 1
void led_init_ports(void) { void led_init_ports(void) {
/** If the OPENDRAIN_INDICATORS option is not defined in config.h, the indicator /** If the OPENDRAIN_INDICATORS option is not defined in config.h, the indicator

View File

@ -69,12 +69,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_EFFECT_TWINKLE
/* Optional encoder pins */
#define ENCODERS_PAD_A { B3 }
#define ENCODERS_PAD_B { B1 }
#define ENCODERS_PAD_A_RIGHT { B4 }
#define ENCODERS_PAD_B_RIGHT { B5 }
/* Optional speaker pin */ /* Optional speaker pin */
#define AUDIO_PIN B6 #define AUDIO_PIN B6

View File

@ -7,12 +7,26 @@
"pid": "0x6063", "pid": "0x6063",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"encoder": {
"rotary": [
{"pin_a": "B3", "pin_b": "B1"}
]
},
"rgblight": { "rgblight": {
"led_count": 10, "led_count": 10,
"sleep": true, "sleep": true,
"led_map": [8, 9, 0, 1, 2, 6, 7, 3, 4, 5], "led_map": [8, 9, 0, 1, 2, 6, 7, 3, 4, 5],
"split_count": [5, 5] "split_count": [5, 5]
}, },
"split": {
"encoder": {
"right": {
"rotary": [
{"pin_a": "B4", "pin_b": "B5"}
]
}
}
},
"ws2812": { "ws2812": {
"pin": "B2" "pin": "B2"
}, },

View File

@ -9,8 +9,6 @@
#pragma once #pragma once
#define MATRIX_IO_DELAY 5
#define BUSY_WAIT #define BUSY_WAIT
#define BUSY_WAIT_INSTRUCTIONS 35 // Increase if two rows are pressed at the same time. #define BUSY_WAIT_INSTRUCTIONS 35 // Increase if two rows are pressed at the same time.
#define GPIO_INPUT_PIN_DELAY 10 #define GPIO_INPUT_PIN_DELAY 10

View File

@ -21,7 +21,8 @@
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["A0", "B11", "B0", "B10", "B12", "B2", "A8"], "cols": ["A0", "B11", "B0", "B10", "B12", "B2", "A8"],
"rows": ["A1", "A3", "B3", "A13", "B15", null, null] "rows": ["A1", "A3", "B3", "A13", "B15", null, null],
"io_delay": 5
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"encoder": { "encoder": {

View File

@ -9,8 +9,6 @@
#pragma once #pragma once
#define MATRIX_IO_DELAY 5
#define BUSY_WAIT #define BUSY_WAIT
#define BUSY_WAIT_INSTRUCTIONS 35 // Increase if two rows are pressed at the same time. #define BUSY_WAIT_INSTRUCTIONS 35 // Increase if two rows are pressed at the same time.
#define GPIO_INPUT_PIN_DELAY 10 #define GPIO_INPUT_PIN_DELAY 10

View File

@ -21,7 +21,8 @@
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["A6", "A7", "B0", "B2", "B1", "B9", "B3", "B4"], "cols": ["A6", "A7", "B0", "B2", "B1", "B9", "B3", "B4"],
"rows": ["B15", "A8", "A15", "B12", "A3", null] "rows": ["B15", "A8", "A15", "B12", "A3", null],
"io_delay": 5
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"encoder": { "encoder": {

View File

@ -6,7 +6,4 @@
/* Locking resynchronize hack */ /* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE
#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE
#define NO_ACTION_ONESHOT #define NO_ACTION_ONESHOT

View File

@ -28,8 +28,6 @@ void board_init(void) {
#endif #endif
} }
#define LED_PIN_ON_STATE 1
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state); bool res = led_update_user(led_state);
if(res) writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); if(res) writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);

View File

@ -15,8 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#define LED_NUM_LOCK_PIN B15
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */

View File

@ -9,6 +9,9 @@
"device_version": "1.0.2", "device_version": "1.0.2",
"force_nkro": true "force_nkro": true
}, },
"indicators": {
"num_lock": "B15"
},
"ws2812": { "ws2812": {
"pin": "C15" "pin": "C15"
}, },

View File

@ -17,8 +17,6 @@
#define SELECT_SOFT_SERIAL_SPEED 1 #define SELECT_SOFT_SERIAL_SPEED 1
#define MATRIX_IO_DELAY 5
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View File

@ -17,7 +17,8 @@
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["B0", "A7", "A3", "A5", "A4", "A2"], "cols": ["B0", "A7", "A3", "A5", "A4", "A2"],
"rows": ["B12", "A6", "B13", "B9", "B8"] "rows": ["B12", "A6", "B13", "B9", "B8"],
"io_delay": 5
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"encoder": { "encoder": {

View File

@ -15,8 +15,6 @@
*/ */
#pragma once #pragma once
#define MATRIX_IO_DELAY 5
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View File

@ -18,7 +18,8 @@
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["B0", "A7", "A6", "A5", "A4", "A3", "A1", "A0", "C15", "C14", "C13", "A15", "B3", "B4", "B5"], "cols": ["B0", "A7", "A6", "A5", "A4", "A3", "A1", "A0", "C15", "C14", "C13", "A15", "B3", "B4", "B5"],
"rows": ["B6", "A2", "B7", "B9", "B8"] "rows": ["B6", "A2", "B7", "B9", "B8"],
"io_delay": 5
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"encoder": { "encoder": {

View File

@ -16,9 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#define LED_CAPS_LOCK_PIN C13
#define LED_PIN_ON_STATE 0
#define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

View File

@ -9,6 +9,10 @@
"device_version": "0.0.1", "device_version": "0.0.1",
"force_nkro": true "force_nkro": true
}, },
"indicators": {
"caps_lock": "C13",
"on_state": 0
},
"rgblight": { "rgblight": {
"led_count": 9 "led_count": 9
}, },

View File

@ -22,7 +22,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 4 #define MATRIX_ROWS 4
#define MATRIX_COLS 12 #define MATRIX_COLS 12
/* COL2ROW, ROW2COL*/
//#define DIODE_DIRECTION
#define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255} #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255}

View File

@ -15,8 +15,6 @@
*/ */
#pragma once #pragma once
#define MATRIX_IO_DELAY 5
#define SPLIT_HAND_PIN B3 #define SPLIT_HAND_PIN B3
#define SELECT_SOFT_SERIAL_SPEED 0 #define SELECT_SOFT_SERIAL_SPEED 0

View File

@ -10,7 +10,8 @@
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["B11", "B10", "B1", "B0", "A7", "A6"], "cols": ["B11", "B10", "B1", "B0", "A7", "A6"],
"rows": ["B15", "B14", "B13", "B12"] "rows": ["B15", "B14", "B13", "B12"],
"io_delay": 5
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"split": { "split": {

View File

@ -15,8 +15,6 @@
*/ */
#pragma once #pragma once
#define MATRIX_IO_DELAY 5
#define SPLIT_HAND_PIN B9 #define SPLIT_HAND_PIN B9
//#define SELECT_SOFT_SERIAL_SPEED 0 //#define SELECT_SOFT_SERIAL_SPEED 0
#define SERIAL_USART_SPEED 921600 #define SERIAL_USART_SPEED 921600

View File

@ -10,7 +10,8 @@
}, },
"matrix_pins": { "matrix_pins": {
"cols": ["B15", "B10", "B0", "A5", "A4", "A3"], "cols": ["B15", "B10", "B0", "A5", "A4", "A3"],
"rows": ["A10", "A15", "B3", "B4"] "rows": ["A10", "A15", "B3", "B4"],
"io_delay": 5
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"encoder": { "encoder": {