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

7 files changed, 431 insertions, 0 deletions

diff --git a/keyboards/handwired/axon/axon.c b/keyboards/handwired/axon/axon.c
new file mode 100644
index 0000000000..e5d7122138
--- /dev/null
+++ b/keyboards/handwired/axon/axon.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2021 Robin Liu
+
+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 "axon.h"
diff --git a/keyboards/handwired/axon/axon.h b/keyboards/handwired/axon/axon.h
new file mode 100644
index 0000000000..0d3a5c90b7
--- /dev/null
+++ b/keyboards/handwired/axon/axon.h
@@ -0,0 +1,85 @@
+/*
+Copyright 2021 Robin Liu
+
+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
+
+#include "quantum.h"
+
+/*
+* Default layout:
+* 2.75u - 2.25u spacebar
+*/
+#define LAYOUT_default( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
+	      K301, K302,       K304,       K306,       K308, K309              \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210 }, \
+	{ KC_NO, K301,  K302,  KC_NO, K304,  KC_NO, K306,  KC_NO, K308,  K309,  K310 }  \
+}
+
+/*
+* Spaceswap layout:
+* Electrically identical to default
+* 2.25u - 2.75u spacebar
+*/
+#define LAYOUT_spaceswap( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
+	      K301, K302,       K304,       K306,       K308, K309              \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210 }, \
+	{ KC_NO, K301,  K302,  KC_NO, K304,  KC_NO, K306,  KC_NO, K308,  K309,  K310 }  \
+}
+
+/*
+* 6.25u spacebar layout:
+* 6.25u spacebar
+*/
+#define LAYOUT_space6p25u( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
+	      K301, K302,                   K306,             K309              \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210 }, \
+	{ KC_NO, K301,  K302,  KC_NO, KC_NO, KC_NO, K306,  KC_NO, KC_NO, K309,  K310 }  \
+}
+
+/*
+* 7u spacebar layout:
+* 7u spacebar
+*/
+#define LAYOUT_space7u( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
+	      K301,             K304,                         K309              \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210 }, \
+	{ KC_NO, K301,  KC_NO, KC_NO, K304,  KC_NO, KC_NO, KC_NO, KC_NO, K309,  K310 }  \
+}
diff --git a/keyboards/handwired/axon/config.h b/keyboards/handwired/axon/config.h
new file mode 100644
index 0000000000..ef015194e8
--- /dev/null
+++ b/keyboards/handwired/axon/config.h
@@ -0,0 +1,48 @@
+/*
+Copyright 2021 Robin Liu
+
+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
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    RobinL
+#define PRODUCT         Axon
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 11
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { D5, D6, D4, D0 }
+#define MATRIX_COL_PINS { B0, D7, B1, B2, C0, C1, C2, C3, C4, C5, D1 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/handwired/axon/info.json b/keyboards/handwired/axon/info.json
new file mode 100644
index 0000000000..70048a8640
--- /dev/null
+++ b/keyboards/handwired/axon/info.json
@@ -0,0 +1,192 @@
+{
+    "keyboard_name": "Axon",
+    "url": "https://github.com/thatfellarobin/axon",
+    "maintainer": "Robin L.",
+    "width": 12,
+    "height": 4,
+    "layouts": {
+        "LAYOUT_default": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.25},
+                {"x": 1.25, "y": 1},
+                {"x": 2.25, "y": 1},
+                {"x": 3.25, "y": 1},
+                {"x": 4.25, "y": 1},
+                {"x": 5.25, "y": 1},
+                {"x": 6.25, "y": 1},
+                {"x": 7.25, "y": 1},
+                {"x": 8.25, "y": 1},
+                {"x": 9.25, "y": 1},
+                {"x": 10.25, "y": 1, "w": 1.75},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2, "w": 1.25},
+
+                {"x": 1.25, "y": 3, "w": 1.25},
+                {"x": 2.5, "y": 3, "w": 1.25},
+                {"x": 3.75, "y": 3, "w": 2.75},
+                {"x": 6.5, "y": 3, "w": 2.25},
+                {"x": 8.75, "y": 3},
+                {"x": 9.75, "y": 3}
+            ]
+        },
+        "LAYOUT_spaceswap": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.25},
+                {"x": 1.25, "y": 1},
+                {"x": 2.25, "y": 1},
+                {"x": 3.25, "y": 1},
+                {"x": 4.25, "y": 1},
+                {"x": 5.25, "y": 1},
+                {"x": 6.25, "y": 1},
+                {"x": 7.25, "y": 1},
+                {"x": 8.25, "y": 1},
+                {"x": 9.25, "y": 1},
+                {"x": 10.25, "y": 1, "w": 1.75},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2, "w": 1.25},
+
+                {"x": 1.25, "y": 3, "w": 1.25},
+                {"x": 2.5, "y": 3, "w": 1.25},
+                {"x": 3.75, "y": 3, "w": 2.25},
+                {"x": 6, "y": 3, "w": 2.75},
+                {"x": 8.75, "y": 3},
+                {"x": 9.75, "y": 3}
+            ]
+        },
+        "LAYOUT_space6p25u": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.25},
+                {"x": 1.25, "y": 1},
+                {"x": 2.25, "y": 1},
+                {"x": 3.25, "y": 1},
+                {"x": 4.25, "y": 1},
+                {"x": 5.25, "y": 1},
+                {"x": 6.25, "y": 1},
+                {"x": 7.25, "y": 1},
+                {"x": 8.25, "y": 1},
+                {"x": 9.25, "y": 1},
+                {"x": 10.25, "y": 1, "w": 1.75},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2, "w": 1.25},
+
+                {"x": 1.25, "y": 3, "w": 1.25},
+                {"x": 2.5, "y": 3},
+                {"x": 3.5, "y": 3, "w": 6.25},
+                {"x": 9.75, "y": 3}
+            ]
+        },
+        "LAYOUT_space7u": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.25},
+                {"x": 1.25, "y": 1},
+                {"x": 2.25, "y": 1},
+                {"x": 3.25, "y": 1},
+                {"x": 4.25, "y": 1},
+                {"x": 5.25, "y": 1},
+                {"x": 6.25, "y": 1},
+                {"x": 7.25, "y": 1},
+                {"x": 8.25, "y": 1},
+                {"x": 9.25, "y": 1},
+                {"x": 10.25, "y": 1, "w": 1.75},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2, "w": 1.25},
+
+                {"x": 1.25, "y": 3, "w": 1.25},
+                {"x": 2.5, "y": 3, "w": 7},
+                {"x": 9.5, "y": 3, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/axon/keymaps/default/keymap.c b/keyboards/handwired/axon/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2afa56ef3c
--- /dev/null
+++ b/keyboards/handwired/axon/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/*
+Copyright 2021 Robin Liu
+
+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] = {
+
+	LAYOUT_default(//Layer 0
+		KC_ESC,  KC_Q,    KC_W,     KC_E,  KC_R,    KC_T,   KC_Y, KC_U, KC_I,     KC_O,   KC_P,   KC_BSPC,
+		KC_TAB,  KC_A,    KC_S,     KC_D,  KC_F,    KC_G,   KC_H, KC_J, KC_K,     KC_L,   KC_ENT,
+		KC_LSFT, KC_Z,    KC_X,     KC_C,  KC_V,    KC_B,   KC_N, KC_M, KC_COMMA, KC_DOT, MO(2),
+		         KC_LALT, KC_LCTL,         KC_SPACE,        MO(1),      KC_RCTL,  KC_RALT
+	),
+
+	LAYOUT_default(//Layer 1
+		KC_GRV,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,     KC_0,     KC_DEL,
+		KC_TAB,  KC_MINS, KC_EQL,  KC_SCLN,  KC_QUOT, KC_HOME, KC_END, KC_NO,   KC_UP,   KC_TRNS,  KC_ENTER,
+		KC_LSFT, KC_LBRC, KC_RBRC, KC_SLSH,  KC_NUBS, KC_NO,   KC_NO,  KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS,
+		         KC_LALT, KC_LGUI,           KC_SPACE,         KC_TRNS,         KC_RGUI, KC_RALT
+	),
+
+	LAYOUT_default(//Layer 2
+		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_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,
+		KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_VOLU, KC_TRNS,
+		       KC_NO, KC_NO,        KC_NO,         KC_NO,        KC_NO, KC_VOLD
+	),
+
+};
diff --git a/keyboards/handwired/axon/readme.md b/keyboards/handwired/axon/readme.md
new file mode 100644
index 0000000000..ca422130ef
--- /dev/null
+++ b/keyboards/handwired/axon/readme.md
@@ -0,0 +1,23 @@
+# Axon
+
+![Axon](https://i.imgur.com/VRVv9i9h.jpeg)
+
+Axon v1.0 built with Durock T1 and GMK Bento
+
+Axon is a compact 40% which uses through-hole components. Hardware repo can be found at https://github.com/thatfellarobin/axon.
+
+* Keyboard Maintainer: [Robin Liu](https://github.com/thatfellarobin)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/axon:default
+
+## To reset into bootloader mode:
+
+1. While plugged in, press and hold `BOOT` switch
+2. While holding `BOOT`, press `RESET` and hold it for a second or two
+3. Release `RESET`
+4. Release `BOOT`
+5. The keyboard should now be recognized as a USBasp programmer device.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/handwired/axon/rules.mk b/keyboards/handwired/axon/rules.mk
new file mode 100644
index 0000000000..e9a5cac276
--- /dev/null
+++ b/keyboards/handwired/axon/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega328p
+
+# Bootloader selection
+BOOTLOADER = USBasp
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output