4pplet Waffling80 Community Layout Support and Touch-Up (#20932)

* add matrix_diagram.md

* fix Configurator key sequence

* info.json: apply friendly formatting

* create common info.json

Moves the data-driven keys which are common between Rev A and Rev B to a joint `info.json` file.

* add LAYOUT_tkl_f13_ansi_split_space_split_bs_rshift

* add LAYOUT_tkl_f13_ansi_split_bs_rshift

* add LAYOUT_tkl_f13_ansi

* add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift

* add LAYOUT_tkl_f13_ansi_tsangan

* add LAYOUT_tkl_ansi_split_bs_rshift

* add LAYOUT_tkl_ansi

* add LAYOUT_tkl_ansi_tsangan_split_bs_rshift

* add LAYOUT_tkl_ansi_tsangan

* add LAYOUT_tkl_f13_iso_split_space_split_bs_rshift

* add LAYOUT_tkl_f13_iso_split_bs_rshift

* add LAYOUT_tkl_f13_iso

* add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift

* add LAYOUT_tkl_f13_iso_tsangan

* add LAYOUT_tkl_iso_split_bs_rshift

* add LAYOUT_tkl_iso

* add LAYOUT_tkl_iso_tsangan_split_bs_rshift

* add LAYOUT_tkl_iso_tsangan

* enable Community Layout support
master
James Young 2023-05-14 12:52:10 -07:00 committed by GitHub
parent 13a989dbbf
commit a5b382beb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2096 additions and 246 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,33 @@
# Matrix Diagram for 4pplet waffling80 (Rev A and B)
```
┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
│00 ││10 │01 │11 │02 ││12 │03 │13 │04 ││14 │05 │15 │06 ││16 ││07 │17 │37 │ F13 Row
└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
│00 │ │01 │11 │02 │12 │ │03 │13 │04 │14 │ │05 │15 │06 │16 ││07 │17 │37 │
└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐ ┌───────┐
│20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │67 ││27 │57 │97 │ │67 │ 2u Backspace
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤ └─┬─────┤
│40 │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │56 ││47 │77 │B7 │ │ │
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┼───┼───┤ ┌──┴┐76 │ ISO Enter
│60 │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │76 ││B0 │ │A2 │ │66 │ │
├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤└───┼───┼───┘ └───┴────┘
│80 │90 │81 │91 │82 │92 │83 │93 │84 │94 │85 │95 │86 │96 │ │87 │
├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐
│A0 │B1 │A1 │B2 │A3 │B3 │A4 │B4 │A5 │B5 ││A6 │B6 │A7 │
└────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘└───┴───┴───┘
┌────────┐ ┌──────────┐
│80 │ 2.25u LShift 2.75u RShift │86 │
└────────┘ └──────────┘
┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
│A0 │B1 │A1 │A3 │A4 │B4 │A5 │B5 │ Standard
└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
│A0 │B1 │A1 │A3 │B4 │A5 │B5 │ Tsangan/WKL
└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
┌─────┬───┬─────┬───────────┬───┬───────────┬─────┬───┬─────┐
│A0 │B1 │A1 │B2 │A3 │B3 │B4 │A5 │B5 │ Tsangan/WKL Split Space
└─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘
```

View File

@ -1,10 +1,6 @@
{ {
"keyboard_name": "waffling80 Rev A", "keyboard_name": "waffling80 Rev A",
"manufacturer": "4pplet",
"url": "",
"maintainer": "4pplet",
"usb": { "usb": {
"vid": "0x4444",
"pid": "0x0006", "pid": "0x0006",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
@ -21,123 +17,5 @@
"esc_output": "C6" "esc_output": "C6"
}, },
"processor": "atmega32u2", "processor": "atmega32u2",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu"
"layouts": {
"LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 1.25, "y": 0},
{"matrix": [0, 1], "x": 2.25, "y": 0},
{"matrix": [1, 1], "x": 3.25, "y": 0},
{"matrix": [0, 2], "x": 4.25, "y": 0},
{"matrix": [1, 2], "x": 5.5, "y": 0},
{"matrix": [0, 3], "x": 6.5, "y": 0},
{"matrix": [1, 3], "x": 7.5, "y": 0},
{"matrix": [0, 4], "x": 8.5, "y": 0},
{"matrix": [1, 4], "x": 9.75, "y": 0},
{"matrix": [0, 5], "x": 10.75, "y": 0},
{"matrix": [1, 5], "x": 11.75, "y": 0},
{"matrix": [0, 6], "x": 12.75, "y": 0},
{"matrix": [1, 6], "x": 14, "y": 0},
{"matrix": [0, 7], "x": 15.25, "y": 0},
{"matrix": [1, 7], "x": 16.25, "y": 0},
{"matrix": [3, 7], "x": 17.25, "y": 0},
{"matrix": [2, 0], "x": 0, "y": 1.5},
{"matrix": [3, 0], "x": 1, "y": 1.5},
{"matrix": [2, 1], "x": 2, "y": 1.5},
{"matrix": [3, 1], "x": 3, "y": 1.5},
{"matrix": [2, 2], "x": 4, "y": 1.5},
{"matrix": [3, 2], "x": 5, "y": 1.5},
{"matrix": [2, 3], "x": 6, "y": 1.5},
{"matrix": [3, 3], "x": 7, "y": 1.5},
{"matrix": [2, 4], "x": 8, "y": 1.5},
{"matrix": [3, 4], "x": 9, "y": 1.5},
{"matrix": [2, 5], "x": 10, "y": 1.5},
{"matrix": [3, 5], "x": 11, "y": 1.5},
{"matrix": [2, 6], "x": 12, "y": 1.5},
{"matrix": [3, 6], "x": 13, "y": 1.5},
{"matrix": [6, 7], "x": 14, "y": 1.5},
{"matrix": [2, 7], "x": 15.25, "y": 1.5},
{"matrix": [5, 7], "x": 16.25, "y": 1.5},
{"matrix": [9, 7], "x": 17.25, "y": 1.5},
{"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
{"matrix": [5, 0], "x": 1.5, "y": 2.5},
{"matrix": [4, 1], "x": 2.5, "y": 2.5},
{"matrix": [5, 1], "x": 3.5, "y": 2.5},
{"matrix": [4, 2], "x": 4.5, "y": 2.5},
{"matrix": [5, 2], "x": 5.5, "y": 2.5},
{"matrix": [4, 3], "x": 6.5, "y": 2.5},
{"matrix": [5, 3], "x": 7.5, "y": 2.5},
{"matrix": [4, 4], "x": 8.5, "y": 2.5},
{"matrix": [5, 4], "x": 9.5, "y": 2.5},
{"matrix": [4, 5], "x": 10.5, "y": 2.5},
{"matrix": [5, 5], "x": 11.5, "y": 2.5},
{"matrix": [4, 6], "x": 12.5, "y": 2.5},
{"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
{"matrix": [4, 7], "x": 15.25, "y": 2.5},
{"matrix": [7, 7], "x": 16.25, "y": 2.5},
{"matrix": [11, 7], "x": 17.25, "y": 2.5},
{"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
{"matrix": [7, 0], "x": 1.75, "y": 3.5},
{"matrix": [6, 1], "x": 2.75, "y": 3.5},
{"matrix": [7, 1], "x": 3.75, "y": 3.5},
{"matrix": [6, 2], "x": 4.75, "y": 3.5},
{"matrix": [7, 2], "x": 5.75, "y": 3.5},
{"matrix": [6, 3], "x": 6.75, "y": 3.5},
{"matrix": [7, 3], "x": 7.75, "y": 3.5},
{"matrix": [6, 4], "x": 8.75, "y": 3.5},
{"matrix": [7, 4], "x": 9.75, "y": 3.5},
{"matrix": [6, 5], "x": 10.75, "y": 3.5},
{"matrix": [7, 5], "x": 11.75, "y": 3.5},
{"matrix": [6, 6], "x": 12.75, "y": 3.5},
{"matrix": [7, 6], "x": 13.75, "y": 3.5, "w": 1.25},
{"matrix": [8, 0], "x": 15.25, "y": 3.5},
{"matrix": [9, 0], "x": 17.25, "y": 3.5},
{"matrix": [8, 1], "x": 0, "y": 4.5, "w": 1.25},
{"matrix": [9, 1], "x": 1.25, "y": 4.5},
{"matrix": [8, 2], "x": 2.25, "y": 4.5},
{"matrix": [9, 2], "x": 3.25, "y": 4.5},
{"matrix": [8, 3], "x": 4.25, "y": 4.5},
{"matrix": [9, 3], "x": 5.25, "y": 4.5},
{"matrix": [8, 4], "x": 6.25, "y": 4.5},
{"matrix": [9, 4], "x": 7.25, "y": 4.5},
{"matrix": [8, 5], "x": 8.25, "y": 4.5},
{"matrix": [9, 5], "x": 9.25, "y": 4.5},
{"matrix": [8, 6], "x": 10.25, "y": 4.5},
{"matrix": [9, 6], "x": 11.25, "y": 4.5},
{"matrix": [8, 7], "x": 12.25, "y": 4.5, "w": 1.75},
{"matrix": [10, 0], "x": 14, "y": 4.5},
{"matrix": [11, 1], "x": 16.25, "y": 4.5},
{"matrix": [10, 1], "x": 0, "y": 5.5, "w": 1.25},
{"matrix": [11, 2], "x": 1.25, "y": 5.5, "w": 1.25},
{"matrix": [10, 3], "x": 2.5, "y": 5.5, "w": 1.25},
{"matrix": [11, 3], "x": 3.75, "y": 5.5, "w": 2.25},
{"matrix": [10, 4], "x": 6, "y": 5.5, "w": 1.25},
{"matrix": [11, 4], "x": 7.25, "y": 5.5, "w": 2.75},
{"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
{"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
{"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
{"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
{"matrix": [10, 7], "x": 15.25, "y": 5.5},
{"matrix": [11, 0], "x": 16.25, "y": 5.5},
{"matrix": [10, 2], "x": 17.25, "y": 5.5}
]
}
}
} }

View File

@ -1,10 +1,6 @@
{ {
"keyboard_name": "waffling80 Rev B", "keyboard_name": "waffling80 Rev B",
"manufacturer": "4pplet",
"url": "",
"maintainer": "4pplet",
"usb": { "usb": {
"vid": "0x4444",
"pid": "0x000F", "pid": "0x000F",
"device_version": "0.0.2" "device_version": "0.0.2"
}, },
@ -17,123 +13,5 @@
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "STM32F072", "processor": "STM32F072",
"bootloader": "stm32-dfu", "bootloader": "stm32-dfu"
"layouts": {
"LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 1.25, "y": 0},
{"matrix": [0, 1], "x": 2.25, "y": 0},
{"matrix": [1, 1], "x": 3.25, "y": 0},
{"matrix": [0, 2], "x": 4.25, "y": 0},
{"matrix": [1, 2], "x": 5.5, "y": 0},
{"matrix": [0, 3], "x": 6.5, "y": 0},
{"matrix": [1, 3], "x": 7.5, "y": 0},
{"matrix": [0, 4], "x": 8.5, "y": 0},
{"matrix": [1, 4], "x": 9.75, "y": 0},
{"matrix": [0, 5], "x": 10.75, "y": 0},
{"matrix": [1, 5], "x": 11.75, "y": 0},
{"matrix": [0, 6], "x": 12.75, "y": 0},
{"matrix": [1, 6], "x": 14, "y": 0},
{"matrix": [0, 7], "x": 15.25, "y": 0},
{"matrix": [1, 7], "x": 16.25, "y": 0},
{"matrix": [3, 7], "x": 17.25, "y": 0},
{"matrix": [2, 0], "x": 0, "y": 1.5},
{"matrix": [3, 0], "x": 1, "y": 1.5},
{"matrix": [2, 1], "x": 2, "y": 1.5},
{"matrix": [3, 1], "x": 3, "y": 1.5},
{"matrix": [2, 2], "x": 4, "y": 1.5},
{"matrix": [3, 2], "x": 5, "y": 1.5},
{"matrix": [2, 3], "x": 6, "y": 1.5},
{"matrix": [3, 3], "x": 7, "y": 1.5},
{"matrix": [2, 4], "x": 8, "y": 1.5},
{"matrix": [3, 4], "x": 9, "y": 1.5},
{"matrix": [2, 5], "x": 10, "y": 1.5},
{"matrix": [3, 5], "x": 11, "y": 1.5},
{"matrix": [2, 6], "x": 12, "y": 1.5},
{"matrix": [3, 6], "x": 13, "y": 1.5},
{"matrix": [6, 7], "x": 14, "y": 1.5},
{"matrix": [2, 7], "x": 15.25, "y": 1.5},
{"matrix": [5, 7], "x": 16.25, "y": 1.5},
{"matrix": [9, 7], "x": 17.25, "y": 1.5},
{"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
{"matrix": [5, 0], "x": 1.5, "y": 2.5},
{"matrix": [4, 1], "x": 2.5, "y": 2.5},
{"matrix": [5, 1], "x": 3.5, "y": 2.5},
{"matrix": [4, 2], "x": 4.5, "y": 2.5},
{"matrix": [5, 2], "x": 5.5, "y": 2.5},
{"matrix": [4, 3], "x": 6.5, "y": 2.5},
{"matrix": [5, 3], "x": 7.5, "y": 2.5},
{"matrix": [4, 4], "x": 8.5, "y": 2.5},
{"matrix": [5, 4], "x": 9.5, "y": 2.5},
{"matrix": [4, 5], "x": 10.5, "y": 2.5},
{"matrix": [5, 5], "x": 11.5, "y": 2.5},
{"matrix": [4, 6], "x": 12.5, "y": 2.5},
{"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
{"matrix": [4, 7], "x": 15.25, "y": 2.5},
{"matrix": [7, 7], "x": 16.25, "y": 2.5},
{"matrix": [11, 7], "x": 17.25, "y": 2.5},
{"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
{"matrix": [7, 0], "x": 1.75, "y": 3.5},
{"matrix": [6, 1], "x": 2.75, "y": 3.5},
{"matrix": [7, 1], "x": 3.75, "y": 3.5},
{"matrix": [6, 2], "x": 4.75, "y": 3.5},
{"matrix": [7, 2], "x": 5.75, "y": 3.5},
{"matrix": [6, 3], "x": 6.75, "y": 3.5},
{"matrix": [7, 3], "x": 7.75, "y": 3.5},
{"matrix": [6, 4], "x": 8.75, "y": 3.5},
{"matrix": [7, 4], "x": 9.75, "y": 3.5},
{"matrix": [6, 5], "x": 10.75, "y": 3.5},
{"matrix": [7, 5], "x": 11.75, "y": 3.5},
{"matrix": [6, 6], "x": 12.75, "y": 3.5},
{"matrix": [7, 6], "x": 13.75, "y": 3.5, "w": 1.25},
{"matrix": [8, 0], "x": 15.25, "y": 3.5},
{"matrix": [9, 0], "x": 17.25, "y": 3.5},
{"matrix": [8, 1], "x": 0, "y": 4.5, "w": 1.25},
{"matrix": [9, 1], "x": 1.25, "y": 4.5},
{"matrix": [8, 2], "x": 2.25, "y": 4.5},
{"matrix": [9, 2], "x": 3.25, "y": 4.5},
{"matrix": [8, 3], "x": 4.25, "y": 4.5},
{"matrix": [9, 3], "x": 5.25, "y": 4.5},
{"matrix": [8, 4], "x": 6.25, "y": 4.5},
{"matrix": [9, 4], "x": 7.25, "y": 4.5},
{"matrix": [8, 5], "x": 8.25, "y": 4.5},
{"matrix": [9, 5], "x": 9.25, "y": 4.5},
{"matrix": [8, 6], "x": 10.25, "y": 4.5},
{"matrix": [9, 6], "x": 11.25, "y": 4.5},
{"matrix": [8, 7], "x": 12.25, "y": 4.5, "w": 1.75},
{"matrix": [10, 0], "x": 14, "y": 4.5},
{"matrix": [11, 1], "x": 16.25, "y": 4.5},
{"matrix": [10, 1], "x": 0, "y": 5.5, "w": 1.25},
{"matrix": [11, 2], "x": 1.25, "y": 5.5, "w": 1.25},
{"matrix": [10, 3], "x": 2.5, "y": 5.5, "w": 1.25},
{"matrix": [11, 3], "x": 3.75, "y": 5.5, "w": 2.25},
{"matrix": [10, 4], "x": 6, "y": 5.5, "w": 1.25},
{"matrix": [11, 4], "x": 7.25, "y": 5.5, "w": 2.75},
{"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
{"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
{"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
{"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
{"matrix": [10, 7], "x": 15.25, "y": 5.5},
{"matrix": [11, 0], "x": 16.25, "y": 5.5},
{"matrix": [10, 2], "x": 17.25, "y": 5.5}
]
}
}
} }