Skip to content

Commit 6fe2ea4

Browse files
latkinso42latkinso42
committed
Merging back with updated main files
2 parents 04af01a + d3626f1 commit 6fe2ea4

File tree

63 files changed

+455
-241
lines changed

Some content is hidden

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

63 files changed

+455
-241
lines changed

‎LICENSE

Lines changed: 6 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
The MIT License (MIT)
1+
MIT License
22

3-
Copyright (c) 2013-2022 Damien P. George
3+
Copyright (c) 2013-2022 Damien P. George and others
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -9,77 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
99
copies of the Software, and to permit persons to whom the Software is
1010
furnished to do so, subject to the following conditions:
1111

12-
The above copyright notice and this permission notice shall be included in
13-
all copies or substantial portions of the Software.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
1414

1515
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1616
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1717
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21-
THE SOFTWARE.
22-
23-
--------------------------------------------------------------------------------
24-
25-
Unless specified otherwise (see below), the above license and copyright applies
26-
to all files in this repository.
27-
28-
Individual files may include additional copyright holders.
29-
30-
The various ports of MicroPython may include third-party software that is
31-
licensed under different terms. These licenses are summarised in the tree
32-
below, please refer to these files and directories for further license and
33-
copyright information. Note that (L)GPL-licensed code listed below is only
34-
used during the build process and is not part of the compiled source code.
35-
36-
/ (MIT)
37-
/drivers
38-
/cc3000 (BSD-3-clause)
39-
/cc3100 (BSD-3-clause)
40-
/wiznet5k (BSD-3-clause)
41-
/lib
42-
/asf4 (Apache-2.0)
43-
/axtls (BSD-3-clause)
44-
/config
45-
/scripts
46-
/config (GPL-2.0-or-later)
47-
/Rules.mak (GPL-2.0)
48-
/berkeley-db-1xx (BSD-4-clause)
49-
/btstack (See btstack/LICENSE)
50-
/cmsis (BSD-3-clause)
51-
/crypto-algorithms (NONE)
52-
/libhydrogen (ISC)
53-
/littlefs (BSD-3-clause)
54-
/lwip (BSD-3-clause)
55-
/mynewt-nimble (Apache-2.0)
56-
/nrfx (BSD-3-clause)
57-
/nxp_driver (BSD-3-Clause)
58-
/oofatfs (BSD-1-clause)
59-
/pico-sdk (BSD-3-clause)
60-
/re15 (BSD-3-clause)
61-
/stm32lib (BSD-3-clause)
62-
/tinytest (BSD-3-clause)
63-
/tinyusb (MIT)
64-
/uzlib (Zlib)
65-
/logo (uses OFL-1.1)
66-
/ports
67-
/cc3200
68-
/hal (BSD-3-clause)
69-
/simplelink (BSD-3-clause)
70-
/FreeRTOS (GPL-2.0 with FreeRTOS exception)
71-
/stm32
72-
/usbd*.c (MCD-ST Liberty SW License Agreement V2)
73-
/stm32_it.* (MIT + BSD-3-clause)
74-
/system_stm32*.c (MIT + BSD-3-clause)
75-
/boards
76-
/startup_stm32*.s (BSD-3-clause)
77-
/*/stm32*.h (BSD-3-clause)
78-
/usbdev (MCD-ST Liberty SW License Agreement V2)
79-
/usbhost (MCD-ST Liberty SW License Agreement V2)
80-
/teensy
81-
/core (PJRC.COM)
82-
/zephyr
83-
/src (Apache-2.0)
84-
/tools
85-
/dfu.py (LGPL-3.0-only)
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎LICENSE_MicroPython

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2013-2022 Damien P. George
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.
22+
23+
--------------------------------------------------------------------------------
24+
25+
Unless specified otherwise (see below), the above license and copyright applies
26+
to all files in this repository.
27+
28+
Individual files may include additional copyright holders.
29+
30+
The various ports of MicroPython may include third-party software that is
31+
licensed under different terms. These licenses are summarised in the tree
32+
below, please refer to these files and directories for further license and
33+
copyright information. Note that (L)GPL-licensed code listed below is only
34+
used during the build process and is not part of the compiled source code.
35+
36+
/ (MIT)
37+
/drivers
38+
/cc3000 (BSD-3-clause)
39+
/cc3100 (BSD-3-clause)
40+
/wiznet5k (BSD-3-clause)
41+
/lib
42+
/asf4 (Apache-2.0)
43+
/axtls (BSD-3-clause)
44+
/config
45+
/scripts
46+
/config (GPL-2.0-or-later)
47+
/Rules.mak (GPL-2.0)
48+
/berkeley-db-1xx (BSD-4-clause)
49+
/btstack (See btstack/LICENSE)
50+
/cmsis (BSD-3-clause)
51+
/crypto-algorithms (NONE)
52+
/libhydrogen (ISC)
53+
/littlefs (BSD-3-clause)
54+
/lwip (BSD-3-clause)
55+
/mynewt-nimble (Apache-2.0)
56+
/nrfx (BSD-3-clause)
57+
/nxp_driver (BSD-3-Clause)
58+
/oofatfs (BSD-1-clause)
59+
/pico-sdk (BSD-3-clause)
60+
/re15 (BSD-3-clause)
61+
/stm32lib (BSD-3-clause)
62+
/tinytest (BSD-3-clause)
63+
/tinyusb (MIT)
64+
/uzlib (Zlib)
65+
/logo (uses OFL-1.1)
66+
/ports
67+
/cc3200
68+
/hal (BSD-3-clause)
69+
/simplelink (BSD-3-clause)
70+
/FreeRTOS (GPL-2.0 with FreeRTOS exception)
71+
/stm32
72+
/usbd*.c (MCD-ST Liberty SW License Agreement V2)
73+
/stm32_it.* (MIT + BSD-3-clause)
74+
/system_stm32*.c (MIT + BSD-3-clause)
75+
/boards
76+
/startup_stm32*.s (BSD-3-clause)
77+
/*/stm32*.h (BSD-3-clause)
78+
/usbdev (MCD-ST Liberty SW License Agreement V2)
79+
/usbhost (MCD-ST Liberty SW License Agreement V2)
80+
/teensy
81+
/core (PJRC.COM)
82+
/zephyr
83+
/src (Apache-2.0)
84+
/tools
85+
/dfu.py (LGPL-3.0-only)

‎license.rst renamed to ‎docs/LICENSE.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
MicroPython & CircuitPython license information
2-
===============================================
1+
# MicroPython & CircuitPython License
32

4-
The MIT License (MIT)
3+
MIT License
54

6-
Copyright (c) 2013-2017 Damien P. George, and others
5+
Copyright (c) 2013-2022 Damien P. George and others
76

87
Permission is hereby granted, free of charge, to any person obtaining a copy
98
of this software and associated documentation files (the "Software"), to deal
@@ -12,13 +11,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
1211
copies of the Software, and to permit persons to whom the Software is
1312
furnished to do so, subject to the following conditions:
1413

15-
The above copyright notice and this permission notice shall be included in
16-
all copies or substantial portions of the Software.
14+
The above copyright notice and this permission notice shall be included in all
15+
copies or substantial portions of the Software.
1716

1817
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1918
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
2019
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
2120
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
2221
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24-
THE SOFTWARE.
22+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23+
SOFTWARE.

‎docs/design_guide.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ statement will ensure hardware isn't enabled longer than needed.
141141
Verify your device
142142
--------------------------------------------------------------------------------
143143

144-
Whenever possible, make sure device you are talking to is the device you expect.
144+
Whenever possible, make sure the device you are talking to is the device you expect.
145145
If not, raise a RuntimeError. Beware that I2C addresses can be identical on
146146
different devices so read registers you know to make sure they match your
147147
expectation. Validating this upfront will help catch mistakes.
@@ -202,7 +202,7 @@ interchangeably with the CPython name. This is confusing. Instead, think up a
202202
new name that is related to the extra functionality you are adding.
203203

204204
For example, storage mounting and unmounting related functions were moved from
205-
``uos`` into a new `storage` module. Terminal related functions were moved into
205+
``uos`` into a new `storage` module. Terminal-related functions were moved into
206206
`multiterminal`. These names better match their functionality and do not
207207
conflict with CPython names. Make sure to check that you don't conflict with
208208
CPython libraries too. That way we can port the API to CPython in the future.
@@ -213,7 +213,7 @@ Example
213213
When adding extra functionality to CircuitPython to mimic what a normal
214214
operating system would do, either copy an existing CPython API (for example file
215215
writing) or create a separate module to achieve what you want. For example,
216-
mounting and unmount drives is not a part of CPython so it should be done in a
216+
mounting and unmounting drives is not a part of CPython so it should be done in a
217217
module, such as a new ``storage`` module, that is only available in CircuitPython.
218218
That way when someone moves the code to CPython they know what parts need to be
219219
adapted.

