Skip to content
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.

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

stm32f2: document all ADC fields (same ADC peripherals as stm32f4) #306

Merged
merged 1 commit into from
Nov 29, 2019

Conversation

aurelj
Copy link
Member

@aurelj aurelj commented Nov 19, 2019

No description provided.

Copy link
Member

@adamgreig adamgreig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

bors r+

bors bot added a commit that referenced this pull request Nov 28, 2019
306: stm32f2: document all ADC fields (same ADC peripherals as stm32f4) r=adamgreig a=aurelj



307: complete stm32f0 ADC documentation r=adamgreig a=aurelj



309: Fix access of FLASH_SR.EOP in STM32L0 r=adamgreig a=hannobraun

I need some help getting this over the finish line. When I try to build the crates according to the instructions in README, I get this when executing `make svd2rust`:
```
python3 scripts/makedeps.py devices/stm32l0x1.yaml > .deps/stm32l0x1.d
python3 scripts/makedeps.py devices/stm32l0x3.yaml > .deps/stm32l0x3.d
python3 scripts/makedeps.py devices/stm32l0x2.yaml > .deps/stm32l0x2.d
python3 scripts/svdpatch.py devices/stm32l0x3.yaml
python3 scripts/svdpatch.py devices/stm32l0x1.yaml
python3 scripts/svdpatch.py devices/stm32l0x2.yaml
Traceback (most recent call last):
  File "scripts/svdpatch.py", line 893, in <module>
    main()
  File "scripts/svdpatch.py", line 889, in main
    svd.write(svdpath_out)
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 772, in write
    serialize(write, self._root, qnames, namespaces,
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 937, in _serialize_xml
    _serialize_xml(write, e, qnames, None,
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 937, in _serialize_xml
    _serialize_xml(write, e, qnames, None,
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 937, in _serialize_xml
    _serialize_xml(write, e, qnames, None,
  [Previous line repeated 2 more times]
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 935, in _serialize_xml
    write(_escape_cdata(text))
TypeError: write() argument must be str, not collections.OrderedDict
make: *** [Makefile:39: svd/stm32l0x1.svd.patched] Error 1
make: *** Waiting for unfinished jobs....
Traceback (most recent call last):
  File "scripts/svdpatch.py", line 893, in <module>
    main()
  File "scripts/svdpatch.py", line 889, in main
    svd.write(svdpath_out)
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 772, in write
    serialize(write, self._root, qnames, namespaces,
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 937, in _serialize_xml
    _serialize_xml(write, e, qnames, None,
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 937, in _serialize_xml
    _serialize_xml(write, e, qnames, None,
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 937, in _serialize_xml
    _serialize_xml(write, e, qnames, None,
  [Previous line repeated 2 more times]
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 935, in _serialize_xml
    write(_escape_cdata(text))
TypeError: write() argument must be str, not collections.OrderedDict
make: *** [Makefile:39: svd/stm32l0x2.svd.patched] Error 1
Traceback (most recent call last):
  File "scripts/svdpatch.py", line 893, in <module>
    main()
  File "scripts/svdpatch.py", line 889, in main
    svd.write(svdpath_out)
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 772, in write
    serialize(write, self._root, qnames, namespaces,
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 937, in _serialize_xml
    _serialize_xml(write, e, qnames, None,
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 937, in _serialize_xml
    _serialize_xml(write, e, qnames, None,
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 937, in _serialize_xml
    _serialize_xml(write, e, qnames, None,
  [Previous line repeated 2 more times]
  File "/usr/lib/python3.8/xml/etree/ElementTree.py", line 935, in _serialize_xml
    write(_escape_cdata(text))
TypeError: write() argument must be str, not collections.OrderedDict
make: *** [Makefile:39: svd/stm32l0x3.svd.patched] Error 1
```

I have no idea what's happening. To the best of my knowledge, what I'm doing follows what I've seen in the other YAML files. Does someone know what I'm doing wrong here?

310: complete stm32f7 ADC documentation r=adamgreig a=aurelj



311: STM32F412: Add missing reset and enable registers for AHB3 r=adamgreig a=samcrow

The STM32F412 SVD is missing the registers RCC_AHB3RSTR and RCC_AHB3ENR. This commit adds them.

312: complete stm32h7 ADC documentation r=adamgreig a=aurelj



Co-authored-by: Aurelien Jacobs <aurel@gnuage.org>
Co-authored-by: Hanno Braun <hanno@braun-embedded.com>
Co-authored-by: Sam Crow <scrow@eng.ucsd.edu>
@bors bors bot merged commit f599d0d into stm32-rs:master Nov 29, 2019
@bors
Copy link
Contributor

bors bot commented Nov 29, 2019

Build succeeded

@aurelj aurelj deleted the f2_adc branch November 29, 2019 23:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants