ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move encoder config to data driven (#19923)

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

8
keyboards/meletrix/zoom65/config.h
View file

@ -22,14 +22,6 @@
#define DIODE_DIRECTION COL2ROW
/* Enable encoder */
#define ENCODERS_PAD_A { B1 }
#define ENCODERS_PAD_B { B0 }
#define ENCODERS 1
#define ENCODER_RESOLUTION 2
// Note: array is { col, row )
#define ENCODERS_CW_KEY { { 5, 4 } }
#define ENCODERS_CCW_KEY { { 3, 4 } }

5
keyboards/meletrix/zoom65/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x0004",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "B1", "pin_b": "B0", "resolution": 2}
]
},
"indicators": {
"caps_lock": "F7",
"on_state": 0

8
keyboards/meletrix/zoom65/zoom65.c
View file

@ -17,13 +17,13 @@
#include "zoom65.h"
#ifdef VIA_ENABLE
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])
{

8
keyboards/meletrix/zoom65_lite/config.h
View file

@ -22,14 +22,6 @@
#define DIODE_DIRECTION COL2ROW
/* Enable encoder */
#define ENCODERS_PAD_A { B1 }
#define ENCODERS_PAD_B { B0 }
#define ENCODERS 1
#define ENCODER_RESOLUTION 2
// Note: array is { col, row )
#define ENCODERS_CW_KEY { { 5, 4 } }
#define ENCODERS_CCW_KEY { { 3, 4 } }

5
keyboards/meletrix/zoom65_lite/info.json
View file

@ -8,6 +8,11 @@
"pid": "0x0005",
"device_version": "0.0.1"
},
"encoder": {
"rotary": [
{"pin_a": "B1", "pin_b": "B0", "resolution": 2}
]
},
"indicators": {
"caps_lock": "F7",
"on_state": 0

12
keyboards/meletrix/zoom65_lite/keymaps/via/keymap.c
View file

@ -16,14 +16,13 @@
#include QMK_KEYBOARD_H
#ifdef VIA_ENABLE
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])
{
@ -56,8 +55,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise)
{
encoder_action_register(index, clockwise);
return true;
};
#endif
}
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(