This repository was archived by the owner on Apr 18, 2026. It is now read-only.
Commit 3020d95
Merge branch 'main' into fix/add-xl-and-missing-device-layouts
Resolves conflicts in profile_manager.py introduced by verygoodplugins#18 (the 20GBX9901
"+ XL" keypad rewrite landing on main). MODEL_LAYOUTS now contains all
seven entries: Original (5x3), MK.2 (5x3), XL (8x4), XL rev2 (8x4),
+ XL (9x4 keypad + 6-dial encoder), Mini (3x2), Neo (4x2), plus the UI
Stream Deck emulator.
Resolution cherry-picked from copilot/fix-conflicts-in-streamdeck-mcp
(commit 02a928a) which the Copilot agent produced but couldn't push to
the PR source branch because it lives on a fork.
Co-Authored-By: Mini Brax <braxhim@users.noreply.github.com>
Co-Authored-By: copilot-swe-agent[bot] <noreply@github.com>4 files changed
Lines changed: 702 additions & 90 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
80 | 92 | | |
81 | 93 | | |
82 | | - | |
83 | 94 | | |
84 | 95 | | |
85 | 96 | | |
| |||
0 commit comments