Skip to content

Commit

Permalink
fix wrong key in umiguri layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@4yn
4yn committed Jun 26, 2022
1 parent 486120d commit 882d7d0
Show file tree
Hide file tree
Showing 8 changed files with 186 additions and 180 deletions.
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Software adapter for various Chunithm slider controllers with a built-in Brokeni

## Changelog

- v0.3.1
- Fix wrong key in UMIGURI keyboard layout
- v0.3.0
- Add UMIGURI LED controller server support
- Add UMIGURI default keyboard layout
Expand Down
352 changes: 177 additions & 175 deletions res/layouts/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@
<div>J</div>
<div>M</div>
<div>K</div>
<div>,</div>
<div>9</div>
</div>
<div class="air">
<div>.</div>
Expand All @@ -335,192 +335,194 @@
</div>
</div>

<body>
<div class="layout">
<div class="name">Keyboard 16-zone, Linear</div>
<div class="ground ground-16">
<div>A</div>
<div>Z</div>
<div>S</div>
<div>X</div>
<div>D</div>
<div>C</div>
<div>F</div>
<div>V</div>
<div>G</div>
<div>B</div>
<div>H</div>
<div>N</div>
<div>J</div>
<div>M</div>
<div>K</div>
<div>,</div>
</div>
<div class="air">
<div>]</div>
<div>[</div>
<div>;</div>
<div>.</div>
<div>'</div>
<div>/</div>
</div>
<div class="extra">
<div>[enter]</div>
<div>[space]</div>
<div>[esc]</div>
</div>
<div class="layout">
</div>

<div class="layout">
<div class="name">Keyboard 16-zone, Linear</div>
<div class="ground ground-16">
<div>A</div>
<div>Z</div>
<div>S</div>
<div>X</div>
<div>D</div>
<div>C</div>
<div>F</div>
<div>V</div>
<div>G</div>
<div>B</div>
<div>H</div>
<div>N</div>
<div>J</div>
<div>M</div>
<div>K</div>
<div>,</div>
</div>
<div class="layout">
<div class="name">Keyboard 8-zone, Linear</div>
<div class="ground ground-8">
<div>A</div>
<div>S</div>
<div>D</div>
<div>F</div>
<div>J</div>
<div>K</div>
<div>L</div>
<div>;</div>
</div>
<div class="air air-single">
<div>
<span style="writing-mode: vertical-lr">[space]</span>
</div>
</div>
<div class="extra">
<div>[disabled]</div>
<div>[disabled]</div>
<div>[disabled]</div>
</div>
<div class="air">
<div>]</div>
<div>[</div>
<div>;</div>
<div>.</div>
<div>'</div>
<div>/</div>
</div>
<div class="layout">
<div class="name">Keyboard 6-zone, Linear</div>
<div class="ground ground-6">
<div>S</div>
<div>D</div>
<div>F</div>
<div>J</div>
<div>K</div>
<div>L</div>
</div>
<div class="air air-single">
<div>
<span style="writing-mode: vertical-lr">[space]</span>
</div>
</div>
<div class="extra">
<div>[disabled]</div>
<div>[disabled]</div>
<div>[disabled]</div>
</div>
<div class="extra">
<div>[enter]</div>
<div>[space]</div>
<div>[esc]</div>
</div>
<div class="layout">
<div class="name">Keyboard 4-zone, Linear</div>
<div class="ground ground-4">
<div>D</div>
<div>F</div>
<div>J</div>
<div>K</div>
</div>
<div class="air air-single">
<div>
<span style="writing-mode: vertical-lr">[space]</span>
</div>
</div>
<div class="extra">
<div>[disabled]</div>
<div>[disabled]</div>
<div>[disabled]</div>
</div>
</div>
<div class="layout">
<div class="name">Keyboard 8-zone, Linear</div>
<div class="ground ground-8">
<div>A</div>
<div>S</div>
<div>D</div>
<div>F</div>
<div>J</div>
<div>K</div>
<div>L</div>
<div>;</div>
</div>
<div class="layout">
<div class="name">Keyboard 10-zone, Voltex/Neardayo Layout</div>
<div class="ground ground-voltex">
<div style="grid-area: ll">W</div>
<div style="grid-area: lr">E</div>
<div style="grid-area: rl">O</div>
<div style="grid-area: rr">P</div>
<div style="grid-area: a">D</div>
<div style="grid-area: b">F</div>
<div style="grid-area: c">J</div>
<div style="grid-area: d">K</div>
<div style="grid-area: fl">C</div>
<div style="grid-area: fr">M</div>
</div>
<div class="air air-voltex">
<div style="grid-area: rr">P</div>
<div style="grid-area: rl">O</div>
<div style="grid-area: lr">E</div>
<div style="grid-area: ll">W</div>
</div>
<div class="extra">
<div>1</div>
<div>[esc]</div>
<div>[enter]</div>
<div class="air air-single">
<div>
<span style="writing-mode: vertical-lr">[space]</span>
</div>
</div>
<div class="layout">
<div class="name">XBOX 360 Gamepad, Voltex/Neardayo Layout</div>
<div class="ground ground-voltex">
<div style="grid-area: ll">LS<br />&lt;&lt;</div>
<div style="grid-area: lr">LS<br />&gt;&gt;</div>
<div style="grid-area: rl">RS<br />&lt;&lt;</div>
<div style="grid-area: rr">RS<br />&gt;&gt;</div>
<div style="grid-area: a">A</div>
<div style="grid-area: b">B</div>
<div style="grid-area: c">X</div>
<div style="grid-area: d">Y</div>
<div style="grid-area: fl">LB</div>
<div style="grid-area: fr">RB</div>
</div>
<div class="air air-voltex">
<div style="grid-area: rr">RS&gt;</div>
<div style="grid-area: rl">RS&lt;</div>
<div style="grid-area: lr">LS&gt;</div>
<div style="grid-area: ll">LS&lt;</div>
</div>
<div class="extra">
<div>[start]</div>
<div>[back]</div>
<div>[guide]</div>
</div>
<div class="extra">
<div>[disabled]</div>
<div>[disabled]</div>
<div>[disabled]</div>
</div>
<div class="layout">
<div class="name">DS4, HORI DIVA FT ASC Layout</div>
<div class="ground ground-diva">
<div style="grid-area: sl">[slider]</div>
<div style="grid-area: a">Triangle</div>
<div style="grid-area: b">Square</div>
<div style="grid-area: c">Cross</div>
<div style="grid-area: d">Circle</div>
</div>
<div class="air air-single">
<div>
<span style="writing-mode: vertical-lr">[disabled]</span>
</div>
</div>
<div class="extra">
<div>[options]</div>
<div>[disabled]</div>
<div>[disabled]</div>
</div>
<div class="layout">
<div class="name">Keyboard 6-zone, Linear</div>
<div class="ground ground-6">
<div>S</div>
<div>D</div>
<div>F</div>
<div>J</div>
<div>K</div>
<div>L</div>
</div>
<div class="air air-single">
<div>
<span style="writing-mode: vertical-lr">[space]</span>
</div>
</div>
<div class="layout">
<div class="name">DS4, HORI DIVA FT ASC Slider Only Layout</div>
<div class="ground ground-1">
<div>[slider]</div>
<div class="extra">
<div>[disabled]</div>
<div>[disabled]</div>
<div>[disabled]</div>
</div>
</div>
<div class="layout">
<div class="name">Keyboard 4-zone, Linear</div>
<div class="ground ground-4">
<div>D</div>
<div>F</div>
<div>J</div>
<div>K</div>
</div>
<div class="air air-single">
<div>
<span style="writing-mode: vertical-lr">[space]</span>
</div>
<div class="air air-single">
<div>
<span style="writing-mode: vertical-lr">[disabled]</span>
</div>
</div>
<div class="extra">
<div>[disabled]</div>
<div>[disabled]</div>
<div>[disabled]</div>
</div>
</div>
<div class="layout">
<div class="name">Keyboard 10-zone, Voltex/Neardayo Layout</div>
<div class="ground ground-voltex">
<div style="grid-area: ll">W</div>
<div style="grid-area: lr">E</div>
<div style="grid-area: rl">O</div>
<div style="grid-area: rr">P</div>
<div style="grid-area: a">D</div>
<div style="grid-area: b">F</div>
<div style="grid-area: c">J</div>
<div style="grid-area: d">K</div>
<div style="grid-area: fl">C</div>
<div style="grid-area: fr">M</div>
</div>
<div class="air air-voltex">
<div style="grid-area: rr">P</div>
<div style="grid-area: rl">O</div>
<div style="grid-area: lr">E</div>
<div style="grid-area: ll">W</div>
</div>
<div class="extra">
<div>1</div>
<div>[esc]</div>
<div>[enter]</div>
</div>
</div>
<div class="layout">
<div class="name">XBOX 360 Gamepad, Voltex/Neardayo Layout</div>
<div class="ground ground-voltex">
<div style="grid-area: ll">LS<br />&lt;&lt;</div>
<div style="grid-area: lr">LS<br />&gt;&gt;</div>
<div style="grid-area: rl">RS<br />&lt;&lt;</div>
<div style="grid-area: rr">RS<br />&gt;&gt;</div>
<div style="grid-area: a">A</div>
<div style="grid-area: b">B</div>
<div style="grid-area: c">X</div>
<div style="grid-area: d">Y</div>
<div style="grid-area: fl">LB</div>
<div style="grid-area: fr">RB</div>
</div>
<div class="air air-voltex">
<div style="grid-area: rr">RS&gt;</div>
<div style="grid-area: rl">RS&lt;</div>
<div style="grid-area: lr">LS&gt;</div>
<div style="grid-area: ll">LS&lt;</div>
</div>
<div class="extra">
<div>[start]</div>
<div>[back]</div>
<div>[guide]</div>
</div>
</div>
<div class="layout">
<div class="name">DS4, HORI DIVA FT ASC Layout</div>
<div class="ground ground-diva">
<div style="grid-area: sl">[slider]</div>
<div style="grid-area: a">Triangle</div>
<div style="grid-area: b">Square</div>
<div style="grid-area: c">Cross</div>
<div style="grid-area: d">Circle</div>
</div>
<div class="air air-single">
<div>
<span style="writing-mode: vertical-lr">[disabled]</span>
</div>
<div class="extra">
<div>[options]</div>
<div>[disabled]</div>
<div>[disabled]</div>
</div>
<div class="extra">
<div>[options]</div>
<div>[disabled]</div>
<div>[disabled]</div>
</div>
</div>
<div class="layout">
<div class="name">DS4, HORI DIVA FT ASC Slider Only Layout</div>
<div class="ground ground-1">
<div>[slider]</div>
</div>
<div class="air air-single">
<div>
<span style="writing-mode: vertical-lr">[disabled]</span>
</div>
</div>
</body>
<div class="extra">
<div>[options]</div>
<div>[disabled]</div>
<div>[disabled]</div>
</div>
</div>
</body>

</html>
Binary file modified res/layouts/layout.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src-slider_io/src/output/keyboard.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const UMIGURI_KB_MAP: [usize; 41] = [
0x41 /* A */, 0x31 /* 1 */, 0x5a /* Z */, 0x51 /* Q */, 0x53 /* S */, 0x32 /* 2 */, 0x58 /* X */, 0x57 /* W */,
0x44 /* D */, 0x33 /* 3 */, 0x43 /* C */, 0x45 /* E */, 0x46 /* F */, 0x34 /* 4 */, 0x56 /* V */, 0x52 /* R */,
0x47 /* G */, 0x35 /* 5 */, 0x42 /* B */, 0x54 /* T */, 0x48 /* H */, 0x36 /* 6 */, 0x4e /* N */, 0x59 /* Y */,
0x4a /* J */, 0x37 /* 7 */, 0x4d /* M */, 0x55 /* U */, 0x4b /* K */, 0x38 /* 8 */, 0xbc /* VK_OEM_COMMA */, 0x49 /* I */,
0x4a /* J */, 0x37 /* 7 */, 0x4d /* M */, 0x55 /* U */, 0x4b /* K */, 0x38 /* 8 */, 0x39 /* 9 */, 0x49 /* I */,
0x30, 0x4f, 0x4c, // 0, O, L
0x50, 0xbc, 0xbe, // P, VK_OEM_COMMA, VK_OEM_PERIOD,
0x0d, 0x20, 0x1b // VK_RETURN, VK_SPACE, VK_ESCAPE
Expand Down
Loading

0 comments on commit 882d7d0

Please sign in to comment.