GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 01:00:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added missing no us key

Browse Source
This commit is contained in:
Martin Funk 2020-09-20 23:04:52 +02:00
parent 7dd9895dda
commit 3701a0a742
6 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hid/src/ps2/keymap.h
View File

@ -144,5 +144,6 @@ INLINE void keymapPs2(uint8_t code, Ps2KeyType *ps2_type, uint8_t *ps2_code) {
case 103: *ps2_type = PS2_KEY_TYPE_REG; *ps2_code = 112; return; // KEYPAD_0
case 104: *ps2_type = PS2_KEY_TYPE_REG; *ps2_code = 113; return; // KEYPAD_DOT
case 105: *ps2_type = PS2_KEY_TYPE_SPEC; *ps2_code = 94; return; // KEY_POWER
case 106: *ps2_type = PS2_KEY_TYPE_REG; *ps2_code = 97; return; // KEY_NON_US
}
}

1
hid/src/usb/keymap.h
View File

@ -134,6 +134,7 @@ INLINE KeyboardKeycode keymapUsb(uint8_t code) {
case 103: return KEYPAD_0;
case 104: return KEYPAD_DOT;
case 105: return KEY_POWER;
case 106: return KEY_NON_US;
default: return KEY_ERROR_UNDEFINED;
}
}

1
keymap.csv
View File

@ -104,3 +104,4 @@ Numpad9,102,KEYPAD_9,0x61,reg:0x7d,0x49,XK_KP_9
Numpad0,103,KEYPAD_0,0x62,reg:0x70,0x52,XK_KP_0
NumpadDecimal,104,KEYPAD_DOT,0x63,reg:0x71,0x53,XK_KP_Decimal
Power,105,KEY_POWER,0x66,spec:0x5e,0xe05e,XK_XF86_Sleep
IntlBackslash,106,KEY_NON_US,0x64,reg:0x61,0x56,"^XK_greater,XK_less"

1 web_name serial_code arduino_name otg_key ps2_key at1_code x11_names
104 Numpad0 103 KEYPAD_0 0x62 reg:0x70 0x52 XK_KP_0
105 NumpadDecimal 104 KEYPAD_DOT 0x63 reg:0x71 0x53 XK_KP_Decimal
106 Power 105 KEY_POWER 0x66 spec:0x5e 0xe05e XK_XF86_Sleep
107 IntlBackslash 106 KEY_NON_US 0x64 reg:0x61 0x56 ^XK_greater,XK_less

4
kvmd/keyboard/mappings.py
View File

@ -149,6 +149,7 @@ KEYMAP: Dict[str, Key] = {
"Numpad0": Key(serial=SerialKey(code=103), otg=OtgKey(code=98, is_modifier=False)),
"NumpadDecimal": Key(serial=SerialKey(code=104), otg=OtgKey(code=99, is_modifier=False)),
"Power": Key(serial=SerialKey(code=105), otg=OtgKey(code=102, is_modifier=False)),
"IntlBackslash": Key(serial=SerialKey(code=106), otg=OtgKey(code=100, is_modifier=False)),
}
@ -293,6 +294,8 @@ X11_TO_AT1 = {
65456: At1Key(code=82, shift=False), # XK_KP_0
65454: At1Key(code=83, shift=False), # XK_KP_Decimal
65301: At1Key(code=84, shift=False), # XK_Sys_Req
60: At1Key(code=86, shift=False), # XK_less
62: At1Key(code=86, shift=True), # XK_greater
65480: At1Key(code=87, shift=False), # XK_F11
65481: At1Key(code=88, shift=False), # XK_F12
65421: At1Key(code=57372, shift=False), # XK_KP_Enter
@ -402,6 +405,7 @@ AT1_TO_WEB = {
82: "Numpad0",
83: "NumpadDecimal",
84: "PrintScreen",
86: "IntlBackslash",
87: "F11",
88: "F12",
57372: "NumpadEnter",

8
web/kvm/index.html
View File

@ -681,10 +681,14 @@
</div>
</div>
<div class="keypad-row">
<div class="modifier wide-4 left small" data-code="ShiftLeft">
<div class="modifier wide-3 left small" data-code="ShiftLeft">
<div class="label"><b>&bull;</b><br>Shift
</div>
</div>
<div class="key small" data-code="IntlBackslash">
<div class="label">
</div>
</div>
<div class="key single" data-code="KeyZ">
<div class="label">Z
</div>
@ -725,7 +729,7 @@
<div class="label">?<br>/
</div>
</div>
<div class="modifier wide-4 right small" data-code="ShiftRight">
<div class="modifier wide-3 right small" data-code="ShiftRight">
<div class="label"><b>&bull;</b><br>Shift
</div>
</div>

5
web/kvm/window-keyboard.pug
View File

@ -51,13 +51,14 @@ mixin lamp(cls)
+key("Quote") "#[br]'
+key("Enter", "wide-3 right small") Enter#[br]&crarr;
div(class="keypad-row")
+modifier("ShiftLeft", "wide-4 left small") Shift
+modifier("ShiftLeft", "wide-3 left small") Shift
+key("IntlBackslash", "small")
each key in ["Z", "X", "C", "V", "B", "N", "M"]
+key(`Key${key}`, "single") #{key}
+key("Comma") &lt;#[br],
+key("Period") &gt;#[br].
+key("Slash") ?#[br]/
+modifier("ShiftRight", "wide-4 right small") Shift
+modifier("ShiftRight", "wide-3 right small") Shift
div(class="keypad-row")
+modifier("ControlLeft", "wide-1 left small") Ctrl
+modifier("MetaLeft", "wide-1 left small") Win