~ruther/qmk_firmware

26b35a54cf5f0c6ddefb42c9c2ae1a02ab11f99d — James Young 2 years ago 38700f7
4pplet/aekiso60 Layout Macro Conversion and Additions (#20399)

* add matrix_diagram.md

Adds `matrix_diagram.md` to the `4pplet/aekiso60` directory, and removes the diagrams from the keyboard revision header files.

* info.json: apply friendly formatting

* move matrix data to info.json

* create keyboard-level info.json

* add LAYOUT_60_iso_tsangan

* enable Community Layout support
8 files changed, 190 insertions(+), 257 deletions(-)

A keyboards/4pplet/aekiso60/info.json
A keyboards/4pplet/aekiso60/matrix_diagram.md
M keyboards/4pplet/aekiso60/rev_a/info.json
D keyboards/4pplet/aekiso60/rev_a/rev_a.c
D keyboards/4pplet/aekiso60/rev_a/rev_a.h
M keyboards/4pplet/aekiso60/rev_b/info.json
D keyboards/4pplet/aekiso60/rev_b/rev_b.c
D keyboards/4pplet/aekiso60/rev_b/rev_b.h
A keyboards/4pplet/aekiso60/info.json => keyboards/4pplet/aekiso60/info.json +155 -0
@@ 0,0 1,155 @@
{
    "manufacturer": "4pplet",
    "url": "",
    "maintainer": "4pplet",
    "usb": {
        "vid": "0x4444"
    },
    "community_layouts": [
        "60_iso_tsangan"
    ],
    "layouts": {
        "LAYOUT_all": {
            "layout": [
                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
                {"label": "1", "matrix": [0, 1], "x": 1.25, "y": 0},
                {"label": "2", "matrix": [0, 2], "x": 2.25, "y": 0},
                {"label": "3", "matrix": [0, 3], "x": 3.25, "y": 0},
                {"label": "4", "matrix": [0, 4], "x": 4.25, "y": 0},
                {"label": "5", "matrix": [0, 5], "x": 5.25, "y": 0},
                {"label": "6", "matrix": [0, 6], "x": 6.25, "y": 0},
                {"label": "7", "matrix": [0, 7], "x": 7.25, "y": 0},
                {"label": "8", "matrix": [0, 8], "x": 8.25, "y": 0},
                {"label": "9", "matrix": [0, 9], "x": 9.25, "y": 0},
                {"label": "0", "matrix": [0, 10], "x": 10.25, "y": 0},
                {"label": "-", "matrix": [0, 11], "x": 11.25, "y": 0},
                {"label": "=", "matrix": [0, 12], "x": 12.25, "y": 0},
                {"label": "Backspace", "matrix": [0, 13], "x": 13.25, "y": 0, "w": 1.75},

                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
                {"label": "Q", "matrix": [1, 1], "x": 1.75, "y": 1},
                {"label": "W", "matrix": [1, 2], "x": 2.75, "y": 1},
                {"label": "E", "matrix": [1, 3], "x": 3.75, "y": 1},
                {"label": "R", "matrix": [1, 4], "x": 4.75, "y": 1},
                {"label": "T", "matrix": [1, 5], "x": 5.75, "y": 1},
                {"label": "Y", "matrix": [1, 6], "x": 6.75, "y": 1},
                {"label": "U", "matrix": [1, 7], "x": 7.75, "y": 1},
                {"label": "I", "matrix": [1, 8], "x": 8.75, "y": 1},
                {"label": "O", "matrix": [1, 9], "x": 9.75, "y": 1},
                {"label": "P", "matrix": [1, 10], "x": 10.75, "y": 1},
                {"label": "[", "matrix": [1, 11], "x": 11.75, "y": 1},
                {"label": "]", "matrix": [1, 12], "x": 12.75, "y": 1},

                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 2},
                {"label": "A", "matrix": [2, 1], "x": 2, "y": 2},
                {"label": "S", "matrix": [2, 2], "x": 3, "y": 2},
                {"label": "D", "matrix": [2, 3], "x": 4, "y": 2},
                {"label": "F", "matrix": [2, 4], "x": 5, "y": 2},
                {"label": "G", "matrix": [2, 5], "x": 6, "y": 2},
                {"label": "H", "matrix": [2, 6], "x": 7, "y": 2},
                {"label": "J", "matrix": [2, 7], "x": 8, "y": 2},
                {"label": "K", "matrix": [2, 8], "x": 9, "y": 2},
                {"label": "L", "matrix": [2, 9], "x": 10, "y": 2},
                {"label": ";", "matrix": [2, 10], "x": 11, "y": 2},
                {"label": "'", "matrix": [2, 11], "x": 12, "y": 2},
                {"label": "#", "matrix": [2, 12], "x": 13, "y": 2},
                {"label": "Enter", "matrix": [1, 13], "x": 14, "y": 1, "h": 2},

                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
                {"label": "\\", "matrix": [3, 1], "x": 1.5, "y": 3},
                {"label": "Z", "matrix": [3, 2], "x": 2.5, "y": 3},
                {"label": "X", "matrix": [3, 3], "x": 3.5, "y": 3},
                {"label": "C", "matrix": [3, 4], "x": 4.5, "y": 3},
                {"label": "V", "matrix": [3, 5], "x": 5.5, "y": 3},
                {"label": "B", "matrix": [3, 6], "x": 6.5, "y": 3},
                {"label": "N", "matrix": [3, 7], "x": 7.5, "y": 3},
                {"label": "M", "matrix": [3, 8], "x": 8.5, "y": 3},
                {"label": ",", "matrix": [3, 9], "x": 9.5, "y": 3},
                {"label": ".", "matrix": [3, 10], "x": 10.5, "y": 3},
                {"label": "/", "matrix": [3, 11], "x": 11.5, "y": 3},
                {"label": "Shift", "matrix": [3, 12], "x": 12.5, "y": 3, "w": 1.5},
                {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},

                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
                {"label": "Alt", "matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.5},
                {"label": "\u25bd", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 2.75},
                {"label": "Space", "matrix": [4, 5], "x": 7, "y": 4},
                {"label": "\u25bd", "matrix": [4, 6], "x": 8, "y": 4, "w": 2.75},
                {"label": "Alt", "matrix": [4, 8], "x": 10.75, "y": 4, "w": 1.5},
                {"label": "GUI", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5}
            ]
        },

        "LAYOUT_60_iso_tsangan": {
            "layout": [
                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
                {"label": "1", "matrix": [0, 1], "x": 1.25, "y": 0},
                {"label": "2", "matrix": [0, 2], "x": 2.25, "y": 0},
                {"label": "3", "matrix": [0, 3], "x": 3.25, "y": 0},
                {"label": "4", "matrix": [0, 4], "x": 4.25, "y": 0},
                {"label": "5", "matrix": [0, 5], "x": 5.25, "y": 0},
                {"label": "6", "matrix": [0, 6], "x": 6.25, "y": 0},
                {"label": "7", "matrix": [0, 7], "x": 7.25, "y": 0},
                {"label": "8", "matrix": [0, 8], "x": 8.25, "y": 0},
                {"label": "9", "matrix": [0, 9], "x": 9.25, "y": 0},
                {"label": "0", "matrix": [0, 10], "x": 10.25, "y": 0},
                {"label": "-", "matrix": [0, 11], "x": 11.25, "y": 0},
                {"label": "=", "matrix": [0, 12], "x": 12.25, "y": 0},
                {"label": "Backspace", "matrix": [0, 13], "x": 13.25, "y": 0, "w": 1.75},

                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
                {"label": "Q", "matrix": [1, 1], "x": 1.75, "y": 1},
                {"label": "W", "matrix": [1, 2], "x": 2.75, "y": 1},
                {"label": "E", "matrix": [1, 3], "x": 3.75, "y": 1},
                {"label": "R", "matrix": [1, 4], "x": 4.75, "y": 1},
                {"label": "T", "matrix": [1, 5], "x": 5.75, "y": 1},
                {"label": "Y", "matrix": [1, 6], "x": 6.75, "y": 1},
                {"label": "U", "matrix": [1, 7], "x": 7.75, "y": 1},
                {"label": "I", "matrix": [1, 8], "x": 8.75, "y": 1},
                {"label": "O", "matrix": [1, 9], "x": 9.75, "y": 1},
                {"label": "P", "matrix": [1, 10], "x": 10.75, "y": 1},
                {"label": "[", "matrix": [1, 11], "x": 11.75, "y": 1},
                {"label": "]", "matrix": [1, 12], "x": 12.75, "y": 1},

                {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 2},
                {"label": "A", "matrix": [2, 1], "x": 2, "y": 2},
                {"label": "S", "matrix": [2, 2], "x": 3, "y": 2},
                {"label": "D", "matrix": [2, 3], "x": 4, "y": 2},
                {"label": "F", "matrix": [2, 4], "x": 5, "y": 2},
                {"label": "G", "matrix": [2, 5], "x": 6, "y": 2},
                {"label": "H", "matrix": [2, 6], "x": 7, "y": 2},
                {"label": "J", "matrix": [2, 7], "x": 8, "y": 2},
                {"label": "K", "matrix": [2, 8], "x": 9, "y": 2},
                {"label": "L", "matrix": [2, 9], "x": 10, "y": 2},
                {"label": ";", "matrix": [2, 10], "x": 11, "y": 2},
                {"label": "'", "matrix": [2, 11], "x": 12, "y": 2},
                {"label": "#", "matrix": [2, 12], "x": 13, "y": 2},
                {"label": "Enter", "matrix": [1, 13], "x": 14, "y": 1, "h": 2},

                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
                {"label": "\\", "matrix": [3, 1], "x": 1.5, "y": 3},
                {"label": "Z", "matrix": [3, 2], "x": 2.5, "y": 3},
                {"label": "X", "matrix": [3, 3], "x": 3.5, "y": 3},
                {"label": "C", "matrix": [3, 4], "x": 4.5, "y": 3},
                {"label": "V", "matrix": [3, 5], "x": 5.5, "y": 3},
                {"label": "B", "matrix": [3, 6], "x": 6.5, "y": 3},
                {"label": "N", "matrix": [3, 7], "x": 7.5, "y": 3},
                {"label": "M", "matrix": [3, 8], "x": 8.5, "y": 3},
                {"label": ",", "matrix": [3, 9], "x": 9.5, "y": 3},
                {"label": ".", "matrix": [3, 10], "x": 10.5, "y": 3},
                {"label": "/", "matrix": [3, 11], "x": 11.5, "y": 3},
                {"label": "Shift", "matrix": [3, 12], "x": 12.5, "y": 3, "w": 2.5},

                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
                {"label": "Alt", "matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.5},
                {"label": "Space", "matrix": [4, 5], "x": 4.25, "y": 4, "w": 6.5},
                {"label": "Alt", "matrix": [4, 8], "x": 10.75, "y": 4, "w": 1.5},
                {"label": "GUI", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.25},
                {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5}
            ]
        }
    }
}

A keyboards/4pplet/aekiso60/matrix_diagram.md => keyboards/4pplet/aekiso60/matrix_diagram.md +33 -0
@@ 0,0 1,33 @@
# Matrix Diagram for 4pplet AEKISO60 (Revs. A and B)

```
┌────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐
│00  │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d    │
├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
│10    │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │    │
├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐1d │
│20     │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │   │
├─────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤   ┌─────────┐
│30   │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c   │3d │   │3c       │ 2.75u RShift
├─────┼───┴┬──┴──┬┴───┴───┴─┬─┴─┬─┴───┴───┴┬──┴──┬┴───┬─┴───┤   └─────────┘
│40   │41  │43   │44        │45 │46        │48   │4a  │4b   │
└─────┴────┴─────┴──────────┴───┴──────────┴─────┴────┴─────┘
┌─────┬────┬─────┬─────────────────────────┬─────┬────┬─────┐ ─┐
│40   │41  │43   │45                       │48   │4a  │4b   │  ├─ Tsangan
└─────┴────┴─────┴─────────────────────────┴─────┴────┴─────┘  │
┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐  │
│40   │41 │43   │45                         │48   │4a │4b   │  │
└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ ─┘
┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
│40   │   │43   │45                         │48   │   │4b   │ WKL
└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
┌─────┬────┬─────┬─────────┬─────┬─────────┬─────┬────┬─────┐ ─┐
│40   │41  │43   │44       │45   │46       │48   │4a  │4b   │  ├─ same matrix as LAYOUT_all
└─────┴────┴─────┴─────────┴─────┴─────────┴─────┴────┴─────┘  │
┌─────┬────┬─────┬────────┬─────┬──────────┬─────┬────┬─────┐  │
│40   │41  │43   │44      │45   │46        │48   │4a  │4b   │  │
└─────┴────┴─────┴────────┴─────┴──────────┴─────┴────┴─────┘  │
┌─────┬────┬─────┬─────────┬────┬──────────┬─────┬────┬─────┐  │
│40   │41  │43   │44       │45  │46        │48   │4a  │4b   │  │
└─────┴────┴─────┴─────────┴────┴──────────┴─────┴────┴─────┘ ─┘
```

M keyboards/4pplet/aekiso60/rev_a/info.json => keyboards/4pplet/aekiso60/rev_a/info.json +1 -79
@@ 1,10 1,6 @@
{
    "keyboard_name": "AEKISO60 Rev A",
    "manufacturer": "4pplet",
    "url": "",
    "maintainer": "4pplet",
    "usb": {
        "vid": "0x4444",
        "pid": "0x0001",
        "device_version": "0.0.1"
    },


@@ 13,79 9,5 @@
        "esc_output": "C4"
    },
    "processor": "atmega32u2",
    "bootloader": "atmel-dfu",
    "layouts": {
        "LAYOUT_all": {
            "layout": [
                {"x":0, "y":0, "w":1.25},
                {"x":1.25, "y":0},
                {"x":2.25, "y":0},
                {"x":3.25, "y":0},
                {"x":4.25, "y":0},
                {"x":5.25, "y":0},
                {"x":6.25, "y":0},
                {"x":7.25, "y":0},
                {"x":8.25, "y":0},
                {"x":9.25, "y":0},
                {"x":10.25, "y":0},
                {"x":11.25, "y":0},
                {"x":12.25, "y":0},
                {"x":13.25, "y":0, "w":1.75},

                {"x":0, "y":1, "w":1.75},
                {"x":1.75, "y":1},
                {"x":2.75, "y":1},
                {"x":3.75, "y":1},
                {"x":4.75, "y":1},
                {"x":5.75, "y":1},
                {"x":6.75, "y":1},
                {"x":7.75, "y":1},
                {"x":8.75, "y":1},
                {"x":9.75, "y":1},
                {"x":10.75, "y":1},
                {"x":11.75, "y":1},
                {"x":12.75, "y":1},

                {"x":0, "y":2, "w":2},
                {"x":2, "y":2},
                {"x":3, "y":2},
                {"x":4, "y":2},
                {"x":5, "y":2},
                {"x":6, "y":2},
                {"x":7, "y":2},
                {"x":8, "y":2},
                {"x":9, "y":2},
                {"x":10, "y":2},
                {"x":11, "y":2},
                {"x":12, "y":2},
                {"x":13, "y":2},
                {"x":14, "y":1, "h":2},

                {"x":0, "y":3, "w":1.5},
                {"x":1.5, "y":3},
                {"x":2.5, "y":3},
                {"x":3.5, "y":3},
                {"x":4.5, "y":3},
                {"x":5.5, "y":3},
                {"x":6.5, "y":3},
                {"x":7.5, "y":3},
                {"x":8.5, "y":3},
                {"x":9.5, "y":3},
                {"x":10.5, "y":3},
                {"x":11.5, "y":3},
                {"x":12.5, "y":3, "w":1.5},
                {"x":14, "y":3},

                {"x":0, "y":4, "w":1.5},
                {"x":1.5, "y":4, "w":1.25},
                {"x":2.75, "y":4, "w":1.5},
                {"x":4.25, "y":4, "w":2.75},
                {"x":7, "y":4},
                {"x":8, "y":4, "w":2.75},
                {"x":10.75, "y":4, "w":1.5},
                {"x":12.25, "y":4, "w":1.25},
                {"x":13.5, "y":4, "w":1.5}
            ]
        }
    }
    "bootloader": "atmel-dfu"
}

D keyboards/4pplet/aekiso60/rev_a/rev_a.c => keyboards/4pplet/aekiso60/rev_a/rev_a.c +0 -1
@@ 1,1 0,0 @@
#include "rev_a.h"

D keyboards/4pplet/aekiso60/rev_a/rev_a.h => keyboards/4pplet/aekiso60/rev_a/rev_a.h +0 -31
@@ 1,31 0,0 @@
#pragma once

#include "quantum.h"

/* LAYOUT_all
 * ┌────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐
 * │00  │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d    │
 * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
 * │10    │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │    │
 * ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐1d │
 * │20     │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │   │
 * ├─────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
 * │30   │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c   │3d │
 * ├─────┼───┴┬──┴──┬┴───┴───┴─┬─┴─┬─┴───┴───┴┬──┴──┬┴───┬─┴───┤
 * │40   │41  │43   │44        │45 │46        │48   │4a  │4b   │
 * └─────┴────┴─────┴──────────┴───┴──────────┴─────┴────┴─────┘
 */
#define LAYOUT_all( \
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      \
    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1d, \
    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
    k40, k41, k43,      k44,      k45,      k46,           k48, k4a, k4b  \
) \
{ \
    {k00, k01, k02,   k03, k04, k05, k06, k07,   k08, k09,   k0a, k0b, k0c,     k0d},  \
    {k10, k11, k12,   k13, k14, k15, k16, k17,   k18, k19,   k1a, k1b, k1c,     k1d},  \
    {k20, k21, k22,   k23, k24, k25, k26, k27,   k28, k29,   k2a, k2b, k2c,     KC_NO},\
    {k30, k31, k32,   k33, k34, k35, k36, k37,   k38, k39,   k3a, k3b, k3c,     k3d},  \
    {k40, k41, KC_NO, k43, k44, k45, k46, KC_NO, k48, KC_NO, k4a, k4b, KC_NO,   KC_NO} \
}

