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

Remove encoder in-matrix workaround code #20389

Merged
merged 6 commits into from
Jun 19, 2023
Merged

Remove encoder in-matrix workaround code #20389

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f76e84c
initial
waffle87 Apr 10, 2023
0e7042d
more
waffle87 Apr 11, 2023
73cec59
most of them
waffle87 Apr 12, 2023
8625897
last?
waffle87 Apr 16, 2023
92c8d87
another
waffle87 May 8, 2023
c484bf1
forgotten layout remove
waffle87 May 14, 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
Prev Previous commit
Next Next commit
most of them
  • Loading branch information
@waffle87
waffle87 committed Jun 19, 2023
commit 73cec59753ae99249b6608a0f0e4f463edd961f7
58 changes: 0 additions & 58 deletions keyboards/gl516/n51gl/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,64 +86,6 @@
{"matrix": [7, 5], "x": 14.75, "y": 3},
{"matrix": [7, 6], "x": 15.75, "y": 3}
]
},
"LAYOUT_rotary_layer": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [4, 0], "x": 7, "y": 0},
{"matrix": [4, 1], "x": 8, "y": 0},
{"matrix": [4, 2], "x": 9, "y": 0},
{"matrix": [4, 3], "x": 10, "y": 0},
{"matrix": [4, 4], "x": 11, "y": 0},
{"matrix": [4, 5], "x": 12, "y": 0},
{"matrix": [4, 6], "x": 13, "y": 0},
{"matrix": [1, 1], "x": 14, "y": 0},
{"matrix": [1, 2], "x": 15, "y": 0},
{"matrix": [1, 3], "x": 16, "y": 0},
{"matrix": [1, 4], "x": 17, "y": 0},
{"matrix": [1, 5], "x": 18, "y": 0},
{"matrix": [1, 6], "x": 19, "y": 0},
{"matrix": [1, 0], "x": 20, "y": 0},
{"matrix": [5, 0], "x": 21, "y": 0},
{"matrix": [5, 1], "x": 22, "y": 0},
{"matrix": [5, 2], "x": 23, "y": 0},
{"matrix": [5, 3], "x": 24, "y": 0},
{"matrix": [5, 4], "x": 25, "y": 0},
{"matrix": [5, 5], "x": 26, "y": 0},
{"matrix": [5, 6], "x": 27, "y": 0},
{"matrix": [2, 1], "x": 28, "y": 0},
{"matrix": [2, 2], "x": 29, "y": 0},
{"matrix": [2, 3], "x": 30, "y": 0},
{"matrix": [2, 4], "x": 31, "y": 0},
{"matrix": [2, 5], "x": 32, "y": 0},
{"matrix": [2, 6], "x": 33, "y": 0},
{"matrix": [2, 0], "x": 34, "y": 0},
{"matrix": [6, 0], "x": 35, "y": 0},
{"matrix": [6, 1], "x": 36, "y": 0},
{"matrix": [6, 2], "x": 37, "y": 0},
{"matrix": [6, 3], "x": 38, "y": 0},
{"matrix": [6, 4], "x": 39, "y": 0},
{"matrix": [6, 5], "x": 40, "y": 0},
{"matrix": [6, 6], "x": 41, "y": 0},
{"matrix": [3, 1], "x": 42, "y": 0},
{"matrix": [3, 2], "x": 43, "y": 0},
{"matrix": [3, 4], "x": 44, "y": 0},
{"matrix": [3, 5], "x": 45, "y": 0},
{"matrix": [3, 6], "x": 46, "y": 0},
{"matrix": [3, 0], "x": 47, "y": 0},
{"matrix": [7, 0], "x": 48, "y": 0},
{"matrix": [7, 1], "x": 49, "y": 0},
{"matrix": [7, 2], "x": 50, "y": 0},
{"matrix": [7, 4], "x": 51, "y": 0},
{"matrix": [7, 5], "x": 52, "y": 0},
{"matrix": [7, 6], "x": 53, "y": 0}
]
}
}
}
22 changes: 0 additions & 22 deletions keyboards/gl516/n51gl/keymaps/salicylic/config.h
View file
Open in desktop

This file was deleted.

117 changes: 0 additions & 117 deletions keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
View file
Open in desktop

This file was deleted.

45 changes: 20 additions & 25 deletions keyboards/gl516/n51gl/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,48 +18,48 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_rotary_layer(
[0] = LAYOUT(
//,--------------------------------------------------------------| |--------------------------------------------------------------.
KC_ESC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
LT(1,KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_VOLU, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
LT(1,KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_VOLD, KC_SPC, KC_SPC, KC_LALT, KC_LEFT, KC_DOWN, KC_RGHT
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LEFT, KC_DOWN, KC_RGHT
//|--------------------------------------------------------------| |--------------------------------------------------------------'
),
[1] = LAYOUT_rotary_layer(
[1] = LAYOUT(
//,--------------------------------------------------------------| |--------------------------------------------------------------.
_______, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
_______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______,
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
//|--------------------------------------------------------------| |--------------------------------------------------------------'
),
[2] = LAYOUT_rotary_layer(
[2] = LAYOUT(
//,--------------------------------------------------------------| |--------------------------------------------------------------.
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
//|--------------------------------------------------------------| |--------------------------------------------------------------'
),
[3] = LAYOUT_rotary_layer(
[3] = LAYOUT(
//,--------------------------------------------------------------| |--------------------------------------------------------------.
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
//|--------------------------------------------------------------| |--------------------------------------------------------------'
)
};
Expand Down Expand Up @@ -87,16 +87,11 @@ layer_state_t layer_state_set_user(layer_state_t state) {
return state;
}

bool encoder_update_user(uint8_t index, bool clockwise) {
keypos_t key;
if (clockwise) {
key.row = 3;
key.col = 0;
} else {
key.row = 1;
key.col = 0;
}
action_exec(MAKE_KEYEVENT(key.row, key.col, true));
action_exec(MAKE_KEYEVENT(key.row, key.col, false));
return true;
}
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(_______, _______) },
[2] = { ENCODER_CCW_CW(_______, _______) },
[3] = { ENCODER_CCW_CW(_______, _______) },
};
#endif
3 changes: 2 additions & 1 deletion keyboards/gl516/n51gl/keymaps/via/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
VIA_ENABLE = yes
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes
8 changes: 1 addition & 7 deletions keyboards/jones/v1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,7 @@
{"label": "k93", "matrix": [9, 3], "x": 11, "y": 4, "w": 1.25},
{"label": "k47", "matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.25},
{"label": "k91", "matrix": [9, 1], "x": 13.5, "y": 4},
{"label": "k41", "matrix": [4, 1], "x": 14.5, "y": 4},

{"label": "k85", "matrix": [8, 5], "x": 0, "y": 5},
{"label": "k86", "matrix": [8, 6], "x": 1, "y": 5},

{"label": "k95", "matrix": [9, 5], "x": 14, "y": 5},
{"label": "k96", "matrix": [9, 6], "x": 15, "y": 5}
{"label": "k41", "matrix": [4, 1], "x": 14.5, "y": 4}
]
}
}
Expand Down
Loading