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.

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

add scotto community layouts and userspace #21097

Merged
merged 27 commits into from
Jul 7, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
776f8e9
add `scotto` community layout
dunk2k May 31, 2023
71b972c
Add colemak and qwerty variants
joe-scotto May 31, 2023
107eb91
add to `LAYOUT_ortho_4x10`
dunk2k May 31, 2023
2cefe80
add `scotto` userspace
dunk2k Jun 1, 2023
4df243f
add tap_dance files
dunk2k Jun 1, 2023
f3460db
change `scotto-qwerty` to `scotto`
dunk2k Jun 1, 2023
ebc62a3
add wrappers
dunk2k Jun 1, 2023
2c2c457
adjustments made to tap dance files
dunk2k Jun 1, 2023
3996758
swapped scotto to colemak
dunk2k Jun 1, 2023
2178b5c
further changes to tap_dance files
dunk2k Jun 1, 2023
525123d
more changes to tap_dance files
dunk2k Jun 1, 2023
ce28275
more tapdance admendments
dunk2k Jun 1, 2023
9477462
tap_dance 'bool error' fixed
dunk2k Jun 1, 2023
b35fc9c
build fixes for `scotto`
dunk2k Jun 1, 2023
2262669
corrections added
dunk2k Jun 1, 2023
b861272
corrections to `scotto` ortho_4x10
dunk2k Jun 1, 2023
3701f49
fixed 2 extra arguments error
dunk2k Jun 2, 2023
66f0f8e
fixed `ortho_4x10`
dunk2k Jun 2, 2023
ce2f1fe
completed keymap tranformation code
dunk2k Jun 2, 2023
e8ddfdf
add readme.md
dunk2k Jun 2, 2023
84f3ec5
Update users/scotto/config.h
dunk2k Jun 2, 2023
573cbf8
Update users/scotto/readme.md
dunk2k Jun 2, 2023
a250ec3
Update readme.md
joe-scotto Jun 2, 2023
f456abb
Update layouts/community/ortho_4x10/scotto/keymap.c
dunk2k Jun 6, 2023
ebf5bec
Update users/scotto/config.h
dunk2k Jun 6, 2023
b34abd7
Update users/scotto/rules.mk
dunk2k Jun 6, 2023
7f8a444
Update users/scotto/tap_dance.c
dunk2k Jun 11, 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
add scotto userspace
keymaps amended
  • Loading branch information
dunk2k committed Jun 1, 2023
commit 2cefe803515f5ce7b73ac86f3fd051a27545dece
73 changes: 37 additions & 36 deletions layouts/community/ortho_4x10/scotto-colemak/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include QMK_KEYBOARD_H
#include "scotto.h"

// Tap dance declarations
enum {
Expand Down Expand Up @@ -123,57 +124,57 @@ void x_reset(tap_dance_state_t *state, void *user_data);

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_ortho_4x10(
KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_BSPC,
KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
KC_NO, KC_NO, TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI), KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT), TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI), KC_NO, KC_NO
_________________COLEMAK1_________________,
_________________COLEMAK2_________________,
_________________COLEMAK3a________________,
KC_NO, KC_NO, _______THUMB6_1_______ KC_NO, KC_NO
),
[1] = LAYOUT_ortho_4x10(
KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO
______________SYM_MEDIA_NAV1______________,
______________SYM_MEDIA_NAV2______________,
______________SYM_MEDIA_NAV3______________,
KC_NO, KC_NO, _____THUMB6_TRNS______ KC_NO, KC_NO
),
[2] = LAYOUT_ortho_4x10(
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO
_________________NUM_SYM1_________________,
_________________NUM_SYM2_________________,
_________________NUM_SYM3a________________,
KC_NO, KC_NO, _____THUMB6_TRNS______ KC_NO, KC_NO
),
[3] = LAYOUT_ortho_4x10(
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(5), TO(4),
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO
________________FUNC_SYS1a________________,
________________FUNC_SYS2_________________,
________________FUNC_SYS3_________________,
KC_NO, KC_NO, _____THUMB6_TRNS______ KC_NO, KC_NO
),
[4] = LAYOUT_ortho_4x10(
KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_BSPC,
KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
KC_NO, KC_NO, TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_LALT, LCTL_T(KC_SPC), LT(6, KC_TAB), LT(7, KC_ENT), TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_NO, KC_NO
_________________COLEMAK1_________________,
_________________COLEMAK2_________________,
_________________COLEMAK3a________________,
KC_NO, KC_NO, _______THUMB6_4_______ KC_NO, KC_NO
),
[5] = LAYOUT_ortho_4x10(
KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_BSPC,
KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMMA, KC_DOT, KC_SLSH,
KC_NO, KC_NO, TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_LCTL, KC_SPC, LT(6, KC_TAB), LT(7, KC_ENT), TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_NO, KC_NO
_________________COLEMAK1_________________,
_________________COLEMAK2_________________,
_________________COLEMAK3b________________,
KC_NO, KC_NO, _______THUMB6_5_______ KC_NO, KC_NO
),
[6] = LAYOUT_ortho_4x10(
KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO
______________SYM_MEDIA_NAV1______________,
______________SYM_MEDIA_NAV2______________,
______________SYM_MEDIA_NAV3______________,
KC_NO, KC_NO, _____THUMB6_TRNS______ KC_NO, KC_NO
),
[7] = LAYOUT_ortho_4x10(
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_LSFT, KC_NO, KC_NO, KC_NO, MO(8), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO
_________________NUM_SYM1_________________,
_________________NUM_SYM2_________________,
_________________NUM_SYM3b________________,
KC_NO, KC_NO, _____THUMB6_TRNS______ KC_NO, KC_NO
),
[8] = LAYOUT_ortho_4x10(
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(4), TO(5), TO(0),
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO
________________FUNC_SYS1b________________,
________________FUNC_SYS2_________________,
________________FUNC_SYS3_________________,
KC_NO, KC_NO, _____THUMB6_TRNS______ KC_NO, KC_NO
)
};
1 change: 0 additions & 1 deletion layouts/community/ortho_4x10/scotto-colemak/rules.mk

