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

3 files changed, 139 insertions, 0 deletions

diff --git a/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h b/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h
new file mode 100644
index 0000000000..8723c294cb
--- /dev/null
+++ b/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h
@@ -0,0 +1,24 @@
+/*
+Copyright 2022 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/>.
+*/
+
+#pragma once
+
+// Define options
+#define IGNORE_MOD_TAP_INTERRUPT
+#define TAPPING_TERM 135
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/jscotto/scotto40/keymaps/default/keymap.c b/keyboards/handwired/jscotto/scotto40/keymaps/default/keymap.c
new file mode 100644
index 0000000000..adfcdc559c
--- /dev/null
+++ b/keyboards/handwired/jscotto/scotto40/keymaps/default/keymap.c
@@ -0,0 +1,114 @@
+/*
+Copyright 2022 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
+
+// Tap Dance declarations
+enum {
+    TD_ESC_SPOTLIGHT_EMOJI,
+    TD_ESC_WINDOWS_EMOJI
+};
+
+void td_esc_spotlight_emoji (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        tap_code(KC_ESC);
+    } else if (state->count == 2) {
+        tap_code16(G(KC_SPC));
+    } else if (state->count == 3) {
+        tap_code16(C(G(KC_SPC)));
+    }
+}
+
+void td_esc_windows_emoji (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        tap_code(KC_ESC);
+    } else if (state->count == 2) {
+        tap_code(KC_LGUI);
+    } else if (state->count == 3) {
+        tap_code16(G(KC_DOT));
+    }
+};
+
+ // Tap Dance definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_ESC_SPOTLIGHT_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_spotlight_emoji),
+    [TD_ESC_WINDOWS_EMOJI] = ACTION_TAP_DANCE_FN(td_esc_windows_emoji)
+};
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TD(TD_ESC_SPOTLIGHT_EMOJI) :
+        case TD(TD_ESC_WINDOWS_EMOJI) :
+        case LGUI_T(KC_SPC) :
+        case LT(1, KC_TAB) :
+        case LT(2, KC_ENT) :
+      return 200;
+    default:
+      return TAPPING_TERM;
+  }
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_3x10_7(
+        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_ESC,             KC_LCTL, KC_LALT, LGUI_T(KC_SPC),       LT(1, KC_TAB), LT(2, KC_ENT),         TD(TD_ESC_SPOTLIGHT_EMOJI)
+    ),
+    [1] = LAYOUT_ortho_3x10_7(
+        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_ESC,                   KC_LCTL, KC_LALT, LGUI_T(KC_SPC),           KC_TRNS, KC_TRNS,          TD(TD_ESC_SPOTLIGHT_EMOJI)
+    ),
+    [2] = LAYOUT_ortho_3x10_7(
+        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_ESC,         KC_LCTL, KC_LALT, LGUI_T(KC_SPC),          KC_TRNS, KC_TRNS,          TD(TD_ESC_SPOTLIGHT_EMOJI) 
+    ),
+    [3] = LAYOUT_ortho_3x10_7(
+        KC_NO,  KC_NO, KC_NO,   KC_NO,   KC_NO,          KC_NO, KC_NO,   KC_NO,   KC_NO, 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_ESC,        KC_LCTL, KC_LALT, LGUI_T(KC_SPC),        KC_TRNS, KC_TRNS,        TD(TD_ESC_SPOTLIGHT_EMOJI) 
+    ),
+    [4] = LAYOUT_ortho_3x10_7(
+        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_ESC,             KC_LALT, KC_LCTL, KC_SPC,       LT(5, KC_TAB), LT(6, KC_ENT),         TD(TD_ESC_WINDOWS_EMOJI)
+    ),
+    [5] = LAYOUT_ortho_3x10_7(
+        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_ESC,             KC_LALT, KC_LCTL, KC_SPC,       LT(5, KC_TAB), LT(6, KC_ENT),         TD(TD_ESC_WINDOWS_EMOJI)
+    ),
+    [6] = LAYOUT_ortho_3x10_7(
+        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(7),   KC_NO,   KC_NO,         KC_COMM,       KC_DOT,  RSFT_T(KC_SLSH),
+        KC_ESC,         KC_LALT, KC_LCTL, KC_SPC,           LT(5, KC_TAB), LT(6, KC_ENT),          TD(TD_ESC_WINDOWS_EMOJI)
+    ),
+    [7] = LAYOUT_ortho_3x10_7(
+        KC_NO,  KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,         KC_NO,         KC_NO, 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_ESC,        KC_LALT, KC_LCTL, KC_SPC,         LT(5, KC_TAB), LT(6, KC_ENT),        TD(TD_ESC_WINDOWS_EMOJI)
+    )
+};
diff --git a/keyboards/handwired/jscotto/scotto40/keymaps/default/rules.mk b/keyboards/handwired/jscotto/scotto40/keymaps/default/rules.mk
new file mode 100644
index 0000000000..e5ddcae8d9
--- /dev/null
+++ b/keyboards/handwired/jscotto/scotto40/keymaps/default/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes