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

Jump to bottom

Add större keyboard #22959

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Add större keyboard #22959

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0ac27d5
Add Större keyboard
mohoyt Jan 25, 2024
fe6f784
Readme updated
mohoyt Jan 25, 2024
6881a52
Update keyboards/sthlmkb/storre/info.json
mohoyt Jan 25, 2024
582f97a
Update keyboards/sthlmkb/storre/readme.md
mohoyt Jan 25, 2024
de2be95
Update keyboards/sthlmkb/storre/keymaps/default/keymap.c
mohoyt Jan 25, 2024
59417f8
Update keyboards/sthlmkb/storre/readme.md
mohoyt Jan 26, 2024
027bfb6
Update keyboards/sthlmkb/storre/rules.mk
mohoyt Jan 26, 2024
6018ccb
Update keyboards/sthlmkb/storre/storre.c
mohoyt Jan 26, 2024
2176bdb
Update keyboards/sthlmkb/storre/info.json
mohoyt Jan 26, 2024
44b44fe
Update keyboards/sthlmkb/storre/info.json
mohoyt Jan 26, 2024
8376687
Update keyboards/sthlmkb/storre/info.json
mohoyt Jan 26, 2024
64d0472
Encoder map added to default keymap
mohoyt Jan 26, 2024
4427654
Update rules.mk
mohoyt Jan 31, 2024
1b33602
Update keyboards/sthlmkb/storre/readme.md
mohoyt Jan 31, 2024
9c1107a
rules.mk added to default keymap for encoder map
mohoyt Jan 31, 2024
b02e5ef
Update keyboards/sthlmkb/storre/rules.mk
mohoyt Jan 31, 2024
84501d4
Update readme.md
mohoyt Jan 31, 2024
f3a49bf
Update keyboards/sthlmkb/storre/matrix.c
mohoyt May 6, 2024
35752bf
Update keyboards/sthlmkb/storre/matrix.c
mohoyt May 6, 2024
a02afe1
Update keyboards/sthlmkb/storre/matrix.c
mohoyt May 6, 2024
e893ffc
Update keyboards/sthlmkb/storre/matrix.c
mohoyt May 6, 2024
1bab176
Rename info.json to storre.json
mohoyt Aug 22, 2024
9372b64
Rename storre.json to keyboard.json
mohoyt Aug 22, 2024
94cb0f5
Update keyboards/sthlmkb/storre/matrix.c
mohoyt Aug 25, 2024
7f24d37
Update keyboards/sthlmkb/storre/matrix.c
mohoyt Aug 25, 2024
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
Encoder map added to default keymap
  • Loading branch information
