8000 Merge branch 'main' into adding_circle_bitmaptools · megacoder/circuitpython@f3d85d6 · GitHub
[go: up one dir, main page]
Skip to content

Commit f3d85d6

Browse files
jposada202020jposada202020
committed
Merge branch 'main' into adding_circle_bitmaptools
2 parents 29613c7 + 55c3e9f commit f3d85d6

File tree

266 files changed

+4370
-997
lines changed

Some content is hidden

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

266 files changed

+4370
-997
lines changed

‎.codespell/exclude-file.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#define MICROPY_HW_BOARD_NAME "BLOK"
2+
USB_PRODUCT = "BLOK"
3+
uint32_t THI = (*(uint32_t *)FUSES_HOT_TEMP_VAL_INT_ADDR & FUSES_HOT_TEMP_VAL_INT_Msk) >> FUSES_HOT_TEMP_VAL_INT_Pos;
4+
float TH = THI + convert_dec_to_frac(THD);
5+
print(binascii.b2a_base64(b"fo"))
6+
# again, neither will "there" or "wither", since they have "the"
7+
i1Qb$TE"rl

‎.codespell/ignore-words.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
ans
2+
ure
3+
clen
4+
ser
5+
endianess
6+
pris
7+
synopsys
8+
reenable
9+
dout
10+
inout
11+
wel
12+
iput
13+
hsi
14+
astroid
15+
busses
16+
cyphertext
17+
dum
18+
deque
19+
deques
20+
extint
21+
shs
22+
pass-thru

‎.codespellrc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# See: https://github.com/codespell-project/codespell#using-a-config-file
2+
[codespell]
3+
# In the event of a false positive, add the problematic word, in all lowercase, to 'ignore-words.txt' (one word per line).
4+
# Or copy & paste the whole problematic line to 'exclude-file.txt'
5+
ignore-words = .codespell/ignore-words.txt
6+
exclude-file = .codespell/exclude-file.txt
7+
check-filenames =
8+
check-hidden =
9+
count =
10+
skip = .cproject,.git,./lib,./locale,ACKNOWLEDGEMENTS

‎.pre-commit-config.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,19 @@ repos:
88
hooks:
99
- id: check-yaml
1010
- id: end-of-file-fixer
11-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
11+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
1212
- id: trailing-whitespace
13-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/.*)'
13+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff)'
14+
- repo: https://github.com/codespell-project/codespell
15+
rev: v2.2.4
16+
hooks:
17+
- id: codespell
18+
args: [-w]
19+
exclude: |
20+
(?x)^(
21+
locale/|
22+
lib/
23+
)
1424
- repo: local
1525
hooks:
1626
- id: translations

‎Makefile

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,9 +324,24 @@ clean-stm:
324324
$(MAKE) -C ports/stm BOARD=feather_stm32f405_express clean
325325

326326

