Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

YMDK Melody96 Matrix Touch-Up #22113

Merged
merged 4 commits into from
Sep 24, 2023
Merged

YMDK Melody96 Matrix Touch-Up #22113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39d6586
Correct layout/matrix diagram
noroadsleft Sep 22, 2023
33ca036
Correct matrix data
noroadsleft Sep 22, 2023
0b62caf
Implement `LAYOUT_hotswap` directly
noroadsleft Sep 22, 2023
c102e44
Specify primary support for Soldered PCBs
noroadsleft Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 117 additions & 9 deletions keyboards/ymdk/melody96/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"keyboard_name": "Melody96",
"keyboard_name": "Melody96 Soldered",
"manufacturer": "YMDK",
"url": "",
"maintainer": "qmk",
Expand Down Expand Up @@ -49,8 +49,7 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
"LAYOUT": "LAYOUT_all",
"LAYOUT_hotswap": "LAYOUT_96_ansi"
"LAYOUT": "LAYOUT_all"
},
"community_layouts": ["96_ansi", "96_iso"],
"layouts": {
Expand Down Expand Up @@ -109,7 +108,7 @@
{"matrix": [9, 7], "x": 10.5, "y": 2},
{"matrix": [9, 5], "x": 11.5, "y": 2},
{"matrix": [9, 4], "x": 12.5, "y": 2},
{"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
{"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
{"matrix": [9, 6], "x": 15, "y": 2},
{"matrix": [9, 2], "x": 16, "y": 2},
{"matrix": [9, 1], "x": 17, "y": 2},
Expand All @@ -127,7 +126,7 @@
{"matrix": [8, 8], "x": 9.75, "y": 3},
{"matrix": [8, 7], "x": 10.75, "y": 3},
{"matrix": [8, 5], "x": 11.75, "y": 3},
{"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
{"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
{"matrix": [8, 6], "x": 15, "y": 3},
{"matrix": [8, 2], "x": 16, "y": 3},
{"matrix": [8, 1], "x": 17, "y": 3},
Expand Down Expand Up @@ -221,7 +220,7 @@
{"matrix": [9, 7], "x": 10.5, "y": 2},
{"matrix": [9, 5], "x": 11.5, "y": 2},
{"matrix": [9, 4], "x": 12.5, "y": 2},
{"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
{"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
{"matrix": [9, 6], "x": 15, "y": 2},
{"matrix": [9, 2], "x": 16, "y": 2},
{"matrix": [9, 1], "x": 17, "y": 2},
Expand All @@ -239,7 +238,7 @@
{"matrix": [8, 8], "x": 9.75, "y": 3},
{"matrix": [8, 7], "x": 10.75, "y": 3},
{"matrix": [8, 5], "x": 11.75, "y": 3},
{"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
{"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
{"matrix": [8, 6], "x": 15, "y": 3},
{"matrix": [8, 2], "x": 16, "y": 3},
{"matrix": [8, 1], "x": 17, "y": 3},
Expand Down Expand Up @@ -331,7 +330,7 @@
{"matrix": [9, 7], "x": 10.5, "y": 2},
{"matrix": [9, 5], "x": 11.5, "y": 2},
{"matrix": [9, 4], "x": 12.5, "y": 2},
{"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
{"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5},
{"matrix": [9, 6], "x": 15, "y": 2},
{"matrix": [9, 2], "x": 16, "y": 2},
{"matrix": [9, 1], "x": 17, "y": 2},
Expand All @@ -349,7 +348,7 @@
{"matrix": [8, 8], "x": 9.75, "y": 3},
{"matrix": [8, 7], "x": 10.75, "y": 3},
{"matrix": [8, 5], "x": 11.75, "y": 3},
{"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
{"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25},
{"matrix": [8, 6], "x": 15, "y": 3},
{"matrix": [8, 2], "x": 16, "y": 3},
{"matrix": [8, 1], "x": 17, "y": 3},
Expand Down Expand Up @@ -926,6 +925,115 @@
{"matrix": [6, 2], "x": 16, "y": 5},
{"matrix": [6, 1], "x": 17, "y": 5}
]
},
"LAYOUT_hotswap": {
"layout": [
{"matrix": [5, 0], "x": 0, "y": 0},
{"matrix": [5, 1], "x": 1, "y": 0},
{"matrix": [5, 2], "x": 2, "y": 0},
{"matrix": [5, 3], "x": 3, "y": 0},
{"matrix": [5, 4], "x": 4, "y": 0},
{"matrix": [5, 5], "x": 5, "y": 0},
{"matrix": [5, 6], "x": 6, "y": 0},
{"matrix": [5, 7], "x": 7, "y": 0},
{"matrix": [5, 8], "x": 8, "y": 0},
{"matrix": [11, 8], "x": 9, "y": 0},
{"matrix": [11, 7], "x": 10, "y": 0},
{"matrix": [11, 5], "x": 11, "y": 0},
{"matrix": [11, 4], "x": 12, "y": 0},
{"matrix": [11, 3], "x": 13, "y": 0},
{"matrix": [11, 6], "x": 14, "y": 0},
{"matrix": [11, 2], "x": 15, "y": 0},
{"matrix": [11, 1], "x": 16, "y": 0},
{"matrix": [11, 0], "x": 17, "y": 0},
{"matrix": [6, 3], "x": 18, "y": 0},

{"matrix": [4, 0], "x": 0, "y": 1},
{"matrix": [4, 1], "x": 1, "y": 1},
{"matrix": [4, 2], "x": 2, "y": 1},
{"matrix": [4, 3], "x": 3, "y": 1},
{"matrix": [4, 4], "x": 4, "y": 1},
{"matrix": [4, 5], "x": 5, "y": 1},
{"matrix": [4, 6], "x": 6, "y": 1},
{"matrix": [4, 7], "x": 7, "y": 1},
{"matrix": [4, 8], "x": 8, "y": 1},
{"matrix": [10, 8], "x": 9, "y": 1},
{"matrix": [10, 7], "x": 10, "y": 1},
{"matrix": [10, 5], "x": 11, "y": 1},
{"matrix": [10, 4], "x": 12, "y": 1},
{"matrix": [10, 6], "x": 13, "y": 1, "w": 2},
{"matrix": [10, 2], "x": 15, "y": 1},
{"matrix": [10, 1], "x": 16, "y": 1},
{"matrix": [10, 0], "x": 17, "y": 1},
{"matrix": [6, 4], "x": 18, "y": 1},

{"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
{"matrix": [3, 1], "x": 1.5, "y": 2},
{"matrix": [3, 2], "x": 2.5, "y": 2},
{"matrix": [3, 3], "x": 3.5, "y": 2},
{"matrix": [3, 4], "x": 4.5, "y": 2},
{"matrix": [3, 5], "x": 5.5, "y": 2},
{"matrix": [3, 6], "x": 6.5, "y": 2},
{"matrix": [3, 7], "x": 7.5, "y": 2},
{"matrix": [3, 8], "x": 8.5, "y": 2},
{"matrix": [9, 8], "x": 9.5, "y": 2},
{"matrix": [9, 7], "x": 10.5, "y": 2},
{"matrix": [9, 5], "x": 11.5, "y": 2},
{"matrix": [9, 4], "x": 12.5, "y": 2},
{"matrix": [9, 3], "x": 13.5, "y": 2, "w": 1.5},
{"matrix": [9, 6], "x": 15, "y": 2},
{"matrix": [9, 2], "x": 16, "y": 2},
{"matrix": [9, 1], "x": 17, "y": 2},
{"matrix": [8, 0], "x": 18, "y": 2, "h": 2},

{"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 3},
{"matrix": [2, 2], "x": 2.75, "y": 3},
{"matrix": [2, 3], "x": 3.75, "y": 3},
{"matrix": [2, 4], "x": 4.75, "y": 3},
{"matrix": [2, 5], "x": 5.75, "y": 3},
{"matrix": [2, 6], "x": 6.75, "y": 3},
{"matrix": [2, 7], "x": 7.75, "y": 3},
{"matrix": [2, 8], "x": 8.75, "y": 3},
{"matrix": [8, 8], "x": 9.75, "y": 3},
{"matrix": [8, 7], "x": 10.75, "y": 3},
{"matrix": [8, 5], "x": 11.75, "y": 3},
{"matrix": [8, 4], "x": 12.75, "y": 3, "w": 2.25},
{"matrix": [8, 6], "x": 15, "y": 3},
{"matrix": [8, 2], "x": 16, "y": 3},
{"matrix": [8, 1], "x": 17, "y": 3},

{"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25},
{"matrix": [1, 2], "x": 2.25, "y": 4},
{"matrix": [1, 3], "x": 3.25, "y": 4},
{"matrix": [1, 4], "x": 4.25, "y": 4},
{"matrix": [1, 5], "x": 5.25, "y": 4},
{"matrix": [1, 6], "x": 6.25, "y": 4},
{"matrix": [1, 7], "x": 7.25, "y": 4},
{"matrix": [1, 8], "x": 8.25, "y": 4},
{"matrix": [7, 8], "x": 9.25, "y": 4},
{"matrix": [7, 7], "x": 10.25, "y": 4},
{"matrix": [7, 5], "x": 11.25, "y": 4},
{"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75},
{"matrix": [7, 3], "x": 14, "y": 4},
{"matrix": [7, 6], "x": 15, "y": 4},
{"matrix": [7, 2], "x": 16, "y": 4},
{"matrix": [7, 1], "x": 17, "y": 4},
{"matrix": [6, 0], "x": 18, "y": 4, "h": 2},

{"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25},
{"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25},
{"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25},
{"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25},
{"matrix": [0, 8], "x": 10, "y": 5},
{"matrix": [0, 7], "x": 11, "y": 5},
{"matrix": [0, 5], "x": 12, "y": 5},
{"matrix": [0, 4], "x": 13, "y": 5},
{"matrix": [0, 3], "x": 14, "y": 5},
{"matrix": [6, 6], "x": 15, "y": 5},
{"matrix": [6, 2], "x": 16, "y": 5},
{"matrix": [6, 1], "x": 17, "y": 5}
]
}
}
}
6 changes: 3 additions & 3 deletions keyboards/ymdk/melody96/matrix_diagram.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Matrix Diagram for Ymdk Melody96
# Matrix Diagram for YMDK Melody96

```
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
│50 │51 │52 │53 │54 │55 │56 │57 │58 │B8 │B7 │B5 │B4 │B3 │B6 │B2 │B1 │B0 │63 │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ ┌───────┐
│40 │41 │42 │43 │44 │45 │56 │47 │48 │A8 │A7 │A5 │A4 │A3 │A6 │A2 │A1 │A0 │64 │ │A6 │ 2u Backpsace
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤ └─┬─────┤ ┌───┐
│30 │31 │32 │33 │34 │35 │36 │37 │38 │98 │97 │95 │94 │93 │96 │92 │91 │90 │ │ │ │ │
│30 │31 │32 │33 │34 │35 │36 │37 │38 │98 │97 │95 │94 │84 │96 │92 │91 │90 │ │ │ │ │
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┼───┤ ┌──┴┐93 │ ISO Enter │80 │ Numpad "+" 2u
│20 │21 │22 │23 │24 │25 │26 │27 │28 │88 │87 │85 │84 │86 │82 │81 │80 │ │84 │ │ │ │
│20 │21 │22 │23 │24 │25 │26 │27 │28 │88 │87 │85 │93 │86 │82 │81 │80 │ │84 │ │ │ │
├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤ └───┴────┘ ├───┤
│10 │11 │12 │13 │14 │15 │16 │17 │18 │78 │77 │75 │74 │73 │76 │72 │71 │70 │ │ │
├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┼───┼───┼───┤ ┌───────┐ │60 │ Numpad Enter 2U
Expand Down
6 changes: 3 additions & 3 deletions keyboards/ymdk/melody96/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# YMDK Melody96
# YMDK Melody96 Soldered

![melody96](https://i.imgur.com/9o0a6XFh.png)

96-key Keyboard from YMDK. The PCB for this board is also commonly used in the NYM96.

* Keyboard Maintainer: [superuser41](https://github.com/kaylanm)
* Hardware Supported: melody96
* Hardware Supported: Melody96 Soldered PCBs
* Hardware Availability: [YMDK on Geekhack, group buy closed](https://geekhack.org/index.php?topic=93614.0), [NYM96 on Massdrop](https://www.massdrop.com/buy/nym96-aluminum-mechanical-keyboard?mode=guest_open)

Make example for this keyboard (after setting up your build environment):
Expand All @@ -14,6 +14,6 @@ Make example for this keyboard (after setting up your build environment):

Flashing example for this keyboard:

make melody96:default:flash
make ymdk/melody96: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).
Loading