Skip to content

Commit a25e10e

Browse files
hierophecthierophect
committed
Merge branch 'mimxrt-uart-oneway' of https://github.com/hierophect/circuitpython into mimxrt-uart-oneway
2 parents 1e914ac + fe10a45 commit a25e10e

File tree

31 files changed

+702
-474
lines changed

31 files changed

+702
-474
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ jobs:
136136
board:
137137
- "8086_commander"
138138
- "TG-Watch02A"
139+
- "aloriumtech_evo_m51"
139140
- "aramcon_badge_2019"
140141
- "arduino_mkr1300"
141142
- "arduino_mkrzero"

‎lib/tinyusb

‎locale/sv.po

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-05-21 11:18-0400\n"
11-
"PO-Revision-Date: 2020-05-17 20:56+0000\n"
12-
"Last-Translator: Anonymous <[email protected]>\n"
10+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
11+
"PO-Revision-Date: 2020-05-20 18:32+0000\n"
12+
"Last-Translator: Jonny Bergdahl <[email protected]>\n"
1313
"Language-Team: LANGUAGE <[email protected]>\n"
1414
"Language: sv\n"
1515
"MIME-Version: 1.0\n"
@@ -467,7 +467,7 @@ msgstr "Kan inte ställa in CCCD på lokal karaktäristik"
467467

468468
#: shared-bindings/displayio/Bitmap.c shared-bindings/pulseio/PulseIn.c
469469
msgid "Cannot delete values"
470-
msgstr "Kan radera värden"
470+
msgstr "Kan inte radera värden"
471471

472472
#: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c
473473
#: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
@@ -1293,7 +1293,7 @@ msgstr "Plus eventuella moduler i filsystemet\n"
12931293

12941294
#: shared-module/vectorio/Polygon.c
12951295
msgid "Polygon needs at least 3 points"
1296-
msgstr ""
1296+
msgstr "Polygonen behöver minst 3 punkter"
12971297

12981298
#: shared-bindings/ps2io/Ps2.c
12991299
msgid "Pop from an empty Ps2 buffer"
@@ -1519,7 +1519,7 @@ msgstr "Tile-bredd måste vara jämnt delbar med bredd på bitmap"
15191519
#: ports/nrf/common-hal/_bleio/Adapter.c
15201520
#, c-format
15211521
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1522-
msgstr ""
1522+
msgstr "Åtgärden tog för lång tid: Max väntetid är %d sekunder"
15231523