M keyboards/4pplet/aekiso60/rev_b/info.json => keyboards/4pplet/aekiso60/rev_b/info.json +1 -79
@@ 1,10 1,6 @@
{
    "keyboard_name": "AEKISO60 Rev B",
    "manufacturer": "4pplet",
    "url": "",
    "maintainer": "4pplet",
    "usb": {
        "vid": "0x4444",
        "pid": "0x0011",
        "device_version": "0.0.2"
    },


@@ 12,79 8,5 @@
        "caps_lock": "A10"
    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
        "LAYOUT_all": {
            "layout": [
                {"x":0, "y":0, "w":1.25},
                {"x":1.25, "y":0},
                {"x":2.25, "y":0},
                {"x":3.25, "y":0},
                {"x":4.25, "y":0},
                {"x":5.25, "y":0},
                {"x":6.25, "y":0},
                {"x":7.25, "y":0},
                {"x":8.25, "y":0},
                {"x":9.25, "y":0},
                {"x":10.25, "y":0},
                {"x":11.25, "y":0},
                {"x":12.25, "y":0},
                {"x":13.25, "y":0, "w":1.75},

                {"x":0, "y":1, "w":1.75},
                {"x":1.75, "y":1},
                {"x":2.75, "y":1},
                {"x":3.75, "y":1},
                {"x":4.75, "y":1},
                {"x":5.75, "y":1},
                {"x":6.75, "y":1},
                {"x":7.75, "y":1},
                {"x":8.75, "y":1},
                {"x":9.75, "y":1},
                {"x":10.75, "y":1},
                {"x":11.75, "y":1},
                {"x":12.75, "y":1},

                {"x":0, "y":2, "w":2},
                {"x":2, "y":2},
                {"x":3, "y":2},
                {"x":4, "y":2},
                {"x":5, "y":2},
                {"x":6, "y":2},
                {"x":7, "y":2},
                {"x":8, "y":2},
                {"x":9, "y":2},
                {"x":10, "y":2},
                {"x":11, "y":2},
                {"x":12, "y":2},
                {"x":13, "y":2},
                {"x":14, "y":1, "h":2},

                {"x":0, "y":3, "w":1.5},
                {"x":1.5, "y":3},
                {"x":2.5, "y":3},
                {"x":3.5, "y":3},
                {"x":4.5, "y":3},
                {"x":5.5, "y":3},
                {"x":6.5, "y":3},
                {"x":7.5, "y":3},
                {"x":8.5, "y":3},
                {"x":9.5, "y":3},
                {"x":10.5, "y":3},
                {"x":11.5, "y":3},
                {"x":12.5, "y":3, "w":1.5},
                {"x":14, "y":3},

                {"x":0, "y":4, "w":1.5},
                {"x":1.5, "y":4, "w":1.25},
                {"x":2.75, "y":4, "w":1.5},
                {"x":4.25, "y":4, "w":2.75},
                {"x":7, "y":4},
                {"x":8, "y":4, "w":2.75},
                {"x":10.75, "y":4, "w":1.5},
                {"x":12.25, "y":4, "w":1.25},
                {"x":13.5, "y":4, "w":1.5}
            ]
        }
    }
    "bootloader": "stm32-dfu"
}

