Skip to content

Commit 47e50e5

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/master' into bleio_tweaks
2 parents 91c9d51 + 08d1019 commit 47e50e5

File tree

63 files changed

+824
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+824
-110
lines changed

‎.github/workflows/build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ jobs:
5252
done
5353
working-directory: tests
5454
if: failure()
55-
- name: Test threads
56-
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread
57-
working-directory: tests
5855
- name: Native Tests
5956
run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native
6057
working-directory: tests
@@ -78,6 +75,7 @@ jobs:
7875
board:
7976
- "arduino_mkr1300"
8077
- "arduino_mkrzero"
78+
- "arduino_nano_33_ble"
8179
- "arduino_zero"
8280
- "bast_pro_mini_m0"
8381
- "capablerobot_usbhub"
@@ -95,7 +93,6 @@ jobs:
9593
- "electronut_labs_blip"
9694
- "electronut_labs_papyr"
9795
- "escornabot_makech"
98-
- "feather_f405"
9996
- "feather_m0_adalogger"
10097
- "feather_m0_basic"
10198
- "feather_m0_express"
@@ -106,12 +103,14 @@ jobs:
106103
- "feather_m4_express"
107104
- "feather_nrf52840_express"
108105
- "feather_radiofruit_zigbee"
106+
- "feather_stm32f405_express"
109107
- "gemma_m0"
110108
- "grandcentral_m4_express"
111109
- "hallowing_m0_express"
112110
- "hallowing_m4_express"
113111
- "itsybitsy_m0_express"
114112
- "itsybitsy_m4_express"
113+
- "itsybitsy_nrf52840_express"
115114
- "kicksat-sprite"
116115
- "makerdiary_nrf52840_mdk"
117116
- "makerdiary_nrf52840_mdk_usb_dongle"
@@ -145,6 +144,8 @@ jobs:
145144
- "snekboard"
146145
- "sparkfun_lumidrive"
147146
- "sparkfun_nrf52840_mini"
147+
- "sparkfun_qwiic_micro_no_flash"
148+
- "sparkfun_qwiic_micro_with_flash"
148149
- "sparkfun_redboard_turbo"
149150
- "sparkfun_samd21_dev"
150151
- "sparkfun_samd21_mini"

‎lib/stm32lib

Submodule stm32lib deleted from d2bcfda

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

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,24 +74,21 @@ uint8_t display_init_sequence[] = {
7474
0x11, 0x1d, 0x23, 0x35, 0x41, 0x4b, 0x4b, 0x42, 0x3A,
7575
0x27, 0x1B, 0x08, 0x09, 0x03, 0x00, 0x01,
7676
0x3a, 1, 0x55,
77-
0x36, 1, 0x00,
77+
0x36, 1, 0x60,
7878
0x11, DELAY, 150/5, // Exit Sleep, then delay 150 ms
7979
0x29, DELAY, 50/5
8080
};
8181