15241524
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15251525
msgid "Too many channels in sample."
@@ -1703,7 +1703,7 @@ msgstr ""
17031703
"\n"
17041704
"Besök learning.adafruit.com/category/circuitpython för projektguider.\n"
17051705
"\n"
1706-
"För att lista inbyggda moduler, vänligen `help(\" modules \")`.\n"
1706+
"För att lista inbyggda moduler, ange `help(\"modules\")`.\n"
17071707

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

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

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
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+
// Updated to support Alorium Technology Evo M51
28+
// Author: Bryan Craker
29+
// Date: 2020-05-20
30+
31+
#include "boards/board.h"
32+
#include "mpconfigboard.h"
33+
34+
void board_init(void) {
35+
REG_PORT_DIRSET1 = PORT_PB20; // PB20 as output
36+
REG_PORT_OUTCLR1 = PORT_PB20; // PB20 cleared
37+
PORT->Group[1].PINCFG[20].reg |= PORT_PINCFG_PMUXEN; // Mux enabled on PB20
38+
PORT->Group[1].PMUX[10].reg = 0x0C; // PB20 as mux function "M"
39+
// Gclk[6] is on PB20
40+
GCLK->GENCTRL[6].reg = GCLK_GENCTRL_SRC(GCLK_GENCTRL_SRC_DPLL0) |
41+
GCLK_GENCTRL_IDC |
42+
GCLK_GENCTRL_DIV(10) |
43+
//GCLK_GENCTRL_DIVSEL |
44+
GCLK_GENCTRL_OE |
45+
GCLK_GENCTRL_GENEN;
46+
while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_GENCTRL6)
47+
{
48+
// Wait for synchronization
49+
}
50+
}
51+
52+
bool board_requests_safe_mode(void) {
53+
return false;
54+
}
55+
56+
void reset_board(void) {
57+
}

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#define MICROPY_HW_BOARD_NAME "AloriumTech Evo M51"
2+
#define MICROPY_HW_MCU_NAME "samd51p19"
3+
4+
#define CIRCUITPY_MCU_FAMILY samd51
5+
6+
// Rev E
7+
8+
#define MICROPY_HW_LED_STATUS (&pin_PA23)
9+
#define MICROPY_HW_NEOPIXEL (&pin_PB03)
10+
11+
// These are pins not to reset.
12+
// QSPI Data pins
13+
#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11)
14+
// QSPI CS, QSPI SCK and NeoPixel pin
15+
#define MICROPY_PORT_B (PORT_PB03 | PORT_PB10 | PORT_PB11 | PORT_PB20)
16+
#define MICROPY_PORT_C (0)
17+
#define MICROPY_PORT_D (0)
18+
19+
// BC needed?
20+
//#define AUTORESET_DELAY_MS 500
21+
22+
// If you change this, then make sure to update the linker scripts as well to
23+
// make sure you don't overwrite code
24+
//#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
25+
26+
//#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
27+
// End BC
28+
29+
#define EXTERNAL_FLASH_QSPI_DUAL
30+
31+
#define BOARD_HAS_CRYSTAL 1
32+
33+
//#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
34+
//#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
35+
#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
36+
#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
37+
38+
#define DEFAULT_SPI_BUS_SCK (&pin_PA17)
39+
#define DEFAULT_SPI_BUS_MOSI (&pin_PB23)
40+
#define DEFAULT_SPI_BUS_MISO (&pin_PB22)
41+
42+
#define DEFAULT_UART_BUS_RX (&pin_PB17)
43+
#define DEFAULT_UART_BUS_TX (&pin_PB16)
44+
45+
// USB is always used internally so skip the pin objects for it.
46+
#define IGNORE_PIN_PA24 1
47+
#define IGNORE_PIN_PA25 1

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
LD_FILE = boards/samd51x19-bootloader-external-flash.ld
2+
3+
USB_VID = 0x32BD
4+
USB_PID = 0x3001
5+
USB_PRODUCT = "AloriumTech Evo M51"
6+
USB_MANUFACTURER = "Alorium Technology, LLC"
7+
8+
CHIP_VARIANT = SAMD51P19A
9+
CHIP_FAMILY = samd51
10+
11+
QSPI_FLASH_FILESYSTEM = 1
12+
EXTERNAL_FLASH_DEVICE_COUNT = 1
13+
EXTERNAL_FLASH_DEVICES = GD25Q16C
14+
LONGINT_IMPL = MPZ
15+
16+
CIRCUITPY_NETWORK = 1
17+
MICROPY_PY_WIZNET5K = 5500
18+
CIRCUITPY_PS2IO = 1

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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_A0), MP_ROM_PTR(&pin_PA02) },
5+
{ MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_PA02) },
6+
7+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA05) },
8+
{ MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_PA05) },
9+
10+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB08) },
11+
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_PB08) },
12+
13+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PB09) },
14+
{ MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_PB09) },
15+
16+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA04) },
17+
{ MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_PA04) },
18+
19+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA06) },
20+
{ MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_PA06) },
21+
22+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA17) },
23+
{ MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_PA17) },
24+
25+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB23) },
26+
{ MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_PB23) },
27+
28+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB22) },
29+
{ MP_ROM_QSTR(MP_QSTR_D23), MP_ROM_PTR(&pin_PB22) },
30+
31+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PB17) },
32+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB17) },
33+
34+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PB16) },
35+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB16) },
36+
37+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA12) },
38+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA13) },
39+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA14) },
40+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA16) },
41+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA18) },
42+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA19) },
43+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA20) },
44+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA21) },
45+
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA22) },
46+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA23) },
47+
48+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PB03) },
49+
50+
{ MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_PB01) },
51+
{ MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_PB01) },
52+
53+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
54+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
55+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
56+
57+
{ MP_ROM_QSTR(MP_QSTR_SDA_1), MP_ROM_PTR(&pin_PD09) },
58+
{ MP_ROM_QSTR(MP_QSTR_SCL_1), MP_ROM_PTR(&pin_PD08) },
59+
};
60+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎ports/mimxrt10xx/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX -DCFG_TUD_MIDI_RX_BUFSIZE=128 -DCFG_
8282

