Skip to content

Commit 0e2d231

Browse files
jeplerjepler
committed
Merge remote-tracking branch 'origin/main' into stm32-sdioio
2 parents 59ebad6 + 16b7d99 commit 0e2d231

File tree

22 files changed

+234
-18
lines changed

22 files changed

+234
-18
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ jobs:
172172
- "bast_pro_mini_m0"
173173
- "bdmicro_vina_m0"
174174
- "bless_dev_board_multi_sensor"
175+
- "blm_badge"
175176
- "capablerobot_usbhub"
176177
- "catwan_usbstick"
177178
- "circuitbrains_basic_m0"
@@ -420,7 +421,7 @@ jobs:
420421
id: idf-cache
421422
with:
422423
path: ${{ github.workspace }}/.idf_tools
423-
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20200523
424+
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20200801
424425
- name: Install IDF tools
425426
run: |
426427
$IDF_PATH/tools/idf_tools.py --non-interactive install required

‎frozen/Adafruit_CircuitPython_BusDevice

‎locale/circuitpython.pot

Lines changed: 5 additions & 1 deletion
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-07-30 07:18-0500\n"
11+
"POT-Creation-Date: 2020-08-03 21:01-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"
@@ -865,6 +865,10 @@ msgstr ""
865865
msgid "I2C Init Error"
866866
msgstr ""
867867

868+
#: shared-bindings/audiobusio/I2SOut.c
869+
msgid "I2SOut not available"
870+
msgstr ""
871+
868872
#: shared-bindings/aesio/aes.c
869873
#, c-format
870874
msgid "IV must be %d bytes long"

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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 "supervisor/shared/board.h"
29+
30+
void board_init(void) {
31+
}
32+
33+
bool board_requests_safe_mode(void) {
34+
return false;
35+
}
36+
37+
void reset_board(void) {
38+
board_reset_user_neopixels();
39+
}

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#define MICROPY_HW_BOARD_NAME "Adafruit BLM Badge"
2+
#define MICROPY_HW_MCU_NAME "samd21e18"
3+
4+
#define MICROPY_HW_LED_STATUS (&pin_PA03)
5+
6+
#define MICROPY_PORT_A (PORT_PA24 | PORT_PA25)
7+
#define MICROPY_PORT_B (0)
8+
#define MICROPY_PORT_C (0)
9+
10+
#define DEFAULT_I2C_BUS_SCL (&pin_PA01)
11+
#define DEFAULT_I2C_BUS_SDA (&pin_PA00)
12+
13+
#define DEFAULT_UART_BUS_RX (&pin_PA01)
14+
#define DEFAULT_UART_BUS_TX (&pin_PA00)
15+
16+
#define USER_NEOPIXELS_PIN (&pin_PA05)
17+
18+
#define IGNORE_PIN_PA09 1
19+
#define IGNORE_PIN_PA12 1
20+
#define IGNORE_PIN_PA13 1
21+
#define IGNORE_PIN_PA14 1
22+
#define IGNORE_PIN_PA15 1
23+
#define IGNORE_PIN_PA16 1
24+
#define IGNORE_PIN_PA17 1
25+
#define IGNORE_PIN_PA18 1
26+
#define IGNORE_PIN_PA19 1
27+
#define IGNORE_PIN_PA20 1
28+
#define IGNORE_PIN_PA21 1
29+
#define IGNORE_PIN_PA22 1
30+
#define IGNORE_PIN_PA23 1
31+
// USB is always used.
32+
#define IGNORE_PIN_PA24 1
33+
#define IGNORE_PIN_PA25 1
34+
#define IGNORE_PIN_PA27 1
35+
#define IGNORE_PIN_PA28 1
36+
#define IGNORE_PIN_PA30 1
37+
#define IGNORE_PIN_PA31 1

‎ports/atmel-samd/boards/blm_badge/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 = 0x80C0
3+
USB_PRODUCT = "BLM Badge"
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+
CIRCUITPY_AUDIOIO = 1
14+
CIRCUITPY_AUDIOBUSIO = 1
15+
# Pins for I2SOut are not available.
16+
CIRCUITPY_AUDIOBUSIO_I2SOUT = 0
17+
CIRCUITPY_PULSEIO = 0
18+
CIRCUITPY_ROTARYIO = 0
19+
CIRCUITPY_RTC = 0
20+
CIRCUITPY_SAMD = 0
21+
CIRCUITPY_USB_HID = 1
22+
CIRCUITPY_USB_MIDI = 0
23+
24+
SUPEROPT_GC = 0

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
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_RX), MP_ROM_PTR(&pin_PA01) },
5+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA01) }, // pad 1
6+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA01) },
7+
8+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA00) },
9+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA00) }, // pad 0
10+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA00) },
11+
12+
{ MP_ROM_QSTR(MP_QSTR_CAP1), MP_ROM_PTR(&pin_PA02) },
13+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA02) },
14+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
15+
16+
{ MP_ROM_QSTR(MP_QSTR_CAP2), MP_ROM_PTR(&pin_PA04) },
17+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA04) },
18+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA04) },
19+
20+
{ MP_ROM_QSTR(MP_QSTR_CAP3), MP_ROM_PTR(&pin_PA06) },
21+
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA06) },
22+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA06) },
23+
24+
{ MP_ROM_QSTR(MP_QSTR_CAP4), MP_ROM_PTR(&pin_PA07) },
25+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA07) },
26+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA07) },
27+
28+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA05) },
29+
{ MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_PA05) },
30+
31+
{ MP_ROM_QSTR(MP_QSTR_MICROPHONE_CLOCK), MP_ROM_PTR(&pin_PA10) },
32+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA10) },
33+
34+
{ MP_ROM_QSTR(MP_QSTR_MICROPHONE_DATA), MP_ROM_PTR(&pin_PA08) },
35+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA08) },
36+
37+
{ MP_ROM_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_PA11) },
38+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA11) },
39+
40+
{ MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_PA03) },
41+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA03) },
42+
};
43+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ SUPEROPT_GC = 0
1414

1515
CFLAGS_BOARD = --param max-inline-insns-auto=15
1616
ifeq ($(TRANSLATION), zh_Latn_pinyin)
17+
RELEASE_NEEDS_CLEAN_BUILD = 1
1718
CFLAGS_INLINE_LIMIT = 35
1819
endif

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,13 @@ LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

1313
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+
endif

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ void board_init(void) {
7676
sizeof(start_sequence),
7777
stop_sequence,
7878
sizeof(stop_sequence),
79-
400, // width
80-
300, // height
81-
400, // RAM width
82-
300, // RAM height
79+
300, // width
80+
400, // height
81+
300, // RAM width
82+
400, // RAM height
8383
0, // colstart
8484
0, // rowstart
85-
0, // rotation
85+
270, // rotation
8686
NO_COMMAND, // set_column_window_command
8787
NO_COMMAND, // set_row_window_command
8888
NO_COMMAND, // set_current_column_command

0 commit comments

Comments
 (0)