From edcea371487ce8387a3e3e56a60cc00d5e59c535 Mon Sep 17 00:00:00 2001 From: bel Date: Fri, 24 Mar 2023 15:28:17 -0600 Subject: [PATCH] drop .[] chars as they dont work on linux and macos for me out of the box --- .gitignore | 2 + host.d/README.md | 2 +- .../remap.d/players_offset_1.yaml | 4 +- .../remap.d/players_offset_2.yaml | 4 +- .../remap.d/players_offset_3.yaml | 4 +- .../remap.d/players_offset_4.yaml | 4 +- host.d/config.d/rusty-pipe.d/4.yaml | 2 +- src/device/output/key/char.go | 3 - src/device/output/key/keys.go | 107 +++++++++--------- 9 files changed, 64 insertions(+), 68 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f0ae9d2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/mayhem-party +**/*.sw* diff --git a/host.d/README.md b/host.d/README.md index 2ebb371..f414354 100644 --- a/host.d/README.md +++ b/host.d/README.md @@ -15,7 +15,7 @@ Each client needs 1 executable and 1 env file with a unique set of buttons > 10 buttons per player -> `go doc key Undef | grep Key | grep -v Undef | wc -l` total (54) +> `go doc key Undef | grep Key | grep -v Undef | wc -l` total (51) The server cannot be a client because math. Maybe a VM on the client as a server would work tho. diff --git a/host.d/config.d/mayhem-party.d/remap.d/players_offset_1.yaml b/host.d/config.d/mayhem-party.d/remap.d/players_offset_1.yaml index 8bc16c5..e12aabf 100644 --- a/host.d/config.d/mayhem-party.d/remap.d/players_offset_1.yaml +++ b/host.d/config.d/mayhem-party.d/remap.d/players_offset_1.yaml @@ -29,7 +29,7 @@ 'h': 'n' 'j': 'm' 'k': ',' -'l': '.' +'l': '-' ';': '/' # player 4 controls 5 'z': '!' @@ -40,7 +40,7 @@ 'n': '^' 'm': '&' ',': '*' -'.': '(' +'-': '(' '/': ')' # player 5 controls 1 '!': '1' diff --git a/host.d/config.d/mayhem-party.d/remap.d/players_offset_2.yaml b/host.d/config.d/mayhem-party.d/remap.d/players_offset_2.yaml index 0e37329..1d3c173 100644 --- a/host.d/config.d/mayhem-party.d/remap.d/players_offset_2.yaml +++ b/host.d/config.d/mayhem-party.d/remap.d/players_offset_2.yaml @@ -18,7 +18,7 @@ 'y': 'n' 'u': 'm' 'i': ',' -'o': '.' +'o': '-' 'p': '/' # player 3 controls 5 'a': '!' @@ -40,7 +40,7 @@ 'n': '6' 'm': '7' ',': '8' -'.': '9' +'-': '9' '/': '0' # player 5 controls 2 '!': 'q' diff --git a/host.d/config.d/mayhem-party.d/remap.d/players_offset_3.yaml b/host.d/config.d/mayhem-party.d/remap.d/players_offset_3.yaml index 9fe061c..bb66f1f 100644 --- a/host.d/config.d/mayhem-party.d/remap.d/players_offset_3.yaml +++ b/host.d/config.d/mayhem-party.d/remap.d/players_offset_3.yaml @@ -7,7 +7,7 @@ '6': 'n' '7': 'm' '8': ',' -'9': '.' +'9': '-' '0': '/' # player 2 controls 5 'q': '!' @@ -40,7 +40,7 @@ 'n': 'y' 'm': 'u' ',': 'i' -'.': 'o' +'-': 'o' '/': 'p' # player 5 controls 3 '!': 'a' diff --git a/host.d/config.d/mayhem-party.d/remap.d/players_offset_4.yaml b/host.d/config.d/mayhem-party.d/remap.d/players_offset_4.yaml index 20db335..f694f4f 100644 --- a/host.d/config.d/mayhem-party.d/remap.d/players_offset_4.yaml +++ b/host.d/config.d/mayhem-party.d/remap.d/players_offset_4.yaml @@ -40,7 +40,7 @@ 'n': 'h' 'm': 'j' ',': 'k' -'.': 'l' +'-': 'l' '/': ';' # player 5 controls 4 '!': 'z' @@ -51,5 +51,5 @@ '^': 'n' '&': 'm' '*': ',' -'(': '.' +'(': '-' ')': '/' diff --git a/host.d/config.d/rusty-pipe.d/4.yaml b/host.d/config.d/rusty-pipe.d/4.yaml index 6a59c45..bd4e4bf 100644 --- a/host.d/config.d/rusty-pipe.d/4.yaml +++ b/host.d/config.d/rusty-pipe.d/4.yaml @@ -14,7 +14,7 @@ streams: r: 'n' a: 'm' b: ',' - x: '.' + x: '-' y: '/' output: engine: diff --git a/src/device/output/key/char.go b/src/device/output/key/char.go index 4185559..6d25121 100644 --- a/src/device/output/key/char.go +++ b/src/device/output/key/char.go @@ -49,11 +49,8 @@ var ( '(': F9, ')': F10, ',': PComma, - '.': PPeriod, '/': PFSlash, ';': PSemicolon, - '[': POpenBracket, - ']': PCloseBracket, '-': PMinus, '=': PEqual, } diff --git a/src/device/output/key/keys.go b/src/device/output/key/keys.go index 254750c..9c68d28 100644 --- a/src/device/output/key/keys.go +++ b/src/device/output/key/keys.go @@ -5,59 +5,56 @@ import "github.com/micmonay/keybd_event" type Key int const ( - Undef = Key(keybd_event.VK_SP11) - A = Key(keybd_event.VK_A) - B = Key(keybd_event.VK_B) - C = Key(keybd_event.VK_C) - D = Key(keybd_event.VK_D) - E = Key(keybd_event.VK_E) - F = Key(keybd_event.VK_F) - G = Key(keybd_event.VK_G) - H = Key(keybd_event.VK_H) - I = Key(keybd_event.VK_I) - J = Key(keybd_event.VK_J) - K = Key(keybd_event.VK_K) - L = Key(keybd_event.VK_L) - M = Key(keybd_event.VK_M) - N = Key(keybd_event.VK_N) - O = Key(keybd_event.VK_O) - P = Key(keybd_event.VK_P) - Q = Key(keybd_event.VK_Q) - R = Key(keybd_event.VK_R) - S = Key(keybd_event.VK_S) - T = Key(keybd_event.VK_T) - U = Key(keybd_event.VK_U) - V = Key(keybd_event.VK_V) - W = Key(keybd_event.VK_W) - X = Key(keybd_event.VK_X) - Y = Key(keybd_event.VK_Y) - Z = Key(keybd_event.VK_Z) - N1 = Key(keybd_event.VK_1) - N2 = Key(keybd_event.VK_2) - N3 = Key(keybd_event.VK_3) - N4 = Key(keybd_event.VK_4) - N5 = Key(keybd_event.VK_5) - N6 = Key(keybd_event.VK_6) - N7 = Key(keybd_event.VK_7) - N8 = Key(keybd_event.VK_8) - N9 = Key(keybd_event.VK_9) - N0 = Key(keybd_event.VK_0) - F1 = Key(keybd_event.VK_F1) - F2 = Key(keybd_event.VK_F2) - F3 = Key(keybd_event.VK_F3) - F4 = Key(keybd_event.VK_F4) - F5 = Key(keybd_event.VK_F5) - F6 = Key(keybd_event.VK_F6) - F7 = Key(keybd_event.VK_F7) - F8 = Key(keybd_event.VK_F8) - F9 = Key(keybd_event.VK_F9) - F10 = Key(keybd_event.VK_F10) - PComma = Key(keybd_event.VK_COMMA) - PPeriod = Key(keybd_event.VK_Period) - PFSlash = Key(keybd_event.VK_BACKSLASH) - PSemicolon = Key(keybd_event.VK_SEMICOLON) - POpenBracket = Key(keybd_event.VK_LeftBracket) - PCloseBracket = Key(keybd_event.VK_RightBracket) - PMinus = Key(keybd_event.VK_MINUS) - PEqual = Key(keybd_event.VK_EQUAL) + Undef = Key(keybd_event.VK_SP11) + A = Key(keybd_event.VK_A) + B = Key(keybd_event.VK_B) + C = Key(keybd_event.VK_C) + D = Key(keybd_event.VK_D) + E = Key(keybd_event.VK_E) + F = Key(keybd_event.VK_F) + G = Key(keybd_event.VK_G) + H = Key(keybd_event.VK_H) + I = Key(keybd_event.VK_I) + J = Key(keybd_event.VK_J) + K = Key(keybd_event.VK_K) + L = Key(keybd_event.VK_L) + M = Key(keybd_event.VK_M) + N = Key(keybd_event.VK_N) + O = Key(keybd_event.VK_O) + P = Key(keybd_event.VK_P) + Q = Key(keybd_event.VK_Q) + R = Key(keybd_event.VK_R) + S = Key(keybd_event.VK_S) + T = Key(keybd_event.VK_T) + U = Key(keybd_event.VK_U) + V = Key(keybd_event.VK_V) + W = Key(keybd_event.VK_W) + X = Key(keybd_event.VK_X) + Y = Key(keybd_event.VK_Y) + Z = Key(keybd_event.VK_Z) + N1 = Key(keybd_event.VK_1) + N2 = Key(keybd_event.VK_2) + N3 = Key(keybd_event.VK_3) + N4 = Key(keybd_event.VK_4) + N5 = Key(keybd_event.VK_5) + N6 = Key(keybd_event.VK_6) + N7 = Key(keybd_event.VK_7) + N8 = Key(keybd_event.VK_8) + N9 = Key(keybd_event.VK_9) + N0 = Key(keybd_event.VK_0) + F1 = Key(keybd_event.VK_F1) + F2 = Key(keybd_event.VK_F2) + F3 = Key(keybd_event.VK_F3) + F4 = Key(keybd_event.VK_F4) + F5 = Key(keybd_event.VK_F5) + F6 = Key(keybd_event.VK_F6) + F7 = Key(keybd_event.VK_F7) + F8 = Key(keybd_event.VK_F8) + F9 = Key(keybd_event.VK_F9) + F10 = Key(keybd_event.VK_F10) + PComma = Key(keybd_event.VK_COMMA) + PFSlash = Key(keybd_event.VK_BACKSLASH) + PSemicolon = Key(keybd_event.VK_SEMICOLON) + PMinus = Key(keybd_event.VK_MINUS) + PEqual = Key(keybd_event.VK_EQUAL) )