Skip to content

Commit cf9741b

Browse files
committed
Merge remote-tracking branch 'upstream/main' into setnextcode
2 parents 8889ac1 + 5f81f9e commit cf9741b

File tree

3,320 files changed

+154894
-78203
lines changed

Some content is hidden

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

3,320 files changed

+154894
-78203
lines changed

.git-blame-ignore-revs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# tests/run-tests.py: Reformat with Black.
2+
2a38d7103672580882fb621a5b76e8d26805d593
3+
4+
# all: Update Python code to conform to latest black formatting.
5+
06659077a81b85882254cf0953c33b27614e018e
6+
7+
# tools/uncrustify: Enable more opts to remove space between func and '('.
8+
77ed6f69ac35c1663a5633a8ee1d8a2446542204
9+
10+
# tools/codeformat.py: Include extmod/{btstack,nimble} in code formatting.
11+
026fda605e03113d6e753290d65fed774418bc53
12+
13+
# all: Format code to add space after C++-style comment start.
14+
84fa3312cfa7d2237d4b56952f2cd6e3591210c4
15+
16+
# tests: Format all Python code with black, except tests in basics subdir.
17+
3dc324d3f1312e40d3a8ed87e7244966bb756f26
18+
19+
# all: Remove spaces inside and around parenthesis.
20+
1a3e386c67e03a79eb768cb6e9f6777e002d6660
21+
22+
# all: Remove spaces between nested paren and inside function arg paren.
23+
feb25775851ba0c04b8d1013716f442258879d9c
24+
25+
# all: Reformat C and Python source code with tools/codeformat.py.
26+
69661f3343bedf86e514337cff63d96cc42f8859
27+
28+
# stm32/usbdev: Convert files to unix line endings.
29+
abde0fa2267f9062b28c3c015d7662a550125cc6
30+
31+
# all: Remove trailing spaces, per coding conventions.
32+
761e4c7ff62896c7d8f8c3dfc3cc98a4cc4f2f6f

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
1111
*.bat text eol=crlf
1212

1313
# These are binary so should never be modified by git.
14+
*.a binary
1415
*.png binary
1516
*.jpg binary
1617
*.dxf binary
1718
*.mpy binary
1819
*.deb binary
1920
*.zip binary
2021
*.pdf binary
22+
*.wav binary
2123

2224
# These should also not be modified by git.
2325
tests/basics/string_cr_conversion.py -text

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: 'bug'
6+
assignees: ''
7+
8+
---
9+
10+
<!-- Thanks! for testing out CircuitPython. Now that you have got a problem...
11+
you can file a bug report for it. Feel free to modify the below format to better
12+
suit your issue. :) -->
13+
14+
**Firmware**
15+
16+
<!-- Include the version of CircuitPython you're running. You can see it in the
17+
`boot_out.txt` file, as well as in the REPL. -->
18+
19+
```python
20+
Adafruit CircuitPython 6.2.0-beta.2 on 2021-03-01; Raspberry Pi Pico with rp2040
21+
```
22+
23+
**Code/REPL**
24+
25+
<!-- Include your code that reproduces the bug here. Try to distill down to the
26+
minimum possible to reproduce. -->
27+
28+
```python
29+
import busio, bitbangio
30+
i2c = bitbangio.I2C(board.GP1, board.GP0)
31+
```
32+
33+
**Behavior**
34+
35+
<!-- What happens when you run the code above? Include any error messages. -->
36+
37+
```python
38+
Traceback (most recent call last):
39+
File "<stdin>", line 1, in <module>
40+
TimeoutError: Clock stretch too long
41+
```
42+
43+
**Description**
44+
45+
<!-- Optionally, describe the issue in more detail. Here are some examples: -->
46+
47+
- Error while using i2c...
48+
- Only happens when...
49+
- might be related to #4291...
50+
51+
**Additional Info**
52+
53+
<!-- Optionally, add any other information like hardware connection, scope output etc.
54+
If you have already done some debugging, mention it here. -->

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
contact_links:
2+
- name: Adafruit Forum
3+
url: https://forums.adafruit.com/
4+
about: Official Adafruit technical support forum. Good for getting help on getting a project working.
5+
- name: Adafruit Discord
6+
url: https://adafru.it/discord
7+
about: Unofficial chat with many helpful folks and normally prompt replies.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: 'enhancement'
6+
assignees: ''
7+
8+
---
9+
10+
<!-- We are always adding new features and enhancements to CircuitPython 🚀
11+
and would love ❤ to see what new challenge you have got for us... 🙂 -->

0 commit comments

Comments
 (0)