Skip to content
This repository was archived by the owner on May 5, 2024. It is now read-only.

Commit 7a0243e

Browse files
nubcorenubcore
committed
Merge remote-tracking branch 'upstream/esp32' into esp32
2 parents 3d5f676 + 84035f0 commit 7a0243e

File tree

2,173 files changed

+62693
-485969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,173 files changed

+62693
-485969
lines changed

‎.gitattributes

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,18 @@
1010
*.png binary
1111
*.jpg binary
1212
*.dxf binary
13+
*.mpy binary
1314

1415
# These should also not be modified by git.
1516
tests/basics/string_cr_conversion.py -text
1617
tests/basics/string_crlf_conversion.py -text
17-
stmhal/startup_stm32f40xx.s -text
18-
stmhal/pybcdc.inf_template -text
19-
stmhal/usbd_* -text
20-
stmhal/boards/*/stm32f4xx_hal_conf.h -text
21-
stmhal/cmsis/** -text
22-
stmhal/hal/** -text
23-
stmhal/usbdev/** -text
24-
stmhal/usbhost/** -text
25-
cc3200/hal/aes.c -text
26-
cc3200/hal/aes.h -text
27-
cc3200/hal/des.c -text
28-
cc3200/hal/i2s.c -text
29-
cc3200/hal/i2s.h -text
30-
cc3200/version.h -text
31-
lib/fatfs/** -text
18+
ports/stm32/pybcdc.inf_template -text
19+
ports/stm32/usbd_* -text
20+
ports/stm32/usbdev/** -text
21+
ports/stm32/usbhost/** -text
22+
ports/cc3200/hal/aes.c -text
23+
ports/cc3200/hal/aes.h -text
24+
ports/cc3200/hal/des.c -text
25+
ports/cc3200/hal/i2s.c -text
26+
ports/cc3200/hal/i2s.h -text
27+
ports/cc3200/version.h -text

‎.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*.dis
1010
*.exe
1111

12-
# Packages
12+
# Packages
1313
############
1414

1515
# Logs and Databases
@@ -39,3 +39,7 @@ __pycache__/
3939
GNUmakefile
4040
makefile
4141
user.props
42+
43+
# Generated rst files
44+
######################
45+
genrst/

‎.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@
1111
[submodule "lib/berkeley-db-1.xx"]
1212
path = lib/berkeley-db-1.xx
1313
url = https://github.com/pfalcon/berkeley-db-1.xx
14+
[submodule "lib/stm32lib"]
15+
path = lib/stm32lib
16+
url = https://github.com/micropython/stm32lib
17+
branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0

‎.travis.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,48 +19,48 @@ before_script:
1919
- sudo apt-get install -y --force-yes gcc-arm-none-eabi
2020
# For teensy build
2121
- sudo apt-get install realpath
22-
# For coverage testing
23-
- sudo pip install cpp-coveralls
22+
# For coverage testing (upgrade is used to get latest urllib3 version)
23+
- sudo pip install --upgrade cpp-coveralls
2424
- gcc --version
2525
- arm-none-eabi-gcc --version
2626
- python3 --version
2727

2828
script:
2929
- make -C mpy-cross
30-
- make -C minimal CROSS=1 build/firmware.bin
31-
- ls -l minimal/build/firmware.bin
30+
- make -C ports/minimal CROSS=1 build/firmware.bin
31+
- ls -l ports/minimal/build/firmware.bin
3232
- tools/check_code_size.sh
3333
- mkdir -p ${HOME}/persist
3434
# Save new firmware for reference, but only if building a main branch, not a pull request
35-
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp minimal/build/firmware.bin ${HOME}/persist/; fi'
36-
- make -C unix deplibs
37-
- make -C unix
38-
- make -C unix nanbox
39-
- make -C bare-arm
40-
- make -C qemu-arm test
41-
- make -C stmhal
42-
- make -C stmhal -B MICROPY_PY_WIZNET5K=1 MICROPY_PY_CC3K=1
43-
- make -C stmhal BOARD=STM32F7DISC
44-
- make -C stmhal BOARD=STM32L476DISC
45-
- make -C teensy
46-
- make -C cc3200 BTARGET=application BTYPE=release
47-
- make -C cc3200 BTARGET=bootloader BTYPE=release
48-
- make -C windows CROSS_COMPILE=i686-w64-mingw32-
35+
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp ports/minimal/build/firmware.bin ${HOME}/persist/; fi'
36+
- make -C ports/unix deplibs
37+
- make -C ports/unix
38+
- make -C ports/unix nanbox
39+
- make -C ports/bare-arm
40+
- make -C ports/qemu-arm test
41+
- make -C ports/stm32
42+
- make -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
43+
- make -C ports/stm32 BOARD=STM32F769DISC
44+
- make -C ports/stm32 BOARD=STM32L476DISC
45+
- make -C ports/teensy
46+
- make -C ports/cc3200 BTARGET=application BTYPE=release
47+
- make -C ports/cc3200 BTARGET=bootloader BTYPE=release
48+
- make -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
4949

5050
# run tests without coverage info
5151
#- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests)
5252
#- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests --emit native)
5353

5454
# run tests with coverage info
55-
- make -C unix coverage
56-
- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests)
57-
- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests -d thread)
58-
- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --emit native)
59-
- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --via-mpy -d basics float)
55+
- make -C ports/unix coverage
56+
- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests)
57+
- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -d thread)
58+
- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --emit native)
59+
- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy -d basics float)
6060

6161
# run coveralls coverage analysis (try to, even if some builds/tests failed)
62-
- (cd unix && coveralls --root .. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
62+
- (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
6363

6464
after_failure:
6565
- (cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff -u $testbase.exp $testbase.out; done)
66-
- (grep "FAIL" qemu-arm/build/console.out)
66+
- (grep "FAIL" ports/qemu-arm/build/console.out)

‎CODECONVENTIONS.md

Lines changed: 96 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,28 @@ a change in a detail, if needed. Any change beyond 5 lines would likely
2424
require such detailed description.
2525

2626
To get good practical examples of good commits and their messages, browse
27-
thry the `git log` of the project.
27+
the `git log` of the project.
28+
29+
MicroPython doesn't require explicit sign-off for patches ("Signed-off-by"
30+
lines and similar). Instead, the commit message, and your name and email
31+
address on it construes your sign-off of the following:
32+
33+
* That you wrote the change yourself, or took it from a project with
34+
a compatible license (in the latter case the commit message, and possibly
35+
source code should provide reference where the implementation was taken
36+
from and give credit to the original author, as required by the license).
37+
* That you are allowed to release these changes to an open-source project
38+
(for example, changes done during paid work for a third party may require
39+
explicit approval from that third party).
40+
* That you (or your employer) agree to release the changes under
41+
MicroPython's license, which is the MIT license. Note that you retain
42+
copyright for your changes (for smaller changes, the commit message
43+
conveys your copyright; if you make significant changes to a particular
44+
source module, you're welcome to add your name to the file header).
45+
* Your signature for all of the above, which is the 'Author' line in
46+
the commit message, and which should include your full real name and
47+
a valid and active email address by which you can be contacted in the
48+
foreseeable future.
2849

2950
Python code conventions
3051
=======================
@@ -52,7 +73,7 @@ White space:
5273
keyword and the opening parenthesis.
5374
- Put 1 space after a comma, and 1 space around operators.
5475

55-
Braces:
76+
Braces:
5677
- Use braces for all blocks, even no-line and single-line pieces of
5778
code.
5879
- Put opening braces on the end of the line it belongs to, not on
@@ -114,3 +135,76 @@ Type declarations:
114135
int member;
115136
void *data;
116137
} my_struct_t;
138+
139+
Documentation conventions
140+
=========================
141+
142+
MicroPython generally follows CPython in documentation process and
143+
conventions. reStructuredText syntax is used for the documention.
144+
145+
Specific conventions/suggestions:
146+
147+
* Use `*` markup to refer to arguments of a function, e.g.:
148+
149+
```
150+
.. method:: poll.unregister(obj)
151+
152+
Unregister *obj* from polling.
153+
```
154+
155+
* Use following syntax for cross-references/cross-links:
156+
157+
```
158+
:func:`foo` - function foo in current module
159+
:func:`module1.foo` - function foo in module "module1"
160+
(similarly for other referent types)
161+
:class:`Foo` - class Foo
162+
:meth:`Class.method1` - method1 in Class
163+
:meth:`~Class.method1` - method1 in Class, but rendered just as "method1()",
164+
not "Class.method1()"
165+
:meth:`title <method1>` - reference method1, but render as "title" (use only
166+
if really needed)
167+
:mod:`module1` - module module1
168+
169+
`symbol` - generic xref syntax which can replace any of the above in case
170+
the xref is unambiguous. If there's ambiguity, there will be a warning
171+
during docs generation, which need to be fixed using one of the syntaxes
172+
above
173+
```
174+
175+
* Cross-referencing arbitrary locations
176+
~~~
177+
.. _xref_target:
178+
179+
Normal non-indented text.
180+
181+
This is :ref:`reference <xref_target>`.
182+
183+
(If xref target is followed by section title, can be just
184+
:ref:`xref_target`).
185+
~~~
186+
187+
* Linking to external URL:
188+
```
189+
`link text <http://foo.com/...>`_
190+
```
191+
192+
* Referencing builtin singleton objects:
193+
```
194+
``None``, ``True``, ``False``
195+
```
196+
197+
* Use following syntax to create common description for more than one element:
198+
~~~
199+
.. function:: foo(x)
200+
bar(y)
201+
202+
Description common to foo() and bar().
203+
~~~
204+
205+
206+
More detailed guides and quickrefs:
207+
208+
* http://www.sphinx-doc.org/en/stable/rest.html
209+
* http://www.sphinx-doc.org/en/stable/markup/inline.html
210+
* http://docutils.sourceforge.net/docs/user/rst/quickref.html

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy