RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

perkey layouts: route country code 4 to ISO QWERTY, not AZERTY 

A real UK-ISO G915 TKL (model B35F408EC343, WPID 408E) reports 4 from
KEYBOARD_LAYOUT_2 (0x4540). Its zone bitmap includes the ISO-only POUND
(47) and ISO_BACKSLASH (97) keys and the physical board is UK QWERTY,
so the painter showed AZERTY symbols on the digit row for a QWERTY
board. No spec for the 0x4540 country enumeration is public; this is a
device-observation correction. AZERTY keeps its layout but has no
country code mapped until a confirmed FR device report arrives.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
grechmarlon 2026-06-11 19:31:24 +02:00
parent 3d1e502096
commit b6c930162a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/solaar/ui/perkey/layouts/__init__.py
View File

@ -76,6 +76,10 @@ _KEYBOARD_FAMILY_BY_COUNTRY: dict[int, str] = {
1: "ansi",
# ISO QWERTY (UK + ES/IT/PT/BE/Nordic — same shape, different keycap legends)
2: "iso_qwerty",
# Observed: UK-ISO G915 TKL (model B35F408EC343, WPID 408E) reports 4 —
# its zone bitmap includes the ISO-only POUND (47) and ISO_BACKSLASH (97)
# keys and the physical board is UK QWERTY, not AZERTY.
4: "iso_qwerty",
5: "iso_qwerty",
8: "iso_qwerty",
0x0B: "iso_qwerty",
@ -89,8 +93,9 @@ _KEYBOARD_FAMILY_BY_COUNTRY: dict[int, str] = {
# ISO QWERTZ (DE/Swiss)
3: "iso_qwertz",
7: "iso_qwertz",
# ISO AZERTY (FR)
4: "iso_azerty",
# ISO AZERTY (FR) — no confirmed country code; 4 was originally mapped
# here but a real UK-ISO G915 TKL reports 4 (see above), so AZERTY is
# unreachable until a confirmed FR device report arrives.
# JIS
9: "jis",
0x3E: "jis",