Cons-n-Stuff/slidershim
1
0
Fork 0
mirror of https://github.com/4yn/slidershim.git synced 2024-11-23 21:40:57 +01:00
Code Releases Activity

fix wrong key in umiguri layout

Browse Source
This commit is contained in:
4yn 2022-06-26 15:12:13 +08:00
parent 486120d9c0
commit 882d7d0b5b
8 changed files with 188 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -12,6 +12,8 @@ Software adapter for various Chunithm slider controllers with a built-in Brokeni
## Changelog ## Changelog
- v0.3.1
- Fix wrong key in UMIGURI keyboard layout
- v0.3.0 - v0.3.0
- Add UMIGURI LED controller server support - Add UMIGURI LED controller server support
- Add UMIGURI default keyboard layout - Add UMIGURI default keyboard layout

356
res/layouts/index.html
View File

@ -318,7 +318,7 @@
<div>J</div> <div>J</div>
<div>M</div> <div>M</div>
<div>K</div> <div>K</div>
<div>,</div> <div>9</div>
</div> </div>
<div class="air"> <div class="air">
<div>.</div> <div>.</div>
@ -335,192 +335,194 @@
</div> </div>
</div> </div>
<body> <div class="layout">
<div class="layout"> </div>
<div class="name">Keyboard 16-zone, Linear</div>
<div class="ground ground-16"> <div class="layout">
<div>A</div> <div class="name">Keyboard 16-zone, Linear</div>
<div>Z</div> <div class="ground ground-16">
<div>S</div> <div>A</div>
<div>X</div> <div>Z</div>
<div>D</div> <div>S</div>
<div>C</div> <div>X</div>
<div>F</div> <div>D</div>
<div>V</div> <div>C</div>
<div>G</div> <div>F</div>
<div>B</div> <div>V</div>
<div>H</div> <div>G</div>
<div>N</div> <div>B</div>
<div>J</div> <div>H</div>
<div>M</div> <div>N</div>
<div>K</div> <div>J</div>
<div>,</div> <div>M</div>
</div> <div>K</div>
<div class="air"> <div>,</div>
<div>]</div> </div>
<div>[</div> <div class="air">
<div>;</div> <div>]</div>
<div>.</div> <div>[</div>
<div>'</div> <div>;</div>
<div>/</div> <div>.</div>
</div> <div>'</div>
<div class="extra"> <div>/</div>
<div>[enter]</div> </div>
<div>[space]</div> <div class="extra">
<div>[esc]</div> <div>[enter]</div>
<div>[space]</div>
<div>[esc]</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> </div>
<div class="layout"> <div class="extra">
<div class="name">Keyboard 8-zone, Linear</div> <div>[disabled]</div>
<div class="ground ground-8"> <div>[disabled]</div>
<div>A</div> <div>[disabled]</div>
<div>S</div> </div>
<div>D</div> </div>
<div>F</div> <div class="layout">
<div>J</div> <div class="name">Keyboard 6-zone, Linear</div>
<div>K</div> <div class="ground ground-6">
<div>L</div> <div>S</div>
<div>;</div> <div>D</div>
</div> <div>F</div>
<div class="air air-single"> <div>J</div>
<div> <div>K</div>
<span style="writing-mode: vertical-lr">[space]</span> <div>L</div>
</div> </div>
</div> <div class="air air-single">
<div class="extra"> <div>
<div>[disabled]</div> <span style="writing-mode: vertical-lr">[space]</span>
<div>[disabled]</div>
<div>[disabled]</div>
</div> </div>
</div> </div>
<div class="layout"> <div class="extra">
<div class="name">Keyboard 6-zone, Linear</div> <div>[disabled]</div>
<div class="ground ground-6"> <div>[disabled]</div>
<div>S</div> <div>[disabled]</div>
<div>D</div> </div>
<div>F</div> </div>
<div>J</div> <div class="layout">
<div>K</div> <div class="name">Keyboard 4-zone, Linear</div>
<div>L</div> <div class="ground ground-4">
</div> <div>D</div>
<div class="air air-single"> <div>F</div>
<div> <div>J</div>
<span style="writing-mode: vertical-lr">[space]</span> <div>K</div>
</div> </div>
</div> <div class="air air-single">
<div class="extra"> <div>
<div>[disabled]</div> <span style="writing-mode: vertical-lr">[space]</span>
<div>[disabled]</div>
<div>[disabled]</div>
</div> </div>
</div> </div>
<div class="layout"> <div class="extra">
<div class="name">Keyboard 4-zone, Linear</div> <div>[disabled]</div>
<div class="ground ground-4"> <div>[disabled]</div>
<div>D</div> <div>[disabled]</div>
<div>F</div> </div>
<div>J</div> </div>
<div>K</div> <div class="layout">
</div> <div class="name">Keyboard 10-zone, Voltex/Neardayo Layout</div>
<div class="air air-single"> <div class="ground ground-voltex">
<div> <div style="grid-area: ll">W</div>
<span style="writing-mode: vertical-lr">[space]</span> <div style="grid-area: lr">E</div>
</div> <div style="grid-area: rl">O</div>
</div> <div style="grid-area: rr">P</div>
<div class="extra"> <div style="grid-area: a">D</div>
<div>[disabled]</div> <div style="grid-area: b">F</div>
<div>[disabled]</div> <div style="grid-area: c">J</div>
<div>[disabled]</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>
</div> </div>
<div class="layout"> <div class="extra">
<div class="name">Keyboard 10-zone, Voltex/Neardayo Layout</div> <div>[options]</div>
<div class="ground ground-voltex"> <div>[disabled]</div>
<div style="grid-area: ll">W</div> <div>[disabled]</div>
<div style="grid-area: lr">E</div> </div>
<div style="grid-area: rl">O</div> </div>
<div style="grid-area: rr">P</div> <div class="layout">
<div style="grid-area: a">D</div> <div class="name">DS4, HORI DIVA FT ASC Slider Only Layout</div>
<div style="grid-area: b">F</div> <div class="ground ground-1">
<div style="grid-area: c">J</div> <div>[slider]</div>
<div style="grid-area: d">K</div> </div>
<div style="grid-area: fl">C</div> <div class="air air-single">
<div style="grid-area: fr">M</div> <div>
</div> <span style="writing-mode: vertical-lr">[disabled]</span>
<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> </div>
<div class="layout"> <div class="extra">
<div class="name">XBOX 360 Gamepad, Voltex/Neardayo Layout</div> <div>[options]</div>
<div class="ground ground-voltex"> <div>[disabled]</div>
<div style="grid-area: ll">LS<br />&lt;&lt;</div> <div>[disabled]</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>
<div class="layout"> </div>
<div class="name">DS4, HORI DIVA FT ASC Layout</div> </body>
<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>
<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>
<div class="extra">
<div>[options]</div>
<div>[disabled]</div>
<div>[disabled]</div>
</div>
</div>
</body>
</html> </html>

BIN
res/layouts/layout.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 66 KiB

2
src-slider_io/src/output/keyboard.rs
View File

@ -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 */, 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 */, 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 */, 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 0x30, 0x4f, 0x4c, // 0, O, L
0x50, 0xbc, 0xbe, // P, VK_OEM_COMMA, VK_OEM_PERIOD, 0x50, 0xbc, 0xbe, // P, VK_OEM_COMMA, VK_OEM_PERIOD,
0x0d, 0x20, 0x1b // VK_RETURN, VK_SPACE, VK_ESCAPE 0x0d, 0x20, 0x1b // VK_RETURN, VK_SPACE, VK_ESCAPE

2
src-tauri/Cargo.lock generated
View File

@ -2995,7 +2995,7 @@ dependencies = [
[[package]] [[package]]
name = "slidershim" name = "slidershim"
version = "0.3.0" version = "0.3.1"
dependencies = [ dependencies = [
"env_logger", "env_logger",
"log", "log",

2
src-tauri/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "slidershim" name = "slidershim"
version = "0.3.0" version = "0.3.1"
description = "slidershim" description = "slidershim"
authors = ["4yn"] authors = ["4yn"]
license = "" license = ""

4
src-tauri/README.txt
View File

@ -2,13 +2,15 @@
___| (_) __| | ___ _ __ ___| |__ (_)_ __ ___ ___| (_) __| | ___ _ __ ___| |__ (_)_ __ ___
/ __| | |/ _` |/ _ \ '__/ __| '_ \| | '_ ` _ \ / __| | |/ _` |/ _ \ '__/ __| '_ \| | '_ ` _ \
\__ \ | | (_| | __/ | \__ \ | | | | | | | | | \__ \ | | (_| | __/ | \__ \ | | | | | | | | |
|___/_|_|\__,_|\___|_| |___/_| |_|_|_| |_| |_| v0.3.0 UMIGURI UPDATE |___/_|_|\__,_|\___|_| |___/_| |_|_|_| |_| |_| v0.3.1 UMIGURI UPDATE
=============================================== ===============================================
https://github.com/4yn/slidershim https://github.com/4yn/slidershim
# Changelog # Changelog
- v0.3.1
- Fix wrong key in UMIGURI keyboard layout
- v0.3.0 - v0.3.0
- Add UMIGURI LED controller server support - Add UMIGURI LED controller server support
- Add UMIGURI default keyboard layout - Add UMIGURI default keyboard layout

2
src-tauri/tauri.conf.json
View File

@ -1,7 +1,7 @@
{ {
"package": { "package": {
"productName": "slidershim", "productName": "slidershim",
"version": "0.3.0" "version": "0.3.1"
}, },
"build": { "build": {
"distDir": "../public", "distDir": "../public",