Move encoder config to data driven (#19923)

Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
Ryan
2023-02-26 09:45:12 +11:00
committed by GitHub
parent 314f6c1ddb
commit 7e0299117b
972 changed files with 2898 additions and 2569 deletions

View File

@@ -34,10 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define ENCODER_RESOLUTION 1
#define ENCODERS_PAD_A { D2 }
#define ENCODERS_PAD_B { D1 }
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
# define RGBLED_NUM 6

View File

@@ -8,6 +8,11 @@
"pid": "0x0012",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "D2", "pin_b": "D1", "resolution": 1}
]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {

View File

@@ -34,10 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define ENCODER_RESOLUTION 4
#define ENCODERS_PAD_A { E6, B6 }
#define ENCODERS_PAD_B { B4, B5 }
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
# define RGBLED_NUM 12

View File

@@ -8,6 +8,12 @@
"pid": "0x0014",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "E6", "pin_b": "B4"},
{"pin_a": "B6", "pin_b": "B5"}
]
},
"split": {
"soft_serial_pin": "D2"
},

View File

@@ -37,10 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define ENCODER_RESOLUTION 4
#define ENCODERS_PAD_A { D4 }
#define ENCODERS_PAD_B { C6 }
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
# define RGBLED_NUM 4 * 2

View File

@@ -8,6 +8,11 @@
"pid": "0x0018",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "D4", "pin_b": "C6"}
]
},
"split": {
"soft_serial_pin": "D2"
},

View File

@@ -34,10 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define ENCODER_RESOLUTION 1
#define ENCODERS_PAD_A { D2 }
#define ENCODERS_PAD_B { D1 }
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
# define RGBLED_NUM 6

View File

@@ -8,6 +8,11 @@
"pid": "0x0013",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "D2", "pin_b": "D1", "resolution": 1}
]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {

View File

@@ -1,9 +0,0 @@
// Copyright 2022 takashicompany (@takashicompany)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define ENCODER_RESOLUTION 4
#define ENCODERS_PAD_A { D1 }
#define ENCODERS_PAD_B { D0 }

View File

@@ -40,6 +40,11 @@
"pid": "0x0023",
"vid": "0x7463"
},
"encoder": {
"rotary": [
{"pin_a": "D1", "pin_b": "D0"}
]
},
"rgblight": {
"led_count": 53,
"pin": "D3",

View File

@@ -12,9 +12,6 @@
// when turn knob clockwise or counterclockwise.
// This is handy to assign key codes by VIA.
// Number of endoder
#define ENCODERS 1
// Mappings of encoder rotation to key position in key matrix.
#define ENCODERS_CW_KEY { { 0, 4 }}
#define ENCODERS_CCW_KEY { { 6, 0 }}

View File

@@ -88,12 +88,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
//------------------------------------------------------------------------------
// Rotary Encoder
//------------------------------------------------------------------------------
static uint8_t encoder_state[ENCODERS] = {0};
static keypos_t encoder_cw[ENCODERS] = ENCODERS_CW_KEY;
static keypos_t encoder_ccw[ENCODERS] = ENCODERS_CCW_KEY;
static uint8_t encoder_state[NUM_ENCODERS] = {0};
static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;
void encoder_action_unregister(void) {
for (int index = 0; index < ENCODERS; ++index) {
for (int index = 0; index < NUM_ENCODERS; ++index) {
if (encoder_state[index]) {
keyevent_t encoder_event = (keyevent_t) {
.key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],