Skip to content

Commit b581671

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 24aea01 + 0639c08 commit b581671

File tree

129 files changed

+238
-196
lines changed

Some content is hidden

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

129 files changed

+238
-196
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: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@ repos:
1111
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
1212
- id: trailing-whitespace
1313
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/.*)'
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

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

0 commit comments

Comments
 (0)