diff --git a/server.py b/server.py index 238d13c..7e1b181 100644 --- a/server.py +++ b/server.py @@ -109,7 +109,7 @@ def render_page(profile): cfg = vp.annotate_profile({ "buttons": [dict(b) for b in raw["buttons"]], "encoders": [dict(e) for e in raw["encoders"]], - }) + }, combined.get("macros")) tabs = "".join( f'{html.escape(combined["profile_names"][p])}' for p in range(vp.NUM_PROFILES) diff --git a/versapad_mcp_server.py b/versapad_mcp_server.py index 5a262c7..c47ecc6 100644 --- a/versapad_mcp_server.py +++ b/versapad_mcp_server.py @@ -61,7 +61,11 @@ def _profile_switch_data(target): def _describe_action(action): - return {"type": action["type"], "data": action["data"], "label": vp.action_label(action), + """label zeigt bei Makros die echte Tastenfolge statt nur der + Slot-Nummer (gleiche Darstellung wie im Hauptfenster) -- die Makrotabelle + liegt im selben State, also kein Grund, hier weniger zu verraten.""" + return {"type": action["type"], "data": action["data"], + "label": vp.action_label(action, _cfg().get("macros")), "note": action.get("note", "")}