8282
void board_init(void) {
83-
busio_spi_obj_t* spi = &displays[0].fourwire_bus.inline_bus;
84-
common_hal_busio_spi_construct(spi, &pin_PA13, &pin_PA12, &pin_PA14);
85-
common_hal_busio_spi_never_reset(spi);
86-
87-
displayio_fourwire_obj_t* bus = &displays[0].fourwire_bus;
88-
bus->base.type = &displayio_fourwire_type;
89-
common_hal_displayio_fourwire_construct(bus,
90-
spi,
91-
&pin_PB05, // TFT_DC Command or data
92-
&pin_PB06, // TFT_CS Chip select
93-
&pin_PA00, // TFT_RST Reset
94-
24000000);
83+
displayio_parallelbus_obj_t* bus = &displays[0].parallel_bus;
84+
bus->base.type = &displayio_parallelbus_type;
85+
common_hal_displayio_parallelbus_construct(bus,
86+
&pin_PA16, // Data0
87+
&pin_PB05, // Command or data
88+
&pin_PB06, // Chip select
89+
&pin_PB09, // Write
90+
&pin_PB04, // Read
91+
&pin_PA00); // Reset
9592

9693
displayio_display_obj_t* display = &displays[0].display;
9794
display->base.type = &displayio_display_type;
@@ -101,7 +98,7 @@ void board_init(void) {
10198
320, // Height
10299
0, // column start
103100
0, // row start
104-
270, // rotation
101+
0, // rotation
105102
16, // Color depth
106103
false, // grayscale
107104
false, // pixels_in_byte_share_row (unused for depths > 8)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#define CIRCUITPY_MCU_FAMILY samd51
55

6-
76
#define MICROPY_HW_LED_STATUS (&pin_PA27)
87

98
#define MICROPY_HW_NEOPIXEL (&pin_PB22)

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
8080
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
8181
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
8282

83-
// TFT control pins
84-
{MP_OBJ_NEW_QSTR(MP_QSTR_TFT_LITE), MP_ROM_PTR(&pin_PB31)},
85-
{MP_OBJ_NEW_QSTR(MP_QSTR_TFT_MOSI), MP_ROM_PTR(&pin_PA12)},
86-
{MP_OBJ_NEW_QSTR(MP_QSTR_TFT_SCK), MP_ROM_PTR(&pin_PA13)},
87-
{MP_OBJ_NEW_QSTR(MP_QSTR_TFT_MISO), MP_ROM_PTR(&pin_PA14)},
88-
{MP_OBJ_NEW_QSTR(MP_QSTR_TFT_RST), MP_ROM_PTR(&pin_PA00)},
89-
{MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_PB06)},
90-
{MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_PB05)},
91-
9283
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) },
9384
};
9485
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

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

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

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#define MICROPY_HW_BOARD_NAME "SparkFun Qwiic Micro"
2+
#define MICROPY_HW_MCU_NAME "samd21e18"
3+
4+
#define MICROPY_PORT_A ( 0 )
5+
#define MICROPY_PORT_B ( 0 )
6+
#define MICROPY_PORT_C ( 0 )
7+
8+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
9+
10+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
11+
12+
#define CALIBRATE_CRYSTALLESS 1
13+
#define BOARD_HAS_CRYSTAL 0
14+
15+
//I2C and Qwiic Connector
16+
#define DEFAULT_I2C_BUS_SCL (&pin_PA09)
17+
#define DEFAULT_I2C_BUS_SDA (&pin_PA08)
18+
19+
//SPI
20+
#define DEFAULT_SPI_BUS_SCK (&pin_PA07)
21+
#define DEFAULT_SPI_BUS_MOSI (&pin_PA06)
22+
#define DEFAULT_SPI_BUS_MISO (&pin_PA05)
23+
24+
//UART
25+
#define DEFAULT_UART_BUS_RX (&pin_PA23)
26+
#define DEFAULT_UART_BUS_TX (&pin_PA22)
27+
28+
// USB is always used internally so skip the pin objects for it.
29+
#define IGNORE_PIN_PA24 1
30+
#define IGNORE_PIN_PA25 1
31+
32+
// Unused
33+
#define IGNORE_PIN_PA03 1
34+
#define IGNORE_PIN_PA11 1
35+
#define IGNORE_PIN_PA14 1
36+
#define IGNORE_PIN_PA15 1
37+
#define IGNORE_PIN_PA27 1
38+
#define IGNORE_PIN_PA28 1

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld
2+
USB_VID = 0x1B4F
3+
USB_PID = 0x8D24
4+
USB_PRODUCT = "SparkFun Qwiic Micro"
5+
USB_MANUFACTURER = "SparkFun Electronics"
6+
7+
CHIP_VARIANT = SAMD21E18A
8+
CHIP_FAMILY = samd21
9+
10+
INTERNAL_FLASH_FILESYSTEM = 1
11+
LONGINT_IMPL = NONE
12+
13+
CIRCUITPY_SMALL_BUILD = 1
14+
SUPEROPT_GC = 0

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4+
5+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
6+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA06) },
7+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA05) },
8+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA07) },
9+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA10) },
10+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA04) },
11+
12+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA08) },
13+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA02) },
14+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA06) },
15+
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA05) },
16+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA07) },
17+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA00) },
18+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA01) },
19+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA04) },
20+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA09) },
21+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA10) },
22+
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_PA22) },
23+
{ MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_PA23) },
24+
25+
// External SPI
26+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA07) },
27+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA06) },
28+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA05) },
29+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
30+
31+
// UART
32+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA22) },
33+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA23) },
34+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
35+
36+
// I2C and Qwiic Connector
37+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA08) },
38+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA09) },
39+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }
40+
41+
};
42+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

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

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

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#define MICROPY_HW_BOARD_NAME "SparkFun Qwiic Micro"
2+
#define MICROPY_HW_MCU_NAME "samd21e18"
3+
4+
// Clock rates are off: Salae reads 12MHz which is the limit even though we set it to the safer 8MHz.
5+
#define SPI_FLASH_BAUDRATE (8000000)
6+
7+
#define SPI_FLASH_MOSI_PIN &pin_PA16
8+
#define SPI_FLASH_MISO_PIN &pin_PA18
9+
#define SPI_FLASH_SCK_PIN &pin_PA17
10+
#define SPI_FLASH_CS_PIN &pin_PA19
11+
12+
#define MICROPY_PORT_A ( 0 )
13+
#define MICROPY_PORT_B ( 0 )
14+
#define MICROPY_PORT_C ( 0 )
15+
16+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
17+
18+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
19+
20+
#define CALIBRATE_CRYSTALLESS 1
21+
#define BOARD_HAS_CRYSTAL 0
22+
23+
//I2C and Qwiic Connector
24+
#define DEFAULT_I2C_BUS_SCL (&pin_PA09)
25+
#define DEFAULT_I2C_BUS_SDA (&pin_PA08)
26+
27+
//SPI
28+
#define DEFAULT_SPI_BUS_SCK (&pin_PA07)
29+
#define DEFAULT_SPI_BUS_MOSI (&pin_PA06)
30+
#define DEFAULT_SPI_BUS_MISO (&pin_PA05)
31+
32+
//UART
33+
#define DEFAULT_UART_BUS_RX (&pin_PA23)
34+
#define DEFAULT_UART_BUS_TX (&pin_PA22)
35+
36+
// USB is always used internally so skip the pin objects for it.
37+
#define IGNORE_PIN_PA24 1
38+
#define IGNORE_PIN_PA25 1
39+
40+
// Unused
41+
#define IGNORE_PIN_PA03 1
42+
#define IGNORE_PIN_PA11 1
43+
#define IGNORE_PIN_PA14 1
44+
#define IGNORE_PIN_PA15 1
45+
#define IGNORE_PIN_PA27 1
46+
#define IGNORE_PIN_PA28 1

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld
2+
USB_VID = 0x1B4F
3+
USB_PID = 0x8D24
4+
USB_PRODUCT = "SparkFun Qwiic Micro"
5+
USB_MANUFACTURER = "SparkFun Electronics"
6+
7+
CHIP_VARIANT = SAMD21E18A
8+
CHIP_FAMILY = samd21
9+
10+
SPI_FLASH_FILESYSTEM = 1
11+
EXTERNAL_FLASH_DEVICE_COUNT = 1
12+
EXTERNAL_FLASH_DEVICES = "W25Q32FV"
13+
LONGINT_IMPL = MPZ
14+
15+
CIRCUITPY_SMALL_BUILD = 1
16+
SUPEROPT_GC = 0

0 commit comments

Comments
 (0)