Merge branch 'main' into esp32-random
This commit is contained in:
commit
a15f948a40
1
.github/workflows/build.yml
vendored
1
.github/workflows/build.yml
vendored
@ -410,6 +410,7 @@ jobs:
|
|||||||
board:
|
board:
|
||||||
- "espressif_saola_1_wroom"
|
- "espressif_saola_1_wroom"
|
||||||
- "espressif_saola_1_wrover"
|
- "espressif_saola_1_wrover"
|
||||||
|
- "microdev_micro_s2"
|
||||||
- "unexpectedmaker_feathers2"
|
- "unexpectedmaker_feathers2"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
4
conf.py
4
conf.py
@ -42,6 +42,9 @@ master_doc = 'docs/index'
|
|||||||
# Grab the JSON values to use while building the module support matrix
|
# Grab the JSON values to use while building the module support matrix
|
||||||
# in 'shared-bindings/index.rst'
|
# in 'shared-bindings/index.rst'
|
||||||
|
|
||||||
|
# The stubs must be built before we calculate the shared bindings matrix
|
||||||
|
subprocess.check_output(["make", "stubs"])
|
||||||
|
|
||||||
#modules_support_matrix = shared_bindings_matrix.support_matrix_excluded_boards()
|
#modules_support_matrix = shared_bindings_matrix.support_matrix_excluded_boards()
|
||||||
modules_support_matrix = shared_bindings_matrix.support_matrix_by_board()
|
modules_support_matrix = shared_bindings_matrix.support_matrix_by_board()
|
||||||
|
|
||||||
@ -77,7 +80,6 @@ source_suffix = {
|
|||||||
'.md': 'markdown',
|
'.md': 'markdown',
|
||||||
}
|
}
|
||||||
|
|
||||||
subprocess.check_output(["make", "stubs"])
|
|
||||||
extensions.append('autoapi.extension')
|
extensions.append('autoapi.extension')
|
||||||
|
|
||||||
autoapi_type = 'python'
|
autoapi_type = 'python'
|
||||||
|
@ -51,10 +51,15 @@ as a natural "TODO" list. An example minimal build list is shown below:
|
|||||||
.. code-block:: makefile
|
.. code-block:: makefile
|
||||||
|
|
||||||
# These modules are implemented in ports/<port>/common-hal:
|
# These modules are implemented in ports/<port>/common-hal:
|
||||||
CIRCUITPY_MICROCONTROLLER = 0 # Typically the first module to create
|
|
||||||
CIRCUITPY_DIGITALIO = 0 # Typically the second module to create
|
# Typically the first module to create
|
||||||
|
CIRCUITPY_MICROCONTROLLER = 0
|
||||||
|
# Typically the second module to create
|
||||||
|
CIRCUITPY_DIGITALIO = 0
|
||||||
|
# Other modules:
|
||||||
CIRCUITPY_ANALOGIO = 0
|
CIRCUITPY_ANALOGIO = 0
|
||||||
CIRCUITPY_BUSIO = 0
|
CIRCUITPY_BUSIO = 0
|
||||||
|
CIRCUITPY_COUNTIO = 0
|
||||||
CIRCUITPY_NEOPIXEL_WRITE = 0
|
CIRCUITPY_NEOPIXEL_WRITE = 0
|
||||||
CIRCUITPY_PULSEIO = 0
|
CIRCUITPY_PULSEIO = 0
|
||||||
CIRCUITPY_OS = 0
|
CIRCUITPY_OS = 0
|
||||||
@ -63,22 +68,34 @@ as a natural "TODO" list. An example minimal build list is shown below:
|
|||||||
CIRCUITPY_AUDIOIO = 0
|
CIRCUITPY_AUDIOIO = 0
|
||||||
CIRCUITPY_ROTARYIO = 0
|
CIRCUITPY_ROTARYIO = 0
|
||||||
CIRCUITPY_RTC = 0
|
CIRCUITPY_RTC = 0
|
||||||
|
CIRCUITPY_SDCARDIO = 0
|
||||||
|
CIRCUITPY_FRAMEBUFFERIO = 0
|
||||||
CIRCUITPY_FREQUENCYIO = 0
|
CIRCUITPY_FREQUENCYIO = 0
|
||||||
CIRCUITPY_I2CPERIPHERAL = 0
|
CIRCUITPY_I2CPERIPHERAL = 0
|
||||||
CIRCUITPY_DISPLAYIO = 0 # Requires SPI, PulseIO (stub ok)
|
# Requires SPI, PulseIO (stub ok):
|
||||||
|
CIRCUITPY_DISPLAYIO = 0
|
||||||
|
|
||||||
# These modules are implemented in shared-module/ - they can be included in
|
# These modules are implemented in shared-module/ - they can be included in
|
||||||
# any port once their prerequisites in common-hal are complete.
|
# any port once their prerequisites in common-hal are complete.
|
||||||
CIRCUITPY_BITBANGIO = 0 # Requires DigitalIO
|
# Requires DigitalIO:
|
||||||
CIRCUITPY_GAMEPAD = 0 # Requires DigitalIO
|
CIRCUITPY_BITBANGIO = 0
|
||||||
CIRCUITPY_PIXELBUF = 0 # Requires neopixel_write or SPI (dotstar)
|
# Requires DigitalIO
|
||||||
CIRCUITPY_RANDOM = 0 # Requires OS
|
CIRCUITPY_GAMEPAD = 0
|
||||||
CIRCUITPY_STORAGE = 0 # Requires OS, filesystem
|
# Requires neopixel_write or SPI (dotstar)
|
||||||
CIRCUITPY_TOUCHIO = 0 # Requires Microcontroller
|
CIRCUITPY_PIXELBUF = 0
|
||||||
CIRCUITPY_USB_HID = 0 # Requires USB
|
# Requires OS
|
||||||
CIRCUITPY_USB_MIDI = 0 # Requires USB
|
CIRCUITPY_RANDOM = 0
|
||||||
CIRCUITPY_REQUIRE_I2C_PULLUPS = 0 # Does nothing without I2C
|
# Requires OS, filesystem
|
||||||
CIRCUITPY_ULAB = 0 # No requirements, but takes extra flash
|
CIRCUITPY_STORAGE = 0
|
||||||
|
# Requires Microcontroller
|
||||||
|
CIRCUITPY_TOUCHIO = 0
|
||||||
|
# Requires USB
|
||||||
|
CIRCUITPY_USB_HID = 0
|
||||||
|
CIRCUITPY_USB_MIDI = 0
|
||||||
|
# Does nothing without I2C
|
||||||
|
CIRCUITPY_REQUIRE_I2C_PULLUPS = 0
|
||||||
|
# No requirements, but takes extra flash
|
||||||
|
CIRCUITPY_ULAB = 0
|
||||||
|
|
||||||
Step 2: Init
|
Step 2: Init
|
||||||
--------------
|
--------------
|
||||||
|
@ -28,6 +28,7 @@ import re
|
|||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
from concurrent.futures import ThreadPoolExecutor
|
||||||
|
|
||||||
SUPPORTED_PORTS = ['atmel-samd', 'esp32s2', 'litex', 'mimxrt10xx', 'nrf', 'stm']
|
SUPPORTED_PORTS = ['atmel-samd', 'esp32s2', 'litex', 'mimxrt10xx', 'nrf', 'stm']
|
||||||
|
|
||||||
@ -42,7 +43,7 @@ def get_circuitpython_root_dir():
|
|||||||
def get_shared_bindings():
|
def get_shared_bindings():
|
||||||
""" Get a list of modules in shared-bindings based on folder names
|
""" Get a list of modules in shared-bindings based on folder names
|
||||||
"""
|
"""
|
||||||
shared_bindings_dir = get_circuitpython_root_dir() / "shared-bindings"
|
shared_bindings_dir = get_circuitpython_root_dir() / "circuitpython-stubs"
|
||||||
return [item.name for item in shared_bindings_dir.iterdir()]
|
return [item.name for item in shared_bindings_dir.iterdir()]
|
||||||
|
|
||||||
|
|
||||||
@ -131,22 +132,24 @@ def lookup_setting(settings, key, default=''):
|
|||||||
key = value[2:-1]
|
key = value[2:-1]
|
||||||
return value
|
return value
|
||||||
|
|
||||||
|
def all_ports_all_boards(ports=SUPPORTED_PORTS):
|
||||||
|
for port in ports:
|
||||||
|
|
||||||
|
port_dir = get_circuitpython_root_dir() / "ports" / port
|
||||||
|
for entry in (port_dir / "boards").iterdir():
|
||||||
|
if not entry.is_dir():
|
||||||
|
continue
|
||||||
|
yield (port, entry)
|
||||||
|
|
||||||
def support_matrix_by_board(use_branded_name=True):
|
def support_matrix_by_board(use_branded_name=True):
|
||||||
""" Compiles a list of the available core modules available for each
|
""" Compiles a list of the available core modules available for each
|
||||||
board.
|
board.
|
||||||
"""
|
"""
|
||||||
base = build_module_map()
|
base = build_module_map()
|
||||||
|
|
||||||
boards = dict()
|
def support_matrix(arg):
|
||||||
for port in SUPPORTED_PORTS:
|
port, entry = arg
|
||||||
|
|
||||||
port_dir = get_circuitpython_root_dir() / "ports" / port
|
port_dir = get_circuitpython_root_dir() / "ports" / port
|
||||||
for entry in (port_dir / "boards").iterdir():
|
|
||||||
if not entry.is_dir():
|
|
||||||
continue
|
|
||||||
board_modules = []
|
|
||||||
board_name = entry.name
|
|
||||||
|
|
||||||
settings = get_settings_from_makefile(str(port_dir), entry.name)
|
settings = get_settings_from_makefile(str(port_dir), entry.name)
|
||||||
|
|
||||||
if use_branded_name:
|
if use_branded_name:
|
||||||
@ -162,7 +165,11 @@ def support_matrix_by_board(use_branded_name=True):
|
|||||||
key = f'CIRCUITPY_{module.upper()}'
|
key = f'CIRCUITPY_{module.upper()}'
|
||||||
if int(lookup_setting(settings, key, '0')):
|
if int(lookup_setting(settings, key, '0')):
|
||||||
board_modules.append(base[module]['name'])
|
board_modules.append(base[module]['name'])
|
||||||
boards[board_name] = sorted(board_modules)
|
|
||||||
|
return (board_name, sorted(board_modules))
|
||||||
|
|
||||||
|
executor = ThreadPoolExecutor(max_workers=os.cpu_count())
|
||||||
|
boards = dict(sorted(executor.map(support_matrix, all_ports_all_boards())))
|
||||||
|
|
||||||
#print(json.dumps(boards, indent=2))
|
#print(json.dumps(boards, indent=2))
|
||||||
return boards
|
return boards
|
||||||
|
@ -113,6 +113,8 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
|
|||||||
start = mp_hal_ticks_ms();
|
start = mp_hal_ticks_ms();
|
||||||
mp_call_function_0(module_fun);
|
mp_call_function_0(module_fun);
|
||||||
mp_hal_set_interrupt_char(-1); // disable interrupt
|
mp_hal_set_interrupt_char(-1); // disable interrupt
|
||||||
|
// Handle any ctrl-c interrupt that arrived just in time
|
||||||
|
mp_handle_pending();
|
||||||
nlr_pop();
|
nlr_pop();
|
||||||
ret = 0;
|
ret = 0;
|
||||||
if (exec_flags & EXEC_FLAG_PRINT_EOF) {
|
if (exec_flags & EXEC_FLAG_PRINT_EOF) {
|
||||||
|
56
ports/esp32s2/boards/microdev_micro_s2/board.c
Normal file
56
ports/esp32s2/boards/microdev_micro_s2/board.c
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of the MicroPython project, http://micropython.org/
|
||||||
|
*
|
||||||
|
* The MIT License (MIT)
|
||||||
|
*
|
||||||
|
* Copyright (c) 2020 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 "shared-bindings/microcontroller/Pin.h"
|
||||||
|
|
||||||
|
void board_init(void) {
|
||||||
|
// USB
|
||||||
|
common_hal_never_reset_pin(&pin_GPIO19);
|
||||||
|
common_hal_never_reset_pin(&pin_GPIO20);
|
||||||
|
|
||||||
|
// Debug UART
|
||||||
|
common_hal_never_reset_pin(&pin_GPIO43);
|
||||||
|
common_hal_never_reset_pin(&pin_GPIO44);
|
||||||
|
|
||||||
|
// SPI Flash and RAM
|
||||||
|
common_hal_never_reset_pin(&pin_GPIO26);
|
||||||
|
common_hal_never_reset_pin(&pin_GPIO27);
|
||||||
|
common_hal_never_reset_pin(&pin_GPIO28);
|
||||||
|
common_hal_never_reset_pin(&pin_GPIO29);
|
||||||
|
common_hal_never_reset_pin(&pin_GPIO30);
|
||||||
|
common_hal_never_reset_pin(&pin_GPIO31);
|
||||||
|
common_hal_never_reset_pin(&pin_GPIO32);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool board_requests_safe_mode(void) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void reset_board(void) {
|
||||||
|
|
||||||
|
}
|
35
ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
Normal file
35
ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of the MicroPython project, http://micropython.org/
|
||||||
|
*
|
||||||
|
* The MIT License (MIT)
|
||||||
|
*
|
||||||
|
* Copyright (c) 2019 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
//Micropython setup
|
||||||
|
|
||||||
|
#define MICROPY_HW_BOARD_NAME "microDev microS2"
|
||||||
|
#define MICROPY_HW_MCU_NAME "ESP32S2"
|
||||||
|
|
||||||
|
#define MICROPY_HW_LED (&pin_GPIO21)
|
||||||
|
#define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
|
||||||
|
|
||||||
|
#define AUTORESET_DELAY_MS 500
|
15
ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.mk
Normal file
15
ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.mk
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
USB_VID = 0x239A
|
||||||
|
USB_PID = 0x80C6
|
||||||
|
USB_PRODUCT = "microS2"
|
||||||
|
USB_MANUFACTURER = "microDev"
|
||||||
|
|
||||||
|
INTERNAL_FLASH_FILESYSTEM = 1
|
||||||
|
LONGINT_IMPL = MPZ
|
||||||
|
|
||||||
|
# The default queue depth of 16 overflows on release builds,
|
||||||
|
# so increase it to 32.
|
||||||
|
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
|
||||||
|
|
||||||
|
CIRCUITPY_ESP_FLASH_MODE=qio
|
||||||
|
CIRCUITPY_ESP_FLASH_FREQ=40m
|
||||||
|
CIRCUITPY_ESP_FLASH_SIZE=16MB
|
49
ports/esp32s2/boards/microdev_micro_s2/pins.c
Normal file
49
ports/esp32s2/boards/microdev_micro_s2/pins.c
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
#include "shared-bindings/board/__init__.h"
|
||||||
|
|
||||||
|
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
|
||||||
|
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
|
||||||
|
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO21) },
|
||||||
|
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO33) },
|
||||||
|
};
|
||||||
|
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
|
35
ports/esp32s2/boards/microdev_micro_s2/sdkconfig
Normal file
35
ports/esp32s2/boards/microdev_micro_s2/sdkconfig
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
|
||||||
|
|
||||||
|
#
|
||||||
|
# SPI RAM config
|
||||||
|
#
|
||||||
|
# CONFIG_SPIRAM_TYPE_AUTO is not set
|
||||||
|
# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
|
||||||
|
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
|
||||||
|
CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
|
||||||
|
CONFIG_SPIRAM_SIZE=8388608
|
||||||
|
|
||||||
|
#
|
||||||
|
# PSRAM clock and cs IO for ESP32S2
|
||||||
|
#
|
||||||
|
CONFIG_DEFAULT_PSRAM_CLK_IO=30
|
||||||
|
CONFIG_DEFAULT_PSRAM_CS_IO=26
|
||||||
|
# end of PSRAM clock and cs IO for ESP32S2
|
||||||
|
|
||||||
|
CONFIG_SPIRAM_SPIWP_SD3_PIN=28
|
||||||
|
# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
|
||||||
|
# CONFIG_SPIRAM_RODATA is not set
|
||||||
|
# CONFIG_SPIRAM_USE_AHB_DBUS3 is not set
|
||||||
|
# CONFIG_SPIRAM_SPEED_80M is not set
|
||||||
|
CONFIG_SPIRAM_SPEED_40M=y
|
||||||
|
# CONFIG_SPIRAM_SPEED_26M is not set
|
||||||
|
# CONFIG_SPIRAM_SPEED_20M is not set
|
||||||
|
CONFIG_SPIRAM=y
|
||||||
|
CONFIG_SPIRAM_BOOT_INIT=y
|
||||||
|
# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
|
||||||
|
CONFIG_SPIRAM_USE_MEMMAP=y
|
||||||
|
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
|
||||||
|
# CONFIG_SPIRAM_USE_MALLOC is not set
|
||||||
|
CONFIG_SPIRAM_MEMTEST=y
|
||||||
|
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
|
||||||
|
# end of SPI RAM config
|
@ -25,7 +25,9 @@ CIRCUITPY_COUNTIO = 0
|
|||||||
|
|
||||||
# These modules are implemented in shared-module/ - they can be included in
|
# These modules are implemented in shared-module/ - they can be included in
|
||||||
# any port once their prerequisites in common-hal are complete.
|
# any port once their prerequisites in common-hal are complete.
|
||||||
CIRCUITPY_USB_MIDI = 0 # Requires USB
|
# Requires USB
|
||||||
CIRCUITPY_ULAB = 0 # No requirements, but takes extra flash
|
CIRCUITPY_USB_MIDI = 0
|
||||||
|
# Too large for the partition table!
|
||||||
|
CIRCUITPY_ULAB = 0
|
||||||
|
|
||||||
CIRCUITPY_MODULE ?= none
|
CIRCUITPY_MODULE ?= none
|
||||||
|
@ -10,7 +10,8 @@ MCU_VARIANT = STM32F401xE
|
|||||||
MCU_PACKAGE = UFQFPN48
|
MCU_PACKAGE = UFQFPN48
|
||||||
|
|
||||||
LD_COMMON = boards/common_default.ld
|
LD_COMMON = boards/common_default.ld
|
||||||
LD_FILE = boards/STM32F401xd_fs.ld # use for internal flash
|
# use for internal flash
|
||||||
|
LD_FILE = boards/STM32F401xd_fs.ld
|
||||||
|
|
||||||
# Disable ulab as we're nearly out of space on this board due to
|
# Disable ulab as we're nearly out of space on this board due to
|
||||||
# INTERNAL_FLASH_FILESYSTEM. It can probably be reenabled if we enable
|
# INTERNAL_FLASH_FILESYSTEM. It can probably be reenabled if we enable
|
||||||
|
@ -13,5 +13,6 @@ MCU_PACKAGE = LQFP64
|
|||||||
|
|
||||||
LD_COMMON = boards/common_default.ld
|
LD_COMMON = boards/common_default.ld
|
||||||
LD_DEFAULT = boards/STM32F405_default.ld
|
LD_DEFAULT = boards/STM32F405_default.ld
|
||||||
LD_BOOT = boards/STM32F405_boot.ld # UF2 boot option
|
# UF2 boot option
|
||||||
|
LD_BOOT = boards/STM32F405_boot.ld
|
||||||
UF2_OFFSET = 0x8010000
|
UF2_OFFSET = 0x8010000
|
||||||
|
@ -18,4 +18,5 @@ OPTIMIZATION_FLAGS = -Os
|
|||||||
|
|
||||||
LD_COMMON = boards/common_default.ld
|
LD_COMMON = boards/common_default.ld
|
||||||
LD_FILE = boards/STM32F401xe_boot.ld
|
LD_FILE = boards/STM32F401xe_boot.ld
|
||||||
# LD_FILE = boards/STM32F401xe_fs.ld # use for internal flash
|
# use for internal flash
|
||||||
|
# LD_FILE = boards/STM32F401xe_fs.ld
|
||||||
|
2
py/obj.c
2
py/obj.c
@ -67,6 +67,8 @@ void mp_obj_print_helper(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
|
|||||||
#ifdef RUN_BACKGROUND_TASKS
|
#ifdef RUN_BACKGROUND_TASKS
|
||||||
RUN_BACKGROUND_TASKS;
|
RUN_BACKGROUND_TASKS;
|
||||||
#endif
|
#endif
|
||||||
|
mp_handle_pending();
|
||||||
|
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
if (o_in == MP_OBJ_NULL) {
|
if (o_in == MP_OBJ_NULL) {
|
||||||
mp_print_str(print, "(nil)");
|
mp_print_str(print, "(nil)");
|
||||||
|
@ -29,14 +29,24 @@
|
|||||||
#include "supervisor/serial.h"
|
#include "supervisor/serial.h"
|
||||||
#include "lib/oofatfs/ff.h"
|
#include "lib/oofatfs/ff.h"
|
||||||
#include "py/mpconfig.h"
|
#include "py/mpconfig.h"
|
||||||
|
#include "py/mpstate.h"
|
||||||
|
#include "py/runtime.h"
|
||||||
|
|
||||||
#include "supervisor/shared/status_leds.h"
|
#include "supervisor/shared/status_leds.h"
|
||||||
|
|
||||||
|
#if CIRCUITPY_WATCHDOG
|
||||||
|
#include "shared-bindings/watchdog/__init__.h"
|
||||||
|
#define WATCHDOG_EXCEPTION_CHECK() (MP_STATE_VM(mp_pending_exception) == &mp_watchdog_timeout_exception)
|
||||||
|
#else
|
||||||
|
#define WATCHDOG_EXCEPTION_CHECK() 0
|
||||||
|
#endif
|
||||||
|
|
||||||
int mp_hal_stdin_rx_chr(void) {
|
int mp_hal_stdin_rx_chr(void) {
|
||||||
for (;;) {
|
for (;;) {
|
||||||
#ifdef MICROPY_VM_HOOK_LOOP
|
#ifdef MICROPY_VM_HOOK_LOOP
|
||||||
MICROPY_VM_HOOK_LOOP
|
MICROPY_VM_HOOK_LOOP
|
||||||
#endif
|
#endif
|
||||||
|
mp_handle_pending();
|
||||||
if (serial_bytes_available()) {
|
if (serial_bytes_available()) {
|
||||||
toggle_rx_led();
|
toggle_rx_led();
|
||||||
return serial_read();
|
return serial_read();
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
#include "supervisor/shared/tick.h"
|
#include "supervisor/shared/tick.h"
|
||||||
|
|
||||||
#include "py/mpstate.h"
|
#include "py/mpstate.h"
|
||||||
|
#include "py/runtime.h"
|
||||||
#include "supervisor/linker.h"
|
#include "supervisor/linker.h"
|
||||||
#include "supervisor/filesystem.h"
|
#include "supervisor/filesystem.h"
|
||||||
#include "supervisor/background_callback.h"
|
#include "supervisor/background_callback.h"
|
||||||
@ -149,17 +150,7 @@ void mp_hal_delay_ms(mp_uint_t delay) {
|
|||||||
while (remaining > 0) {
|
while (remaining > 0) {
|
||||||
RUN_BACKGROUND_TASKS;
|
RUN_BACKGROUND_TASKS;
|
||||||
// Check to see if we've been CTRL-Ced by autoreload or the user.
|
// Check to see if we've been CTRL-Ced by autoreload or the user.
|
||||||
if(MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)))
|
mp_handle_pending();
|
||||||
{
|
|
||||||
// clear exception and generate stacktrace
|
|
||||||
MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
|
|
||||||
nlr_raise(&MP_STATE_VM(mp_kbd_exception));
|
|
||||||
}
|
|
||||||
if( MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception)) ||
|
|
||||||
WATCHDOG_EXCEPTION_CHECK()) {
|
|
||||||
// stop sleeping immediately
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
remaining = end_tick - port_get_raw_ticks(NULL);
|
remaining = end_tick - port_get_raw_ticks(NULL);
|
||||||
// We break a bit early so we don't risk setting the alarm before the time when we call
|
// We break a bit early so we don't risk setting the alarm before the time when we call
|
||||||
// sleep.
|
// sleep.
|
||||||
|
31
tools/mpconfig_category_reader.py
Normal file
31
tools/mpconfig_category_reader.py
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
filepath = '../py/circuitpy_mpconfig.mk'
|
||||||
|
with open(filepath) as fp:
|
||||||
|
line = fp.readline()
|
||||||
|
cnt = 1
|
||||||
|
fullbuild = []
|
||||||
|
defon = []
|
||||||
|
defoff = []
|
||||||
|
while line:
|
||||||
|
wordlist = line.split()
|
||||||
|
if wordlist:
|
||||||
|
if wordlist[-1] == "$(CIRCUITPY_FULL_BUILD)":
|
||||||
|
fullbuild.append(wordlist[0])
|
||||||
|
elif wordlist[-1] == "0":
|
||||||
|
defoff.append(wordlist[0])
|
||||||
|
elif wordlist[-1] == "1":
|
||||||
|
defon.append(wordlist[0])
|
||||||
|
line = fp.readline()
|
||||||
|
cnt += 1
|
||||||
|
|
||||||
|
print(str(cnt) + " Lines Read\n")
|
||||||
|
print("\nFULL BUILDS ------------------------")
|
||||||
|
for string in fullbuild:
|
||||||
|
print(string)
|
||||||
|
|
||||||
|
print("\nON BUILDS ------------------------")
|
||||||
|
for string in defon:
|
||||||
|
print(string)
|
||||||
|
|
||||||
|
print("\nOFF BUILDS ------------------------")
|
||||||
|
for string in defoff:
|
||||||
|
print(string)
|
Loading…
Reference in New Issue
Block a user