8383
#Debugging/Optimization
8484
ifeq ($(DEBUG), 1)
85-
CFLAGS += -ggdb
8685
# You may want to disable -flto if it interferes with debugging.
8786
# CFLAGS += -flto -flto-partition=none
8887
# You may want to enable these flags to make setting breakpoints easier.
@@ -91,7 +90,7 @@ else
9190
#CFLAGS += -flto -flto-partition=none
9291
endif
9392

94-
CFLAGS += $(INC) -Wall -Wno-cast-align -std=gnu11 -nostdlib $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT)
93+
CFLAGS += $(INC) -ggdb -Wall -Wno-cast-align -std=gnu11 -nostdlib $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT)
9594

9695
# TODO: add these when -Werror is applied
9796
# Disable some warnings, as do most ports. NXP SDK causes undef, tinyusb causes cast-align

‎ports/mimxrt10xx/boards/feather_m7_1011/board.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,21 @@
2727

2828
#include "boards/board.h"
2929
#include "mpconfigboard.h"
30+
#include "shared-bindings/microcontroller/Pin.h"
3031

3132
void board_init(void) {
33+
// SWD Pins
34+
common_hal_never_reset_pin(&pin_GPIO_AD_13);//SWDIO
35+
common_hal_never_reset_pin(&pin_GPIO_AD_12);//SWCLK
36+
37+
// FLEX flash
38+
common_hal_never_reset_pin(&pin_GPIO_SD_12);
39+
common_hal_never_reset_pin(&pin_GPIO_SD_11);
40+
common_hal_never_reset_pin(&pin_GPIO_SD_10);
41+
common_hal_never_reset_pin(&pin_GPIO_SD_09);
42+
common_hal_never_reset_pin(&pin_GPIO_SD_08);
43+
common_hal_never_reset_pin(&pin_GPIO_SD_07);
44+
common_hal_never_reset_pin(&pin_GPIO_SD_06);
3245
}
3346

3447
bool board_requests_safe_mode(void) {

‎ports/mimxrt10xx/boards/feather_mimxrt1011/board.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,21 @@
2727

2828
#include "boards/board.h"
2929
#include "mpconfigboard.h"
30+
#include "shared-bindings/microcontroller/Pin.h"
3031

3132
void board_init(void) {
33+
// SWD Pins
34+
common_hal_never_reset_pin(&pin_GPIO_AD_13);//SWDIO
35+
common_hal_never_reset_pin(&pin_GPIO_AD_12);//SWCLK
36+
37+
// FLEX flash
38+
common_hal_never_reset_pin(&pin_GPIO_SD_12);
39+
common_hal_never_reset_pin(&pin_GPIO_SD_11);
40+
common_hal_never_reset_pin(&pin_GPIO_SD_10);
41+
common_hal_never_reset_pin(&pin_GPIO_SD_09);
42+
common_hal_never_reset_pin(&pin_GPIO_SD_08);
43+
common_hal_never_reset_pin(&pin_GPIO_SD_07);
44+
common_hal_never_reset_pin(&pin_GPIO_SD_06);
3245
}
3346

3447
bool board_requests_safe_mode(void) {

0 commit comments

Comments
 (0)