This file was deleted.

20 changes: 0 additions & 20 deletions layouts/community/ortho_4x10/scotto-qwerty/config.h

This file was deleted.

73 changes: 37 additions & 36 deletions layouts/community/ortho_4x10/scotto-qwerty/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include QMK_KEYBOARD_H
#include "scotto.h"

// Tap dance declarations
enum {
Expand Down Expand Up @@ -123,57 +124,57 @@ void x_reset(tap_dance_state_t *state, void *user_data);

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_ortho_4x10(
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_BSPC,
LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
KC_NO, KC,NO TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI), KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT), TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI), KC_NO, KC_NO
_________________QWERTY1__________________,
_________________QWERTY2__________________,
_________________QWERTY3a_________________,
KC_NO, KC_NO, _______THUMB6_1_______, KC_NO, KC_NO
),
[1] = LAYOUT_ortho_4x10(
KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO
______________SYM_MEDIA_NAV1______________,
______________SYM_MEDIA_NAV2______________,
______________SYM_MEDIA_NAV3______________,
KC_NO, KC_NO, _____THUMB6_TRNS______, KC_NO, KC_NO
),
[2] = LAYOUT_ortho_4x10(
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO
_________________NUM_SYM1_________________,
_________________NUM_SYM2_________________,
_________________NUM_SYM3a________________,
KC_NO, KC_NO, _____THUMB6_TRNS______, KC_NO, KC_NO
),
[3] = LAYOUT_ortho_4x10(
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(5), TO(4),
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO
________________FUNC_SYS1a________________,
________________FUNC_SYS2_________________,
________________FUNC_SYS3_________________,
KC_NO, KC_NO, _____THUMB6_TRNS______, KC_NO, KC_NO
),
[4] = LAYOUT_ortho_4x10(
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_BSPC,
LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
KC_NO, KC_NO, TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_LALT, LCTL_T(KC_SPC), LT(6, KC_TAB), LT(7, KC_ENT), TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_NO, KC_NO
_________________QWERTY1__________________,
_________________QWERTY2__________________,
_________________QWERTY3a_________________,
KC_NO, KC_NO, _______THUMB6_4_______, KC_NO, KC_NO
),
[5] = LAYOUT_ortho_4x10(
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_BSPC,
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH,
KC_NO, KC_NO, TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_LCTL, KC_SPC, LT(6, KC_TAB), LT(7, KC_ENT), TD(TD_LALT_ESC_WINDOWS_EMOJI) KC_NO, KC_NO
_________________QWERTY1__________________,
_________________QWERTY2__________________,
_________________QWERTY3b_________________,
KC_NO, KC_NO, _______THUMB6_5_______, KC_NO, KC_NO
),
[6] = LAYOUT_ortho_4x10(
KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO
______________SYM_MEDIA_NAV1______________,
______________SYM_MEDIA_NAV2______________,
______________SYM_MEDIA_NAV3______________,
KC_NO, KC_NO, _____THUMB6_TRNS______, KC_NO, KC_NO
),
[7] = LAYOUT_ortho_4x10(
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_LSFT, KC_NO, KC_NO, KC_NO, MO(8), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO
_________________NUM_SYM1_________________,
_________________NUM_SYM2_________________,
_________________NUM_SYM3b________________,
KC_NO, KC_NO, _____THUMB6_TRNS______, KC_NO, KC_NO
),
[8] = LAYOUT_ortho_4x10(
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(4), TO(5), TO(0),
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO
________________FUNC_SYS1b________________,
________________FUNC_SYS2_________________,
________________FUNC_SYS3_________________,
KC_NO, KC_NO, _____THUMB6_TRNS______, KC_NO, KC_NO
)
};
1 change: 0 additions & 1 deletion layouts/community/ortho_4x10/scotto-qwerty/rules.mk

This file was deleted.

Loading