Skip to content

Commit 66a76d0

Browse files
dhalbertdhalbert
authored
Merge pull request #8187 from tannewt/three_small
Three small changes
2 parents 688f62a + 924422e commit 66a76d0

File tree

24 files changed

+80
-98
lines changed

24 files changed

+80
-98
lines changed

‎locale/circuitpython.pot

Lines changed: 16 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,10 @@ msgstr ""
126126

127127
#: ports/espressif/common-hal/espulp/ULP.c
128128
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
129+
#: ports/mimxrt10xx/common-hal/usb_host/Port.c
129130
#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
130131
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
132+
#: ports/raspberrypi/common-hal/usb_host/Port.c
131133
#: shared-bindings/digitalio/DigitalInOut.c
132134
#: shared-bindings/microcontroller/Pin.c
133135
msgid "%q in use"
@@ -182,6 +184,7 @@ msgid "%q must be 1 when %q is True"
182184
msgstr ""
183185

184186
#: py/argcheck.c shared-bindings/gifio/GifWriter.c
187+
#: shared-module/gifio/OnDiskGif.c
185188
msgid "%q must be <= %d"
186189
msgstr ""
187190

@@ -779,10 +782,6 @@ msgstr ""
779782
msgid "Cannot subclass slice"
780783
msgstr ""
781784

782-
#: shared-module/bitbangio/SPI.c
783-
msgid "Cannot transfer without MOSI and MISO pins"
784-
msgstr ""
785-
786785
#: shared-bindings/pwmio/PWMOut.c
787786
msgid "Cannot vary frequency on a timer that is already in use"
788787
msgstr ""
@@ -1090,13 +1089,10 @@ msgstr ""
10901089
msgid "Half duplex SPI is not implemented"
10911090
msgstr ""
10921091

1093-
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/I2C.c
1094-
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c
1095-
#: ports/stm/common-hal/sdioio/SDCard.c
1096-
msgid "Hardware busy, try alternative pins"
1097-
msgstr ""
1098-
1099-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
1092+
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1093+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/I2C.c
1094+
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/busio/UART.c
1095+
#: ports/stm/common-hal/canio/CAN.c ports/stm/common-hal/sdioio/SDCard.c
11001096
msgid "Hardware in use, try alternative pins"
11011097
msgstr ""
11021098

@@ -1355,14 +1351,6 @@ msgstr ""
13551351
msgid "Mismatched swap flag"
13561352
msgstr ""
13571353

1358-
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1359-
msgid "Missing MISO or MOSI Pin"
1360-
msgstr ""
1361-
1362-
#: ports/stm/common-hal/busio/SPI.c
1363-
msgid "Missing MISO or MOSI pin"
1364-
msgstr ""
1365-
13661354
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
13671355
#, c-format
13681356
msgid "Missing first_in_pin. Instruction %d reads pin(s)"
@@ -1436,6 +1424,14 @@ msgid "Nimble out of memory"
14361424
msgstr ""
14371425

14381426
#: ports/atmel-samd/common-hal/busio/UART.c
1427+
#: ports/espressif/common-hal/busio/SPI.c
1428+
#: ports/espressif/common-hal/busio/UART.c
1429+
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1430+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
1431+
#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c
1432+
#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c
1433+
#: shared-bindings/displayio/I2CDisplay.c
1434+
#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c
14391435
msgid "No %q pin"
14401436
msgstr ""
14411437

@@ -1469,36 +1465,6 @@ msgstr ""
14691465
msgid "No IP"
14701466
msgstr ""
14711467

1472-
#: ports/espressif/common-hal/busio/SPI.c
1473-
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1474-
msgid "No MISO Pin"
1475-
msgstr ""
1476-
1477-
#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
1478-
msgid "No MISO pin"
1479-
msgstr ""
1480-
1481-
#: ports/espressif/common-hal/busio/SPI.c
1482-
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1483-
msgid "No MOSI Pin"
1484-
msgstr ""
1485-
1486-
#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
1487-
msgid "No MOSI pin"
1488-
msgstr ""
1489-
1490-
#: ports/espressif/common-hal/busio/UART.c
1491-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
1492-
#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
1493-
msgid "No RX pin"
1494-
msgstr ""
1495-
1496-
#: ports/espressif/common-hal/busio/UART.c
1497-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
1498-
#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
1499-
msgid "No TX pin"
1500-
msgstr ""
1501-
15021468
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
15031469
msgid "No available clocks"
15041470
msgstr ""
@@ -2405,6 +2371,7 @@ msgstr ""
24052371
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
24062372
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
24072373
#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
2374+
#: ports/espressif/boards/m5stack_stick_c_plus/mpconfigboard.h
24082375
msgid "You pressed button A at start up."
24092376
msgstr ""
24102377

@@ -3628,11 +3595,6 @@ msgstr ""
36283595
msgid "no module named '%q'"
36293596
msgstr ""
36303597

3631-
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
3632-
#: shared-bindings/paralleldisplay/ParallelBus.c
3633-
msgid "no reset pin available"
3634-
msgstr ""
3635-
36363598
#: shared-module/sdcardio/SDCard.c
36373599
msgid "no response from SD card"
36383600
msgstr ""

‎ports/broadcom/common-hal/busio/UART.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
352352
// Write characters.
353353
size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, size_t len, int *errcode) {
354354
if (self->tx_pin == NULL) {
355-
mp_raise_ValueError(translate("No TX pin"));
355+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_tx);
356356
}
357357

358358
COMPLETE_MEMORY_READS;
@@ -400,7 +400,7 @@ STATIC void enable_interrupt(busio_uart_obj_t *self) {
400400
// Read characters.
401401
size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t len, int *errcode) {
402402
if (self->rx_pin == NULL) {
403-
mp_raise_ValueError(translate("No RX pin"));
403+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_rx);
404404
}
405405

406406
if (len == 0) {

‎ports/espressif/common-hal/busio/SPI.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,15 @@ void common_hal_busio_spi_unlock(busio_spi_obj_t *self) {
186186
bool common_hal_busio_spi_write(busio_spi_obj_t *self,
187187
const uint8_t *data, size_t len) {
188188
if (self->MOSI == NULL) {
189-
mp_raise_ValueError(translate("No MOSI Pin"));
189+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_mosi);
190190
}
191191
return common_hal_busio_spi_transfer(self, data, NULL, len);
192192
}
193193

194194
bool common_hal_busio_spi_read(busio_spi_obj_t *self,
195195
uint8_t *data, size_t len, uint8_t write_value) {
196196
if (self->MISO == NULL) {
197-
mp_raise_ValueError(translate("No MISO Pin"));
197+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_miso);
198198
}
199199
if (self->MOSI == NULL) {
200200
return common_hal_busio_spi_transfer(self, NULL, data, len);
@@ -210,10 +210,10 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self,
210210
return true;
211211
}
212212
if (self->MOSI == NULL && data_out != NULL) {
213-
mp_raise_ValueError(translate("No MOSI Pin"));
213+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_mosi);
214214
}
215215
if (self->MISO == NULL && data_in != NULL) {
216-
mp_raise_ValueError(translate("No MISO Pin"));
216+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_miso);
217217
}
218218

219219
spi_transaction_t transactions[MAX_SPI_TRANSACTIONS];

‎ports/espressif/common-hal/busio/UART.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
304304
// Read characters.
305305
size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t len, int *errcode) {
306306
if (self->rx_pin == NULL) {
307-
mp_raise_ValueError(translate("No RX pin"));
307+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_rx);
308308
}
309309
if (len == 0) {
310310
// Nothing to read.
@@ -357,7 +357,7 @@ size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t
357357
// Write characters.
358358
size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, size_t len, int *errcode) {
359359
if (self->tx_pin == NULL) {
360-
mp_raise_ValueError(translate("No TX pin"));
360+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_tx);
361361
}
362362

363363
size_t left_to_write = len;

‎ports/mimxrt10xx/common-hal/busio/SPI.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
182182
self->spi = mcu_spi_banks[self->clock->bank_idx - 1];
183183
} else {
184184
if (spi_taken) {
185-
mp_raise_ValueError(translate("Hardware busy, try alternative pins"));
185+
mp_raise_ValueError(translate("Hardware in use, try alternative pins"));
186186
} else {
187187
raise_ValueError_invalid_pins();
188188
}
@@ -331,7 +331,7 @@ bool common_hal_busio_spi_write(busio_spi_obj_t *self,
331331
return true;
332332
}
333333
if (self->mosi == NULL) {
334-
mp_raise_ValueError(translate("No MOSI Pin"));
334+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_mosi);
335335
}
336336

