diff --git a/cosy.py b/cosy.py index 214ea18..135bf28 100755 --- a/cosy.py +++ b/cosy.py @@ -166,20 +166,19 @@ def parse_elffile(elffile, prefix, appdir, riot_base=None): r"(?P[0-9a-zA-Z_$.]+)\s+" r"(.*/)?" r"(" - r"{appdir}|" r"{riot_base}|" r".cargo/registry/src/[^/]+|" r".cargo/git/checkouts|" r"/rustc/[0-9a-f]+/?/library|" r"ip-over-ble_experiments|" # HACK... - r"{appdir}/.*bin/pkg" + r"RIOT/app/.*bin/pkg" r")/" r"(?P.+)/" r"(?P[0-9a-zA-Z_-]+\.(c|h|rs)):" - r"(?P\d+)$".format(riot_base=riot_base, - appdir=appdir)) + r"(?P\d+)$".format(riot_base=riot_base)) for line in dump.splitlines(): - m = c.match(line.decode("utf-8")) + line = line.decode("utf-8").replace(appdir, "RIOT/app") + m = c.match(line) if m: d = {'arcv': '', 'obj': '', 'size': -1, 'alias': []} d.update(m.groupdict()) diff --git a/root/sunburst.js b/root/sunburst.js index 6f898e6..f7b15a1 100644 --- a/root/sunburst.js +++ b/root/sunburst.js @@ -30,6 +30,7 @@ var b = { // Mapping of step names to colors. var colors = { + "app": "#d98b8f", "core": "#a173d1", "cpu": "#7b615c", "boards": "#de783b",