‎docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Full Table of Contents
4848
../CONTRIBUTING
4949
../BUILDING
5050
../CODE_OF_CONDUCT
51-
../license.rst
51+
../docs/LICENSE
5252
../WEBUSB_README
5353

5454
Indices and tables

‎docs/shared_bindings_matrix.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
"pybadge": ["edgebadge"],
4141
"pyportal": ["pyportal_pynt"],
4242
"gemma_m0": ["gemma_m0_pycon2018"],
43-
"pewpew10": ["pewpew13"],
4443
}
4544

4645
ALIASES_BRAND_NAMES = {
@@ -54,8 +53,6 @@
5453
"Adafruit PyPortal Pynt",
5554
"gemma_m0_pycon2018":
5655
"Adafruit Gemma M0 PyCon 2018",
57-
"pewpew13":
58-
"PewPew 13",
5956
}
6057

6158
ADDITIONAL_MODULES = {

‎docs/workflows.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ root will be returned.
138138
When requested with the `OPTIONS` method, the server will respond with CORS related headers. Most
139139
aren't needed for API use. They are there for the web browser.
140140

141-
* `Access-Control-Allow-Methods` - Varies with USB state. `GET, OPTIONS` when USB is active. `GET, OPTIONS, PUT, DELETE` otherwise.
141+
* `Access-Control-Allow-Methods` - Varies with USB state. `GET, OPTIONS` when USB is active. `GET, OPTIONS, PUT, DELETE, MOVE` otherwise.
142142

143143
Example:
144144

@@ -405,6 +405,12 @@ curl -v -L http://circuitpython.local/cp/version.json
405405
}
406406
```
407407

408+
#### `/code/`
409+
410+
The `/code/` page returns a small static html page that will pull in and load the full code editor from
411+
[code.circuitpython.org](https://code.circuitpython.org) for a full code editor experience. Because most
412+
of the resources reside online instead of the device, an active internet connection is required.
413+
408414
### Static files
409415

410416
* `/favicon.ico` - Blinka

‎frozen/circuitpython-stage

‎locale/ID.po

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -404,14 +404,12 @@ msgstr "Alamat harus sepanjang %d byte"
404404
msgid "All CAN peripherals are in use"
405405
msgstr ""
406406

407-
#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
407+
#: ports/espressif/common-hal/busio/I2C.c
408+
#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
409+
#: ports/nrf/common-hal/busio/I2C.c
408410
msgid "All I2C peripherals are in use"
409411
msgstr "Semua perangkat I2C sedang digunakan"
410412

411-
#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
412-
msgid "All I2C targets are in use"
413-
msgstr ""
414-
415413
#: ports/espressif/common-hal/countio/Counter.c
416414
#: ports/espressif/common-hal/frequencyio/FrequencyIn.c
417415
#: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c
@@ -1074,6 +1072,7 @@ msgid "I2C init error"
10741072
msgstr ""
10751073

10761074
#: ports/raspberrypi/common-hal/busio/I2C.c
1075+
#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
10771076
msgid "I2C peripheral in use"
10781077
msgstr ""
10791078

@@ -1612,6 +1611,7 @@ msgid "Only one TouchAlarm can be set in deep sleep."
16121611
msgstr ""
16131612

16141613
#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
1614+
#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
16151615
msgid "Only one address is allowed"
16161616
msgstr ""
16171617

@@ -2904,6 +2904,12 @@ msgstr ""
29042904
msgid "error = 0x%08lX"
29052905
msgstr "error = 0x%08lX"
29062906

2907+
#: ports/espressif/common-hal/esp32_camera/Camera.c
2908+
msgid ""
2909+
"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
2910+
"documentation for instructions."
2911+
msgstr ""
2912+
29072913
#: py/runtime.c
29082914
msgid "exceptions must derive from BaseException"
29092915
msgstr ""

‎locale/circuitpython.pot

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2873,6 +2873,12 @@ msgstr ""
28732873
msgid "error = 0x%08lX"
28742874
msgstr ""
28752875

2876+
#: ports/espressif/common-hal/esp32_camera/Camera.c
2877+
msgid ""
2878+
"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
2879+
"documentation for instructions."
2880+
msgstr ""
2881+
28762882
#: py/runtime.c
28772883
msgid "exceptions must derive from BaseException"
28782884
msgstr ""

0 commit comments

Comments
 (0)