Compare commits
No commits in common. "master" and "1.1.20rc2" have entirely different histories.
|
|
@ -231,7 +231,7 @@ def run(receivers, args, _find_receiver, find_device):
|
||||||
argl = ["config", dev.serial or dev.unitId, setting.name]
|
argl = ["config", dev.serial or dev.unitId, setting.name]
|
||||||
argl.extend([a for a in [args.value_key, args.extra_subkey, args.extra2] if a is not None])
|
argl.extend([a for a in [args.value_key, args.extra_subkey, args.extra2] if a is not None])
|
||||||
args = yaml.dump(argl)
|
args = yaml.dump(argl)
|
||||||
application.run([args])
|
application.run(args)
|
||||||
else:
|
else:
|
||||||
if dev.persister and setting.persist:
|
if dev.persister and setting.persist:
|
||||||
dev.persister[setting.name] = setting._value
|
dev.persister[setting.name] = setting._value
|
||||||
|
|
|
||||||
|
|
@ -157,17 +157,11 @@ MAIN_ANSI: tuple[Cell, ...] = (
|
||||||
Cell(zone_id=108, row=5, col=13, group="main", label="Ctrl"),
|
Cell(zone_id=108, row=5, col=13, group="main", label="Ctrl"),
|
||||||
)
|
)
|
||||||
|
|
||||||
# --- Main alpha block, ISO. Drops the row 2 col 13 backslash (zone 46 is the
|
# --- Main alpha block, ISO. Same as ANSI minus the row 2 col 13 backslash;
|
||||||
# upper half of the L-shape Enter on ISO, addressed by zone 37) and adds
|
# on ISO that position is the top half of the L-shape Enter, addressed
|
||||||
# the two ISO-only keys: POUND (zone 47) at row 3 col 12 between ' and
|
# by zone 37 (the main Enter cell at row 3 col 13). Zone 46 is silently
|
||||||
# Enter, and ISO_BACKSLASH (zone 97) at row 4 col 1 between Shift and Z.
|
# unaddressable on ISO layouts — same limitation as OpenRGB's UI.
|
||||||
# Regional layouts override the labels to match local keycaps (# / < on
|
MAIN_ISO: tuple[Cell, ...] = tuple(c for c in MAIN_ANSI if not (c.row == 2 and c.col == 13))
|
||||||
# QWERTZ, # / \ on UK QWERTY, * / < on AZERTY).
|
|
||||||
_ISO_EXTRA_KEYS: tuple[Cell, ...] = (
|
|
||||||
Cell(zone_id=47, row=3, col=12, group="main", label="#"),
|
|
||||||
Cell(zone_id=97, row=4, col=1, group="main", label="\\"),
|
|
||||||
)
|
|
||||||
MAIN_ISO: tuple[Cell, ...] = tuple(c for c in MAIN_ANSI if not (c.row == 2 and c.col == 13)) + _ISO_EXTRA_KEYS
|
|
||||||
|
|
||||||
# --- Curated allowlist for unmapped device zones surfaced in the bottom strip.
|
# --- Curated allowlist for unmapped device zones surfaced in the bottom strip.
|
||||||
# G-keys, logo, media, brightness — the canonical "extras" Logitech firmware
|
# G-keys, logo, media, brightness — the canonical "extras" Logitech firmware
|
||||||
|
|
|
||||||
|
|
@ -56,8 +56,6 @@ _OVERRIDES: dict[int, str] = {
|
||||||
51: ";", # ,-position → semicolon
|
51: ";", # ,-position → semicolon
|
||||||
52: ":", # .-position → colon
|
52: ":", # .-position → colon
|
||||||
53: "!", # /-position → exclamation
|
53: "!", # /-position → exclamation
|
||||||
47: "*", # POUND key (row 3 col 12) — French * / µ
|
|
||||||
97: "<", # ISO_BACKSLASH (row 4 col 1), between Shift and W
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,8 +38,6 @@ _OVERRIDES: dict[int, str] = {
|
||||||
49: "Ä", # row 3 col 11
|
49: "Ä", # row 3 col 11
|
||||||
26: "Y", # row 4 col 2 — Y/Z swap
|
26: "Y", # row 4 col 2 — Y/Z swap
|
||||||
53: "-", # row 4 col 11
|
53: "-", # row 4 col 11
|
||||||
47: "#", # POUND key (row 3 col 12), between Ä and Enter
|
|
||||||
97: "<", # ISO_BACKSLASH (row 4 col 1), between Shift and Y
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue