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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
972 changed files with 2898 additions and 2569 deletions

View file

@ -24,12 +24,6 @@
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Encoder setup */
#ifdef ENCODER_ENABLE
#define ENCODERS_PAD_A { E0 }
#define ENCODERS_PAD_B { E1 }
#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

View file

@ -8,6 +8,11 @@
"pid": "0x1805",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "E0", "pin_b": "E1"}
]
},
"processor": "at90usb1286",
"bootloader": "halfkay",
"layouts": {

View file

@ -16,9 +16,6 @@
#pragma once
#define ENCODERS_PAD_A { D1 }
#define ENCODERS_PAD_B { D0 }
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
#define RGBLED_NUM 4

View file

@ -8,6 +8,11 @@
"pid": "0xDAD3",
"device_version": "1.0.0"
},
"encoder": {
"rotary": [
{"pin_a": "D1", "pin_b": "D0"}
]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"matrix_pins": {

View file

@ -40,11 +40,6 @@
)
#endif
/* Encoders */
#define ENCODERS_PAD_A { B3, A0 }
#define ENCODERS_PAD_B { A6, A1 }
/* #define ENCODER_RESOLUTION 4 */
/* OLED */
#define OLED_FONT_H "glcdfont_d48.c"
#define OLED_TIMEOUT 0

View file

@ -8,6 +8,12 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "B3", "pin_b": "A6"},
{"pin_a": "A0", "pin_b": "A1"}
]
},
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",

View file

@ -19,7 +19,4 @@
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
#define ENCODERS_PAD_A { D1 }
#define ENCODERS_PAD_B { D0 }
#define ENCODER_RESOLUTION 4
#define TAP_CODE_DELAY 100

View file

@ -23,6 +23,11 @@
"pid": "0x0000",
"vid": "0xFEED"
},
"encoder": {
"rotary": [
{"pin_a": "D1", "pin_b": "D0"}
]
},
"layouts": {
"LAYOUT": {
"layout": [

View file

@ -34,10 +34,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Set up rotary encoder */
#define ENCODERS_PAD_A { F1 }
#define ENCODERS_PAD_B { F0 }
#define ENCODER_RESOLUTION 2
/* Set delay for tap_code on rotary encoder */
#define TAP_CODE_DELAY 10

View file

@ -8,6 +8,11 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "F1", "pin_b": "F0", "resolution": 2}
]
},
"processor": "at90usb1286",
"bootloader": "atmel-dfu",
"layouts": {

View file

@ -39,8 +39,7 @@
"rotary": [
{
"pin_a": "B13",
"pin_b": "B12",
"resolution": 4
"pin_b": "B12"
}
]
},

View file

@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/*
RE_CHANNEL_A = _BV(6),
RE_CHANNEL_B = _BV(5),
*/
#define ENCODERS_PAD_A \
{ B6 }
#define ENCODERS_PAD_B \
{ B5 }
#define ENCODER_RESOLUTION 4
/*
* Feature disable options
* These options are also useful to firmware size reduction.

View file

@ -8,6 +8,11 @@
"pid": "0x4D43",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "B6", "pin_b": "B5"}
]
},
"bootmagic": {
"matrix": [0, 1]
},

View file

@ -19,6 +19,3 @@
#define MATRIX_ROW_PINS { B5, B15, B9, B10, A14 }
#define MATRIX_COL_PINS { A2, B8, B13, B14, B4, B11, B12, A13, A15, A8, A7, A6, B0, B1 }
#define ENCODERS_PAD_A { A1, B3 }
#define ENCODERS_PAD_B { A0, B2 }

View file

@ -8,6 +8,12 @@
"pid": "0xB195",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "A1", "pin_b": "A0"},
{"pin_a": "B3", "pin_b": "B2"}
]
},
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",

View file

@ -49,6 +49,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
#define NO_ACTION_ONESHOT
#define ENCODERS_PAD_A { D0, D2 }
#define ENCODERS_PAD_B { D1, D3 }

View file

@ -8,6 +8,12 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "D0", "pin_b": "D1"},
{"pin_a": "D2", "pin_b": "D3"}
]
},
"bootmagic": {
"matrix": [2, 0]
},

View file

@ -34,9 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define ENCODERS_PAD_A { B2 }
#define ENCODERS_PAD_B { B3 }
#define RGB_DI_PIN E2
#define RGB_MATRIX_LED_COUNT 30
// RGB Matrix Animation modes. Explicitly enabled

View file

@ -8,6 +8,11 @@
"pid": "0x0000",
"device_version": "0.0.2"
},
"encoder": {
"rotary": [
{"pin_a": "B2", "pin_b": "B3"}
]
},
"backlight": {
"pin": "B7",
"levels": 4,

View file

@ -19,14 +19,6 @@
#define MATRIX_COL_PINS \
{ B1, B3, B2, B6 }
/* encoder support */
#define ENCODERS_PAD_A \
{ F4 }
#define ENCODERS_PAD_B \
{ F5 }
#define ENCODER_RESOLUTION 2
#define TAP_CODE_DELAY 10
/* COL2ROW, ROW2COL */

View file

@ -8,6 +8,11 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "F4", "pin_b": "F5", "resolution": 2}
]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {

View file

@ -32,10 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
/* Define encoder pins */
#define ENCODERS_PAD_A { F5, F7 } // 1a, 2a
#define ENCODERS_PAD_B { F4, F6 } // 1b, 2b
/*
* Feature disable options
* These options are also useful to firmware size reduction.

View file

@ -8,6 +8,12 @@
"pid": "0x6969",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F4"},
{"pin_a": "F7", "pin_b": "F6"}
]
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {

View file

@ -1,17 +1,17 @@
/* Copyright 2020 Imam Rafii
*
* 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/>.
/* Copyright 2020 Imam Rafii
*
* 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
@ -20,10 +20,3 @@
#define BACKLIGHT_PWM_DRIVER PWMD5
#define BACKLIGHT_PWM_CHANNEL 1
/* Encoder */
#define ENCODERS_PAD_A \
{ B9 }
#define ENCODERS_PAD_B \
{ B8 }
#define ENCODER_RESOLUTION 2

View file

@ -8,6 +8,11 @@
"pid": "0x5444",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "B9", "pin_b": "B8", "resolution": 2}
]
},
"backlight": {
"driver": "software",
"pin": "B14",

View file

@ -20,9 +20,6 @@
#define MATRIX_COL_PINS { D3, D1, B7, D6, C7, B6, B5, D7, C6, D0}
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
#define ENCODERS_PAD_A { F7 }
#define ENCODERS_PAD_B { F6 }
#define ENCODER_RESOLUTION 4
/* RGB Light Configuration */

View file

@ -0,0 +1,7 @@
{
"encoder": {
"rotary": [
{"pin_a": "F7", "pin_b": "F6"}
]
}
}

View file

@ -20,9 +20,6 @@
#define MATRIX_COL_PINS { B4, B5, F6, F5, F4, F7, B1, B3, B2, B6}
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
#define ENCODERS_PAD_A { D3 }
#define ENCODERS_PAD_B { D2 }
#define ENCODER_RESOLUTION 4
/* RGB Light Configuration */

View file

@ -0,0 +1,7 @@
{
"encoder": {
"rotary": [
{"pin_a": "D3", "pin_b": "D2"}
]
}
}

View file

@ -20,11 +20,6 @@
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Rotary encoder options */
#define ENCODER_RESOLUTIONS { 4, 4 }
#define ENCODERS_PAD_A { D3, D0 }
#define ENCODERS_PAD_B { D2, D1 }
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */

View file

@ -8,6 +8,12 @@
"pid": "0x7370",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "D3", "pin_b": "D2"},
{"pin_a": "D0", "pin_b": "D1"}
]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {

View file

@ -25,10 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION ROW2COL
/* Encoder */
#define ENCODERS_PAD_A { C6 }
#define ENCODERS_PAD_B { B6 }
/* RGB Indicators */
#define RGB_DI_PIN E6
#define RGBLED_NUM 3

View file

@ -8,6 +8,11 @@
"pid": "0xE881",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "C6", "pin_b": "B6"}
]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {

View file

@ -25,6 +25,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define ENCODERS_PAD_A { B3 }
#define ENCODERS_PAD_B { B7 }

View file

@ -8,6 +8,11 @@
"pid": "0xE7F1",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "B3", "pin_b": "B7"}
]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi", "65_ansi_split_bs", "65_iso", "65_iso_split_bs"],

View file

@ -23,9 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { C6, B3, B0, B1, D6, D5 }
#define MATRIX_COL_PINS { C7, B4, D0, C2 }
#define ENCODERS_PAD_A { C5 }
#define ENCODERS_PAD_B { C4 }
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

View file

@ -8,6 +8,11 @@
"pid": "0xEA68",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "C5", "pin_b": "C4"}
]
},
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"layouts": {

View file

@ -23,10 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { D1, D2, B5, B7, D3, D5, D6, D4, D7, B4 }
#define MATRIX_COL_PINS { B6, C6, C7, F7, F6, F5, F4, F1, F0, D0 }
#define ENCODERS_PAD_A { E6 }
#define ENCODERS_PAD_B { B0 }
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION ROW2COL

View file

@ -8,6 +8,11 @@
"pid": "0xEB0E",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "E6", "pin_b": "B0"}
]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {

View file

@ -26,9 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define ENCODERS_PAD_A { B3 }
#define ENCODERS_PAD_B { B7 }
#define RGB_DI_PIN E6
#define RGBLED_NUM 24
#define RGBLIGHT_EFFECT_BREATHING

View file

@ -8,6 +8,11 @@
"pid": "0xE964",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "B3", "pin_b": "B7"}
]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {

View file

@ -38,10 +38,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EE_HANDS
#define ENCODERS_PAD_A \
{ D5 }
#define ENCODERS_PAD_B \
{ C7 }
/* PMW33XX Settings */
#define PMW33XX_CS_PIN B6

View file

@ -1,5 +1,10 @@
{
"keyboard_name": "Tractyl Manuform (5x6) Elite-C",
"encoder": {
"rotary": [
{"pin_a": "D5", "pin_b": "C7"}
]
},
"split": {
"soft_serial_pin": "D2"
},

View file

@ -70,12 +70,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define I2C1_SDA_PAL_MODE 4
#define I2C1_CLOCK_SPEED 400000
/* encoder config */
#define ENCODERS_PAD_A \
{ A7 }
#define ENCODERS_PAD_B \
{ A8 }
/* spi config for eeprom and pmw3360 sensor */
#define SPI_DRIVER SPID2
#define SPI_SCK_PIN B13

View file

@ -1,5 +1,10 @@
{
"keyboard_name": "Tractyl Manuform (5x6) Proton-C",
"encoder": {
"rotary": [
{"pin_a": "A7", "pin_b": "A8"}
]
},
"processor": "STM32F303",
"bootloader": "stm32-dfu"
}

View file

@ -76,12 +76,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define I2C1_CLOCK_SPEED 400000
#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_16_9
/* encoder config */
#define ENCODERS_PAD_A \
{ A13 }
#define ENCODERS_PAD_B \
{ A14 }
/* spi config for eeprom and pmw3360 sensor */
#define SPI_DRIVER SPID1
#define SPI_SCK_PIN A5

View file

@ -1,5 +1,10 @@
{
"keyboard_name": "Tractyl Manuform (5x6) BlackPill",
"encoder": {
"rotary": [
{"pin_a": "A13", "pin_b": "A14"}
]
},
"processor": "STM32F411",
"bootloader": "stm32-dfu",
"board": "BLACKPILL_STM32_F411"

View file

@ -42,10 +42,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EE_HANDS
#define ENCODERS_PAD_A \
{ D5 }
#define ENCODERS_PAD_B \
{ D4 }
/* PMW33XX Settings */
#define PMW33XX_CS_PIN B0

View file

@ -1,5 +1,10 @@
{
"keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++",
"encoder": {
"rotary": [
{"pin_a": "D5", "pin_b": "D4"}
]
},
"split": {
"soft_serial_pin": "D2"
},

View file

@ -25,14 +25,6 @@
#define MATRIX_ROW_PINS \
{ A4, A3, A2, A1, A0 }
// Encoder config
#define ENCODERS_PAD_A \
{ C15 }
#define ENCODERS_PAD_B \
{ C14 }
#define ENCODER_RESOLUTION 2
// OLED config
#define OLED_DISPLAY_128X64
#define OLED_DISPLAY_WIDTH 128

View file

@ -3,6 +3,11 @@
"usb": {
"device_version": "0.0.3"
},
"encoder": {
"rotary": [
{"pin_a": "C15", "pin_b": "C14", "resolution": 2}
]
},
"processor": "STM32F401",
"bootloader": "stm32-dfu",
"board": "BLACKPILL_STM32_F401"