Skip to content

Commit af24c8a

Browse files
jeplerjepler
committed
Merge remote-tracking branch 'origin/main' into implicit-fallthrough-diagnostic
Conflict in locale/circuitpython.pot resolved with 'make translate'
2 parents 90f7340 + 73ad78e commit af24c8a

File tree

21 files changed

+299
-93
lines changed

21 files changed

+299
-93
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ jobs:
275275
- "pyportal"
276276
- "pyportal_titano"
277277
- "pyruler"
278+
- "qtpy_m0"
278279
- "raytac_mdbt50q-db-40"
279280
- "robohatmm1_m4"
280281
- "sam32"

‎locale/circuitpython.pot

Lines changed: 5 additions & 7 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-09-12 15:10-0500\n"
11+
"POT-Creation-Date: 2020-09-13 14:21-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"
@@ -30,12 +30,6 @@ msgid ""
3030
"https://github.com/adafruit/circuitpython/issues\n"
3131
msgstr ""
3232

33-
#: supervisor/shared/safe_mode.c
34-
msgid ""
35-
"\n"
36-
"To exit, please reset the board without "
37-
msgstr ""
38-
3933
#: py/obj.c
4034
msgid " File \"%q\""
4135
msgstr ""
@@ -1605,6 +1599,10 @@ msgid ""
16051599
"Timer was reserved for internal use - declare PWM pins earlier in the program"
16061600
msgstr ""
16071601

1602+
#: supervisor/shared/safe_mode.c
1603+
msgid "To exit, please reset the board without "
1604+
msgstr ""
1605+
16081606
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
16091607
msgid "Too many channels in sample."
16101608
msgstr ""

‎locale/pt_BR.po

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2020-09-09 14:33-0700\n"
9-
"PO-Revision-Date: 2020-09-02 22:32+0000\n"
9+
"PO-Revision-Date: 2020-09-12 17:32+0000\n"
1010
"Last-Translator: Wellington Terumi Uemura <[email protected]>\n"
1111
"Language-Team: \n"
1212
"Language: pt_BR\n"
@@ -385,7 +385,7 @@ msgstr ""
385385

386386
#: shared-bindings/wifi/Radio.c
387387
msgid "Authentication failure"
388-
msgstr ""
388+
msgstr "Houve um falha na autenticação"
389389

390390
#: main.c
391391
msgid "Auto-reload is off.\n"
@@ -606,7 +606,7 @@ msgstr ""
606606

607607
#: supervisor/shared/safe_mode.c
608608
msgid "CircuitPython was unable to allocate the heap.\n"
609-
msgstr ""
609+
msgstr "O CircuitPython não conseguiu alocar o heap.\n"
610610

611611
#: shared-module/bitbangio/SPI.c
612612
msgid "Clock pin init failed."
@@ -1258,7 +1258,7 @@ msgstr "Não há mais temporizadores disponíveis neste pino."
12581258

12591259
#: shared-bindings/wifi/Radio.c
12601260
msgid "No network with that ssid"
1261-
msgstr ""
1261+
msgstr "Não há rede com este ssid"
12621262

12631263
#: shared-module/touchio/TouchIn.c
12641264
msgid "No pulldown on pin; 1Mohm recommended"
@@ -1282,7 +1282,7 @@ msgstr "Declaração de falha do dispositivo Nordic Soft."
12821282

12831283
#: shared-bindings/ipaddress/IPv4Address.c shared-bindings/ipaddress/__init__.c
12841284
msgid "Not a valid IP string"
1285-
msgstr ""
1285+
msgstr "Não é uma sequência válida de IP"
12861286

12871287
#: ports/nrf/common-hal/_bleio/__init__.c
12881288
#: shared-bindings/_bleio/CharacteristicBuffer.c
@@ -1335,7 +1335,7 @@ msgstr ""
13351335

13361336
#: shared-bindings/ipaddress/__init__.c
13371337
msgid "Only raw int supported for ip"
1338-
msgstr ""
1338+
msgstr "Apenas o int bruto é compatível para o ip"
13391339

13401340
#: shared-bindings/audiobusio/PDMIn.c
13411341
msgid "Oversample must be multiple of 8."
@@ -1547,7 +1547,7 @@ msgstr "Serializer em uso"
15471547

15481548
#: shared-bindings/ssl/SSLContext.c
15491549
msgid "Server side context cannot have hostname"
1550-
msgstr ""
1550+
msgstr "O contexto do lado do servidor não pode ter nome de host"
15511551

15521552
#: shared-bindings/nvm/ByteArray.c
15531553
msgid "Slice and value different lengths."
@@ -1760,7 +1760,7 @@ msgstr "Tipo uuid nrfx inesperado"
17601760

