diff --git a/README.md b/README.md index 9640b21..fe860f0 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/res/layouts/index.html b/res/layouts/index.html index 63b17ff..c59605c 100644 --- a/res/layouts/index.html +++ b/res/layouts/index.html @@ -318,7 +318,7 @@
J
M
K
-
,
+
9
.
@@ -335,192 +335,194 @@
- -
-
Keyboard 16-zone, Linear
-
-
A
-
Z
-
S
-
X
-
D
-
C
-
F
-
V
-
G
-
B
-
H
-
N
-
J
-
M
-
K
-
,
-
-
-
]
-
[
-
;
-
.
-
'
-
/
-
-
-
[enter]
-
[space]
-
[esc]
+
+
+ +
+
Keyboard 16-zone, Linear
+
+
A
+
Z
+
S
+
X
+
D
+
C
+
F
+
V
+
G
+
B
+
H
+
N
+
J
+
M
+
K
+
,
+
+
+
]
+
[
+
;
+
.
+
'
+
/
+
+
+
[enter]
+
[space]
+
[esc]
+
+
+
+
Keyboard 8-zone, Linear
+
+
A
+
S
+
D
+
F
+
J
+
K
+
L
+
;
+
+
+
+ [space]
-
-
Keyboard 8-zone, Linear
-
-
A
-
S
-
D
-
F
-
J
-
K
-
L
-
;
-
-
-
- [space] -
-
-
-
[disabled]
-
[disabled]
-
[disabled]
+
+
[disabled]
+
[disabled]
+
[disabled]
+
+
+
+
Keyboard 6-zone, Linear
+
+
S
+
D
+
F
+
J
+
K
+
L
+
+
+
+ [space]
-
-
Keyboard 6-zone, Linear
-
-
S
-
D
-
F
-
J
-
K
-
L
-
-
-
- [space] -
-
-
-
[disabled]
-
[disabled]
-
[disabled]
+
+
[disabled]
+
[disabled]
+
[disabled]
+
+
+
+
Keyboard 4-zone, Linear
+
+
D
+
F
+
J
+
K
+
+
+
+ [space]
-
-
Keyboard 4-zone, Linear
-
-
D
-
F
-
J
-
K
-
-
-
- [space] -
-
-
-
[disabled]
-
[disabled]
-
[disabled]
+
+
[disabled]
+
[disabled]
+
[disabled]
+
+
+
+
Keyboard 10-zone, Voltex/Neardayo Layout
+
+
W
+
E
+
O
+
P
+
D
+
F
+
J
+
K
+
C
+
M
+
+
+
P
+
O
+
E
+
W
+
+
+
1
+
[esc]
+
[enter]
+
+
+
+
XBOX 360 Gamepad, Voltex/Neardayo Layout
+
+
LS
<<
+
LS
>>
+
RS
<<
+
RS
>>
+
A
+
B
+
X
+
Y
+
LB
+
RB
+
+
+
RS>
+
RS<
+
LS>
+
LS<
+
+
+
[start]
+
[back]
+
[guide]
+
+
+
+
DS4, HORI DIVA FT ASC Layout
+
+
[slider]
+
Triangle
+
Square
+
Cross
+
Circle
+
+
+
+ [disabled]
-
-
Keyboard 10-zone, Voltex/Neardayo Layout
-
-
W
-
E
-
O
-
P
-
D
-
F
-
J
-
K
-
C
-
M
-
-
-
P
-
O
-
E
-
W
-
-
-
1
-
[esc]
-
[enter]
+
+
[options]
+
[disabled]
+
[disabled]
+
+
+
+
DS4, HORI DIVA FT ASC Slider Only Layout
+
+
[slider]
+
+
+
+ [disabled]
-
-
XBOX 360 Gamepad, Voltex/Neardayo Layout
-
-
LS
<<
-
LS
>>
-
RS
<<
-
RS
>>
-
A
-
B
-
X
-
Y
-
LB
-
RB
-
-
-
RS>
-
RS<
-
LS>
-
LS<
-
-
-
[start]
-
[back]
-
[guide]
-
+
+
[options]
+
[disabled]
+
[disabled]
-
-
DS4, HORI DIVA FT ASC Layout
-
-
[slider]
-
Triangle
-
Square
-
Cross
-
Circle
-
-
-
- [disabled] -
-
-
-
[options]
-
[disabled]
-
[disabled]
-
-
-
-
DS4, HORI DIVA FT ASC Slider Only Layout
-
-
[slider]
-
-
-
- [disabled] -
-
-
-
[options]
-
[disabled]
-
[disabled]
-
-
- +
+ \ No newline at end of file diff --git a/res/layouts/layout.png b/res/layouts/layout.png index ab5daaf..9acfff1 100644 Binary files a/res/layouts/layout.png and b/res/layouts/layout.png differ diff --git a/src-slider_io/src/output/keyboard.rs b/src-slider_io/src/output/keyboard.rs index a5cb0b3..dd2afee 100644 --- a/src-slider_io/src/output/keyboard.rs +++ b/src-slider_io/src/output/keyboard.rs @@ -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 diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 80fc5f0..c5f8a17 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2995,7 +2995,7 @@ dependencies = [ [[package]] name = "slidershim" -version = "0.3.0" +version = "0.3.1" dependencies = [ "env_logger", "log", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 11d0efc..1072c03 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "slidershim" -version = "0.3.0" +version = "0.3.1" description = "slidershim" authors = ["4yn"] license = "" diff --git a/src-tauri/README.txt b/src-tauri/README.txt index 2eb24d7..c285e30 100644 --- a/src-tauri/README.txt +++ b/src-tauri/README.txt @@ -2,13 +2,15 @@ ___| (_) __| | ___ _ __ ___| |__ (_)_ __ ___ / __| | |/ _` |/ _ \ '__/ __| '_ \| | '_ ` _ \ \__ \ | | (_| | __/ | \__ \ | | | | | | | | | -|___/_|_|\__,_|\___|_| |___/_| |_|_|_| |_| |_| v0.3.0 UMIGURI UPDATE +|___/_|_|\__,_|\___|_| |___/_| |_|_|_| |_| |_| v0.3.1 UMIGURI UPDATE =============================================== https://github.com/4yn/slidershim # 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 diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 232e514..aa0b03f 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "package": { "productName": "slidershim", - "version": "0.3.0" + "version": "0.3.1" }, "build": { "distDir": "../public",