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

2 files changed, 116 insertions, 0 deletions

diff --git a/keyboards/handwired/concertina/64key/keymaps/default/config.h b/keyboards/handwired/concertina/64key/keymaps/default/config.h
new file mode 100644
index 0000000000..4af423c3a7
--- /dev/null
+++ b/keyboards/handwired/concertina/64key/keymaps/default/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2020-2021 Viktor Eikman
+ *
+ * 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
+
+/* Custom space-cadet modifier and tap combinations: Brackets on Ctrl and braces on Alt. */
+#define LCPO_KEYS KC_LCTL, KC_TRNS, KC_LBRACKET
+#define RCPC_KEYS KC_RCTL, KC_TRNS, KC_RBRACKET
+#define LAPO_KEYS KC_LALT, KC_LSFT, KC_LBRACKET
+#define RAPC_KEYS KC_RALT, KC_RSFT, KC_RBRACKET
diff --git a/keyboards/handwired/concertina/64key/keymaps/default/keymap.c b/keyboards/handwired/concertina/64key/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e8425824fb
--- /dev/null
+++ b/keyboards/handwired/concertina/64key/keymaps/default/keymap.c
@@ -0,0 +1,93 @@
+/* Copyright 2020-2021 Viktor Eikman
+ *
+ * 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 <keymap_colemak.h>
+#include <sendstring_colemak.h>
+
+enum layer_names {
+    _QWERTY,   // OS-side Colemak. Default.
+    _COLEMAK,  // Keyboard-side Colemak. Portability, emergency.
+    _GAMING,   // Navigation clusters (only) change hands.
+    _NUMERIC   // Numbers, function keys, special characters, mouse.
+};
+
+enum taps {
+    PNX,  // Play/pause; next track.
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [PNX] = ACTION_TAP_DANCE_DOUBLE(KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK),
+};
+
+// Shorthand:
+#define LAYER_N MO(_NUMERIC)
+#define LAYER_C TG(_COLEMAK)
+#define LAYER_G TG(_GAMING)
+#define PASTE LSFT(KC_INS)  // Terminal-compatible paste.
+#define SLQ RALT(KC_9)  // Single left-side quotation mark (in Colemak).
+#define SRQ RALT(KC_0)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_QWERTY] = LAYOUT_64key(
+                      KC_LSPO, KC_MINS, KC_EQL,                           KC_VOLD, KC_VOLU, KC_RSPC,
+                      KC_LCPO, KC_LGUI, KC_HAEN, KC_ENT,         KC_MUTE, TD(PNX), LAYER_N, KC_RCPC,
+                               KC_LAPO, KC_SPC,  SLQ,            SRQ,     KC_ESC,  KC_RAPC,
+
+                      CM_W,    CM_F,    CM_P,    CM_G,           CM_J,    CM_L,    CM_U,    CM_Y,
+    KC_TAB,  CM_Q,    CM_R,    CM_S,    CM_T,    CM_D,           CM_H,    CM_N,    CM_E,    CM_I,    CM_SCLN, KC_BSLS,
+    KC_BSPC, CM_A,    CM_X,    CM_C,    CM_V,    CM_B,           CM_K,    CM_M,    KC_COMM, KC_DOT,  CM_O,    KC_QUOT,
+    KC_DEL,  CM_Z,    KC_HOME, KC_PGUP, KC_END,                           KC_LEFT, KC_UP,   KC_RGHT, KC_SLSH, KC_GRV,
+                               KC_PGDN,                                            KC_DOWN
+),
+
+[_COLEMAK] = LAYOUT_64key(
+                      _______, _______, _______,                          _______, _______, _______,
+                      _______, _______, _______, _______,        _______, _______, _______, _______,
+                               _______, _______, _______,        _______, _______, _______,
+
+                      KC_W,    KC_F,    KC_P,    KC_G,           KC_J,    KC_L,    KC_U,    KC_Y,
+    _______, KC_Q,    KC_R,    KC_S,    KC_T,    KC_D,           KC_H,    KC_N,    KC_E,    KC_I,    KC_SCLN, _______,
+    _______, KC_A,    KC_X,    KC_C,    KC_V,    KC_B,           KC_K,    KC_M,    _______, _______, KC_O,    _______,
+    _______, KC_Z,    _______, _______, _______,                          _______, _______, _______, _______, _______,
+                               _______,                                            _______
+),
+
+[_GAMING] = LAYOUT_64key(
+                      _______, _______, _______,                          _______, _______, _______,
+                      _______, _______, _______, _______,        _______, _______, _______, _______,
+                               _______, _______, _______,        _______, _______, _______,
+
+                      _______, _______, _______, _______,        _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______,
+    _______, _______, KC_LEFT, KC_UP,   KC_RGHT,                          KC_HOME, KC_PGUP, KC_END,  _______, _______,
+                               KC_DOWN,                                            KC_PGDN
+),
+
+[_NUMERIC] = LAYOUT_64key(
+                      _______, _______, _______,                          KC_ACL1, KC_ACL2, _______,
+                      _______, _______, LAYER_C, _______,        KC_ACL0, _______, _______, _______,
+                               _______, _______, _______,        KC_SLEP, _______, _______,
+
+                      KC_F2,   KC_F3,   KC_F4,   KC_F5,          KC_F6,   KC_F7,   KC_F8,   KC_F9,
+    KC_F12,  KC_F1,   KC_2,    KC_3,    KC_4,    KC_5,           KC_6,    KC_7,    KC_8,    KC_9,    KC_F10,  KC_F11,
+    _______, KC_1,    KC_AT,   KC_HASH, KC_DLR,  KC_PERC,        KC_CIRC, KC_AMPR, KC_ASTR, KC_APP,  KC_0,    PASTE,
+    KC_INS,  KC_EXLM, KC_BTN1, KC_BTN3, KC_BTN2,                          KC_MS_L, KC_MS_U, KC_MS_R, KC_PSCR, RESET,
+                               LAYER_G,                                            KC_MS_D
+)
+};