@mohoyt
mohoyt committed Jan 26, 2024
commit 64d0472b349b908ef1d925d20d7f5e27a3095c75
26 changes: 13 additions & 13 deletions keyboards/sthlmkb/storre/info.json
View file
Open in desktop
mohoyt marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
},
"encoder": {
"rotary": [
{"pin_a": "D4", "pin_b": "C6"},
{"pin_a": "F4", "pin_b": "F5"}
{"pin_a": "C6", "pin_b": "D4"},
{"pin_a": "F5", "pin_b": "F4"}
]
},
"layouts": {
Expand Down Expand Up @@ -156,7 +156,7 @@
{"label": "-", "matrix": [1, 11], "x": 11, "y": 2.25},
{"label": "=", "matrix": [1, 12], "x": 12, "y": 2.25},
{"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.25, "w": 2},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},

{"label": "Tab", "matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.5},
{"label": "Q", "matrix": [2, 3], "x": 1.5, "y": 3.25},
Expand Down Expand Up @@ -251,7 +251,7 @@
{"label": "=", "matrix": [1, 12], "x": 12, "y": 2.25},
{"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 2.25},
{"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},

{"label": "Tab", "matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.5},
{"label": "Q", "matrix": [2, 3], "x": 1.5, "y": 3.25},
Expand Down Expand Up @@ -345,7 +345,7 @@
{"label": "-", "matrix": [1, 11], "x": 11, "y": 2.25},
{"label": "=", "matrix": [1, 12], "x": 12, "y": 2.25},
{"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.25, "w": 2},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},

{"label": "Tab", "matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.5},
{"label": "Q", "matrix": [2, 3], "x": 1.5, "y": 3.25},
Expand Down Expand Up @@ -442,7 +442,7 @@
{"label": "=", "matrix": [1, 12], "x": 12, "y": 2.25},
{"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 2.25},
{"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},

{"label": "Tab", "matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.5},
{"label": "Q", "matrix": [2, 3], "x": 1.5, "y": 3.25},
Expand Down Expand Up @@ -538,7 +538,7 @@
{"label": "-", "matrix": [1, 11], "x": 11, "y": 2.25},
{"label": "=", "matrix": [1, 12], "x": 12, "y": 2.25},
{"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.25, "w": 2},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},

{"label": "Tab", "matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.5},
{"label": "Q", "matrix": [2, 3], "x": 1.5, "y": 3.25},
Expand Down Expand Up @@ -632,7 +632,7 @@
{"label": "=", "matrix": [1, 12], "x": 12, "y": 2.25},
{"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 2.25},
{"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},

{"label": "Tab", "matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.5},
{"label": "Q", "matrix": [2, 3], "x": 1.5, "y": 3.25},
Expand Down Expand Up @@ -821,7 +821,7 @@
{"label": "=", "matrix": [1, 12], "x": 12, "y": 2.25},
{"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 2.25},
{"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},

{"label": "Tab", "matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.5},
{"label": "Q", "matrix": [2, 3], "x": 1.5, "y": 3.25},
Expand Down Expand Up @@ -917,7 +917,7 @@
{"label": "-", "matrix": [1, 11], "x": 11, "y": 2.25},
{"label": "=", "matrix": [1, 12], "x": 12, "y": 2.25},
{"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.25, "w": 2},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},

{"label": "Tab", "matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.5},
{"label": "Q", "matrix": [2, 3], "x": 1.5, "y": 3.25},
Expand Down Expand Up @@ -1016,7 +1016,7 @@
{"label": "=", "matrix": [1, 12], "x": 12, "y": 2.25},
{"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 2.25},
{"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},

{"label": "Tab", "matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.5},
{"label": "Q", "matrix": [2, 3], "x": 1.5, "y": 3.25},
Expand Down Expand Up @@ -1114,7 +1114,7 @@
{"label": "-", "matrix": [1, 11], "x": 11, "y": 2.25},
{"label": "=", "matrix": [1, 12], "x": 12, "y": 2.25},
{"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 2.25, "w": 2},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},

{"label": "Tab", "matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.5},
{"label": "Q", "matrix": [2, 3], "x": 1.5, "y": 3.25},
Expand Down Expand Up @@ -1210,7 +1210,7 @@
{"label": "=", "matrix": [1, 12], "x": 12, "y": 2.25},
{"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 2.25},
{"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},
{"label": "Home", "matrix": [1, 15], "x": 15, "y": 2.25},

{"label": "Tab", "matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.5},
{"label": "Q", "matrix": [2, 3], "x": 1.5, "y": 3.25},
Expand Down
7 changes: 7 additions & 0 deletions keyboards/sthlmkb/storre/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
};

#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
};
#endif
1 change: 1 addition & 0 deletions keyboards/sthlmkb/storre/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CUSTOM_MATRIX = lite # Lite custom matrix
mohoyt marked this conversation as resolved.
Show resolved Hide resolved
SRC += matrix.c
ENCODER_MAP_ENABLE = yes
mohoyt marked this conversation as resolved.
Show resolved Hide resolved
8 changes: 4 additions & 4 deletions keyboards/sthlmkb/storre/storre.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
if (index == 0) {
if (clockwise) {
tap_code(KC_MPRV);
} else {
tap_code(KC_MNXT);
} else {
tap_code(KC_MPRV);
}
} else if (index == 1) {
if (clockwise) {
tap_code_delay(KC_VOLD, 10);
} else {
tap_code_delay(KC_VOLU, 10);
} else {
tap_code_delay(KC_VOLD, 10);
}
}
return true;
Expand Down
Loading