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

[keyboard] add jacky_studio/piggy60/rev2 (#20297 )
2024-12-04 17:05:17 +00:00 · 2023-04-02 17:25:54 +00:00 · 2023-04-02 11:25:14 -06:00 · 2023-04-02 17:24:41 +00:00 · 2023-04-02 17:24:05 +00:00 · 2023-04-02 11:23:26 -06:00
19 changed files with 742 additions and 5 deletions
--- a/keyboards/jacky_studio/piggy60/readme.md
+++ b/keyboards/jacky_studio/piggy60/readme.md
@ -5,17 +5,21 @@
 A gasket-mounted 60% in the style of the S7 Elephant.

 * Keyboard Maintainer: [The QMK Community](https://github.com/qmk)
-* Hardware Supported: Piggy60 PCB "rev1" (atmega32u4)
-  * **Make sure your PCB uses an `atmega32u4` before flashing!** A PCB that uses an `APM32F103CBT6` with `uf2boot` has been shipped with some extras purchases and to replace some defective units. Flashing that PCB with "rev1" firmware may result in a non-functional PCB which can only be recovered using a hardware programmer (e.g. an ST-Link V2)
-* Hardware Availability: Group Buy took place between 2021-05-22 1600 UTC and 2021-05-25 1600 UTC on [https://jackylab.com/](https://jackylab.com/).
+* Hardware Supported:
+  * Piggy60 PCB rev 1 (atmega32u4, atmel-dfu)
+  * Piggy60 PCB rev 2 (APM32F103CBT6, uf2boot)
+  **Check your PCB before flashing!** Loading rev1 firmware on a rev2 PCB may result in a non-functional PCB which can only be recovered using a hardware programmer (e.g. an ST-Link V2)
+* Hardware Availability: Group Buy took place between 2021-05-22 1600 UTC and 2021-05-25 1600 UTC on [https://jackylab.com/](https://jackylab.com/). Rev 2 PCBs were provided during extras sales and as replacements.

 Make example for this keyboard (after setting up your build environment):

    make jacky_studio/piggy60/rev1:default
+    make jacky_studio/piggy60/rev2:default

 Flashing example for this keyboard:

    make jacky_studio/piggy60/rev1:default:flash
+    make jacky_studio/piggy60/rev2:default:flash

 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).

@ -23,6 +27,15 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to

 Enter the bootloader in 3 ways:

-* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear EEPROM, so it is a good first step if the keyboard is misbehaving.
-* **Physical reset**: Short the set of vertical holes on the third row, to the right of Caps Lock. These can be reached with tweezers after the board has been assembled.
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear EEPROM/emulated EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset**:
+  - Rev 1: Short the set of vertical holes on the third row, to the right of Caps Lock. These can be reached with tweezers after the board has been assembled.
+  - Rev 2: Near the MCU there are two square pads with a circle in the middle. This is an unpopulated footprint for a reset button. Short these two pads twice in quick succession.
 * **Keycode in layout**: There is no key mapped to `QK_BOOT` in the pre-created keymaps, but you may assign this key in any keymaps you create.
+
+## Flashing
+
+After entering the bootloader through one of the three methods above:
+
+- Rev 1: The keyboard will appear as an Atmel DFU device. It can be flashed using the QMK CLI or QMK Toolbox.
+- Rev 2: The keyboard will appear as a USB mass storage device named `MT.KEY`. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded.
--- a/keyboards/jacky_studio/piggy60/rev2/board.h
+++ b/keyboards/jacky_studio/piggy60/rev2/board.h
@ -0,0 +1,21 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * 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_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
--- a/keyboards/jacky_studio/piggy60/rev2/config.h
+++ b/keyboards/jacky_studio/piggy60/rev2/config.h
@ -0,0 +1,30 @@
+/* Copyright 2022 MT
+ *
+ * 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 RGB_DI_PIN B9
+#define RGB_MATRIX_LED_COUNT 14
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#define WS2812_PWM_DRIVER PWMD4
+#define WS2812_PWM_CHANNEL 4
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_DMA_CHANNEL 7
--- a/keyboards/jacky_studio/piggy60/rev2/halconf.h
+++ b/keyboards/jacky_studio/piggy60/rev2/halconf.h
@ -0,0 +1,21 @@
+/* Copyright 2020 QMK
+ *
+ * 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 HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
--- a/keyboards/jacky_studio/piggy60/rev2/info.json
+++ b/keyboards/jacky_studio/piggy60/rev2/info.json
@ -0,0 +1,282 @@
+{
+    "board": "STM32_F103_STM32DUINO",
+    "bootloader": "uf2boot",
+    "diode_direction": "ROW2COL",
+    "community_layouts": ["60_hhkb", "60_tsangan_hhkb"],
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "indicators": {
+        "caps_lock": "B3",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A6", "A5", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15"],
+        "rows": ["A7", "B0", "B1", "B2", "B10"]
+    },
+    "processor": "STM32F103",
+    "ws2812": {
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true
+        },
+        "layout": [
+            { "flags": 2, "x": 0, "y": 63 },
+            { "flags": 2, "x": 45, "y": 63 },
+            { "flags": 2, "x": 90, "y": 63 },
+            { "flags": 2, "x": 135, "y": 63 },
+            { "flags": 2, "x": 180, "y": 63 },
+            { "flags": 2, "x": 223, "y": 63 },
+            { "flags": 2, "x": 160, "y": 32 },
+            { "flags": 2, "x": 223, "y": 0 },
+            { "flags": 2, "x": 180, "y": 0 },
+            { "flags": 2, "x": 135, "y": 0 },
+            { "flags": 2, "x": 90, "y": 0 },
+            { "flags": 2, "x": 45, "y": 0 },
+            { "flags": 2, "x": 0, "y": 0 },
+            { "flags": 2, "x": 32, "y": 32 }
+        ]
+    },
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x1002"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "\\|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "|\\", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Menu", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "\\|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Control", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "GUI", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "GUI", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "\\|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 13], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "label": "Space", "matrix": [4, 7], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
+            ]
+        }
+    }
+}
--- a/keyboards/jacky_studio/piggy60/rev2/mcuconf.h
+++ b/keyboards/jacky_studio/piggy60/rev2/mcuconf.h
@ -0,0 +1,25 @@
+/* Copyright 2020 QMK
+ *
+ * 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_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM4
+#define STM32_PWM_USE_TIM4 TRUE
+
+#undef STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2
--- a/keyboards/jacky_studio/piggy60/rev2/rules.mk
+++ b/keyboards/jacky_studio/piggy60/rev2/rules.mk
@ -0,0 +1,8 @@
+# Configure for 128K flash
+MCU_LDSCRIPT = STM32F103xB
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/keebio/kbo5000/keymaps/via/keymap.c
+++ b/keyboards/keebio/kbo5000/keymaps/via/keymap.c
@ -34,3 +34,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,                   _______, _______, _______, _______
  )
 };
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =  { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_UP, KC_DOWN)  },
+    [1] =  { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_UP, KC_DOWN)  },
+    [2] =  { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_UP, KC_DOWN)  }
+};
+#endif
--- a/keyboards/keebio/kbo5000/keymaps/via/rules.mk
+++ b/keyboards/keebio/kbo5000/keymaps/via/rules.mk
@ -1,2 +1,3 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
--- a/keyboards/vertex/angle65/chconf.h
+++ b/keyboards/vertex/angle65/chconf.h
@ -0,0 +1,28 @@
+/* Copyright 2022 vertex
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/bt66tech/bt66tech60/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_TIMEDELTA 0
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
--- a/keyboards/vertex/angle65/config.h
+++ b/keyboards/vertex/angle65/config.h
@ -0,0 +1,21 @@
+/* Copyright 2022 vertex
+
+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 SOLENOID_PIN A2
+
+#define FORCE_NKRO
--- a/keyboards/vertex/angle65/halconf.h
+++ b/keyboards/vertex/angle65/halconf.h
@ -0,0 +1,28 @@
+/* Copyright 2022 vertex
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/bt66tech/bt66tech60/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
--- a/keyboards/vertex/angle65/info.json
+++ b/keyboards/vertex/angle65/info.json
@ -0,0 +1,97 @@
+{
+    "keyboard_name": "ANGLE65",
+    "manufacturer": "vertex",
+    "url": "",
+    "maintainer": "EasonQian1, Vertex-kb",
+    "usb": {
+        "vid": "0x7374",
+        "pid": "0x9770",
+        "device_version": "0.0.1"
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "matrix_pins": {
+        "rows": ["B10", "B1", "B0", "A7", "A6"],
+        "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "C13",
+        "on_state": 0
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout":[
+                {"label": "K00 (B10,B9)", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01 (B10,B8)", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02 (B10,B7)", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03 (B10,B6)", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04 (B10,B5)", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05 (B10,B4)", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06 (B10,B3)", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07 (B10,B11)", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08 (B10,A15)", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09 (B10,A10)", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A (B10,A9)", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B (B10,B14)", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C (B10,B13)", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D (B10,B12)", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K0E (B10,A5)", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "K10 (B1,B9)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11 (B1,B8)", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12 (B1,B7)", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13 (B1,B6)", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14 (B1,B5)", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15 (B1,B4)", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16 (B1,B3)", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17 (B1,B11)", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18 (B1,A15)", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19 (B1,A10)", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A (B1,A9)", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B (B1,B14)", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C (B1,B13)", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D (B1,B12)", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "K1E (B1,A5)", "matrix": [1, 14], "x": 15, "y": 1},
+                {"label": "K20 (B0,B9)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21 (B0,B8)", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22 (B0,B7)", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23 (B0,B6)", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24 (B0,B5)", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25 (B0,B4)", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26 (B0,B3)", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27 (B0,B11)", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28 (B0,A15)", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29 (B0,A10)", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A (B0,A9)", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B (B0,B14)", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2C (B0,B13)", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "K2D (B0,B12)", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"label": "K2E (B0,A5)", "matrix": [2, 14], "x": 15, "y": 2},
+                {"label": "K30 (A7,B9)", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31 (A7,B8)", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32 (A7,B7)", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33 (A7,B6)", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34 (A7,B5)", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35 (A7,B4)", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36 (A7,B3)", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37 (A7,B11)", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38 (A7,A15)", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39 (A7,A10)", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A (A7,A9)", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B (A7,B14)", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C (A7,B13)", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D (A7,B12)", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "K3E (A7,A5)", "matrix": [3, 14], "x": 15, "y": 3},
+                {"label": "K40 (A6,B9)", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41 (A6,B8)", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42 (A6,B7)", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46 (A6,B3)", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K4A (A6,A9)", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4B (A6,B14)", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C (A6,B13)", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "K4D (A6,B12)", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "K4E (A6,A5)", "matrix": [4, 14], "x": 15, "y": 4}
+           ]
+        }
+    }
+}
--- a/keyboards/vertex/angle65/keymaps/default/keymap.c
+++ b/keyboards/vertex/angle65/keymaps/default/keymap.c
@ -0,0 +1,35 @@
+/* Copyright 2022 vertex
+ *
+ * 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 (
+      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_1,    KC_BSPC,
+      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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,  KC_PGUP,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_UP,   KC_PGDN,
+      KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                              MO(1),  KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT (
+      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,  _______,_______,
+      _______, HF_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,_______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,
+      _______, _______, _______,                            _______,                            _______, _______, _______, _______,_______
+  ),
+};
--- a/keyboards/vertex/angle65/keymaps/via/keymap.c
+++ b/keyboards/vertex/angle65/keymaps/via/keymap.c
@ -0,0 +1,51 @@
+/* Copyright 2022 vertex
+ *
+ * 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 (
+        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_1,    KC_BSPC,
+        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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,  KC_PGUP,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                              MO(1),  KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT (
+        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,  _______,_______,
+        _______, HF_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,_______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,_______
+    ),
+
+    [2] = LAYOUT (
+        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,  _______,_______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,_______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,_______
+    ),
+
+    [3] = LAYOUT(
+        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,  _______,_______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,_______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,_______
+    ),
+};
--- a/keyboards/vertex/angle65/keymaps/via/rules.mk
+++ b/keyboards/vertex/angle65/keymaps/via/rules.mk
@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
--- a/keyboards/vertex/angle65/mcuconf.h
+++ b/keyboards/vertex/angle65/mcuconf.h
@ -0,0 +1,27 @@
+/* Copyright 2022 vertex
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/bt66tech/bt66tech60/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
--- a/keyboards/vertex/angle65/readme.md
+++ b/keyboards/vertex/angle65/readme.md
@ -0,0 +1,22 @@
+# angle65
+
+* A customizable soldering 60% keyboard.
+
+* Keyboard Maintainer: [EASON](https://github.com/EasonQian1)
+* Hardware Supported: angle65
+* Hardware Availability: [vertex-kb](https://github.com/Vertex-kb)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make vertex/angle65:default
+
+Flashing example for this keyboard:
+
+    make vertex/angle65:default:flash
+
+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).
+
+## Bootloader Enter the bootloader in 3 ways:
+* **Bootmagic reset**: Hold down Enter in the keyboard then replug
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`
--- a/keyboards/vertex/angle65/rules.mk
+++ b/keyboards/vertex/angle65/rules.mk
@ -0,0 +1,17 @@
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # 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 = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+HAPTIC_ENABLE = yes
+HAPTIC_DRIVER += SOLENOID
+
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
Author	SHA1	Message	Date
QMK Bot	4024e779f3	Merge remote-tracking branch 'origin/develop' into xap	2023-04-02 17:25:54 +00:00
Less/Rikki	9b89ad1e7b	[keyboard] add jacky_studio/piggy60/rev2 (#20297 )	2023-04-02 11:25:14 -06:00
QMK Bot	b4d3029675	Merge remote-tracking branch 'origin/develop' into xap	2023-04-02 17:24:41 +00:00
QMK Bot	203d9eb97c	Merge remote-tracking branch 'origin/master' into develop	2023-04-02 17:24:05 +00:00
Raphael Mangubat	5b8dae0d61	Enable encoder mapping in VIA for Keebio KBO-5000 (#20272 )	2023-04-02 11:23:26 -06:00
QMK Bot	cb49817082	Merge remote-tracking branch 'origin/develop' into xap	2023-04-02 17:10:06 +00:00
QMK Bot	822445277e	Merge remote-tracking branch 'origin/master' into develop	2023-04-02 17:09:29 +00:00
Vertex-kb	fd56a2a1dc	Add angle65 (#19986 ) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>	2023-04-02 11:08:53 -06:00