17611761
#: shared-bindings/wifi/Radio.c
17621762
msgid "Unknown failure"
1763-
msgstr ""
1763+
msgstr "Falha desconhecida"
17641764

17651765
#: ports/nrf/common-hal/_bleio/__init__.c
17661766
#, c-format
@@ -1879,7 +1879,7 @@ msgstr ""
18791879

18801880
#: shared-bindings/wifi/Radio.c
18811881
msgid "WiFi password must be between 8 and 63 characters"
1882-
msgstr ""
1882+
msgstr "A senha do Wi-Fi deve ter entre 8 e 63 caracteres"
18831883

18841884
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
18851885
msgid "Writes not supported on Characteristic"

‎ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define CALIBRATE_CRYSTALLESS 1
2626

2727
// Explanation of how a user got into safe mode.
28-
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up"
28+
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
2929

3030
// Increase stack size slightly due to CPX library import nesting
3131
#define CIRCUITPY_DEFAULT_STACK_SIZE (4248) //divisible by 8

‎ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define USER_NEOPIXELS_PIN (&pin_PB23)
2828

2929
// Explanation of how a user got into safe mode.
30-
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up"
30+
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
3131

3232
// Increase stack size slightly due to CPX library import nesting
3333
#define CIRCUITPY_DEFAULT_STACK_SIZE (4248) // divisible by 8

‎ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define CALIBRATE_CRYSTALLESS 1
2626

2727
// Explanation of how a user got into safe mode.
28-
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up"
28+
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
2929

3030
// Increase stack size slightly due to CPX library import nesting.
3131
#define CIRCUITPY_DEFAULT_STACK_SIZE (4248) // divisible by 8

‎ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define CALIBRATE_CRYSTALLESS 1
1212

1313
// Explanation of how a user got into safe mode.
14-
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up"
14+
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
1515

1616
#define DEFAULT_I2C_BUS_SCL (&pin_PA08)
1717
#define DEFAULT_I2C_BUS_SDA (&pin_PA09)

‎ports/atmel-samd/boards/meowmeow/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define CALIBRATE_CRYSTALLESS 1
1212

1313
// Explanation of how a user got into safe mode.
14-
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up"
14+
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
1515

1616
#define DEFAULT_I2C_BUS_SCL (&pin_PA01)
1717
#define DEFAULT_I2C_BUS_SDA (&pin_PA00)

‎ports/atmel-samd/boards/qtpy_m0/board.c

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* 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.
25+
*/
26+
27+
#include "boards/board.h"
28+
#include "common-hal/microcontroller/Pin.h"
29+
#include "supervisor/shared/board.h"
30+
#include "hal/include/hal_gpio.h"
31+
32+
void board_init(void) {
33+
gpio_set_pin_function(PIN_PA18, GPIO_PIN_FUNCTION_OFF);
34+
gpio_set_pin_direction(PIN_PA18, GPIO_DIRECTION_OUT);
35+
gpio_set_pin_level(PIN_PA18, true); // Turn on neopixel by default
36+
}
37+
38+
bool board_requests_safe_mode(void) {
39+
return false;
40+
}
41+
42+
void reset_board(void) {
43+
}

‎ports/atmel-samd/boards/qtpy_m0/mpconfigboard.h

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
#define MICROPY_HW_BOARD_NAME "Adafruit QT Py M0"
2+
#define MICROPY_HW_MCU_NAME "samd21e18"
3+
4+
#define MICROPY_HW_NEOPIXEL (&pin_PA19)
5+
6+
#define MICROPY_PORT_A (0)
7+
#define MICROPY_PORT_B (0)
8+
#define MICROPY_PORT_C (0)
9+
10+
#define IGNORE_PIN_PA00 1
11+
#define IGNORE_PIN_PA01 1
12+
#define IGNORE_PIN_PA09 1
13+
#define IGNORE_PIN_PA12 1
14+
#define IGNORE_PIN_PA13 1
15+
#define IGNORE_PIN_PA20 1
16+
#define IGNORE_PIN_PA21 1
17+
// USB is always used internally so skip the pin objects for it.
18+
#define IGNORE_PIN_PA24 1
19+
#define IGNORE_PIN_PA25 1
20+
#define IGNORE_PIN_PA27 1
21+
#define IGNORE_PIN_PA28 1
22+
#define IGNORE_PIN_PA30 1
23+
#define IGNORE_PIN_PA31 1
24+
#define IGNORE_PIN_PB01 1
25+
#define IGNORE_PIN_PB02 1
26+
#define IGNORE_PIN_PB03 1
27+
#define IGNORE_PIN_PB04 1
28+
#define IGNORE_PIN_PB05 1
29+
#define IGNORE_PIN_PB06 1
30+
#define IGNORE_PIN_PB07 1
31+
#define IGNORE_PIN_PB08 1
32+
#define IGNORE_PIN_PB09 1
33+
#define IGNORE_PIN_PB10 1
34+
#define IGNORE_PIN_PB11 1
35+
#define IGNORE_PIN_PB12 1
36+
#define IGNORE_PIN_PB13 1
37+
#define IGNORE_PIN_PB14 1
38+
#define IGNORE_PIN_PB15 1
39+
#define IGNORE_PIN_PB16 1
40+
#define IGNORE_PIN_PB17 1
41+
#define IGNORE_PIN_PB22 1
42+
#define IGNORE_PIN_PB23 1
43+
#define IGNORE_PIN_PB30 1
44+
#define IGNORE_PIN_PB31 1
45+
#define IGNORE_PIN_PB00 1
46+
47+
#define DEFAULT_I2C_BUS_SCL (&pin_PA17)
48+
#define DEFAULT_I2C_BUS_SDA (&pin_PA16)
49+
50+
#define DEFAULT_SPI_BUS_SCK (&pin_PA11)
51+
#define DEFAULT_SPI_BUS_MOSI (&pin_PA08)
52+
#define DEFAULT_SPI_BUS_MISO (&pin_PA10)
53+
54+
#define DEFAULT_UART_BUS_RX (&pin_PA07)
55+
#define DEFAULT_UART_BUS_TX (&pin_PA06)

