summaryrefslogtreecommitdiff
path: root/keyboards/keycapsss
diff options
context:
space:
mode:
authorCharles Strahan <charles@cstrahan.com>2023-09-21 00:23:18 -0500
committerGitHub <noreply@github.com>2023-09-21 06:23:18 +0100
commit5858efd6c9b8f1601fcc93c20d70d1e01cd0995d (patch)
tree0f7c2289a2d41959ada91216ecf63652fcad95db /keyboards/keycapsss
parente91bf4583fb9279daf826f7c662e84db3465120b (diff)
kimiko: mirror encoder pins between halves (#21728)
Diffstat (limited to 'keyboards/keycapsss')
-rw-r--r--keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c4
-rw-r--r--keyboards/keycapsss/kimiko/keymaps/default/keymap.c10
-rw-r--r--keyboards/keycapsss/kimiko/rev1/info.json11
3 files changed, 18 insertions, 7 deletions
diff --git a/keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c b/keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c
index 19d45a75c7..c3c79d76ee 100644
--- a/keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c
+++ b/keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c
@@ -1,3 +1,7 @@
+// Copyright 2019 MechMerlin
+// Copyright 2020 @ben_roe (keycapsss.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
#include "progmem.h"
// Corne 8x6 font
diff --git a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c b/keyboards/keycapsss/kimiko/keymaps/default/keymap.c
index 0515b96dfe..74da1ce973 100644
--- a/keyboards/keycapsss/kimiko/keymaps/default/keymap.c
+++ b/keyboards/keycapsss/kimiko/keymaps/default/keymap.c
@@ -334,11 +334,11 @@ bool oled_task_user(void) {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [_QWERTY] = { ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) },
- [_LOWER] = { ENCODER_CCW_CW(KC_TAB, RGB_HUI), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
- [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
- [_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
+ [_QWERTY] = { ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
+ [_LOWER] = { ENCODER_CCW_CW(RGB_HUI, KC_TAB), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
+ [_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
};
-#endif // ENCODER_MAP_ENABLE
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json
index e0106f4423..1a7f62b2c8 100644
--- a/keyboards/keycapsss/kimiko/rev1/info.json
+++ b/keyboards/keycapsss/kimiko/rev1/info.json
@@ -15,11 +15,18 @@
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
- {"pin_a": "F4", "pin_b": "F5"}
+ {"pin_a": "F5", "pin_b": "F4"}
]
},
"split": {
- "soft_serial_pin": "D2"
+ "soft_serial_pin": "D2",
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "F4", "pin_b": "F5"}
+ ]
+ }
+ }
},
"rgblight": {
"led_count": 60,