337337
lpspi_transfer_t xfer = { 0 };
@@ -349,7 +349,7 @@ bool common_hal_busio_spi_read(busio_spi_obj_t *self,
349349
return true;
350350
}
351351
if (self->miso == NULL) {
352-
mp_raise_ValueError(translate("No MISO Pin"));
352+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_miso);
353353
}
354354

355355
LPSPI_SetDummyData(self->spi, write_value);
@@ -367,8 +367,11 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self, const uint8_t *data_ou
367367
if (len == 0) {
368368
return true;
369369
}
370-
if (self->miso == NULL || self->mosi == NULL) {
371-
mp_raise_ValueError(translate("Missing MISO or MOSI Pin"));
370+
if (self->mosi == NULL && data_out != NULL) {
371+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_mosi);
372+
}
373+
if (self->miso == NULL && data_in != NULL) {
374+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_miso);
372375
}
373376

374377
LPSPI_SetDummyData(self->spi, 0xFF);

‎ports/mimxrt10xx/common-hal/busio/UART.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
401401
// Read characters.
402402
size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t len, int *errcode) {
403403
if (self->rx == NULL) {
404-
mp_raise_ValueError(translate("No RX pin"));
404+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_rx);
405405
}
406406

407407
if (len == 0) {
@@ -458,7 +458,7 @@ size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t
458458
// Write characters.
459459
size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, size_t len, int *errcode) {
460460
if (self->tx == NULL) {
461-
mp_raise_ValueError(translate("No TX pin"));
461+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_tx);
462462
}
463463
if (self->rs485_dir && len) {
464464
GPIO_PinWrite(self->rs485_dir->gpio, self->rs485_dir->number, !self->rs485_invert);

‎ports/mimxrt10xx/mpconfigport.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ extern uint8_t _ld_filesystem_start;
3737
extern uint8_t _ld_filesystem_end;
3838
extern uint8_t _ld_default_stack_size;
3939

40-
// 20kiB stack
4140
#define CIRCUITPY_DEFAULT_STACK_SIZE ((uint32_t)&_ld_default_stack_size)
4241
#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (0)
4342
#define MICROPY_PY_FUNCTION_ATTRS (0)
@@ -47,6 +46,10 @@ extern uint8_t _ld_default_stack_size;
4746
#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_START_ADDR ((uint32_t)&_ld_filesystem_start)
4847
#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE ((uint32_t)(&_ld_filesystem_end - &_ld_filesystem_start))
4948

49+
// Allocate 32 bytes at a time instead of the default 16 so that allocated buffers
50+
// are aligned to cache lines.
51+
#define MICROPY_BYTES_PER_GC_BLOCK (32)
52+
5053
#include "py/circuitpy_mpconfig.h"
5154

5255
#define MICROPY_PORT_ROOT_POINTERS \

‎ports/nrf/common-hal/busio/UART.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
297297
// Read characters.
298298
size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t len, int *errcode) {
299299
if (nrf_uarte_rx_pin_get(self->uarte->p_reg) == NRF_UARTE_PSEL_DISCONNECTED) {
300-
mp_raise_ValueError(translate("No RX pin"));
300+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_rx);
301301
}
302302

303303
uint64_t start_ticks = supervisor_ticks_ms64();
@@ -347,7 +347,7 @@ size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t
347347
// Write characters.
348348
size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, size_t len, int *errcode) {
349349
if (nrf_uarte_tx_pin_get(self->uarte->p_reg) == NRF_UARTE_PSEL_DISCONNECTED) {
350-
mp_raise_ValueError(translate("No TX pin"));
350+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_tx);
351351
}
352352

353353
if (len == 0) {

‎ports/raspberrypi/common-hal/busio/UART.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
211211
// Write characters.
212212
size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, size_t len, int *errcode) {
213213
if (self->tx_pin == NO_PIN) {
214-
mp_raise_ValueError(translate("No TX pin"));
214+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_tx);
215215
}
216216

217217
if (self->rs485_dir_pin != NO_PIN) {
@@ -239,7 +239,7 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data,
239239
// Read characters.
240240
size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t len, int *errcode) {
241241
if (self->rx_pin == NO_PIN) {
242-
mp_raise_ValueError(translate("No RX pin"));
242+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_rx);
243243
}
244244

