Merge remote-tracking branch 'upstream/master' into develop

3 files changed, 227 insertions, 0 deletions

diff --git a/layouts/community/ortho_4x10/scotto/keymap.c b/layouts/community/ortho_4x10/scotto/keymap.c
new file mode 100644
index 0000000000..919764324b
--- /dev/null
+++ b/layouts/community/ortho_4x10/scotto/keymap.c
@@ -0,0 +1,74 @@
+/*
+Copyright 2023 Joe Scotto
+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/>.
+*/
+
+#include "scotto.h"
+
+#define LAYOUT_ortho_4x10_wrapper(...)  LAYOUT_ortho_4x10(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_4x10_wrapper(
+        _________________KEYMAP1__________________,
+        _________________KEYMAP2__________________,
+        _________________KEYMAP3a_________________,
+        KC_NO, KC_NO, _______THUMB6_1_______, KC_NO, KC_NO
+    ),
+    [1] = LAYOUT_ortho_4x10_wrapper(
+        ______________SYM_MEDIA_NAV1______________,
+        ______________SYM_MEDIA_NAV2______________,
+        ______________SYM_MEDIA_NAV3______________,
+        KC_NO, KC_NO, _____THUMB6_TRNS______, KC_NO, KC_NO
+    ),
+    [2] = LAYOUT_ortho_4x10_wrapper(
+        _________________NUM_SYM1_________________,
+        _________________NUM_SYM2_________________,
+        _________________NUM_SYM3a________________,
+        KC_NO, KC_NO, _____THUMB6_TRNS______, KC_NO, KC_NO
+    ),
+    [3] = LAYOUT_ortho_4x10_wrapper(
+        ________________FUNC_SYS1a________________,
+        ________________FUNC_SYS2_________________,
+        ________________FUNC_SYS3_________________,
+        KC_NO, KC_NO, _____THUMB6_TRNS______, KC_NO, KC_NO
+    ),
+    [4] = LAYOUT_ortho_4x10_wrapper(
+        _________________KEYMAP1__________________,
+        _________________KEYMAP2__________________,
+        _________________KEYMAP3a_________________,
+        KC_NO, KC_NO, _______THUMB6_4_______, KC_NO, KC_NO
+    ),
+    [5] = LAYOUT_ortho_4x10_wrapper(
+        _________________KEYMAP1__________________,
+        _________________KEYMAP2__________________,
+        _________________KEYMAP3b_________________,
+        KC_NO, KC_NO, _______THUMB6_5_______, KC_NO, KC_NO
+    ),
+    [6] = LAYOUT_ortho_4x10_wrapper(
+        ______________SYM_MEDIA_NAV1______________,
+        ______________SYM_MEDIA_NAV2______________,
+        ______________SYM_MEDIA_NAV3______________,
+        KC_NO, KC_NO, _____THUMB6_TRNS______, KC_NO, KC_NO
+    ),
+    [7] = LAYOUT_ortho_4x10_wrapper(
+        _________________NUM_SYM1_________________,
+        _________________NUM_SYM2_________________,
+        _________________NUM_SYM3b________________,
+        KC_NO, KC_NO, _____THUMB6_TRNS______, KC_NO, KC_NO
+    ),
+    [8] = LAYOUT_ortho_4x10_wrapper(
+        ________________FUNC_SYS1b________________,
+        ________________FUNC_SYS2_________________,
+        ________________FUNC_SYS3_________________,
+        KC_NO, KC_NO, _____THUMB6_TRNS______, KC_NO, KC_NO
+    )
+};
diff --git a/layouts/community/split_3x5_2/scotto/keymap.c b/layouts/community/split_3x5_2/scotto/keymap.c
new file mode 100644
index 0000000000..fcba0f483b
--- /dev/null
+++ b/layouts/community/split_3x5_2/scotto/keymap.c
@@ -0,0 +1,78 @@
+/*
+Copyright 2023 Joe Scotto
+
+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/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "scotto.h"
+
+#define LAYOUT_split_3x5_2_wrapper(...) LAYOUT_split_3x5_2(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_split_3x5_2_wrapper(
+        _________________KEYMAP1__________________,
+        _________________KEYMAP2__________________,
+        _________________KEYMAP3a_________________,
+        _______THUMB4_1_______
+    ),
+    [1] = LAYOUT_split_3x5_2_wrapper(
+        ______________SYM_MEDIA_NAV1______________,
+        ______________SYM_MEDIA_NAV2______________,
+        ______________SYM_MEDIA_NAV3______________,
+        _____THUMB4_TRNS______
+    ),
+    [2] = LAYOUT_split_3x5_2_wrapper(
+        _________________NUM_SYM1_________________,
+        _________________NUM_SYM2_________________,
+        _________________NUM_SYM3a________________,
+        _____THUMB4_TRNS______
+    ),
+    [3] = LAYOUT_split_3x5_2_wrapper(
+        ________________FUNC_SYS1a________________,
+        ________________FUNC_SYS2_________________,
+        ________________FUNC_SYS3_________________,
+        _____THUMB4_TRNS______
+    ),
+    [4] = LAYOUT_split_3x5_2_wrapper(
+        _________________KEYMAP1__________________,
+        _________________KEYMAP2__________________,
+        _________________KEYMAP3a_________________,
+        _______THUMB4_4_______
+    ),
+    [5] = LAYOUT_split_3x5_2_wrapper(
+        _________________KEYMAP1__________________,
+        _________________KEYMAP2__________________,
+        _________________KEYMAP3b_________________,
+        _______THUMB4_5_______
+    ),
+    [6] = LAYOUT_split_3x5_2_wrapper(
+        ______________SYM_MEDIA_NAV1______________,
+        ______________SYM_MEDIA_NAV2______________,
+        ______________SYM_MEDIA_NAV3______________,
+        _____THUMB4_TRNS______
+    ),
+    [7] = LAYOUT_split_3x5_2_wrapper(
+        _________________NUM_SYM1_________________,
+        _________________NUM_SYM2_________________,
+        _________________NUM_SYM3b________________,
+        _____THUMB4_TRNS______
+    ),
+    [8] = LAYOUT_split_3x5_2_wrapper(
+        ________________FUNC_SYS1b________________,
+        ________________FUNC_SYS2_________________,
+        ________________FUNC_SYS3_________________,
+        _____THUMB4_TRNS______
+    )
+};
diff --git a/layouts/community/split_3x5_3/scotto/keymap.c b/layouts/community/split_3x5_3/scotto/keymap.c
new file mode 100644
index 0000000000..b0d4d9a038
--- /dev/null
+++ b/layouts/community/split_3x5_3/scotto/keymap.c
@@ -0,0 +1,75 @@
+/*
+Copyright 2023 Joe Scotto
+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/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "scotto.h"
+
+#define LAYOUT_split_3x5_3_wrapper(...) LAYOUT_split_3x5_3(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_split_3x5_3_wrapper(
+        _________________KEYMAP1__________________,
+        _________________KEYMAP2__________________,
+        _________________KEYMAP3a_________________,
+        _______THUMB6_1_______
+    ),
+    [1] = LAYOUT_split_3x5_3_wrapper(
+        ______________SYM_MEDIA_NAV1______________,
+        ______________SYM_MEDIA_NAV2______________,
+        ______________SYM_MEDIA_NAV3______________,
+        _____THUMB6_TRNS______
+    ),
+    [2] = LAYOUT_split_3x5_3_wrapper(
+        _________________NUM_SYM1_________________,
+        _________________NUM_SYM2_________________,
+        _________________NUM_SYM3a________________,
+        _____THUMB6_TRNS______
+    ),
+    [3] = LAYOUT_split_3x5_3_wrapper(
+        ________________FUNC_SYS1a________________,
+        ________________FUNC_SYS2_________________,
+        ________________FUNC_SYS3_________________,
+        _____THUMB6_TRNS______
+    ),
+    [4] = LAYOUT_split_3x5_3_wrapper(
+        _________________KEYMAP1__________________,
+        _________________KEYMAP2__________________,
+        _________________KEYMAP3a_________________,
+        _______THUMB6_4_______
+    ),
+    [5] = LAYOUT_split_3x5_3_wrapper(
+        _________________KEYMAP1__________________,
+        _________________KEYMAP2__________________,
+        _________________KEYMAP3b_________________,
+        _______THUMB6_5_______
+    ),
+    [6] = LAYOUT_split_3x5_3_wrapper(
+        ______________SYM_MEDIA_NAV1______________,
+        ______________SYM_MEDIA_NAV2______________,
+        ______________SYM_MEDIA_NAV3______________,
+        _____THUMB6_TRNS______
+    ),
+    [7] = LAYOUT_split_3x5_3_wrapper(
+        _________________NUM_SYM1_________________,
+        _________________NUM_SYM2_________________,
+        _________________NUM_SYM3b________________,
+        _____THUMB6_TRNS______
+    ),
+    [8] = LAYOUT_split_3x5_3_wrapper(
+        ________________FUNC_SYS1b________________,
+        ________________FUNC_SYS2_________________,
+        ________________FUNC_SYS3_________________,
+        _____THUMB6_TRNS______
+    )
+};