Skip to content

Commit 1527a3c

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/main' into add_pwmio
2 parents 9a8b4e9 + 5b1a1c7 commit 1527a3c

File tree

29 files changed

+212
-68
lines changed

29 files changed

+212
-68
lines changed

‎locale/circuitpython.pot

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-08-18 11:19-0400\n"
11+
"POT-Creation-Date: 2020-08-21 21:39-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -1349,10 +1349,6 @@ msgstr ""
13491349
msgid "Pull not used when direction is output."
13501350
msgstr ""
13511351

1352-
#: ports/stm/ref/pulseout-pre-timeralloc.c
1353-
msgid "PulseOut not supported on this chip"
1354-
msgstr ""
1355-
13561352
#: ports/stm/common-hal/os/__init__.c
13571353
msgid "RNG DeInit Error"
13581354
msgstr ""
@@ -2879,6 +2875,14 @@ msgstr ""
28792875
msgid "ord() expected a character, but string of length %d found"
28802876
msgstr ""
28812877

2878+
#: shared-bindings/displayio/Bitmap.c
2879+
msgid "out of range of source"
2880+
msgstr ""
2881+
2882+
#: shared-bindings/displayio/Bitmap.c
2883+
msgid "out of range of target"
2884+
msgstr ""
2885+
28822886
#: py/objint_mpz.c
28832887
msgid "overflow converting long int to machine word"
28842888
msgstr ""
@@ -3056,6 +3060,10 @@ msgstr ""
30563060
msgid "sosfilt requires iterable arguments"
30573061
msgstr ""
30583062

3063+
#: shared-bindings/displayio/Bitmap.c
3064+
msgid "source palette too large"
3065+
msgstr ""
3066+
30593067
#: py/objstr.c
30603068
msgid "start/end indices"
30613069
msgstr ""

‎locale/pt_BR.po

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2020-08-18 11:19-0400\n"
9-
"PO-Revision-Date: 2020-08-16 02:25+0000\n"
9+
"PO-Revision-Date: 2020-08-21 18:19+0000\n"
1010
"Last-Translator: Wellington Terumi Uemura <[email protected]>\n"
1111
"Language-Team: \n"
1212
"Language: pt_BR\n"
1313
"MIME-Version: 1.0\n"
1414
"Content-Type: text/plain; charset=UTF-8\n"
1515
"Content-Transfer-Encoding: 8bit\n"
1616
"Plural-Forms: nplurals=2; plural=n > 1;\n"
17-
"X-Generator: Weblate 4.2-dev\n"
17+
"X-Generator: Weblate 4.2.1-dev\n"
1818

1919
#: main.c
2020
msgid ""
@@ -1375,6 +1375,8 @@ msgid ""
13751375
"Port does not accept pins or frequency. "
13761376
"Construct and pass a PWMOut Carrier instead"
13771377
msgstr ""
1378+
"A porta não aceita pinos ou frequência. "
1379+
"Em vez disso, Construa e encaminhe um PWMOut Carrier"
13781380

13791381
#: shared-bindings/_bleio/Adapter.c
13801382
msgid "Prefix buffer must be on the heap"

‎ports/cxd56/common-hal/microcontroller/Processor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ typedef struct {
3535
mp_obj_base_t base;
3636
} mcu_processor_obj_t;
3737

38-
const mp_obj_type_t mcu_processor_type;
38+
extern const mp_obj_type_t mcu_processor_type;
3939

4040
#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H

‎ports/mimxrt10xx/mphalport.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ static inline mp_uint_t mp_hal_ticks_ms(void) {
3939
return supervisor_ticks_ms32();
4040
}
4141
// Number of bytes in receive buffer
42-
volatile uint8_t usb_rx_count;
43-
volatile bool mp_cdc_enabled;
42+
extern volatile uint8_t usb_rx_count;
43+
extern volatile bool mp_cdc_enabled;
4444

4545
int receive_usb(void);
4646

‎ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@
2727
#ifndef MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1011_PERIPH_H
2828
#define MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1011_PERIPH_H
2929

30-
LPI2C_Type *mcu_i2c_banks[2];
30+
extern LPI2C_Type *mcu_i2c_banks[2];
3131

3232
extern const mcu_periph_obj_t mcu_i2c_sda_list[8];
3333
extern const mcu_periph_obj_t mcu_i2c_scl_list[8];
3434

