Content-Length: 314679 | pFad | http://github.com/stm32-rs/stm32-rs/pull/591/files/3ba0aaaeecb6515e9a28c3674aef3537cb03464b

E2 [scripts/makehtml] Fix displaying of registers with the same addressOffset and parsing of addressOffset by maximeborges · Pull Request #591 · stm32-rs/stm32-rs · GitHub
Skip to content

[scripts/makehtml] Fix displaying of registers with the same addressOffset and parsing of addressOffset #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 15, 2021
Merged

[scripts/makehtml] Fix displaying of registers with the same addressOffset and parsing of addressOffset #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
283e8c7
[scripts/makehtml] Fix displaying of registers with the same addressO…
maximeborges Aug 15, 2021
2064371
Simplify parsing of adressOffset
maximeborges Aug 15, 2021
3ba0aaa
[scripts/makehtml] Fix sorting of registers
maximeborges Aug 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions scripts/makehtml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def parse_device(svdfile):
rdesc = rtag.findtext('description')
rrstv = rtag.findtext('resetValue')
raccs = rtag.findtext('access') or "Unspecified"
roffset = int(rtag.findtext('addressOffset'), 16)
roffset = int(rtag.findtext('addressOffset'), 0)
for ftag in rtag.iter('field'):
register_fields_total += 1
fname = ftag.findtext('name')
Expand Down Expand Up @@ -146,14 +146,14 @@ def parse_device(svdfile):
# Bodge to prevent /0 when there are no fields in a register
if register_fields_total == 0:
register_fields_total = 1
registers[roffset] = {"name": rname,
"offset": "0x{:X}".format(roffset),
"description": rdesc, "resetValue": rrstv,
"access": raccs, "fields": fields,
"table": table,
"fields_total": register_fields_total,
"fields_documented":
register_fields_documented}
registers[(roffset, rname)] = {"name": rname,
"offset": "0x{:X}".format(roffset),
"description": rdesc, "resetValue": rrstv,
"access": raccs, "fields": fields,
"table": table,
"fields_total": register_fields_total,
"fields_documented":
register_fields_documented}
peripheral_fields_total += register_fields_total
peripheral_fields_documented += register_fields_documented
peripherals[pname] = {"name": pname, "base": pbase,
Expand Down
2 changes: 1 addition & 1 deletion scripts/makehtml.template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ <h3>
<a class=toggle-registers href=#>Toggle Registers</a>.
</p>
<div class="container registers" id="{{ pname }}-registers">
{% for roffset, register in peripheral.registers|dictsort %}
{% for _, register in peripheral.registers|dictsort %}
<div class=row>
<div class="col-sm-11 register">
<h4>
Expand Down








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/stm32-rs/stm32-rs/pull/591/files/3ba0aaaeecb6515e9a28c3674aef3537cb03464b

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy