[keyboard] add jacky_studio/piggy60/rev2 (#20297)

2 years ago · 9b89ad1e7b
parent 203d9eb97c
commit 9b89ad1e7b
7 changed files with 405 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)
+* Hardware Supported:
-  * **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)
+  * Piggy60 PCB rev 1 (atmega32u4, atmel-dfu)
-* 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/).
+  * 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.
+* **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**: 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.
+* **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