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

27 files changed, 799 insertions, 0 deletions

diff --git a/keyboards/sawnsprojects/amber80/readme.md b/keyboards/sawnsprojects/amber80/readme.md
new file mode 100644
index 0000000000..bc5dd417fc
--- /dev/null
+++ b/keyboards/sawnsprojects/amber80/readme.md
@@ -0,0 +1,25 @@
+# Amber80 solder
+
+A TKL keyboard sold in several variants. 
+
+1. [Solder](solder/): 1/2022. Atmega32u4 soldered keyboard. Sold under the name "Amber80" with Amber80 keyboard case. Compatible with Amber80 keyboard case.
+
+ **Firmware files are SPECIFIC to each board. Firmware files from one, will not work on the other.** Please use the `.hex` or `.bin` appropriate for your board.
+
+* Keyboard Maintainer: [SawnsProjects](https://github.com/MaiTheSan)
+* Hardware Supported: Amber80 
+* Hardware Availability: Comming Soon
+
+Make examples for this keyboard (after setting up your build environment):
+
+    make sawnsprojects/amber80/solder:default
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+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).
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h
new file mode 100644
index 0000000000..90c9bc522c
--- /dev/null
+++ b/keyboards/sawnsprojects/amber80/solder/config.h
@@ -0,0 +1,72 @@
+/* Copyright 2022 SawnsProjects
+ *
+ * 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       0x5350
+#define PRODUCT_ID      0xA801
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    SawnsProjects X Yuutsu X Zlane
+#define PRODUCT         Amber80 Solder
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 9
+
+/* Indicator */
+#define LED_CAPS_LOCK_PIN F5
+#define LED_SCROLL_LOCK_PIN B0
+#define LED_PIN_ON_STATE 0
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B1, B2, B3, B7, D0, D1, F1, F0, D7, B4, D5, D3 }
+#define MATRIX_COL_PINS { F4, F6, F7, C7, C6, B6, B5, D6, D4 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* RGB */
+#define RGB_DI_PIN D2
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 22
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== or choose animations ==*/
+    #define RGBLIGHT_EFFECT_BREATHING
+    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+    #define RGBLIGHT_EFFECT_SNAKE
+    #define RGBLIGHT_EFFECT_KNIGHT
+    #define RGBLIGHT_EFFECT_CHRISTMAS
+    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+    #define RGBLIGHT_EFFECT_RGB_TEST
+    #define RGBLIGHT_EFFECT_ALTERNATING
+#endif
diff --git a/keyboards/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/info.json
new file mode 100644
index 0000000000..49ca20594c
--- /dev/null
+++ b/keyboards/sawnsprojects/amber80/solder/info.json
@@ -0,0 +1,101 @@
+{
+    "keyboard_name": "Amber80 SOLDER",
+    "url": "",
+    "maintainer": "SawnsProjects",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "K00 (B1,F4)", "x": 0, "y": 0 },
+                { "label": "K10 (B2,F4)", "x": 1.25, "y": 0 },
+                { "label": "K01 (B1,F6)", "x": 2.25, "y": 0 },
+                { "label": "K11 (B2,F6)", "x": 3.25, "y": 0 },
+                { "label": "K02 (B1,F7)", "x": 4.25, "y": 0 },
+                { "label": "K12 (B2,F7)", "x": 5.5, "y": 0 },
+                { "label": "K03 (B1,C7)", "x": 6.5, "y": 0 },
+                { "label": "K13 (B2,C7)", "x": 7.5, "y": 0 },
+                { "label": "K04 (B1,C6)", "x": 8.5, "y": 0 },
+                { "label": "K14 (B2,C6)", "x": 9.75, "y": 0 },
+                { "label": "K05 (B1,B6)", "x": 10.75, "y": 0 },
+                { "label": "K15 (B2,B6)", "x": 11.75, "y": 0 },
+                { "label": "K06 (B1,B5)", "x": 12.75, "y": 0 },
+                { "label": "K16 (B2,B5)", "x": 14, "y": 0 },
+                { "label": "K17 (B2,D6)", "x": 15.25, "y": 0 },
+                { "label": "K08 (B1,D4)", "x": 16.25, "y": 0 },
+                { "label": "K18 (B2,D4)", "x": 17.25, "y": 0 },
+                { "label": "K20 (B3,F4)", "x": 0, "y": 1.25 },
+                { "label": "K30 (B7,F4)", "x": 1, "y": 1.25 },
+                { "label": "K21 (B3,F6)", "x": 2, "y": 1.25 },
+                { "label": "K31 (B7,F6)", "x": 3, "y": 1.25 },
+                { "label": "K22 (B3,F7)", "x": 4, "y": 1.25 },
+                { "label": "K32 (B7,F7)", "x": 5, "y": 1.25 },
+                { "label": "K23 (B3,C7)", "x": 6, "y": 1.25 },
+                { "label": "K33 (B7,C7)", "x": 7, "y": 1.25 },
+                { "label": "K24 (B3,C6)", "x": 8, "y": 1.25 },
+                { "label": "K34 (B7,C6)", "x": 9, "y": 1.25 },
+                { "label": "K25 (B3,B6)", "x": 10, "y": 1.25 },
+                { "label": "K35 (B7,B6)", "x": 11, "y": 1.25 },
+                { "label": "K26 (B3,B5)", "x": 12, "y": 1.25 },
+                { "label": "K36 (B7,B5)", "x": 13, "y": 1.25 },
+                { "label": "K27 (B3,D6)", "x": 14, "y": 1.25 },
+                { "label": "K37 (B7,D6)", "x": 15.25, "y": 1.25 },
+                { "label": "K28 (B3,D4)", "x": 16.25, "y": 1.25 },
+                { "label": "K38 (B7,D4)", "x": 17.25, "y": 1.25 },
+                { "label": "K40 (D0,F4)", "x": 0, "y": 2.25, "w": 1.5 },
+                { "label": "K50 (D1,F4)", "x": 1.5, "y": 2.25 },
+                { "label": "K41 (D0,F6)", "x": 2.5, "y": 2.25 },
+                { "label": "K51 (D1,F6)", "x": 3.5, "y": 2.25 },
+                { "label": "K42 (D0,F7)", "x": 4.5, "y": 2.25 },
+                { "label": "K52 (D1,F7)", "x": 5.5, "y": 2.25 },
+                { "label": "K43 (D0,C7)", "x": 6.5, "y": 2.25 },
+                { "label": "K53 (D1,C7)", "x": 7.5, "y": 2.25 },
+                { "label": "K44 (D0,C6)", "x": 8.5, "y": 2.25 },
+                { "label": "K54 (D1,C6)", "x": 9.5, "y": 2.25 },
+                { "label": "K45 (D0,B6)", "x": 10.5, "y": 2.25 },
+                { "label": "K55 (D1,B6)", "x": 11.5, "y": 2.25 },
+                { "label": "K46 (D0,B5)", "x": 12.5, "y": 2.25 },
+                { "label": "K56 (D1,B5)", "x": 13.5, "y": 2.25, "w": 1.5 },
+                { "label": "K57 (D1,D6)", "x": 15.25, "y": 2.25 },
+                { "label": "K48 (D0,D4)", "x": 16.25, "y": 2.25 },
+                { "label": "K58 (D1,D4)", "x": 17.25, "y": 2.25 },
+                { "label": "K60 (F1,F4)", "x": 0, "y": 3.25, "w": 1.75 },
+                { "label": "K70 (F0,F4)", "x": 1.75, "y": 3.25 },
+                { "label": "K61 (F1,F6)", "x": 2.75, "y": 3.25 },
+                { "label": "K71 (F0,F6)", "x": 3.75, "y": 3.25 },
+                { "label": "K62 (F1,F7)", "x": 4.75, "y": 3.25 },
+                { "label": "K72 (F0,F7)", "x": 5.75, "y": 3.25 },
+                { "label": "K63 (F1,C7)", "x": 6.75, "y": 3.25 },
+                { "label": "K73 (F0,C7)", "x": 7.75, "y": 3.25 },
+                { "label": "K64 (F1,C6)", "x": 8.75, "y": 3.25 },
+                { "label": "K74 (F0,C6)", "x": 9.75, "y": 3.25 },
+                { "label": "K65 (F1,B6)", "x": 10.75, "y": 3.25 },
+                { "label": "K75 (F0,B6)", "x": 11.75, "y": 3.25 },
+                { "label": "K76 (F0,B5)", "x": 12.75, "y": 3.25, "w": 2.25 },
+                { "label": "K80 (D7,F4)", "x": 0, "y": 4.25, "w": 1.25 },
+                { "label": "K90 (B4,F4)", "x": 1.25, "y": 4.25 },
+                { "label": "K81 (D7,F6)", "x": 2.25, "y": 4.25 },
+                { "label": "K91 (B4,F6)", "x": 3.25, "y": 4.25 },
+                { "label": "K82 (D7,F7)", "x": 4.25, "y": 4.25 },
+                { "label": "K92 (B4,F7)", "x": 5.25, "y": 4.25 },
+                { "label": "K83 (D7,C7)", "x": 6.25, "y": 4.25 },
+                { "label": "K93 (B4,C7)", "x": 7.25, "y": 4.25 },
+                { "label": "K84 (D7,C6)", "x": 8.25, "y": 4.25 },
+                { "label": "K94 (B4,C6)", "x": 9.25, "y": 4.25 },
+                { "label": "K85 (D7,B6)", "x": 10.25, "y": 4.25 },
+                { "label": "K95 (B4,B6)", "x": 11.25, "y": 4.25 },
+                { "label": "K86 (D7,B5)", "x": 12.25, "y": 4.25, "w": 1.75 },
+                { "label": "K96 (B4,B5)", "x": 14, "y": 4.25 },
+                { "label": "K88 (D7,D4)", "x": 16.25, "y": 4.25 },
+                { "label": "KA0 (D5,F4)", "x": 0, "y": 5.25, "w": 1.5 },
+                { "label": "KB0 (D3,F4)", "x": 1.5, "y": 5.25 },
+                { "label": "KA1 (D5,F6)", "x": 2.5, "y": 5.25, "w": 1.5 },
+                { "label": "KB3 (D3,C7)", "x": 4, "y": 5.25, "w": 7 },
+                { "label": "KA6 (D5,B5)", "x": 11, "y": 5.25, "w": 1.5 },
+                { "label": "KB6 (D3,B5)", "x": 12.5, "y": 5.25 },
+                { "label": "KA7 (D5,D6)", "x": 13.5, "y": 5.25, "w": 1.5 },
+                { "label": "KB7 (D3,D6)", "x": 15.25, "y": 5.25 },
+                { "label": "KA8 (D5,D4)", "x": 16.25, "y": 5.25 },
+                { "label": "KB8 (D3,D4)", "x": 17.25, "y": 5.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/sawnsprojects/amber80/solder/keymaps/default/keymap.c b/keyboards/sawnsprojects/amber80/solder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ffc9beb772
--- /dev/null
+++ b/keyboards/sawnsprojects/amber80/solder/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+/* Copyright 2022 SawnsProjects
+ *
+ * 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_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_PSCR, KC_SLCK, KC_PAUS,
+
+        KC_GRV,  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_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
+        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,               KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_KANA, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/amber80/solder/keymaps/default/readme.md b/keyboards/sawnsprojects/amber80/solder/keymaps/default/readme.md
new file mode 100644
index 0000000000..60f00eb4ba
--- /dev/null
+++ b/keyboards/sawnsprojects/amber80/solder/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Amber80 Solder
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/amber80/solder/keymaps/via/keymap.c b/keyboards/sawnsprojects/amber80/solder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b8e8084374
--- /dev/null
+++ b/keyboards/sawnsprojects/amber80/solder/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2022 SawnsProjects
+ *
+ * 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_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_PSCR, KC_SLCK, KC_PAUS,
+
+        KC_GRV,  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_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
+        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,               KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_KANA, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_all(
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/amber80/solder/keymaps/via/readme.md b/keyboards/sawnsprojects/amber80/solder/keymaps/via/readme.md
new file mode 100644
index 0000000000..3313fcc41a
--- /dev/null
+++ b/keyboards/sawnsprojects/amber80/solder/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The VIA keymap for Amber80 Solder
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/amber80/solder/keymaps/via/rules.mk b/keyboards/sawnsprojects/amber80/solder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/sawnsprojects/amber80/solder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/amber80/solder/readme.md b/keyboards/sawnsprojects/amber80/solder/readme.md
new file mode 100644
index 0000000000..a429328702
--- /dev/null
+++ b/keyboards/sawnsprojects/amber80/solder/readme.md
@@ -0,0 +1,24 @@
+# Amber80 solder
+
+![Amber80](https://i.imgur.com/ygUgpqZh.jpg)
+
+A TKL keyboard sold in several variants.
+
+* Keyboard Maintainer: [SawnsProjects](https://github.com/MaiTheSan)
+* Hardware Supported: Amber80 
+* Hardware Availability: Comming Soon
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sawnsprojects/amber80/solder:default
+	
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+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/sawnsprojects/amber80/solder/rules.mk b/keyboards/sawnsprojects/amber80/solder/rules.mk
new file mode 100644
index 0000000000..4613b7d460
--- /dev/null
+++ b/keyboards/sawnsprojects/amber80/solder/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/amber80/solder/solder.c b/keyboards/sawnsprojects/amber80/solder/solder.c
new file mode 100644
index 0000000000..b7dbe1e558
--- /dev/null
+++ b/keyboards/sawnsprojects/amber80/solder/solder.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 SawnsProjects
+ *
+ * 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 "solder.h"
diff --git a/keyboards/sawnsprojects/amber80/solder/solder.h b/keyboards/sawnsprojects/amber80/solder/solder.h
new file mode 100644
index 0000000000..9f76795162
--- /dev/null
+++ b/keyboards/sawnsprojects/amber80/solder/solder.h
@@ -0,0 +1,44 @@
+/* Copyright 2022 SawnsProjects
+ *
+ * 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"
+
+#define XXX KC_NO
+
+#define LAYOUT_all( \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K17, K08, K18, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, K38, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K57, K48, K58, \
+    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, \
+    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96, K88, \
+    KA0, KB0, KA1, KB3, KA6, KB6, KA7, KB7, KA8, KB8  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, XXX, K08 }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
+    { K40, K41, K42, K43, K44, K45, K46, XXX, K48 }, \
+    { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
+    { K60, K61, K62, K63, K64, K65, XXX, XXX, XXX }, \
+    { K70, K71, K72, K73, K74, K75, K76, XXX, XXX }, \
+    { K80, K81, K82, K83, K84, K85, K86, XXX, K88 }, \
+    { K90, K91, K92, K93, K94, K95, K96, XXX, XXX }, \
+    { KA0, KA1, XXX, XXX, XXX, XXX, KA6, KA7, KA8 }, \
+    { KB0, XXX, XXX, KB3, XXX, XXX, KB6, KB7, KB8 }, \
+}
+
diff --git a/keyboards/sawnsprojects/vcl65/readme.md b/keyboards/sawnsprojects/vcl65/readme.md
new file mode 100644
index 0000000000..025c41badf
--- /dev/null
+++ b/keyboards/sawnsprojects/vcl65/readme.md
@@ -0,0 +1,25 @@
+# VCL65 solder
+
+A 65% keyboard sold in several variants. 
+
+1. [Solder](solder/): 06/2021. Atmega32u4 soldered keyboard. Sold under the name "VCL65" with Lotus 65 lite keyboard case. Compatible with some 65% traymount case, VCL65 and Lotus65.
+
+ **Firmware files are SPECIFIC to each board. Firmware files from one, will not work on the other.** Please use the `.hex` or `.bin` appropriate for your board.
+
+* Keyboard Maintainer: [SawnsProjects](https://github.com/MaiTheSan) & [Hoaq](https://github.com/itsmehoaq)
+* Hardware Supported: Lotus65 lite, VCL65, 65% traymount case 
+* Hardware Availability: Private Discord GB
+
+Make examples for this keyboard (after setting up your build environment):
+
+    make sawnsprojects/vcl65/solder:default
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+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).
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h
new file mode 100644
index 0000000000..bf1a7cdde6
--- /dev/null
+++ b/keyboards/sawnsprojects/vcl65/solder/config.h
@@ -0,0 +1,66 @@
+/* Copyright 2021 SawnsProjects
+ *
+ * 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       0x5350
+#define PRODUCT_ID      0x1727
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    VCL x SawnsProjects
+#define PRODUCT         VCL65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F6, F7, F0, F4, B1 }
+#define MATRIX_COL_PINS { B2, B5, F5, C7, B4, C6, D7, D6, D4, D5, D3, D2, B6, D1, D0 }
+#define UNUSED_PINS
+
+/* indicator */
+//  #define LED_CAPS_LOCK_PIN F0
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+/* Caps Lock */
+#define LED_CAPS_LOCK_PIN F1
+#define LED_PIN_ON_STATE 0
+/* rotary */
+
+#define RGB_DI_PIN B7
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 20
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+/*== all animations enable ==*/
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#endif
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json
new file mode 100644
index 0000000000..bae3093b4f
--- /dev/null
+++ b/keyboards/sawnsprojects/vcl65/solder/info.json
@@ -0,0 +1,81 @@
+{
+    "keyboard_name": "VCL65 Solder",
+    "url": "",
+    "maintainer": "MaiTheSan",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "K00 (F6,B2)", "x": 0, "y": 0 },
+                { "label": "K01 (F6,B5)", "x": 1, "y": 0 },
+                { "label": "K02 (F6,F5)", "x": 2, "y": 0 },
+                { "label": "K03 (F6,C7)", "x": 3, "y": 0 },
+                { "label": "K04 (F6,B4)", "x": 4, "y": 0 },
+                { "label": "K05 (F6,C6)", "x": 5, "y": 0 },
+                { "label": "K06 (F6,D7)", "x": 6, "y": 0 },
+                { "label": "K07 (F6,D6)", "x": 7, "y": 0 },
+                { "label": "K08 (F6,D4)", "x": 8, "y": 0 },
+                { "label": "K09 (F6,D5)", "x": 9, "y": 0 },
+                { "label": "K0A (F6,D3)", "x": 10, "y": 0 },
+                { "label": "K0B (F6,D2)", "x": 11, "y": 0 },
+                { "label": "K0C (F6,B6)", "x": 12, "y": 0 },
+                { "label": "K0D (F6,D1)", "x": 13, "y": 0 },
+                { "label": "K2C (F4,B6)", "x": 14, "y": 0 },
+                { "label": "K0E (F6,D0)", "x": 15, "y": 0 },
+                { "label": "K10 (F7,B2)", "x": 0, "y": 1, "w": 1.5 },
+                { "label": "K11 (F7,B5)", "x": 1.5, "y": 1 },
+                { "label": "K12 (F7,F5)", "x": 2.5, "y": 1 },
+                { "label": "K13 (F7,C7)", "x": 3.5, "y": 1 },
+                { "label": "K14 (F7,B4)", "x": 4.5, "y": 1 },
+                { "label": "K15 (F7,C6)", "x": 5.5, "y": 1 },
+                { "label": "K16 (F7,D7)", "x": 6.5, "y": 1 },
+                { "label": "K17 (F7,D6)", "x": 7.5, "y": 1 },
+                { "label": "K18 (F7,D4)", "x": 8.5, "y": 1 },
+                { "label": "K19 (F7,D5)", "x": 9.5, "y": 1 },
+                { "label": "K1A (F7,D3)", "x": 10.5, "y": 1 },
+                { "label": "K1B (F7,D2)", "x": 11.5, "y": 1 },
+                { "label": "K1C (F7,B6)", "x": 12.5, "y": 1 },
+                { "label": "K1D (F7,D1)", "x": 13.5, "y": 1, "w": 1.5 },
+                { "label": "K1E (F7,D0)", "x": 15, "y": 1 },
+                { "label": "K20 (F4,B2)", "x": 0, "y": 2, "w": 1.75 },
+                { "label": "K21 (F4,B5)", "x": 1.75, "y": 2 },
+                { "label": "K22 (F4,F5)", "x": 2.75, "y": 2 },
+                { "label": "K23 (F4,C7)", "x": 3.75, "y": 2 },
+                { "label": "K24 (F4,B4)", "x": 4.75, "y": 2 },
+                { "label": "K25 (F4,C6)", "x": 5.75, "y": 2 },
+                { "label": "K26 (F4,D7)", "x": 6.75, "y": 2 },
+                { "label": "K27 (F4,D6)", "x": 7.75, "y": 2 },
+                { "label": "K28 (F4,D4)", "x": 8.75, "y": 2 },
+                { "label": "K29 (F4,D5)", "x": 9.75, "y": 2 },
+                { "label": "K2A (F4,D3)", "x": 10.75, "y": 2 },
+                { "label": "K2B (F4,D2)", "x": 11.75, "y": 2 },
+                { "label": "K2D (F4,D1)", "x": 12.75, "y": 2, "w": 2.25 },
+                { "label": "K2E (F4,D0)", "x": 15, "y": 2 },
+                { "label": "K30 (B0,B2)", "x": 0, "y": 3, "w": 1.25 },
+