327-
# Do blobless partial clones of submodules to save time and space.
327+
# If available, do blobless partial clones of submodules to save time and space.
328328
# A blobless partial clone lazily fetches data as needed, but has all the metadata available (tags, etc.)
329329
# so it does not have the idiosyncrasies of a shallow clone.
330+
#
331+
# If not available, do a fetch that will fail, and then fix it up with a second fetch.
332+
# (Only works for git servers that allow sha fetches.)
330333
.PHONY: fetch-submodules
331334
fetch-submodules:
332-
git submodule update --init --filter=blob:none
335+
git submodule sync
336+
#####################################################################################
337+
# NOTE: Ideally, use git version 2.36.0 or later, to do partial clones of submodules.
338+
# If an older git is used, submodules will be cloned with a shallow clone of depth 1.
339+
# You will see a git usage message first if the git version is too old to do
340+
# clones of submodules.
341+
#####################################################################################
342+
git submodule update --init --filter=blob:none || git submodule update --init -N --depth 1 || git submodule foreach 'git fetch --tags --depth 1 origin $$sha1 && git checkout -q $$sha1' || echo 'make fetch-submodules FAILED'
343+
344+
.PHONY: remove-submodules
345+
remove-submodules:
346+
git submodule deinit -f --all
347+
rm -rf .git/modules/*

‎conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
extensions = [
7878
'sphinx.ext.autodoc',
7979
'sphinx.ext.doctest',
80+
"sphinxcontrib.jquery",
8081
'sphinxcontrib.rsvgconverter',
8182
'sphinx.ext.intersphinx',
8283
'sphinx.ext.todo',

‎devices/ble_hci/common-hal/_bleio/Adapter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ mp_obj_t common_hal_bleio_adapter_start_scan(bleio_adapter_obj_t *self, uint8_t
483483

484484
if (self->scan_results != NULL) {
485485
if (!shared_module_bleio_scanresults_get_done(self->scan_results)) {
486-
mp_raise_bleio_BluetoothError(translate("Scan already in progess. Stop with stop_scan."));
486+
mp_raise_bleio_BluetoothError(translate("Scan already in progress. Stop with stop_scan."));
487487
}
488488
self->scan_results = NULL;
489489
}

‎devices/ble_hci/common-hal/_bleio/Adapter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ typedef struct _bleio_adapter_obj_t {
6565
uint16_t manufacturer;
6666
uint16_t lmp_subversion;
6767

68-
// Used to monitor advertising timeout for legacy avertising.
68+
// Used to monitor advertising timeout for legacy advertising.
6969
uint64_t advertising_start_ticks;
7070
uint64_t advertising_timeout_msecs; // If zero, do not check.
7171

‎devices/ble_hci/common-hal/_bleio/Connection.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ void common_hal_bleio_connection_set_connection_interval(bleio_connection_intern
515515
// (gattc_char->char_props.write ? CHAR_PROP_WRITE : 0) |
516516
// (gattc_char->char_props.write_wo_resp ? CHAR_PROP_WRITE_NO_RESPONSE : 0);
517517

518-
// // Call common_hal_bleio_characteristic_construct() to initalize some fields and set up evt handler.
518+
// // Call common_hal_bleio_characteristic_construct() to initialize some fields and set up evt handler.
519519
// common_hal_bleio_characteristic_construct(
520520
// characteristic, m_char_discovery_service, gattc_char->handle_value, uuid,
521521
// props, SECURITY_MODE_OPEN, SECURITY_MODE_OPEN,

‎devices/ble_hci/common-hal/_bleio/att.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ STATIC uint8_t bleio_properties_to_ble_spec_properties(uint8_t bleio_properties)
9696
return ble_spec_properties;
9797
}
9898

99-
// FIX not currently used; reenable when used.
99+
// FIX not currently used; re-enable when used.
100100
#if 0
101101
STATIC uint8_t ble_spec_properties_to_bleio_properties(uint8_t ble_spec_properties) {
102102
uint8_t bleio_properties = 0;
@@ -964,7 +964,7 @@ static void process_read_group_req(uint16_t conn_handle, uint16_t mtu, uint8_t d
964964
// Keep track of the first one to make sure.
965965
size_t sizeof_first_service_uuid = 0;
966966

967-
// Size of a single bt_att_group_data chunk. Start with the intial size, and
967+
// Size of a single bt_att_group_data chunk. Start with the initial size, and
968968
// add the uuid size in the loop below.
969969
size_t data_length = sizeof(struct bt_att_group_data);
970970

‎devices/ble_hci/common-hal/_bleio/hci_include/att_internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ struct bt_att_read_mult_req {
150150
uint16_t handles[];
151151
} __packed;
152152

153-
/* Read Multiple Respose */
153+
/* Read Multiple Response */
154154
#define BT_ATT_OP_READ_MULT_RSP 0x0f
155155
struct bt_att_read_mult_rsp {
156156
uint8_t _dummy[0];
@@ -243,7 +243,7 @@ struct bt_att_read_mult_vl_req {
243243
uint16_t handles[];
244244
} __packed;
245245

246-
/* Read Multiple Respose */
246+
/* Read Multiple Response */
247247
#define BT_ATT_OP_READ_MULT_VL_RSP 0x21
248248
struct bt_att_read_mult_vl_rsp {
249249
uint16_t len;

‎examples/natmod/features1/features1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
8888
// This must be first, it sets up the globals dict and other things
8989
MP_DYNRUNTIME_INIT_ENTRY
9090

91-
// Messages can be printed as usualy
91+
// Messages can be printed as usually
9292
mp_printf(&mp_plat_print, "initialising module self=%p\n", self);
9393

9494
// Make the functions available in the module's namespace

‎locale/ID.po

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,6 @@ msgstr "%q harus <= %d"
183183
msgid "%q must be >= %d"
184184
msgstr "%q harus >= %d"
185185

186-
#: ports/espressif/common-hal/analogbufio/BufferedIn.c
187-
msgid "%q must be array of type 'H'"
188-
msgstr ""
189-
190186
#: shared-bindings/analogbufio/BufferedIn.c
191187
msgid "%q must be a bytearray or array of type 'H' or 'B'"
192188
msgstr ""
@@ -195,6 +191,10 @@ msgstr ""
195191
msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
196192
msgstr ""
197193

194+
#: ports/espressif/common-hal/analogbufio/BufferedIn.c
195+
msgid "%q must be array of type 'H'"
196+
msgstr ""
197+
198198
#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
199199
#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
200200
msgid "%q must be of type %q or %q, not %q"
@@ -403,10 +403,6 @@ msgstr "0.0 ke kompleks berpangkat"
403403
msgid "3-arg pow() not supported"
404404
msgstr "pow() 3-arg tidak didukung"
405405

406-
#: shared-module/msgpack/__init__.c
407-
msgid "64 bit types"
408-
msgstr ""
409-
410406
#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
411407
#: ports/atmel-samd/common-hal/countio/Counter.c
412408
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
@@ -1233,7 +1229,8 @@ msgstr ""
12331229
msgid "Interrupt error."
12341230
msgstr ""
12351231

1236-
#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
1232+
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c py/argcheck.c
1233+
#: shared-bindings/digitalio/DigitalInOut.c
12371234
#: shared-bindings/displayio/EPaperDisplay.c
12381235
msgid "Invalid %q"
12391236
msgstr ""
@@ -1282,6 +1279,10 @@ msgstr ""
12821279
msgid "Invalid data_pins[%d]"
12831280
msgstr ""
12841281

1282+
#: shared-module/msgpack/__init__.c
1283+
msgid "Invalid format"
1284+
msgstr ""
1285+
12851286
#: shared-module/audiocore/WaveFile.c
12861287
msgid "Invalid format chunk size"
12871288
msgstr "Ukuran potongan format tidak valid"
@@ -1531,10 +1532,6 @@ msgstr ""
15311532
msgid "No in or out in program"
15321533
msgstr ""
15331534

1534-
#: shared-bindings/aesio/aes.c
1535-
msgid "No key was specified"
1536-
msgstr "Tidak ada kunci yang ditentukan"
1537-
15381535
#: shared-bindings/time/__init__.c
15391536
msgid "No long integer support"
15401537
msgstr "Tidak ada dukungan bilangan bulat yang panjang"
@@ -1961,8 +1958,8 @@ msgstr ""
19611958

19621959
#: ports/espressif/common-hal/_bleio/Adapter.c
19631960
#: ports/nrf/common-hal/_bleio/Adapter.c
1964-
msgid "Scan already in progess. Stop with stop_scan."
1965-
msgstr "Pindai sudah dalam proses. Hentikan dengan stop_scan."
1961+
msgid "Scan already in progress. Stop with stop_scan."
1962+
msgstr ""
19661963

19671964
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
19681965
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -2274,6 +2271,11 @@ msgstr ""
22742271
msgid "Unknown BLE error: %d"
22752272
msgstr ""
22762273

2274+
#: ports/raspberrypi/common-hal/wifi/__init__.c
2275+
#, c-format
2276+
msgid "Unknown error code %d"
2277+
msgstr ""
2278+
22772279
#: shared-bindings/wifi/Radio.c
22782280
#, c-format
22792281
msgid "Unknown failure %d"
@@ -2309,11 +2311,6 @@ msgstr ""
23092311
msgid "Unknown system firmware error: %d"
23102312
msgstr ""
23112313

2312-
#: ports/raspberrypi/common-hal/wifi/__init__.c
2313-
#, c-format
2314-
msgid "Unkown error code %d"
2315-
msgstr ""
2316-
23172314
#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
23182315
#: shared-module/_pixelmap/PixelMap.c
23192316
#, c-format
@@ -2768,7 +2765,7 @@ msgstr ""
27682765
msgid "can't set attribute"
27692766
msgstr ""
27702767

2771-
#: py/runtime.c
2768+
#: py/runtime.c shared-bindings/supervisor/Runtime.c
27722769
msgid "can't set attribute '%q'"
27732770
msgstr ""
27742771

@@ -3068,8 +3065,8 @@ msgid "extra positional arguments given"
30683065
msgstr "argumen posisi ekstra telah diberikan"
30693066

30703067
#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
3071-
#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/synthio/__init__.c
3072-
#: shared-module/gifio/GifWriter.c
3068+
#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/gifio/OnDiskGif.c
3069+
#: shared-bindings/synthio/__init__.c shared-module/gifio/GifWriter.c
30733070
msgid "file must be a file opened in byte mode"
30743071
msgstr ""
30753072

@@ -4143,10 +4140,6 @@ msgstr ""
41434140
msgid "tobytes can be invoked for dense arrays only"
41444141
msgstr ""
41454142

4146-
#: shared-module/struct/__init__.c
4147-
msgid "too many arguments provided with the given format"
4148-
msgstr ""
4149-
41504143
#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
41514144
msgid "too many dimensions"
41524145
msgstr ""
@@ -4403,6 +4396,12 @@ msgstr "zi harus berjenis float"
44034396
msgid "zi must be of shape (n_section, 2)"
44044397
msgstr "Zi harus berbentuk (n_section, 2)"
44054398 78BF

4399+
#~ msgid "No key was specified"
4400+
#~ msgstr "Tidak ada kunci yang ditentukan"
4401+
4402+
#~ msgid "Scan already in progess. Stop with stop_scan."
4403+
#~ msgstr "Pindai sudah dalam proses. Hentikan dengan stop_scan."
4404+
44064405
#~ msgid "Supply at least one UART pin"
44074406
#~ msgstr "Berikan setidaknya satu pin UART"
44084407

0 commit comments

Comments
 (0)
0