diff --git a/Machines/Enterprise/Keyboard.cpp b/Machines/Enterprise/Keyboard.cpp index bf0d582e1..db3514a29 100644 --- a/Machines/Enterprise/Keyboard.cpp +++ b/Machines/Enterprise/Keyboard.cpp @@ -15,9 +15,29 @@ uint16_t KeyboardMapper::mapped_key_for_key(Inputs::Keyboard::Key key) const { switch(key) { default: break; + BIND(Backslash, Backslash); + BIND(CapsLock, Lock); + BIND(Tab, Tab); + BIND(Escape, Escape); + BIND(Hyphen, Hyphen); + BIND(Equals, Tilde); + BIND(Backspace, Erase); + BIND(Delete, Delete); + BIND(Semicolon, Semicolon); + BIND(Quote, Colon); + BIND(OpenSquareBracket, OpenSquareBracket); + BIND(CloseSquareBracket, CloseSquareBracket); + + BIND(End, Stop); + BIND(Insert, Insert); + BIND(BackTick, At); + BIND(k1, k1); BIND(k2, k2); BIND(k3, k3); BIND(k4, k4); BIND(k5, k5); BIND(k6, k6); BIND(k7, k7); BIND(k8, k8); BIND(k9, k9); BIND(k0, k0); + BIND(F1, F1); BIND(F2, F2); BIND(F3, F3); BIND(F4, F4); + BIND(F5, F5); BIND(F6, F6); BIND(F7, F7); BIND(F8, F8); + BIND(Q, Q); BIND(W, W); BIND(E, E); BIND(R, R); BIND(T, T); BIND(Y, Y); BIND(U, U); BIND(I, I); BIND(O, O); BIND(P, P); @@ -27,12 +47,16 @@ uint16_t KeyboardMapper::mapped_key_for_key(Inputs::Keyboard::Key key) const { BIND(Z, Z); BIND(X, X); BIND(C, C); BIND(V, V); BIND(B, B); BIND(N, N); BIND(M, M); + BIND(FullStop, FullStop); + BIND(Comma, Comma); + BIND(ForwardSlash, ForwardSlash); + BIND(Space, Space); BIND(Enter, Enter); BIND(LeftShift, LeftShift); BIND(RightShift, RightShift); - BIND(LeftOption, Option); - BIND(RightOption, Option); + BIND(LeftOption, Alt); + BIND(RightOption, Alt); BIND(LeftControl, Control); BIND(RightControl, Control); diff --git a/Machines/Enterprise/Keyboard.hpp b/Machines/Enterprise/Keyboard.hpp index 6ff2e83dc..0a13b7e1a 100644 --- a/Machines/Enterprise/Keyboard.hpp +++ b/Machines/Enterprise/Keyboard.hpp @@ -16,7 +16,7 @@ namespace Enterprise { #define KeyCode(line, mask) (line << 8) | mask enum class Key: uint16_t { - N = 0x0000 | 0x01, BackSlash = 0x0000 | 0x02, B = 0x0000 | 0x04, C = 0x0000 | 0x08, + N = 0x0000 | 0x01, Backslash = 0x0000 | 0x02, B = 0x0000 | 0x04, C = 0x0000 | 0x08, V = 0x0000 | 0x10, X = 0x0000 | 0x20, Z = 0x0000 | 0x40, LeftShift = 0x0000 | 0x80, H = 0x0100 | 0x01, Lock = 0x0100 | 0x02, G = 0x0100 | 0x04, D = 0x0100 | 0x08, @@ -34,11 +34,11 @@ enum class Key: uint16_t { k8 = 0x0500 | 0x01, k9 = 0x0500 | 0x04, Hyphen = 0x0500 | 0x08, k0 = 0x0500 | 0x10, Tilde = 0x0500 | 0x20, Erase = 0x0500 | 0x40, - J = 0x0600 | 0x01, K = 0x0600 | 0x04, SemiColon = 0x0600 | 0x08, + J = 0x0600 | 0x01, K = 0x0600 | 0x04, Semicolon = 0x0600 | 0x08, L = 0x0600 | 0x10, Colon = 0x0600 | 0x20, CloseSquareBracket = 0x0600 | 0x40, Stop = 0x0700 | 0x01, Down = 0x0700 | 0x02, Right = 0x0700 | 0x04, Up = 0x0700 | 0x08, - Hold = 0x0700 | 0x10, Left = 0x0700 | 0x20, Enter = 0x0700 | 0x40, Option = 0x0700 | 0x80, + Hold = 0x0700 | 0x10, Left = 0x0700 | 0x20, Enter = 0x0700 | 0x40, Alt = 0x0700 | 0x80, M = 0x0800 | 0x01, Delete = 0x0800 | 0x02, Comma = 0x0800 | 0x04, ForwardSlash = 0x0800 | 0x08,