summaryrefslogtreecommitdiffstats
path: root/keyboards/keebio
diff options
context:
space:
mode:
authorjack <0x6A73@pm.me>2023-06-19 09:46:27 -0600
committerGitHub <noreply@github.com>2023-06-19 09:46:27 -0600
commitc4a67d3f3302f3096bb6b15921c9587643164ba9 (patch)
treebf10e469333ba42b708e76cfc085eb450d92359e /keyboards/keebio
parent74fbd5a0313769655914166bc872d41461509bd3 (diff)
Remove encoder in-matrix workaround code (#20389)
Diffstat (limited to 'keyboards/keebio')
-rw-r--r--keyboards/keebio/bamfk1/config.h4
-rw-r--r--keyboards/keebio/bamfk1/info.json10
-rw-r--r--keyboards/keebio/bamfk1/keymaps/default/keymap.c27
-rw-r--r--keyboards/keebio/bamfk1/keymaps/default/rules.mk1
-rw-r--r--keyboards/keebio/bamfk1/keymaps/via/keymap.c25
-rw-r--r--keyboards/keebio/bamfk1/keymaps/via/rules.mk1
-rw-r--r--keyboards/keebio/bamfk1/rules.mk2
-rw-r--r--keyboards/keebio/encoder_actions.c63
-rw-r--r--keyboards/keebio/encoder_actions.h23
9 files changed, 32 insertions, 124 deletions
diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h
index 0aeaffa895..13d85fc4d1 100644
--- a/keyboards/keebio/bamfk1/config.h
+++ b/keyboards/keebio/bamfk1/config.h
@@ -8,9 +8,7 @@
# define STARTUP_SONG SONG(STARTUP_SOUND)
#endif
-#define ENCODERS_CW_KEY { { 1, 1 }, { 3, 1 } }
-#define ENCODERS_CCW_KEY { { 0, 1 }, { 2, 1 } }
-
+# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json
index 9c9cd011e8..8ff985741e 100644
--- a/keyboards/keebio/bamfk1/info.json
+++ b/keyboards/keebio/bamfk1/info.json
@@ -25,8 +25,7 @@
"bootloader": "atmel-dfu",
"matrix_pins": {
"direct": [
- ["E6", "B6", "D6", null],
- [null, null, null, null]
+ ["E6", "B6", "D6"]
]
},
"layouts": {
@@ -34,12 +33,7 @@
"layout": [
{"x": 1.5, "y": 0, "h": 2, "w": 2, "matrix": [0, 0]},
{"x": 0.5, "y": 2.25, "matrix": [0, 1]},
- {"x": 3.5, "y": 2.25, "matrix": [0, 2]},
-
- {"x": 0, "y": 3.5, "matrix": [1, 0]},
- {"x": 1, "y": 3.5, "matrix": [1, 1]},
- {"x": 3, "y": 3.5, "matrix": [1, 2]},
- {"x": 4, "y": 3.5, "matrix": [1, 3]}
+ {"x": 3.5, "y": 2.25, "matrix": [0, 2]}
]
}
}
diff --git a/keyboards/keebio/bamfk1/keymaps/default/keymap.c b/keyboards/keebio/bamfk1/keymaps/default/keymap.c
index aa0780eafc..d97a7fe39a 100644
--- a/keyboards/keebio/bamfk1/keymaps/default/keymap.c
+++ b/keyboards/keebio/bamfk1/keymaps/default/keymap.c
@@ -13,27 +13,28 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_MAIN] = LAYOUT(
- KC_A, // Big Switch
- MO(1), KC_MUTE, // Encoder presses
- KC_DOWN, KC_UP, // Left encoder turns
- KC_VOLD, KC_VOLU // Right encoder turns
+ RGB_MOD, // Big Switch
+ TL_LOWR, KC_MUTE // Encoder presses
),
[_FN1] = LAYOUT(
KC_B, // Big Switch
- _______, KC_C, // Encoder presses
- KC_PGDN, KC_PGUP, // Left encoder turns
- KC_VOLU, KC_VOLD // Right encoder turns
+ _______, KC_C // Encoder presses
),
[_FN2] = LAYOUT(
_______, // Big Switch
- _______, _______, // Encoder presses
- _______, _______, // Left encoder turns
- _______, _______ // Right encoder turns
+ _______, _______ // Encoder presses
),
[_FN3] = LAYOUT(
_______, // Big Switch
- _______, _______, // Encoder presses
- _______, _______, // Left encoder turns
- _______, _______ // Right encoder turns
+ _______, _______ // Encoder presses
)
};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [0] = { ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [1] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(_______, _______) },
+ [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
+ [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
+};
+#endif
diff --git a/keyboards/keebio/bamfk1/keymaps/default/rules.mk b/keyboards/keebio/bamfk1/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keebio/bamfk1/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keebio/bamfk1/keymaps/via/keymap.c b/keyboards/keebio/bamfk1/keymaps/via/keymap.c
index 80ada5d8aa..d97a7fe39a 100644
--- a/keyboards/keebio/bamfk1/keymaps/via/keymap.c
+++ b/keyboards/keebio/bamfk1/keymaps/via/keymap.c
@@ -14,26 +14,27 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_MAIN] = LAYOUT(
RGB_MOD, // Big Switch
- TL_LOWR, KC_MUTE, // Encoder presses
- KC_DOWN, KC_UP, // Left encoder turns
- KC_VOLD, KC_VOLU // Right encoder turns
+ TL_LOWR, KC_MUTE // Encoder presses
),
[_FN1] = LAYOUT(
KC_B, // Big Switch
- _______, KC_C, // Encoder presses
- KC_PGDN, KC_PGUP, // Left encoder turns
- KC_VOLU, KC_VOLD // Right encoder turns
+ _______, KC_C // Encoder presses
),
[_FN2] = LAYOUT(
_______, // Big Switch
- _______, _______, // Encoder presses
- _______, _______, // Left encoder turns
- _______, _______ // Right encoder turns
+ _______, _______ // Encoder presses
),
[_FN3] = LAYOUT(
_______, // Big Switch
- _______, _______, // Encoder presses
- _______, _______, // Left encoder turns
- _______, _______ // Right encoder turns
+ _______, _______ // Encoder presses
)
};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [0] = { ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [1] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(_______, _______) },
+ [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
+ [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
+};
+#endif
diff --git a/keyboards/keebio/bamfk1/keymaps/via/rules.mk b/keyboards/keebio/bamfk1/keymaps/via/rules.mk
index 36b7ba9cbc..1189f4ad19 100644
--- a/keyboards/keebio/bamfk1/keymaps/via/rules.mk
+++ b/keyboards/keebio/bamfk1/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
VIA_ENABLE = yes
LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk
index 514d88831a..5275b6ecdc 100644
--- a/keyboards/keebio/bamfk1/rules.mk
+++ b/keyboards/keebio/bamfk1/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = yes # Audio output
ENCODER_ENABLE = yes
LTO_ENABLE = yes
-
-SRC += encoder_actions.c
diff --git a/keyboards/keebio/encoder_actions.c b/keyboards/keebio/encoder_actions.c
deleted file mode 100644
index b02881de5f..0000000000
--- a/keyboards/keebio/encoder_actions.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- * Copyright 2021 drashna jael're (@drashna)
- *
- * 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 3 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 "encoder_actions.h"
-
-#if defined(ENCODER_ENABLE)
-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 < NUM_ENCODERS; ++index) {
- if (encoder_state[index]) {
- keyevent_t encoder_event = (keyevent_t) {
- .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
- .pressed = false,
- .time = timer_read(),
- .type = KEY_EVENT
- };
- encoder_state[index] = 0;
- action_exec(encoder_event);
- }
- }
-}
-
-void encoder_action_register(uint8_t index, bool clockwise) {
- keyevent_t encoder_event = (keyevent_t) {
- .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
- .pressed = true,
- .time = timer_read(),
- .type = KEY_EVENT
- };
- encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
- action_exec(encoder_event);
-}
-
-void matrix_scan_kb(void) {
- encoder_action_unregister();
- matrix_scan_user();
-}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- encoder_action_register(index, clockwise);
- // don't return user actions, because they are in the keymap
- // encoder_update_user(index, clockwise);
- return true;
-};
-
-#endif
diff --git a/keyboards/keebio/encoder_actions.h b/keyboards/keebio/encoder_actions.h
deleted file mode 100644
index 1a7fb72014..0000000000
--- a/keyboards/keebio/encoder_actions.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * 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 3 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
-
-#include "quantum.h"
-
-void encoder_action_unregister(void);
-
-void encoder_action_register(uint8_t index, bool clockwise);