dfb61f01db
Support for Xtensa emitter and assembler, and upgraded F4 and F7 STM HAL This release adds support for the Xtensa architecture as a target for the native emitter, as well as Xtensa inline assembler. The int.from_bytes and int.to_bytes methods now require a second argument (the byte order) per CPython (only "little" is supported at this time). The "readall" method has been removed from all stream classes that used it; "read" with no arguments should be used instead. There is now support for importing packages from compiled .mpy files. Test coverage is increased to 96%. The generic I2C driver has improvements: configurable clock stretching timeout, "stop" argument added to readfrom/writeto methods, "nack" argument added to readinto, and write[to] now returns num of ACKs received. The framebuf module now handles 16-bit depth (generic colour format) and has hline, vline, rect, line methods. A new utimeq module is added for efficient queue ordering defined by modulo time (to be compatible with time.ticks_xxx functions). The pyboard.py script has been modified so that the target board is not reset between scripts or commands that are given on a single command line. For the stmhal port the STM Cube HAL has been upgraded: Cube F4 HAL to v1.13.1 (CMSIS 2.5.1, HAL v1.5.2) and Cube F7 HAL to v1.1.2. There is a more robust pyb.I2C implementation (DMA is now disabled by default, can be enabled via an option), and there is an implementation of machine.I2C with robust error handling and hardware acceleration on F4 MCUs. It is now recommended to use machine.I2C instead of pyb.I2C. The UART class is now more robust with better handling of errors/timeouts. There is also more accurate VBAT and VREFINT measurements for the ADC. New boards that are supported include: NUCLEO_F767ZI, STM32F769DISC and NUCLEO_L476RG. For the esp8266 port select/poll is now supported for sockets using the uselect module. There is support for native and viper emitters, as well as an inline assembler (with limited iRAM for storage of native functions, or the option to store code to flash). There is improved software I2C with a slight API change: scl/sda pins can be specified as positional only when "-1" is passed as the first argument to indicate the use of software I2C. It is recommended to use keyword arguments for scl/sda. There is very early support for over-the-air (OTA) updates using the yaota8266 project. A detailed list of changes follows. py core: - emitnative: fix native import emitter when in viper mode - remove readall() method, which is equivalent to read() w/o args - objexcept: allow clearing traceback with 'exc.__traceback__ = None' - runtime: mp_resume: handle exceptions in Python __next__() - mkrules.mk: rework find command so it works on OSX - *.mk: replace uses of 'sed' with $(SED) - parse: move function to check for const parse node to parse.[ch] - parse: make mp_parse_node_new_leaf an inline function - parse: add code to fold logical constants in or/and/not operations - factor persistent code load/save funcs into persistentcode.[ch] - factor out persistent-code reader into separate files - lexer: rewrite mp_lexer_new_from_str_len in terms of mp_reader_mem - lexer: provide generic mp_lexer_new_from_file based on mp_reader - lexer: rewrite mp_lexer_new_from_fd in terms of mp_reader - lexer: make lexer use an mp_reader as its source - objtype: implement __call__ handling for an instance w/o heap alloc - factor out common code from assemblers into asmbase.[ch] - stream: move ad-hoc ioctl constants to stream.h and rename them - compile: simplify configuration of native emitter - emit.h: remove long-obsolete declarations for cpython emitter - move arch-specific assembler macros from emitnative to asmXXX.h - asmbase: add MP_PLAT_COMMIT_EXEC option for handling exec code - asmxtensa: add low-level Xtensa assembler - integrate Xtensa assembler into native emitter - allow inline-assembler emitter to be generic - add inline Xtensa assembler - emitinline: embed entire asm struct instead of a pointer to it - emitinline: move inline-asm align and data methods to compiler - emitinline: move common code for end of final pass to compiler - asm: remove need for dummy_data when doing initial assembler passes - objint: from_bytes, to_bytes: require byteorder arg, require "little" - binary: do zero extension when storing a value larger than word size - builtinimport: support importing packages from compiled .mpy files - mpz: remove unreachable code in mpn_or_neg functions - runtime: zero out fs_user_mount array in mp_init - mpconfig.h: enable MICROPY_PY_SYS_EXIT by default - add MICROPY_KBD_EXCEPTION config option to provide mp_kbd_exception - compile: add an extra pass for Xtensa inline assembler - modbuiltins: remove unreachable code - objint: rename mp_obj_int_as_float to mp_obj_int_as_float_impl - emitglue: refactor to remove assert(0), to improve coverage - lexer: remove unreachable code in string tokeniser - lexer: remove unnecessary check for EOF in lexer's next_char func - lexer: permanently disable the mp_lexer_show_token function - parsenum: simplify and generalise decoding of digit values - mpz: fix assertion in mpz_set_from_str which checks value of base - mpprint: add assertion for, and comment about, valid base values - objint: simplify mp_int_format_size and remove unreachable code - unicode: comment-out unused function unichar_isprint - consistently update signatures of .make_new and .call methods - mkrules.mk: add MPY_CROSS_FLAGS option to pass flags to mpy-cross - builtinimport: fix bug when importing names from frozen packages extmod: - machine_i2c: make the clock stretching timeout configurable - machine_i2c: raise an error when clock stretching times out - machine_i2c: release SDA on bus error - machine_i2c: add a C-level I2C-protocol, refactoring soft I2C - machine_i2c: add argument to C funcs to control stop generation - machine_i2c: rewrite i2c.scan in terms of C-level protocol - machine_i2c: rewrite mem xfer funcs in terms of C-level protocol - machine_i2c: remove unneeded i2c_write_mem/i2c_read_mem funcs - machine_i2c: make C-level functions return -errno on I2C error - machine_i2c: add 'nack' argument to i2c.readinto - machine_i2c: make i2c.write[to] methods return num of ACKs recvd - machine_i2c: add 'stop' argument to i2c readfrom/writeto meths - machine_i2c: remove trivial function wrappers - machine_i2c: expose soft I2C obj and readfrom/writeto funcs - machine_i2c: add hook to constructor to call port-specific code - modurandom: allow to build with float disabled - modframebuf: make FrameBuffer handle 16bit depth - modframebuf: add back legacy FrameBuffer1 "class" - modframebuf: optimise fill and fill_rect methods - vfs_fat: implement POSIX behaviour of rename, allow to overwrite - moduselect: use stream helper function instead of ad-hoc code - moduselect: use configurable EVENT_POLL_HOOK instead of WFI - modlwip: add ioctl method to socket, with poll implementation - vfs_fat_file: allow file obj to respond to ioctl flush request - modbtree: add method to sync the database - modbtree: rename "sync" method to "flush" for consistency - modframebuf: add hline, vline, rect and line methods - machine_spi: provide reusable software SPI class - modframebuf: make framebuf implement the buffer protocol - modframebuf: store underlying buffer object to prevent GC free - modutimeq: copy of current moduheapq with timeq support for refactoring - modutimeq: refactor into optimized class - modutimeq: make time_less_than be actually "less than", not less/eq lib: - utils/interrupt_char: use core-provided mp_kbd_exception if enabled drivers: - display/ssd1306.py: update to use FrameBuffer not FrameBuffer1 - onewire: enable pull up on data pin - onewire/ds18x20: fix negative temperature calc for DS18B20 tools: - tinytest-codegen: blacklist recently added uheapq_timeq test (qemu-arm) - pyboard.py: refactor so target is not reset between scripts/cmd - mpy-tool.py: add support for OPT_CACHE_MAP_LOOKUP_IN_BYTECODE tests: - micropython: add test for import from within viper function - use read() instead of readall() - basics: add test for logical constant folding - micropython: add test for creating traceback without allocation - micropython: move alloc-less traceback test to separate test file - extmod: improve ujson coverage - basics: improve user class coverage - basics: add test for dict.fromkeys where arg is a generator - basics: add tests for if-expressions - basics: change dict_fromkeys test so it doesn't use generators - basics: enable tests for list slice getting with 3rd arg - extmod/vfs_fat_fileio: add test for constructor of FileIO type - extmod/btree1: exercise btree.flush() - extmod/framebuf1: add basics tests for hline, vline, rect, line - update for required byteorder arg for int.from_bytes()/to_bytes() - extmod: improve moductypes test coverage - extmod: improve modframebuf test coverage - micropython: get heapalloc_traceback test running on baremetal - struct*: make skippable - basics: improve mpz test coverage - float/builtin_float_round: test round() with second arg - basics/builtin_dir: add test for dir() of a type - basics: add test for builtin locals() - basics/set_pop: improve coverage of set functions - run-tests: for REPL tests make sure the REPL is exited at the end - basics: improve test coverage for generators - import: add a test which uses ... in from-import statement - add tests to improve coverage of runtime.c - add tests to improve coverage of objarray.c - extmod: add test for utimeq module - basics/lexer: add a test for newline-escaping within a string - add a coverage test for printing the parse-tree - utimeq_stable: test for partial stability of utimeq queuing - heapalloc_inst_call: test for no alloc for simple object calls - basics: add tests for parsing of ints with base 36 - basics: add tests to improve coverage of binary.c - micropython: add test for micropython.stack_use() function - extmod: improve ubinascii.c test coverage - thread: improve modthread.c test coverage - cmdline: improve repl.c autocomplete test coverage - unix: improve runtime_utils.c test coverage - pyb/uart: update test to match recent change to UART timeout_char - run-tests: allow to skip set tests - improve warning.c test coverage - float: improve formatfloat.c test coverage using Python - unix: improve formatfloat.c test coverage using C - unix/extra_coverage: add basic tests to import frozen str and mpy - types1: split out set type test to set_types - array: allow to skip test if "array" is unavailable - unix/extra_coverage: add tests for importing frozen packages unix port: - rename define for unix moduselect to MICROPY_PY_USELECT_POSIX - Makefile: update freedos target for change of USELECT config name - enable utimeq module - main: allow to print the parse tree in coverage build - Makefile: make "coverage_test" target mirror Travis test actions - moduselect: if file object passed to .register(), return it in .poll() - Makefile: split long line for coverage target, easier to modify - enable and add basic frozen str and frozen mpy in coverage build - Makefile: allow cache-map-lookup optimisation with frozen bytecode windows port: - enable READER_POSIX to get access to lexer_new_from_file stmhal port: - dma: de-init the DMA peripheral properly before initialising - i2c: add option to I2C to enable/disable use of DMA transfers - i2c: reset the I2C peripheral if there was an error on the bus - rename mp_hal_pin_set_af to _config_alt, to simplify alt config - upgrade to STM32CubeF4 v1.13.0 - CMSIS/Device 2.5.1 - upgrade to STM32CubeF4 v1.13.0 - HAL v1.5.1 - apply STM32CubeF4 v1.13.1 patch - upgrade HAL driver to v1.5.2 - hal/i2c: reapply HAL commitea040a4
for f4 - hal/sd: reapply HAL commit1d7fb82
for f4 - hal: reapply HAL commit9db719b
for f4 - hal/rcc: reapply HAL commitc568a2b
for f4 - hal/sd: reapply HAL commit09de030
for f4 - boards: configure all F4 boards to work with new HAL - make-stmconst.py: fix regex's to work with current CMSIS - i2c: handle I2C IRQs - dma: precalculate register base and bitshift on handle init - dma: mark DMA sate as READY even if HAL_DMA_Init is skipped - can: clear FIFO flags in IRQ handler - i2c: provide custom IRQ handlers - hal: do not include <stdio.h> in HAL headers - mphalport.h: use single GPIOx->BSRR register - make-stmconst.py: add support for files with invalid utf8 bytes - update HALCOMMITS due to change to hal - make-stmconst.py: restore Python 2 compatibility - update HALCOMMITS due to change to hal - moduselect: move to extmod/ for reuse by other ports - i2c: use the HAL's I2C IRQ handler for F7 and L4 MCUs - updates to get F411 MCUs compiling with latest ST HAL - i2c: remove use of legacy I2C_NOSTRETCH_DISABLED option - add beginnings of port-specific machine.I2C implementation - i2c: add support for I2C4 hardware block on F7 MCUs - i2c: expose the pyb_i2c_obj_t struct and some relevant functions - machine_i2c: provide HW implementation of I2C peripherals for F4 - add support for flash storage on STM32F415 - add back GPIO_BSRRL and GPIO_BSRRH constants to stm module - add OpenOCD configuration for STM32L4 - add address parameters to openocd config files - adc: add "mask" selection parameter to pyb.ADCAll constructor - adc: provide more accurate measure of VBAT and VREFINT - adc: make ADCAll.read_core_temp return accurate float value - adc: add ADCAll.read_vref method, returning "3.3v" value - adc: add support for F767 MCU - adc: make channel "16" always map to the temperature sensor - sdcard: clean/invalidate cache before DMA transfers with SD card - moduos: implement POSIX behaviour of rename, allow to overwrite - adc: use constants from new HAL version - refactor UART configuration to use pin objects - uart: add support for UART7 and UART8 on F7 MCUs - uart: add check that UART id is valid for the given board - cmsis: update STM32F7 CMSIS device include files to V1.1.2 - hal: update ST32CubeF7 HAL files to V1.1.2 - port of f4 hal commitc568a2b
to updated f7 hal - port of f4 hal commit09de030
to updated f7 hal - port of f4 hal commit1d7fb82
to updated f7 hal - declare and initialise PrescTables for F7 MCUs - boards/STM32F7DISC: define LSE_STARTUP_TIMEOUT - hal: update HALCOMMITS due to change in f7 hal files - refactor to use extmod implementation of software SPI class - cmsis: add CMSIS file stm32f767xx.h, V1.1.2 - add NUCLEO_F767ZI board, with openocd config for stm32f7 - cmsis: add CMSIS file stm32f769xx.h, V1.1.2 - add STM32F769DISC board files - move PY_SYS_PLATFORM config from board to general config file - mpconfigport: add weak-module links for io, collections, random - rename mp_const_vcp_interrupt to mp_kbd_exception - usb: always use the mp_kbd_exception object for VCP interrupt - use core-provided keyboard exception object - led: properly initialise timer handle to zero before using it - mphalport.h: explicitly use HAL's GPIO constants for pull modes - usrsw: use mp_hal_pin_config function instead of HAL_GPIO_Init - led: use mp_hal_pin_config function instead of HAL_GPIO_Init - sdcard: use mp_hal_pin_config function instead of HAL_GPIO_Init - add support for STM32 Nucleo64 L476RG - uart: provide a custom function to transmit over UART - uart: increase inter-character timeout by 1ms - enable utimeq module cc3200 port: - tools/smoke.py: change readall() to read() - pybspi: remove static mode=SPI.MASTER parameter for latest HW API - mods/pybspi: remove SPI.MASTER constant, it's no longer needed - update for moduselect moved to extmod/ - re-add support for UART REPL (MICROPY_STDIO_UART setting) - enable UART REPL by default - README: (re)add information about accessing REPL on serial - make: rename "deploy" target to "deploy-ota" - add targets to erase flash, deploy firmware using cc3200tool - README: reorganize and update to the current state of affairs - modwlan: add network.WLAN.print_ver() diagnostic function esp8266 port: - enable uselect module - move websocket_helper.py from scripts to modules for frozen BC - refactor to use extmod implementation of software SPI class - mpconfigport_512k: disable framebuf module for 512k build - enable native emitter for Xtensa arch - enable inline Xtensa assembler - add "ota" target to produce firmware binary for use with yaota8266 - use core-provided keyboard exception object - add "erase" target to Makefile, to erase entire flash - when doing GC be sure to trace the memory holding native code - modesp: flash_user_start(): support configuration with yaota8266 - force relinking OTA firmware image if built after normal one - scripts/inisetup: dump FS starting sector/size on error - Makefile: produce OTA firmware as firmware-ota.bin - modesp: make check_fw() work with OTA firmware - enable utimeq module - Makefile: put firmware-ota.bin in build/, for consistency - modules/flashbdev: add RESERVED_SECS before the filesystem - modules/flashbdev: remove code to patch bootloader flash size - modules/flashbdev: remove now-unused function set_bl_flash_size - modules/flashbdev: change RESERVED_SECS to 0 zephyr port: - add .gitignore to ignore Zephyr's "outdir" directory - zephyr_getchar: update to Zephyr 1.6 unified kernel API - switch to Zephyr 1.6 unified kernel API - support raw REPL - implement soft reset feature - main: initialize sys.path and sys.argv - use core-provided keyboard exception object - uart_core: access console UART directly instead of printk() hack - enable slice subscription docs: - remove references to readall() and update stream read() docs - library/index: elaborate on u-modules - library/machine.I2C: refine definitions of I2C methods - library/pyb.Accel: add hardware note about pins used by accel - library/pyb.UART: added clarification about timeouts - library/pyb.UART: moved writechar doc to sit with other writes - esp8266/tutorial: update intro to add Getting the firmware section - library/machine.I2C: fix I2C constructor docs to match impl - esp8266/tutorial: close socket after reading page content - esp8266/general: add "Scarcity of runtime resources" section - library/esp: document esp.set_native_code_location() function - library/esp: remove para and add further warning about flash - usocket: clarify that socket timeout raises OSError exception travis: - build STM32 F7 and L4 boards under Travis CI - include persistent bytecode with floats in coverage tests examples: - hwapi: button_led: Add GPIO pin read example - hwapi: add soft_pwm example converted to uasyncio - http_client: use read() instead of readall() - hwapi: add uasyncio example of fading 2 LEDs in parallel - hwapi: add example for machine.time_pulse_us() - hwapi: add hwconfig for console tracing of LED operations - accellog.py: change 1: to /sd/, and update comment about FS - hwapi/hwconfig_console: don't alloc memory in value()
643 lines
19 KiB
C
643 lines
19 KiB
C
/*
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
*
|
|
* 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 <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "py/nlr.h"
|
|
#include "py/lexer.h"
|
|
#include "py/parse.h"
|
|
#include "py/obj.h"
|
|
#include "py/runtime.h"
|
|
#include "py/stackctrl.h"
|
|
#include "py/gc.h"
|
|
#include "py/mphal.h"
|
|
|
|
#include "lib/utils/pyexec.h"
|
|
#include "lib/fatfs/ff.h"
|
|
#include "extmod/fsusermount.h"
|
|
|
|
#include "systick.h"
|
|
#include "pendsv.h"
|
|
#include "gccollect.h"
|
|
#include "readline.h"
|
|
#include "modmachine.h"
|
|
#include "i2c.h"
|
|
#include "spi.h"
|
|
#include "uart.h"
|
|
#include "timer.h"
|
|
#include "led.h"
|
|
#include "pin.h"
|
|
#include "extint.h"
|
|
#include "usrsw.h"
|
|
#include "usb.h"
|
|
#include "rtc.h"
|
|
#include "storage.h"
|
|
#include "sdcard.h"
|
|
#include "rng.h"
|
|
#include "accel.h"
|
|
#include "servo.h"
|
|
#include "dac.h"
|
|
#include "can.h"
|
|
#include "modnetwork.h"
|
|
|
|
void SystemClock_Config(void);
|
|
|
|
fs_user_mount_t fs_user_mount_flash;
|
|
|
|
void flash_error(int n) {
|
|
for (int i = 0; i < n; i++) {
|
|
led_state(PYB_LED_R1, 1);
|
|
led_state(PYB_LED_R2, 0);
|
|
HAL_Delay(250);
|
|
led_state(PYB_LED_R1, 0);
|
|
led_state(PYB_LED_R2, 1);
|
|
HAL_Delay(250);
|
|
}
|
|
led_state(PYB_LED_R2, 0);
|
|
}
|
|
|
|
void NORETURN __fatal_error(const char *msg) {
|
|
for (volatile uint delay = 0; delay < 10000000; delay++) {
|
|
}
|
|
led_state(1, 1);
|
|
led_state(2, 1);
|
|
led_state(3, 1);
|
|
led_state(4, 1);
|
|
mp_hal_stdout_tx_strn("\nFATAL ERROR:\n", 14);
|
|
mp_hal_stdout_tx_strn(msg, strlen(msg));
|
|
for (uint i = 0;;) {
|
|
led_toggle(((i++) & 3) + 1);
|
|
for (volatile uint delay = 0; delay < 10000000; delay++) {
|
|
}
|
|
if (i >= 16) {
|
|
// to conserve power
|
|
__WFI();
|
|
}
|
|
}
|
|
}
|
|
|
|
void nlr_jump_fail(void *val) {
|
|
printf("FATAL: uncaught exception %p\n", val);
|
|
mp_obj_print_exception(&mp_plat_print, (mp_obj_t)val);
|
|
__fatal_error("");
|
|
}
|
|
|
|
#ifndef NDEBUG
|
|
void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
|
|
(void)func;
|
|
printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
|
|
__fatal_error("");
|
|
}
|
|
#endif
|
|
|
|
STATIC mp_obj_t pyb_main(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
|
|
static const mp_arg_t allowed_args[] = {
|
|
{ MP_QSTR_opt, MP_ARG_INT, {.u_int = 0} }
|
|
};
|
|
|
|
if (MP_OBJ_IS_STR(pos_args[0])) {
|
|
MP_STATE_PORT(pyb_config_main) = pos_args[0];
|
|
|
|
// parse args
|
|
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
|
|
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
|
|
MP_STATE_VM(mp_optimise_value) = args[0].u_int;
|
|
}
|
|
return mp_const_none;
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_KW(pyb_main_obj, 1, pyb_main);
|
|
|
|
static const char fresh_boot_py[] =
|
|
"# boot.py -- run on boot-up\r\n"
|
|
"# can run arbitrary Python, but best to keep it minimal\r\n"
|
|
"\r\n"
|
|
"import machine\r\n"
|
|
"import pyb\r\n"
|
|
"#pyb.main('main.py') # main script to run after this one\r\n"
|
|
"#pyb.usb_mode('VCP+MSC') # act as a serial and a storage device\r\n"
|
|
"#pyb.usb_mode('VCP+HID') # act as a serial device and a mouse\r\n"
|
|
;
|
|
|
|
static const char fresh_main_py[] =
|
|
"# main.py -- put your code here!\r\n"
|
|
;
|
|
|
|
static const char fresh_pybcdc_inf[] =
|
|
#include "genhdr/pybcdc_inf.h"
|
|
;
|
|
|
|
static const char fresh_readme_txt[] =
|
|
"This is a MicroPython board\r\n"
|
|
"\r\n"
|
|
"You can get started right away by writing your Python code in 'main.py'.\r\n"
|
|
"\r\n"
|
|
"For a serial prompt:\r\n"
|
|
" - Windows: you need to go to 'Device manager', right click on the unknown device,\r\n"
|
|
" then update the driver software, using the 'pybcdc.inf' file found on this drive.\r\n"
|
|
" Then use a terminal program like Hyperterminal or putty.\r\n"
|
|
" - Mac OS X: use the command: screen /dev/tty.usbmodem*\r\n"
|
|
" - Linux: use the command: screen /dev/ttyACM0\r\n"
|
|
"\r\n"
|
|
"Please visit http://micropython.org/help/ for further help.\r\n"
|
|
;
|
|
|
|
// avoid inlining to avoid stack usage within main()
|
|
MP_NOINLINE STATIC void init_flash_fs(uint reset_mode) {
|
|
// init the vfs object
|
|
fs_user_mount_t *vfs = &fs_user_mount_flash;
|
|
vfs->str = "/flash";
|
|
vfs->len = 6;
|
|
vfs->flags = 0;
|
|
pyb_flash_init_vfs(vfs);
|
|
|
|
// put the flash device in slot 0 (it will be unused at this point)
|
|
MP_STATE_PORT(fs_user_mount)[0] = vfs;
|
|
|
|
// try to mount the flash
|
|
FRESULT res = f_mount(&vfs->fatfs, vfs->str, 1);
|
|
|
|
if (reset_mode == 3 || res == FR_NO_FILESYSTEM) {
|
|
// no filesystem, or asked to reset it, so create a fresh one
|
|
|
|
// LED on to indicate creation of LFS
|
|
led_state(PYB_LED_R2, 1);
|
|
uint32_t start_tick = HAL_GetTick();
|
|
|
|
res = f_mkfs("/flash", 0, 0);
|
|
if (res == FR_OK) {
|
|
// success creating fresh LFS
|
|
} else {
|
|
printf("PYB: can't create flash filesystem\n");
|
|
MP_STATE_PORT(fs_user_mount)[0] = NULL;
|
|
return;
|
|
}
|
|
|
|
// set label
|
|
f_setlabel("/flash/pybflash");
|
|
|
|
// create empty main.py
|
|
FIL fp;
|
|
f_open(&fp, "/flash/main.py", FA_WRITE | FA_CREATE_ALWAYS);
|
|
UINT n;
|
|
f_write(&fp, fresh_main_py, sizeof(fresh_main_py) - 1 /* don't count null terminator */, &n);
|
|
// TODO check we could write n bytes
|
|
f_close(&fp);
|
|
|
|
// create .inf driver file
|
|
f_open(&fp, "/flash/pybcdc.inf", FA_WRITE | FA_CREATE_ALWAYS);
|
|
f_write(&fp, fresh_pybcdc_inf, sizeof(fresh_pybcdc_inf) - 1 /* don't count null terminator */, &n);
|
|
f_close(&fp);
|
|
|
|
// create readme file
|
|
f_open(&fp, "/flash/README.txt", FA_WRITE | FA_CREATE_ALWAYS);
|
|
f_write(&fp, fresh_readme_txt, sizeof(fresh_readme_txt) - 1 /* don't count null terminator */, &n);
|
|
f_close(&fp);
|
|
|
|
// keep LED on for at least 200ms
|
|
sys_tick_wait_at_least(start_tick, 200);
|
|
led_state(PYB_LED_R2, 0);
|
|
} else if (res == FR_OK) {
|
|
// mount sucessful
|
|
} else {
|
|
printf("PYB: can't mount flash\n");
|
|
MP_STATE_PORT(fs_user_mount)[0] = NULL;
|
|
return;
|
|
}
|
|
|
|
// The current directory is used as the boot up directory.
|
|
// It is set to the internal flash filesystem by default.
|
|
f_chdrive("/flash");
|
|
|
|
// Make sure we have a /flash/boot.py. Create it if needed.
|
|
FILINFO fno;
|
|
#if _USE_LFN
|
|
fno.lfname = NULL;
|
|
fno.lfsize = 0;
|
|
#endif
|
|
res = f_stat("/flash/boot.py", &fno);
|
|
if (res == FR_OK) {
|
|
if (fno.fattrib & AM_DIR) {
|
|
// exists as a directory
|
|
// TODO handle this case
|
|
// see http://elm-chan.org/fsw/ff/img/app2.c for a "rm -rf" implementation
|
|
} else {
|
|
// exists as a file, good!
|
|
}
|
|
} else {
|
|
// doesn't exist, create fresh file
|
|
|
|
// LED on to indicate creation of boot.py
|
|
led_state(PYB_LED_R2, 1);
|
|
uint32_t start_tick = HAL_GetTick();
|
|
|
|
FIL fp;
|
|
f_open(&fp, "/flash/boot.py", FA_WRITE | FA_CREATE_ALWAYS);
|
|
UINT n;
|
|
f_write(&fp, fresh_boot_py, sizeof(fresh_boot_py) - 1 /* don't count null terminator */, &n);
|
|
// TODO check we could write n bytes
|
|
f_close(&fp);
|
|
|
|
// keep LED on for at least 200ms
|
|
sys_tick_wait_at_least(start_tick, 200);
|
|
led_state(PYB_LED_R2, 0);
|
|
}
|
|
}
|
|
|
|
STATIC uint update_reset_mode(uint reset_mode) {
|
|
#if MICROPY_HW_HAS_SWITCH
|
|
if (switch_get()) {
|
|
|
|
// The original method used on the pyboard is appropriate if you have 2
|
|
// or more LEDs.
|
|
#if defined(MICROPY_HW_LED2)
|
|
for (uint i = 0; i < 3000; i++) {
|
|
if (!switch_get()) {
|
|
break;
|
|
}
|
|
HAL_Delay(20);
|
|
if (i % 30 == 29) {
|
|
if (++reset_mode > 3) {
|
|
reset_mode = 1;
|
|
}
|
|
led_state(2, reset_mode & 1);
|
|
led_state(3, reset_mode & 2);
|
|
led_state(4, reset_mode & 4);
|
|
}
|
|
}
|
|
// flash the selected reset mode
|
|
for (uint i = 0; i < 6; i++) {
|
|
led_state(2, 0);
|
|
led_state(3, 0);
|
|
led_state(4, 0);
|
|
HAL_Delay(50);
|
|
led_state(2, reset_mode & 1);
|
|
led_state(3, reset_mode & 2);
|
|
led_state(4, reset_mode & 4);
|
|
HAL_Delay(50);
|
|
}
|
|
HAL_Delay(400);
|
|
|
|
#elif defined(MICROPY_HW_LED1)
|
|
|
|
// For boards with only a single LED, we'll flash that LED the
|
|
// appropriate number of times, with a pause between each one
|
|
for (uint i = 0; i < 10; i++) {
|
|
led_state(1, 0);
|
|
for (uint j = 0; j < reset_mode; j++) {
|
|
if (!switch_get()) {
|
|
break;
|
|
}
|
|
led_state(1, 1);
|
|
HAL_Delay(100);
|
|
led_state(1, 0);
|
|
HAL_Delay(200);
|
|
}
|
|
HAL_Delay(400);
|
|
if (!switch_get()) {
|
|
break;
|
|
}
|
|
if (++reset_mode > 3) {
|
|
reset_mode = 1;
|
|
}
|
|
}
|
|
// Flash the selected reset mode
|
|
for (uint i = 0; i < 2; i++) {
|
|
for (uint j = 0; j < reset_mode; j++) {
|
|
led_state(1, 1);
|
|
HAL_Delay(100);
|
|
led_state(1, 0);
|
|
HAL_Delay(200);
|
|
}
|
|
HAL_Delay(400);
|
|
}
|
|
#else
|
|
#error Need a reset mode update method
|
|
#endif
|
|
}
|
|
#endif
|
|
return reset_mode;
|
|
}
|
|
|
|
int main(void) {
|
|
// TODO disable JTAG
|
|
|
|
// Stack limit should be less than real stack size, so we have a chance
|
|
// to recover from limit hit. (Limit is measured in bytes.)
|
|
mp_stack_ctrl_init();
|
|
mp_stack_set_limit((char*)&_ram_end - (char*)&_heap_end - 1024);
|
|
|
|
/* STM32F4xx HAL library initialization:
|
|
- Configure the Flash prefetch, instruction and Data caches
|
|
- Configure the Systick to generate an interrupt each 1 msec
|
|
- Set NVIC Group Priority to 4
|
|
- Global MSP (MCU Support Package) initialization
|
|
*/
|
|
HAL_Init();
|
|
|
|
// set the system clock to be HSE
|
|
SystemClock_Config();
|
|
|
|
// enable GPIO clocks
|
|
__GPIOA_CLK_ENABLE();
|
|
__GPIOB_CLK_ENABLE();
|
|
__GPIOC_CLK_ENABLE();
|
|
__GPIOD_CLK_ENABLE();
|
|
|
|
#if defined(MCU_SERIES_F4) || defined(MCU_SERIES_F7)
|
|
#if defined(__HAL_RCC_DTCMRAMEN_CLK_ENABLE)
|
|
// The STM32F746 doesn't really have CCM memory, but it does have DTCM,
|
|
// which behaves more or less like normal SRAM.
|
|
__HAL_RCC_DTCMRAMEN_CLK_ENABLE();
|
|
#elif defined(CCMDATARAM_BASE)
|
|
// enable the CCM RAM
|
|
__HAL_RCC_CCMDATARAMEN_CLK_ENABLE();
|
|
#endif
|
|
#endif
|
|
|
|
#if defined(MICROPY_BOARD_EARLY_INIT)
|
|
MICROPY_BOARD_EARLY_INIT();
|
|
#endif
|
|
|
|
// basic sub-system init
|
|
pendsv_init();
|
|
led_init();
|
|
#if MICROPY_HW_HAS_SWITCH
|
|
switch_init0();
|
|
#endif
|
|
|
|
#if defined(USE_DEVICE_MODE)
|
|
// default to internal flash being the usb medium
|
|
pyb_usb_storage_medium = PYB_USB_STORAGE_MEDIUM_FLASH;
|
|
#endif
|
|
|
|
int first_soft_reset = true;
|
|
|
|
soft_reset:
|
|
|
|
// check if user switch held to select the reset mode
|
|
#if defined(MICROPY_HW_LED2)
|
|
led_state(1, 0);
|
|
led_state(2, 1);
|
|
#else
|
|
led_state(1, 1);
|
|
led_state(2, 0);
|
|
#endif
|
|
led_state(3, 0);
|
|
led_state(4, 0);
|
|
uint reset_mode = update_reset_mode(1);
|
|
|
|
machine_init();
|
|
|
|
#if MICROPY_HW_ENABLE_RTC
|
|
if (first_soft_reset) {
|
|
rtc_init_start(false);
|
|
}
|
|
#endif
|
|
|
|
// more sub-system init
|
|
#if MICROPY_HW_HAS_SDCARD
|
|
if (first_soft_reset) {
|
|
sdcard_init();
|
|
}
|
|
#endif
|
|
if (first_soft_reset) {
|
|
storage_init();
|
|
}
|
|
|
|
// GC init
|
|
gc_init(&_heap_start, &_heap_end);
|
|
|
|
// Micro Python init
|
|
mp_init();
|
|
mp_obj_list_init(mp_sys_path, 0);
|
|
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
|
|
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash));
|
|
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash_slash_lib));
|
|
mp_obj_list_init(mp_sys_argv, 0);
|
|
|
|
// Initialise low-level sub-systems. Here we need to very basic things like
|
|
// zeroing out memory and resetting any of the sub-systems. Following this
|
|
// we can run Python scripts (eg boot.py), but anything that is configurable
|
|
// by boot.py must be set after boot.py is run.
|
|
|
|
readline_init0();
|
|
pin_init0();
|
|
extint_init0();
|
|
timer_init0();
|
|
uart_init0();
|
|
|
|
// Define MICROPY_HW_UART_REPL to be PYB_UART_6 and define
|
|
// MICROPY_HW_UART_REPL_BAUD in your mpconfigboard.h file if you want a
|
|
// REPL on a hardware UART as well as on USB VCP
|
|
#if defined(MICROPY_HW_UART_REPL)
|
|
{
|
|
mp_obj_t args[2] = {
|
|
MP_OBJ_NEW_SMALL_INT(MICROPY_HW_UART_REPL),
|
|
MP_OBJ_NEW_SMALL_INT(MICROPY_HW_UART_REPL_BAUD),
|
|
};
|
|
MP_STATE_PORT(pyb_stdio_uart) = pyb_uart_type.make_new((mp_obj_t)&pyb_uart_type, MP_ARRAY_SIZE(args), 0, args);
|
|
}
|
|
#else
|
|
MP_STATE_PORT(pyb_stdio_uart) = NULL;
|
|
#endif
|
|
|
|
#if MICROPY_HW_ENABLE_CAN
|
|
can_init0();
|
|
#endif
|
|
|
|
#if MICROPY_HW_ENABLE_RNG
|
|
rng_init0();
|
|
#endif
|
|
|
|
i2c_init0();
|
|
spi_init0();
|
|
pyb_usb_init0();
|
|
|
|
// Initialise the local flash filesystem.
|
|
// Create it if needed, mount in on /flash, and set it as current dir.
|
|
init_flash_fs(reset_mode);
|
|
|
|
#if MICROPY_HW_HAS_SDCARD
|
|
// if an SD card is present then mount it on /sd/
|
|
if (sdcard_is_present()) {
|
|
// create vfs object
|
|
fs_user_mount_t *vfs = m_new_obj_maybe(fs_user_mount_t);
|
|
if (vfs == NULL) {
|
|
goto no_mem_for_sd;
|
|
}
|
|
vfs->str = "/sd";
|
|
vfs->len = 3;
|
|
vfs->flags = FSUSER_FREE_OBJ;
|
|
sdcard_init_vfs(vfs);
|
|
|
|
// put the sd device in slot 1 (it will be unused at this point)
|
|
MP_STATE_PORT(fs_user_mount)[1] = vfs;
|
|
|
|
FRESULT res = f_mount(&vfs->fatfs, vfs->str, 1);
|
|
if (res != FR_OK) {
|
|
printf("PYB: can't mount SD card\n");
|
|
MP_STATE_PORT(fs_user_mount)[1] = NULL;
|
|
m_del_obj(fs_user_mount_t, vfs);
|
|
} else {
|
|
// TODO these should go before the /flash entries in the path
|
|
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_sd));
|
|
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_sd_slash_lib));
|
|
|
|
if (first_soft_reset) {
|
|
// use SD card as medium for the USB MSD
|
|
#if defined(USE_DEVICE_MODE)
|
|
pyb_usb_storage_medium = PYB_USB_STORAGE_MEDIUM_SDCARD;
|
|
#endif
|
|
}
|
|
|
|
#if defined(USE_DEVICE_MODE)
|
|
// only use SD card as current directory if that's what the USB medium is
|
|
if (pyb_usb_storage_medium == PYB_USB_STORAGE_MEDIUM_SDCARD)
|
|
#endif
|
|
{
|
|
// use SD card as current directory
|
|
f_chdrive("/sd");
|
|
}
|
|
}
|
|
no_mem_for_sd:;
|
|
}
|
|
#endif
|
|
|
|
// reset config variables; they should be set by boot.py
|
|
MP_STATE_PORT(pyb_config_main) = MP_OBJ_NULL;
|
|
|
|
// run boot.py, if it exists
|
|
// TODO perhaps have pyb.reboot([bootpy]) function to soft-reboot and execute custom boot.py
|
|
if (reset_mode == 1 || reset_mode == 3) {
|
|
const char *boot_py = "boot.py";
|
|
FRESULT res = f_stat(boot_py, NULL);
|
|
if (res == FR_OK) {
|
|
int ret = pyexec_file(boot_py, NULL);
|
|
if (ret & PYEXEC_FORCED_EXIT) {
|
|
goto soft_reset_exit;
|
|
}
|
|
if (!ret) {
|
|
flash_error(4);
|
|
}
|
|
}
|
|
}
|
|
|
|
// turn boot-up LEDs off
|
|
#if !defined(MICROPY_HW_LED2)
|
|
// If there is only one LED on the board then it's used to signal boot-up
|
|
// and so we turn it off here. Otherwise LED(1) is used to indicate dirty
|
|
// flash cache and so we shouldn't change its state.
|
|
led_state(1, 0);
|
|
#endif
|
|
led_state(2, 0);
|
|
led_state(3, 0);
|
|
led_state(4, 0);
|
|
|
|
// Now we initialise sub-systems that need configuration from boot.py,
|
|
// or whose initialisation can be safely deferred until after running
|
|
// boot.py.
|
|
|
|
#if defined(USE_DEVICE_MODE)
|
|
// init USB device to default setting if it was not already configured
|
|
if (!(pyb_usb_flags & PYB_USB_FLAG_USB_MODE_CALLED)) {
|
|
pyb_usb_dev_init(USBD_VID, USBD_PID_CDC_MSC, USBD_MODE_CDC_MSC, NULL);
|
|
}
|
|
#endif
|
|
|
|
#if MICROPY_HW_HAS_MMA7660
|
|
// MMA accel: init and reset
|
|
accel_init();
|
|
#endif
|
|
|
|
#if MICROPY_HW_ENABLE_SERVO
|
|
// servo
|
|
servo_init();
|
|
#endif
|
|
|
|
#if MICROPY_HW_ENABLE_DAC
|
|
// DAC
|
|
dac_init();
|
|
#endif
|
|
|
|
#if MICROPY_PY_NETWORK
|
|
mod_network_init();
|
|
#endif
|
|
|
|
// At this point everything is fully configured and initialised.
|
|
|
|
// Run the main script from the current directory.
|
|
if ((reset_mode == 1 || reset_mode == 3) && pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
|
|
const char *main_py;
|
|
if (MP_STATE_PORT(pyb_config_main) == MP_OBJ_NULL) {
|
|
main_py = "main.py";
|
|
} else {
|
|
main_py = mp_obj_str_get_str(MP_STATE_PORT(pyb_config_main));
|
|
}
|
|
FRESULT res = f_stat(main_py, NULL);
|
|
if (res == FR_OK) {
|
|
int ret = pyexec_file(main_py, NULL);
|
|
if (ret & PYEXEC_FORCED_EXIT) {
|
|
goto soft_reset_exit;
|
|
}
|
|
if (!ret) {
|
|
flash_error(3);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Main script is finished, so now go into REPL mode.
|
|
// The REPL mode can change, or it can request a soft reset.
|
|
for (;;) {
|
|
if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
|
|
if (pyexec_raw_repl() != 0) {
|
|
break;
|
|
}
|
|
} else {
|
|
if (pyexec_friendly_repl() != 0) {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
soft_reset_exit:
|
|
|
|
// soft reset
|
|
|
|
printf("PYB: sync filesystems\n");
|
|
storage_flush();
|
|
|
|
printf("PYB: soft reboot\n");
|
|
timer_deinit();
|
|
uart_deinit();
|
|
#if MICROPY_HW_ENABLE_CAN
|
|
can_deinit();
|
|
#endif
|
|
|
|
first_soft_reset = false;
|
|
goto soft_reset;
|
|
}
|