35-
LPSPI_Type *mcu_spi_banks[2];
35+
extern LPSPI_Type *mcu_spi_banks[2];
3636

3737
extern const mcu_periph_obj_t mcu_spi_sck_list[4];
3838
extern const mcu_periph_obj_t mcu_spi_mosi_list[4];
3939
extern const mcu_periph_obj_t mcu_spi_miso_list[4];
4040

41-
LPUART_Type *mcu_uart_banks[4];
41+
extern LPUART_Type *mcu_uart_banks[4];
4242

4343
extern const mcu_periph_obj_t mcu_uart_rx_list[9];
4444
extern const mcu_periph_obj_t mcu_uart_tx_list[9];

‎ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/periph.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@
2828
#ifndef MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1021_PERIPH_H
2929
#define MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1021_PERIPH_H
3030

31-
LPI2C_Type *mcu_i2c_banks[4];
31+
extern LPI2C_Type *mcu_i2c_banks[4];
3232

3333
extern const mcu_periph_obj_t mcu_i2c_sda_list[8];
3434
extern const mcu_periph_obj_t mcu_i2c_scl_list[8];
3535

36-
LPSPI_Type *mcu_spi_banks[4];
36+
extern LPSPI_Type *mcu_spi_banks[4];
3737

3838
extern const mcu_periph_obj_t mcu_spi_sck_list[8];
3939
extern const mcu_periph_obj_t mcu_spi_mosi_list[8];
4040
extern const mcu_periph_obj_t mcu_spi_miso_list[8];
4141

42-
LPUART_Type *mcu_uart_banks[8];
42+
extern LPUART_Type *mcu_uart_banks[8];
4343

4444
extern const mcu_periph_obj_t mcu_uart_rx_list[16];
4545
extern const mcu_periph_obj_t mcu_uart_tx_list[16];

‎ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@
2727
#ifndef MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1011_PERIPH_H
2828
#define MICROPY_INCLUDED_MIMXRT10XX_PERIPHERALS_MIMXRT1011_PERIPH_H
2929

30-
LPI2C_Type *mcu_i2c_banks[4];
30+
extern LPI2C_Type *mcu_i2c_banks[4];
3131

3232
extern const mcu_periph_obj_t mcu_i2c_sda_list[9];
3333
extern const mcu_periph_obj_t mcu_i2c_scl_list[9];
3434

35-
LPSPI_Type *mcu_spi_banks[4];
35+
extern LPSPI_Type *mcu_spi_banks[4];
3636

3737
extern const mcu_periph_obj_t mcu_spi_sck_list[8];
3838
extern const mcu_periph_obj_t mcu_spi_mosi_list[8];
3939
extern const mcu_periph_obj_t mcu_spi_miso_list[8];
4040

41-
LPUART_Type *mcu_uart_banks[8];
41+
extern LPUART_Type *mcu_uart_banks[8];
4242

4343
extern const mcu_periph_obj_t mcu_uart_rx_list[18];
4444
extern const mcu_periph_obj_t mcu_uart_tx_list[18];

‎ports/nrf/common-hal/_bleio/__init__.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ void check_sec_status(uint8_t sec_status) {
8787
}
8888
}
8989

90+
bool vm_used_ble;
91+
9092
// Turn off BLE on a reset or reload.
9193
void bleio_reset() {
9294
if (!common_hal_bleio_adapter_get_enabled(&common_hal_bleio_adapter_obj)) {

‎ports/nrf/common-hal/_bleio/__init__.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ void check_gatt_status(uint16_t gatt_status);
4545
void check_sec_status(uint8_t sec_status);
4646

4747
// Track if the user code modified the BLE state to know if we need to undo it on reload.
48-
bool vm_used_ble;
48+
extern bool vm_used_ble;
4949

5050
#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_BLEIO_INIT_H

‎ports/stm/common-hal/pwmio/PWMOut.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t* self,
9696
//if pin is same
9797
if (l_tim->pin == pin) {
9898
//check if the timer has a channel active, or is reserved by main timer system
99-
if (reserved_tim[l_tim_index] != 0) {
99+
if (l_tim_index < TIM_BANK_ARRAY_LEN && reserved_tim[l_tim_index] != 0) {
100100
// Timer has already been reserved by an internal module
101101
if (stm_peripherals_timer_is_reserved(mcu_tim_banks[l_tim_index])) {
102102
tim_taken_internal = true;

0 commit comments

Comments
 (0)