245245
if (len == 0) {

‎ports/silabs/common-hal/busio/I2C.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
7272
common_hal_mcu_pin_claim(sda);
7373
in_used = true;
7474
} else {
75-
mp_raise_ValueError(translate("Hardware busy, try alternative pins"));
75+
mp_raise_ValueError(translate("Hardware in use, try alternative pins"));
7676
}
7777
} else {
7878
raise_ValueError_invalid_pins();

‎ports/silabs/common-hal/busio/SPI.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
9595
mp_raise_ValueError(translate("SPI init error"));
9696
}
9797
} else {
98-
mp_raise_ValueError(translate("Hardware busy, try alternative pins"));
98+
mp_raise_ValueError(translate("Hardware in use, try alternative pins"));
9999
}
100100
} else {
101101
raise_ValueError_invalid_pins();

‎ports/silabs/common-hal/busio/UART.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
131131
context = self;
132132

133133
} else {
134-
mp_raise_ValueError(translate("Hardware busy, try alternative pins"));
134+
mp_raise_ValueError(translate("Hardware in use, try alternative pins"));
135135
}
136136

137137
} else {

‎ports/stm/common-hal/busio/I2C.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
117117
I2Cx = mcu_i2c_banks[self->sda->periph_index - 1];
118118
} else {
119119
if (i2c_taken) {
120-
mp_raise_ValueError(translate("Hardware busy, try alternative pins"));
120+
mp_raise_ValueError(translate("Hardware in use, try alternative pins"));
121121
} else {
122122
raise_ValueError_invalid_pins();
123123
}

‎ports/stm/common-hal/busio/SPI.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ STATIC int check_pins(busio_spi_obj_t *self,
160160
}
161161

162162
if (spi_taken) {
163-
mp_raise_ValueError(translate("Hardware busy, try alternative pins"));
163+
mp_raise_ValueError(translate("Hardware in use, try alternative pins"));
164164
} else {
165165
raise_ValueError_invalid_pin();
166166
}
@@ -347,7 +347,7 @@ void common_hal_busio_spi_unlock(busio_spi_obj_t *self) {
347347
bool common_hal_busio_spi_write(busio_spi_obj_t *self,
348348
const uint8_t *data, size_t len) {
349349
if (self->mosi == NULL) {
350-
mp_raise_ValueError(translate("No MOSI pin"));
350+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_mosi);
351351
}
352352
HAL_StatusTypeDef result = HAL_SPI_Transmit(&self->handle, (uint8_t *)data, (uint16_t)len, HAL_MAX_DELAY);
353353
return result == HAL_OK;
@@ -356,9 +356,9 @@ bool common_hal_busio_spi_write(busio_spi_obj_t *self,
356356
bool common_hal_busio_spi_read(busio_spi_obj_t *self,
357357
uint8_t *data, size_t len, uint8_t write_value) {
358358
if (self->miso == NULL && !self->half_duplex) {
359-
mp_raise_ValueError(translate("No MISO pin"));
359+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_miso);
360360
} else if (self->half_duplex && self->mosi == NULL) {
361-
mp_raise_ValueError(translate("No MOSI pin"));
361+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_mosi);
362362
}
363363
HAL_StatusTypeDef result = HAL_OK;
364364
if ((!self->half_duplex && self->mosi == NULL) || (self->half_duplex && self->mosi != NULL && self->miso == NULL)) {
@@ -372,8 +372,11 @@ bool common_hal_busio_spi_read(busio_spi_obj_t *self,
372372

373373
bool common_hal_busio_spi_transfer(busio_spi_obj_t *self,
374374
const uint8_t *data_out, uint8_t *data_in, size_t len) {
375-
if (self->miso == NULL || self->mosi == NULL) {
376-
mp_raise_ValueError(translate("Missing MISO or MOSI pin"));
375+
if (self->mosi == NULL && data_out != NULL) {
376+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_mosi);
377+
}
378+
if (self->miso == NULL && data_in != NULL) {
379+
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_miso);
377380
}
378381
HAL_StatusTypeDef result = HAL_SPI_TransmitReceive(&self->handle,
379382
(uint8_t *)data_out, data_in, (uint16_t)len,HAL_MAX_DELAY);

0 commit comments

Comments
 (0)