Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kimiko: mirror encoder pins between halves #21728

Merged
merged 6 commits into from
Sep 21, 2023
Merged

kimiko: mirror encoder pins between halves #21728

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e08bd09
kimiko: mirror encoder pins between halves
Aug 10, 2023
23d58a4
kimiko: reverse encoder polarity
cstrahan Aug 13, 2023
c011e01
kimiko: un-reverse encoder polarity
cstrahan Aug 14, 2023
c43faa5
kimiko: lint
cstrahan Aug 14, 2023
811c7b7
kimiko: try to fix ci build
cstrahan Aug 14, 2023
de445d7
kimiko: changes from review
cstrahan Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/* Copyright 2019 MechMerlin
* Copyright 2020 @ben_roe (keycapsss.com)
*
* 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/>.
*/
cstrahan marked this conversation as resolved.
Show resolved Hide resolved

#include "progmem.h"

// Corne 8x6 font
Expand Down
10 changes: 5 additions & 5 deletions keyboards/keycapsss/kimiko/keymaps/default/keymap.c
View file
Open in desktop
zvecr marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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


2 changes: 1 addition & 1 deletion keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
// #define MASTER_RIGHT
// #define EE_HANDS

#define OLED_FONT_H "keyboards/keycapsss/kimiko/keymaps/rgb_matrix/glcdfont.c"
#define OLED_FONT_H "keyboards/keycapsss/kimiko/keymaps/oriaj3/glcdfont.c"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you revert this line, otherwise it will require user sign off or go via develop.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can, but then CI will fail (that was the only reason I changed it -- to get CI to pass, instead of failing on that non-extant file). Can you confirm that's what you would like me to do?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

Compiling: drivers/oled/oled_driver.c                                                              In file included from <command-line>:
./keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h:26:21: fatal error: keyboards/keycapsss/kimiko/keymaps/rgb_matrix/glcdfont.c: No such file or directory
 #define OLED_FONT_H "keyboards/keycapsss/kimiko/keymaps/rgb_matrix/glcdfont.c"
                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

From https://github.com/qmk/qmk_firmware/runs/15882532648

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI failing on non-default keymaps is okay.

// #define OLED_FONT_WIDTH 5
// #define OLED_FONT_HEIGHT 7

Expand Down
11 changes: 9 additions & 2 deletions keyboards/keycapsss/kimiko/rev1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
zvecr marked this conversation as resolved.
Show resolved Hide resolved
]
}
}
},
"ws2812": {
"pin": "D3"
Expand Down