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

4 files changed, 108 insertions, 0 deletions

diff --git a/keyboards/sixkeyboard/keymaps/semicolonsnet/keymap.c b/keyboards/sixkeyboard/keymaps/semicolonsnet/keymap.c
new file mode 100644
index 0000000000..86fdc90b65
--- /dev/null
+++ b/keyboards/sixkeyboard/keymaps/semicolonsnet/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2021 Chase Nordengren 
+  * 
+  * 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
+
+
+enum custom_keycodes {
+    QMKPASS = SAFE_RANGE,
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+    case QMKPASS:
+        if (record->event.pressed) {
+            // when keycode QMKPASS is pressed
+            SEND_STRING("Sample string");
+        } else {
+            // when keycode QMKPASS is released
+        }
+        break;
+    }
+    return true;
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT(KC_ESC, SGUI(KC_R), SGUI(KC_S), QMKPASS, SGUI(KC_A), SGUI(KC_V))
+};
+
diff --git a/keyboards/sixkeyboard/keymaps/semicolonsnet/readme.md b/keyboards/sixkeyboard/keymaps/semicolonsnet/readme.md
new file mode 100644
index 0000000000..e791b12a65
--- /dev/null
+++ b/keyboards/sixkeyboard/keymaps/semicolonsnet/readme.md
@@ -0,0 +1,29 @@
+Techkeys SixKeyBoard
+===
+
+Keyboard Maintainer: QMK Community  
+Hardware Supported: Techkeys SixKeyBoard PCB  
+Hardware Availability: [Techkeys](http://techkeys.us/collections/accessories/products/sixkeyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sixkeyboard:semicolonsnet
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+
+## Hardware Info
+
+The schematic is like this:
+
+```
+ switches       leds
+,--+--+--.   ,--+--+--.
+|C7|B7|B5|   |C6|B6|B4|
++--+--+--+   +--+--+--+
+|D6|D1|D4|   |D5|D2|D3|
+`--+--+--'   `--+--+--'
+```
+
+The LED on the bottom is `C4`. All 7 of the leds are turned on when the keyboard boots-up in the `sixkeyboard.c` file - backlight_enable is not required. The MCU is an Atmega16u2, so the flash memory is limited to 0x3000 bytes - the current setup uses just about all of that! I'm sure things can be opitimised a bit.
+
+There is a jumper on the bottom of the board (next to the USB port) that serves as a reset button - I drilled a hole in my case to allow for quick access via a screwdriver/metal object.
diff --git a/keyboards/xd60/keymaps/semicolonsnet/keymap.c b/keyboards/xd60/keymaps/semicolonsnet/keymap.c
new file mode 100644
index 0000000000..7b1bacf0fe
--- /dev/null
+++ b/keyboards/xd60/keymaps/semicolonsnet/keymap.c
@@ -0,0 +1,24 @@
+/* Copyright 2021 Chase Nordengren 
+  * 
+  * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_all(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_SLSH), KC_UP, KC_DEL, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+	[1] = LAYOUT_all(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_VOLU, KC_VOLD, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LCAG(KC_SCLN), LCAG(KC_QUOT), KC_NO, KC_TRNS, KC_TRNS, KC_NO, LCAG(KC_Z), LCAG(KC_X), LCAG(KC_ASTR), LCAG(KC_V), LCAG(KC_B), LCAG(KC_N), LCAG(KC_M), LCAG(KC_COMM), KC_INS, KC_DEL, KC_TRNS, KC_PGUP, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, LCAG(KC_SPC), KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END)
+};
+
+// Loop
diff --git a/keyboards/xd60/keymaps/semicolonsnet/readme.md b/keyboards/xd60/keymaps/semicolonsnet/readme.md
new file mode 100644
index 0000000000..b8a3ac4fff
--- /dev/null
+++ b/keyboards/xd60/keymaps/semicolonsnet/readme.md
@@ -0,0 +1,13 @@
+# Semicolonsnet Keymap for XIUDI's 60% XD60 PCB
+
+![Semicolonsnet Keymap for XD60](https://i.imgur.com/VZygOqK.png)
+
+## Additional Notes
+Custom Keymap for XD60 - uses a META key and lots of shortcut keys that are later software controlled
+
+## Build
+
+To build the default keymap, simply run:
+
+    make xd60/rev2:default  # XD60 rev2
+    make xd60/rev3:default  # XD60 rev3
\ No newline at end of file