‎ports/atmel-samd/boards/qtpy_m0/mpconfigboard.mk

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
USB_VID = 0x239A
2+
USB_PID = 0x80CC
3+
USB_PRODUCT = "QT Py M0"
4+
USB_MANUFACTURER = "Adafruit Industries LLC"
5+
6+
CHIP_VARIANT = SAMD21E18A
7+
CHIP_FAMILY = samd21
8+
9+
INTERNAL_FLASH_FILESYSTEM = 1
10+
LONGINT_IMPL = NONE
11+
CIRCUITPY_FULL_BUILD = 0
12+
13+
SUPEROPT_GC = 0
14+
15+
CFLAGS_BOARD = --param max-inline-insns-auto=15
16+
ifeq ($(TRANSLATION), zh_Latn_pinyin)
17+
RELEASE_NEEDS_CLEAN_BUILD = 1
18+
CFLAGS_INLINE_LIMIT = 35
19+
endif
20+
ifeq ($(TRANSLATION), de_DE)
21+
RELEASE_NEEDS_CLEAN_BUILD = 1
22+
CFLAGS_INLINE_LIMIT = 35
23+
SUPEROPT_VM = 0
24+
endif

‎ports/atmel-samd/boards/qtpy_m0/pins.c

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA02) },
5+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
6+
7+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA03) },
8+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA03) },
9+
10+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA04) },
11+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA04) },
12+
13+
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA05) },
14+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA05) },
15+
16+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA16) },
17+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA16) },
18+
19+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA17) },
20+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA17) },
21+
22+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA06) },
23+
{ MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_PA06) },
24+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA06) },
25+
26+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA07) },
27+
{ MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_PA07) },
28+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA07) },
29+
30+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA11) },
31+
{ MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_PA11) },
32+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA11) },
33+
34+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA10) },
35+
{ MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_PA10) },
36+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA10) },
37+
38+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA08) },
39+
{ MP_ROM_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_PA08) },
40+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA08) },
41+
42+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA19) },
43+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_PA18) },
44+
45+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
46+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
47+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
48+
};
49+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,8 @@
2929
#define MICROPY_HW_BOARD_NAME "BastWiFi"
3030
#define MICROPY_HW_MCU_NAME "ESP32S2"
3131

32+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
33+
34+
#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
35+
3236
#define AUTORESET_DELAY_MS 500

‎ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,8 @@
3131

3232
#define MICROPY_HW_NEOPIXEL (&pin_GPIO45)
3333

34+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
35+
36+
#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
37+
3438
#define AUTORESET_DELAY_MS 500

‎ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,8 @@
3131

3232
#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
3333

34+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
35+
36+
#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
37+
3438
#define AUTORESET_DELAY_MS 500

‎ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,8 @@
3131

3232
#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
3333

34+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
35+
36+
#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
37+
3438
#define AUTORESET_DELAY_MS 500

‎ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,8 @@
3232
#define MICROPY_HW_LED (&pin_GPIO21)
3333
#define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
3434

35+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
36+
37+
#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
38+
3539
#define AUTORESET_DELAY_MS 500

‎ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
#define MICROPY_HW_BOARD_NAME "FeatherS2"
3030
#define MICROPY_HW_MCU_NAME "ESP32S2"
3131

32+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
33+
34+
#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
35+
3236
#define AUTORESET_DELAY_MS 500
3337

3438
// Doesn't work with this on.

0 commit comments

Comments
 (0)