D keyboards/4pplet/aekiso60/rev_b/rev_b.c => keyboards/4pplet/aekiso60/rev_b/rev_b.c +0 -19
@@ 1,19 0,0 @@
/*
Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>

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 "rev_b.h"



D keyboards/4pplet/aekiso60/rev_b/rev_b.h => keyboards/4pplet/aekiso60/rev_b/rev_b.h +0 -48
@@ 1,48 0,0 @@
/*
Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>

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"

/* LAYOUT_all
 * ┌────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐
 * │00  │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d    │
 * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
 * │10    │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │    │
 * ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐1d │
 * │20     │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │   │
 * ├─────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
 * │30   │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c   │3d │
 * ├─────┼───┴┬──┴──┬┴───┴───┴─┬─┴─┬─┴───┴───┴┬──┴──┬┴───┬─┴───┤
 * │40   │41  │43   │44        │45 │46        │48   │4a  │4b   │
 * └─────┴────┴─────┴──────────┴───┴──────────┴─────┴────┴─────┘
 */
#define LAYOUT_all( \
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      \
    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1d, \
    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
    k40, k41, k43,      k44,      k45,      k46,           k48, k4a, k4b  \
) \
{ \
    {k00, k01, k02,   k03, k04, k05, k06, k07,   k08, k09,   k0a, k0b, k0c,     k0d},  \
    {k10, k11, k12,   k13, k14, k15, k16, k17,   k18, k19,   k1a, k1b, k1c,     k1d},  \
    {k20, k21, k22,   k23, k24, k25, k26, k27,   k28, k29,   k2a, k2b, k2c,     KC_NO},\
    {k30, k31, k32,   k33, k34, k35, k36, k37,   k38, k39,   k3a, k3b, k3c,     k3d},  \
    {k40, k41, KC_NO, k43, k44, k45, k46, KC_NO, k48, KC_NO, k4a, k4b, KC_NO,   KC_NO} \
}