forked from micropython/micropython
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2401 from adafruit/4.1.x
merge 4.1.x into 4.x
- Loading branch information
Showing
7 changed files
with
210 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
/* | ||
* This file is part of the MicroPython project, http://micropython.org/ | ||
* | ||
* The MIT License (MIT) | ||
* | ||
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
* THE SOFTWARE. | ||
*/ | ||
|
||
#include "boards/board.h" | ||
#include "mpconfigboard.h" | ||
#include "hal/include/hal_gpio.h" | ||
#include "shared-bindings/busio/SPI.h" | ||
#include "shared-bindings/displayio/FourWire.h" | ||
#include "shared-module/displayio/__init__.h" | ||
#include "shared-module/displayio/mipi_constants.h" | ||
#include "tick.h" | ||
|
||
displayio_fourwire_obj_t board_display_obj; | ||
|
||
#define DELAY 0x80 | ||
|
||
uint8_t display_init_sequence[] = { | ||
0x01, 0 | DELAY, 150, // SWRESET | ||
0x11, 0 | DELAY, 255, // SLPOUT | ||
0x36, 1, 0x00, // _MADCTL bottom to top refresh in vsync aligned order. | ||
0x3a, 1, 0x55, // COLMOD - 16bit color | ||
0x21, 0 | DELAY, 10, // _INVON | ||
0x13, 0 | DELAY, 10, // _NORON | ||
0x29, 0 | DELAY, 255, // _DISPON | ||
}; | ||
|
||
void board_init(void) { | ||
busio_spi_obj_t* spi = &displays[0].fourwire_bus.inline_bus; | ||
common_hal_busio_spi_construct(spi, &pin_PA01, &pin_PA00, NULL); | ||
common_hal_busio_spi_never_reset(spi); | ||
|
||
displayio_fourwire_obj_t* bus = &displays[0].fourwire_bus; | ||
bus->base.type = &displayio_fourwire_type; | ||
common_hal_displayio_fourwire_construct(bus, | ||
spi, | ||
&pin_PB31, // TFT_DC Command or data | ||
&pin_PA27, // TFT_CS Chip select | ||
&pin_PB30, // TFT_RST Reset | ||
60000000); | ||
|
||
displayio_display_obj_t* display = &displays[0].display; | ||
display->base.type = &displayio_display_type; | ||
common_hal_displayio_display_construct(display, | ||
bus, | ||
240, // Width (after rotation) | ||
240, // Height (after rotation) | ||
0, // column start | ||
0, // row start | ||
180, // rotation | ||
16, // Color depth | ||
MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command | ||
MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command | ||
MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command | ||
0x37, // set vertical scroll command | ||
display_init_sequence, | ||
sizeof(display_init_sequence), | ||
&pin_PB14, // backlight pin | ||
1.0f, // brightness (ignored) | ||
true, // auto_brightness | ||
false, // single_byte_bounds | ||
false); // data_as_commands | ||
} | ||
|
||
bool board_requests_safe_mode(void) { | ||
return false; | ||
} | ||
|
||
void reset_board(void) { | ||
} |
39 changes: 39 additions & 0 deletions
39
ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
#define MICROPY_HW_BOARD_NAME "Adafruit Hallowing M4 Express" | ||
#define MICROPY_HW_MCU_NAME "samd51j19" | ||
|
||
#define CIRCUITPY_MCU_FAMILY samd51 | ||
|
||
// Rev C | ||
|
||
#define MICROPY_HW_LED_STATUS (&pin_PA23) | ||
#define MICROPY_HW_NEOPIXEL (&pin_PB16) | ||
|
||
// These are pins not to reset. | ||
// QSPI Data pins | ||
#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11) | ||
// NeoPixel pin, QSPI CS, and QSPI SCK | ||
#define MICROPY_PORT_B (PORT_PB16 | PORT_PB10 | PORT_PB11) | ||
#define MICROPY_PORT_C (0) | ||
#define MICROPY_PORT_D (0) | ||
|
||
#define AUTORESET_DELAY_MS 500 | ||
|
||
// If you change this, then make sure to update the linker scripts as well to | ||
// make sure you don't overwrite code | ||
#define CIRCUITPY_INTERNAL_NVM_SIZE 8192 | ||
|
||
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE) | ||
|
||
#define DEFAULT_I2C_BUS_SCL (&pin_PA13) | ||
#define DEFAULT_I2C_BUS_SDA (&pin_PA12) | ||
|
||
#define DEFAULT_SPI_BUS_SCK (&pin_PA22) | ||
#define DEFAULT_SPI_BUS_MOSI (&pin_PB23) | ||
#define DEFAULT_SPI_BUS_MISO (&pin_PB22) | ||
|
||
#define DEFAULT_UART_BUS_RX (&pin_PB12) | ||
#define DEFAULT_UART_BUS_TX (&pin_PB13) | ||
|
||
// USB is always used internally so skip the pin objects for it. | ||
#define IGNORE_PIN_PA24 1 | ||
#define IGNORE_PIN_PA25 1 |
19 changes: 19 additions & 0 deletions
19
ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.mk
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
LD_FILE = boards/samd51x19-bootloader-external-flash.ld | ||
USB_VID = 0x239A | ||
USB_PID = 0x804A | ||
USB_PRODUCT = "Hallowing M4 Express" | ||
USB_MANUFACTURER = "Adafruit Industries LLC" | ||
|
||
CHIP_VARIANT = SAMD51J19A | ||
CHIP_FAMILY = samd51 | ||
|
||
QSPI_FLASH_FILESYSTEM = 1 | ||
EXTERNAL_FLASH_DEVICE_COUNT = 1 | ||
EXTERNAL_FLASH_DEVICES = GD25Q64C | ||
LONGINT_IMPL = MPZ | ||
|
||
CIRCUITPY_NETWORK = 1 | ||
MICROPY_PY_WIZNET5K = 5500 | ||
CIRCUITPY_PS2IO = 1 | ||
# No touch on SAMD51 yet | ||
CIRCUITPY_TOUCHIO = 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
#include "shared-bindings/board/__init__.h" | ||
|
||
#include "shared-module/displayio/__init__.h" | ||
|
||
STATIC const mp_rom_map_elem_t board_global_dict_table[] = { | ||
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, | ||
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA05) }, | ||
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA06) }, | ||
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PB09) }, | ||
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PB08) }, | ||
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA04) }, | ||
{ MP_ROM_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_PB04) }, | ||
{ MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_PB04) }, | ||
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA22) }, | ||
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB23) }, | ||
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB22) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PB12) }, | ||
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB12) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PB13) }, | ||
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB13) }, | ||
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA12) }, | ||
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA13) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA14) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA16) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA17) }, | ||
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), MP_ROM_PTR(&pin_PB15) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PB15) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA18) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA19) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA20) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA21) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA23) }, | ||
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PB16) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PB16) }, | ||
{ MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_PB01) }, | ||
{ MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_PB01) }, | ||
{ MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_PB01) }, | ||
|
||
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PB02) }, | ||
{ MP_ROM_QSTR(MP_QSTR_EXTERNAL_NEOPIXEL), MP_ROM_PTR(&pin_PB02) }, | ||
{ MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_PB02) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PB03) }, | ||
{ MP_ROM_QSTR(MP_QSTR_SENSE), MP_ROM_PTR(&pin_PB03) }, | ||
{ MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_PB03) }, | ||
|
||
{ MP_ROM_QSTR(MP_QSTR_SPEAKER_ENABLE), MP_ROM_PTR(&pin_PB05) }, | ||
{ MP_ROM_QSTR(MP_QSTR_CAP_PIN), MP_ROM_PTR(&pin_PA15) }, | ||
|
||
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, | ||
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, | ||
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, | ||
|
||
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)} | ||
}; | ||
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters