8000 Merge pull request #2401 from adafruit/4.1.x · adafruit/circuitpython@d4bb108 · GitHub
[go: up one dir, main page]
Skip to content

Commit d4bb108

Browse files
dhalbertdhalbert
authored
Merge pull request #2401 from adafruit/4.1.x
merge 4.1.x into 4.x
2 parents 67d2e88 + 8d43848 commit d4bb108

File tree

7 files changed

+210
-1
lines changed

7 files changed

+210
-1
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ env:
2424
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="circuitplayground_express mini_sam_m4 grandcentral_m4_express capablerobot_usbhub pygamer pca10056 pca10059 feather_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini electronut_labs_papyr electronut_labs_blip" TRAVIS_SDK=arm:nrf
2525
- TRAVIS_BOARDS="metro_m0_express metro_m4_express metro_m4_airlift_lite pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo bast_pro_mini_m0 datum_distance pyruler" TRAVIS_SDK=arm
2626
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uchip escornabot_makech pygamer_advance datum_imu" TRAVIS_SDK=arm
27-
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10 kicksat-sprite ugame10 robohatmm1 datum_light" TRAVIS_SDK=arm
27+
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10 kicksat-sprite ugame10 robohatmm1 datum_light hallowing_m4_express" TRAVIS_SDK=arm
2828
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev pybadge pybadge_airlift datum_weather" TRAVIS_SDK=arm
2929

3030
addons:

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

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
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 "mpconfigboard.h"
29+
#include "hal/include/hal_gpio.h"
30+
#include "shared-bindings/busio/SPI.h"
31+
#include "shared-bindings/displayio/FourWire.h"
32+
#include "shared-module/displayio/__init__.h"
33+
#include "shared-module/displayio/mipi_constants.h"
34+
#include "tick.h"
35+
36+
displayio_fourwire_obj_t board_display_obj;
37+
38+
#define DELAY 0x80
39+
40+
uint8_t display_init_sequence[] = {
41+
0x01, 0 | DELAY, 150, // SWRESET
42+
0x11, 0 | DELAY, 255, // SLPOUT
43+
0x36, 1, 0x00, // _MADCTL bottom to top refresh in vsync aligned order.
44+
0x3a, 1, 0x55, // COLMOD - 16bit color
45+
0x21, 0 | DELAY, 10, // _INVON
46+
0x13, 0 | DELAY, 10, // _NORON
47+
0x29, 0 | DELAY, 255, // _DISPON
48+
};
49+
50+
void board_init(void) {
51+
busio_spi_obj_t* spi = &displays[0].fourwire_bus.inline_bus;
52+
common_hal_busio_spi_construct(spi, &pin_PA01, &pin_PA00, NULL);
53+
common_hal_busio_spi_never_reset(spi);
54+
55+ 6D40
displayio_fourwire_obj_t* bus = &displays[0].fourwire_bus;
56+
bus->base.type = &displayio_fourwire_type;
57+
common_hal_displayio_fourwire_construct(bus,
58+
spi,
59+
&pin_PB31, // TFT_DC Command or data
60+
&pin_PA27, // TFT_CS Chip select
61+
&pin_PB30, // TFT_RST Reset
62+
60000000);
63+
64+
displayio_display_obj_t* display = &displays[0].display;
65+
display->base.type = &displayio_display_type;
66+
common_hal_displayio_display_construct(display,
67+
bus,
68+
240, // Width (after rotation)
69+
240, // Height (after rotation)
70+
0, // column start
71+
0, // row start
72+
180, // rotation
73+
16, // Color depth
74+
MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
75+
MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
76+
MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
77+
0x37, // set vertical scroll command
78+
display_init_sequence,
79+
sizeof(display_init_sequence),
80+
&pin_PB14, // backlight pin
81+
1.0f, // brightness (ignored)
82+
true, // auto_brightness
83+
false, // single_byte_bounds
84+
false); // data_as_commands
85+
}
86+
87+
bool board_requests_safe_mode(void) {
88+
return false;
89+
}
90+
91+
void reset_board(void) {
92+
}

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#define MICROPY_HW_BOARD_NAME "Adafruit Hallowing M4 Express"
2+
#define MICROPY_HW_MCU_NAME "samd51j19"
3+
4+
#define CIRCUITPY_MCU_FAMILY samd51
5+
6+
// Rev C
7+
8+
#define MICROPY_HW_LED_STATUS (&pin_PA23)
9+
#define MICROPY_HW_NEOPIXEL (&pin_PB16)
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+
// NeoPixel pin, QSPI CS, and QSPI SCK
15+
#define MICROPY_PORT_B (PORT_PB16 | PORT_PB10 | PORT_PB11)
16+
#define MICROPY_PORT_C (0)
17+
#define MICROPY_PORT_D (0)
18+
19+
#define AUTORESET_DELAY_MS 500
20+
21+
// If you change this, then make sure to update the linker scripts as well to
22+
// make sure you don't overwrite code
23+
#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
24+
25+
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
26+
27+
#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
28+
#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
29+
30+
#define DEFAULT_SPI_BUS_SCK (&pin_PA22)
31+
#define DEFAULT_SPI_BUS_MOSI (&pin_PB23)
32+
#define DEFAULT_SPI_BUS_MISO (&pin_PB22)
33+
34+
#define DEFAULT_UART_BUS_RX (&pin_PB12)
35+
#define DEFAULT_UART_BUS_TX (&pin_PB13)
36+
37+
// USB is always used internally so skip the pin objects for it.
38+
#define IGNORE_PIN_PA24 1
39+
#define IGNORE_PIN_PA25 1

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
LD_FILE = boards/samd51x19-bootloader-external-flash.ld
2+
USB_VID = 0x239A
3+
USB_PID = 0x804A
4+
USB_PRODUCT = "Hallowing M4 Express"
5+
USB_MANUFACTURER = "Adafruit Industries LLC"
6+
7+
CHIP_VARIANT = SAMD51J19A
8+
CHIP_FAMILY = samd51
9+
10+
QSPI_FLASH_FILESYSTEM = 1
11+
EXTERNAL_FLASH_DEVICE_COUNT = 1
12+
EXTERNAL_FLASH_DEVICES = GD25Q64C
13+
LONGINT_IMPL = MPZ
14+
15+
CIRCUITPY_NETWORK = 1
16+
MICROPY_PY_WIZNET5K = 5500
17+
CIRCUITPY_PS2IO = 1
18+
# No touch on SAMD51 yet
19+
CIRCUITPY_TOUCHIO = 0

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
#include "shared-module/displayio/__init__.h"
4+
5+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
6+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
7+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA05) },
8+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA06) },
9+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PB09) },
10+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PB08) },
11+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA04) },
12+
{ MP_ROM_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_PB04) },
13+
{ MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_PB04) },
14+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA22) },
15+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB23) },
16+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB22) },
17+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PB12) },
18+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB12) },
19+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PB13) },
20+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB13) },
21+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA12) },
22+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA13) },
23+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA14) },
24+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA16) },
25+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA17) },
26+
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), MP_ROM_PTR(&pin_PB15) },
27+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PB15) },
28+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA18) },
29+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA19) },
30+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA20) },
31+
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA21) },
32+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA23) },
33+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PB16) },
34+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PB16) },
35+
{ MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_PB01) },
36+
{ MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_PB01) },
37+
{ MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_PB01) },
38+
39+
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PB02) },
40+
{ MP_ROM_QSTR(MP_QSTR_EXTERNAL_NEOPIXEL), MP_ROM_PTR(&pin_PB02) },
41+
{ MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_PB02) },
42+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PB03) },
43+
{ MP_ROM_QSTR(MP_QSTR_SENSE), MP_ROM_PTR(&pin_PB03) },
44+
{ MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_PB03) },
45+
46+
{ MP_ROM_QSTR(MP_QSTR_SPEAKER_ENABLE), MP_ROM_PTR(&pin_PB05) },
47+
{ MP_ROM_QSTR(MP_QSTR_CAP_PIN), MP_ROM_PTR(&pin_PA15) },
48+
49+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
50+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
51+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
52+
53+
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}
54+
};
55+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎ports/nrf/common-hal/pulseio/PWMOut.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,9 @@ void common_hal_pulseio_pwmout_deinit(pulseio_pwmout_obj_t* self) {
233233
// Disconnect pin from channel.
234234
pwm->PSEL.OUT[self->channel] = 0xFFFFFFFF;
235235

236+
reset_pin_number(self->pin_number);
237+
self->pin_number = NO_PIN;
238+
236239
for(int i=0; i < CHANNELS_PER_PWM; i++) {
237240
if (self->pwm->PSEL.OUT[i] != 0xFFFFFFFF) {
238241
// Some channel is still being used, so don't disable.

‎tools/preprocess_frozen_modules.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ def copy_and_process(in_dir, out_dir):
3434

3535
# Skip library examples directories.
3636
if Path(root).name in ['examples', 'docs', 'tests']:
37+
del subdirs[:]
3738
continue
3839

3940
for file in files:

0 commit comments

Comments
 (0)
0