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()
722 lines
24 KiB
C
722 lines
24 KiB
C
/*
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014, 2015 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 <stdarg.h>
|
|
#include <string.h>
|
|
|
|
#include "usbd_core.h"
|
|
#include "usbd_desc.h"
|
|
#include "usbd_cdc_msc_hid.h"
|
|
#include "usbd_cdc_interface.h"
|
|
#include "usbd_msc_storage.h"
|
|
#include "usbd_hid_interface.h"
|
|
|
|
#include "py/ioctl.h"
|
|
#include "py/objstr.h"
|
|
#include "py/runtime.h"
|
|
#include "py/stream.h"
|
|
#include "py/mperrno.h"
|
|
#include "bufhelper.h"
|
|
#include "usb.h"
|
|
|
|
#if defined(USE_USB_FS)
|
|
#define USB_PHY_ID USB_PHY_FS_ID
|
|
#elif defined(USE_USB_HS) && defined(USE_USB_HS_IN_FS)
|
|
#define USB_PHY_ID USB_PHY_HS_ID
|
|
#else
|
|
#error Unable to determine proper USB_PHY_ID to use
|
|
#endif
|
|
|
|
// this will be persistent across a soft-reset
|
|
mp_uint_t pyb_usb_flags = 0;
|
|
|
|
#ifdef USE_DEVICE_MODE
|
|
USBD_HandleTypeDef hUSBDDevice;
|
|
pyb_usb_storage_medium_t pyb_usb_storage_medium = PYB_USB_STORAGE_MEDIUM_NONE;
|
|
#endif
|
|
|
|
// predefined hid mouse data
|
|
STATIC const mp_obj_str_t pyb_usb_hid_mouse_desc_obj = {
|
|
{&mp_type_bytes},
|
|
0, // hash not valid
|
|
USBD_HID_MOUSE_REPORT_DESC_SIZE,
|
|
USBD_HID_MOUSE_ReportDesc,
|
|
};
|
|
const mp_obj_tuple_t pyb_usb_hid_mouse_obj = {
|
|
{&mp_type_tuple},
|
|
5,
|
|
{
|
|
MP_OBJ_NEW_SMALL_INT(1), // subclass: boot
|
|
MP_OBJ_NEW_SMALL_INT(2), // protocol: mouse
|
|
MP_OBJ_NEW_SMALL_INT(USBD_HID_MOUSE_MAX_PACKET),
|
|
MP_OBJ_NEW_SMALL_INT(8), // polling interval: 8ms
|
|
(mp_obj_t)&pyb_usb_hid_mouse_desc_obj,
|
|
},
|
|
};
|
|
|
|
// predefined hid keyboard data
|
|
STATIC const mp_obj_str_t pyb_usb_hid_keyboard_desc_obj = {
|
|
{&mp_type_bytes},
|
|
0, // hash not valid
|
|
USBD_HID_KEYBOARD_REPORT_DESC_SIZE,
|
|
USBD_HID_KEYBOARD_ReportDesc,
|
|
};
|
|
const mp_obj_tuple_t pyb_usb_hid_keyboard_obj = {
|
|
{&mp_type_tuple},
|
|
5,
|
|
{
|
|
MP_OBJ_NEW_SMALL_INT(1), // subclass: boot
|
|
MP_OBJ_NEW_SMALL_INT(1), // protocol: keyboard
|
|
MP_OBJ_NEW_SMALL_INT(USBD_HID_KEYBOARD_MAX_PACKET),
|
|
MP_OBJ_NEW_SMALL_INT(8), // polling interval: 8ms
|
|
(mp_obj_t)&pyb_usb_hid_keyboard_desc_obj,
|
|
},
|
|
};
|
|
|
|
void pyb_usb_init0(void) {
|
|
USBD_CDC_SetInterrupt(-1);
|
|
MP_STATE_PORT(pyb_hid_report_desc) = MP_OBJ_NULL;
|
|
}
|
|
|
|
bool pyb_usb_dev_init(uint16_t vid, uint16_t pid, usb_device_mode_t mode, USBD_HID_ModeInfoTypeDef *hid_info) {
|
|
#ifdef USE_DEVICE_MODE
|
|
if (!(pyb_usb_flags & PYB_USB_FLAG_DEV_ENABLED)) {
|
|
// only init USB once in the device's power-lifetime
|
|
USBD_SetVIDPIDRelease(vid, pid, 0x0200, mode == USBD_MODE_CDC);
|
|
if (USBD_SelectMode(mode, hid_info) != 0) {
|
|
return false;
|
|
}
|
|
USBD_Init(&hUSBDDevice, (USBD_DescriptorsTypeDef*)&USBD_Descriptors, USB_PHY_ID);
|
|
USBD_RegisterClass(&hUSBDDevice, &USBD_CDC_MSC_HID);
|
|
USBD_CDC_RegisterInterface(&hUSBDDevice, (USBD_CDC_ItfTypeDef*)&USBD_CDC_fops);
|
|
switch (pyb_usb_storage_medium) {
|
|
#if MICROPY_HW_HAS_SDCARD
|
|
case PYB_USB_STORAGE_MEDIUM_SDCARD:
|
|
USBD_MSC_RegisterStorage(&hUSBDDevice, (USBD_StorageTypeDef*)&USBD_SDCARD_STORAGE_fops);
|
|
break;
|
|
#endif
|
|
default:
|
|
USBD_MSC_RegisterStorage(&hUSBDDevice, (USBD_StorageTypeDef*)&USBD_FLASH_STORAGE_fops);
|
|
break;
|
|
}
|
|
USBD_HID_RegisterInterface(&hUSBDDevice, (USBD_HID_ItfTypeDef*)&USBD_HID_fops);
|
|
USBD_Start(&hUSBDDevice);
|
|
}
|
|
pyb_usb_flags |= PYB_USB_FLAG_DEV_ENABLED;
|
|
#endif
|
|
|
|
return true;
|
|
}
|
|
|
|
void pyb_usb_dev_deinit(void) {
|
|
if (pyb_usb_flags & PYB_USB_FLAG_DEV_ENABLED) {
|
|
USBD_Stop(&hUSBDDevice);
|
|
pyb_usb_flags &= ~PYB_USB_FLAG_DEV_ENABLED;
|
|
}
|
|
}
|
|
|
|
bool usb_vcp_is_enabled(void) {
|
|
return (pyb_usb_flags & PYB_USB_FLAG_DEV_ENABLED) != 0;
|
|
}
|
|
|
|
void usb_vcp_set_interrupt_char(int c) {
|
|
if (pyb_usb_flags & PYB_USB_FLAG_DEV_ENABLED) {
|
|
if (c != -1) {
|
|
mp_obj_exception_clear_traceback(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
|
|
}
|
|
USBD_CDC_SetInterrupt(c);
|
|
}
|
|
}
|
|
|
|
int usb_vcp_recv_byte(uint8_t *c) {
|
|
return USBD_CDC_Rx(c, 1, 0);
|
|
}
|
|
|
|
void usb_vcp_send_strn(const char *str, int len) {
|
|
#ifdef USE_DEVICE_MODE
|
|
if (pyb_usb_flags & PYB_USB_FLAG_DEV_ENABLED) {
|
|
USBD_CDC_TxAlways((const uint8_t*)str, len);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void usb_vcp_send_strn_cooked(const char *str, int len) {
|
|
#ifdef USE_DEVICE_MODE
|
|
if (pyb_usb_flags & PYB_USB_FLAG_DEV_ENABLED) {
|
|
for (const char *top = str + len; str < top; str++) {
|
|
if (*str == '\n') {
|
|
USBD_CDC_TxAlways((const uint8_t*)"\r\n", 2);
|
|
} else {
|
|
USBD_CDC_TxAlways((const uint8_t*)str, 1);
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
/******************************************************************************/
|
|
// Micro Python bindings for USB
|
|
|
|
/*
|
|
Philosophy of USB driver and Python API: pyb.usb_mode(...) configures the USB
|
|
on the board. The USB itself is not an entity, rather the interfaces are, and
|
|
can be accessed by creating objects, such as pyb.USB_VCP() and pyb.USB_HID().
|
|
|
|
We have:
|
|
|
|
pyb.usb_mode() # return the current usb mode
|
|
pyb.usb_mode(None) # disable USB
|
|
pyb.usb_mode('VCP') # enable with VCP interface
|
|
pyb.usb_mode('VCP+MSC') # enable with VCP and MSC interfaces
|
|
pyb.usb_mode('VCP+HID') # enable with VCP and HID, defaulting to mouse protocol
|
|
pyb.usb_mode('VCP+HID', vid=0xf055, pid=0x9800) # specify VID and PID
|
|
pyb.usb_mode('VCP+HID', hid=pyb.hid_mouse)
|
|
pyb.usb_mode('VCP+HID', hid=pyb.hid_keyboard)
|
|
pyb.usb_mode('VCP+HID', pid=0x1234, hid=(subclass, protocol, max_packet_len, polling_interval, report_desc))
|
|
|
|
vcp = pyb.USB_VCP() # get the VCP device for read/write
|
|
hid = pyb.USB_HID() # get the HID device for write/poll
|
|
|
|
Possible extensions:
|
|
pyb.usb_mode('host', ...)
|
|
pyb.usb_mode('OTG', ...)
|
|
pyb.usb_mode(..., port=2) # for second USB port
|
|
*/
|
|
|
|
STATIC mp_obj_t pyb_usb_mode(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_mode, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = mp_const_none} },
|
|
{ MP_QSTR_vid, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = USBD_VID} },
|
|
{ MP_QSTR_pid, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
|
|
{ MP_QSTR_hid, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = (mp_obj_t)&pyb_usb_hid_mouse_obj} },
|
|
};
|
|
|
|
// fetch the current usb mode -> pyb.usb_mode()
|
|
if (n_args == 0) {
|
|
#if defined(USE_HOST_MODE)
|
|
return MP_OBJ_NEW_QSTR(MP_QSTR_host);
|
|
#elif defined(USE_DEVICE_MODE)
|
|
uint8_t mode = USBD_GetMode();
|
|
switch (mode) {
|
|
case USBD_MODE_CDC:
|
|
return MP_OBJ_NEW_QSTR(MP_QSTR_VCP);
|
|
case USBD_MODE_MSC:
|
|
return MP_OBJ_NEW_QSTR(MP_QSTR_MSC);
|
|
case USBD_MODE_HID:
|
|
return MP_OBJ_NEW_QSTR(MP_QSTR_HID);
|
|
case USBD_MODE_CDC_MSC:
|
|
return MP_OBJ_NEW_QSTR(MP_QSTR_VCP_plus_MSC);
|
|
case USBD_MODE_CDC_HID:
|
|
return MP_OBJ_NEW_QSTR(MP_QSTR_VCP_plus_HID);
|
|
case USBD_MODE_MSC_HID:
|
|
return MP_OBJ_NEW_QSTR(MP_QSTR_MSC_plus_HID);
|
|
default:
|
|
return mp_const_none;
|
|
}
|
|
#endif
|
|
}
|
|
|
|
// parse args
|
|
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
|
|
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
|
|
|
|
// record the fact that the usb has been explicitly configured
|
|
pyb_usb_flags |= PYB_USB_FLAG_USB_MODE_CALLED;
|
|
|
|
// check if user wants to disable the USB
|
|
if (args[0].u_obj == mp_const_none) {
|
|
// disable usb
|
|
#if defined(USE_DEVICE_MODE)
|
|
pyb_usb_dev_deinit();
|
|
#endif
|
|
return mp_const_none;
|
|
}
|
|
|
|
// get mode string
|
|
const char *mode_str = mp_obj_str_get_str(args[0].u_obj);
|
|
|
|
#if defined(USE_HOST_MODE)
|
|
|
|
// hardware configured for USB host mode
|
|
|
|
if (strcmp(mode_str, "host") == 0) {
|
|
pyb_usb_host_init();
|
|
} else {
|
|
goto bad_mode;
|
|
}
|
|
|
|
#elif defined(USE_DEVICE_MODE)
|
|
|
|
// hardware configured for USB device mode
|
|
|
|
// get the VID, PID and USB mode
|
|
// note: PID=-1 means select PID based on mode
|
|
// note: we support CDC as a synonym for VCP for backward compatibility
|
|
uint16_t vid = args[1].u_int;
|
|
uint16_t pid = args[2].u_int;
|
|
usb_device_mode_t mode;
|
|
if (strcmp(mode_str, "CDC+MSC") == 0 || strcmp(mode_str, "VCP+MSC") == 0) {
|
|
if (args[2].u_int == -1) {
|
|
pid = USBD_PID_CDC_MSC;
|
|
}
|
|
mode = USBD_MODE_CDC_MSC;
|
|
} else if (strcmp(mode_str, "CDC+HID") == 0 || strcmp(mode_str, "VCP+HID") == 0) {
|
|
if (args[2].u_int == -1) {
|
|
pid = USBD_PID_CDC_HID;
|
|
}
|
|
mode = USBD_MODE_CDC_HID;
|
|
} else if (strcmp(mode_str, "CDC") == 0 || strcmp(mode_str, "VCP") == 0) {
|
|
if (args[2].u_int == -1) {
|
|
pid = USBD_PID_CDC;
|
|
}
|
|
mode = USBD_MODE_CDC;
|
|
} else {
|
|
goto bad_mode;
|
|
}
|
|
|
|
// get hid info if user selected such a mode
|
|
USBD_HID_ModeInfoTypeDef hid_info;
|
|
if (mode & USBD_MODE_HID) {
|
|
mp_obj_t *items;
|
|
mp_obj_get_array_fixed_n(args[3].u_obj, 5, &items);
|
|
hid_info.subclass = mp_obj_get_int(items[0]);
|
|
hid_info.protocol = mp_obj_get_int(items[1]);
|
|
hid_info.max_packet_len = mp_obj_get_int(items[2]);
|
|
hid_info.polling_interval = mp_obj_get_int(items[3]);
|
|
mp_buffer_info_t bufinfo;
|
|
mp_get_buffer_raise(items[4], &bufinfo, MP_BUFFER_READ);
|
|
hid_info.report_desc = bufinfo.buf;
|
|
hid_info.report_desc_len = bufinfo.len;
|
|
|
|
// need to keep a copy of this so report_desc does not get GC'd
|
|
MP_STATE_PORT(pyb_hid_report_desc) = items[4];
|
|
}
|
|
|
|
// init the USB device
|
|
if (!pyb_usb_dev_init(vid, pid, mode, &hid_info)) {
|
|
goto bad_mode;
|
|
}
|
|
|
|
#else
|
|
// hardware not configured for USB
|
|
goto bad_mode;
|
|
#endif
|
|
|
|
return mp_const_none;
|
|
|
|
bad_mode:
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "bad USB mode"));
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_mode_obj, 0, pyb_usb_mode);
|
|
|
|
/******************************************************************************/
|
|
// Micro Python bindings for USB VCP
|
|
|
|
/// \moduleref pyb
|
|
/// \class USB_VCP - USB virtual comm port
|
|
///
|
|
/// The USB_VCP class allows creation of an object representing the USB
|
|
/// virtual comm port. It can be used to read and write data over USB to
|
|
/// the connected host.
|
|
|
|
typedef struct _pyb_usb_vcp_obj_t {
|
|
mp_obj_base_t base;
|
|
} pyb_usb_vcp_obj_t;
|
|
|
|
STATIC const pyb_usb_vcp_obj_t pyb_usb_vcp_obj = {{&pyb_usb_vcp_type}};
|
|
|
|
STATIC void pyb_usb_vcp_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
|
|
mp_print_str(print, "USB_VCP()");
|
|
}
|
|
|
|
/// \classmethod \constructor()
|
|
/// Create a new USB_VCP object.
|
|
STATIC mp_obj_t pyb_usb_vcp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
|
// check arguments
|
|
mp_arg_check_num(n_args, n_kw, 0, 0, false);
|
|
|
|
// TODO raise exception if USB is not configured for VCP
|
|
|
|
// return the USB VCP object
|
|
return (mp_obj_t)&pyb_usb_vcp_obj;
|
|
}
|
|
|
|
STATIC mp_obj_t pyb_usb_vcp_setinterrupt(mp_obj_t self_in, mp_obj_t int_chr_in) {
|
|
usb_vcp_set_interrupt_char(mp_obj_get_int(int_chr_in));
|
|
return mp_const_none;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_usb_vcp_setinterrupt_obj, pyb_usb_vcp_setinterrupt);
|
|
|
|
STATIC mp_obj_t pyb_usb_vcp_isconnected(mp_obj_t self_in) {
|
|
return mp_obj_new_bool(USBD_CDC_IsConnected());
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_usb_vcp_isconnected_obj, pyb_usb_vcp_isconnected);
|
|
|
|
// deprecated in favour of USB_VCP.isconnected
|
|
STATIC mp_obj_t pyb_have_cdc(void) {
|
|
return pyb_usb_vcp_isconnected(MP_OBJ_NULL);
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_0(pyb_have_cdc_obj, pyb_have_cdc);
|
|
|
|
/// \method any()
|
|
/// Return `True` if any characters waiting, else `False`.
|
|
STATIC mp_obj_t pyb_usb_vcp_any(mp_obj_t self_in) {
|
|
if (USBD_CDC_RxNum() > 0) {
|
|
return mp_const_true;
|
|
} else {
|
|
return mp_const_false;
|
|
}
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_usb_vcp_any_obj, pyb_usb_vcp_any);
|
|
|
|
/// \method send(data, *, timeout=5000)
|
|
/// Send data over the USB VCP:
|
|
///
|
|
/// - `data` is the data to send (an integer to send, or a buffer object).
|
|
/// - `timeout` is the timeout in milliseconds to wait for the send.
|
|
///
|
|
/// Return value: number of bytes sent.
|
|
STATIC const mp_arg_t pyb_usb_vcp_send_args[] = {
|
|
{ MP_QSTR_data, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
|
|
{ MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 5000} },
|
|
};
|
|
#define PYB_USB_VCP_SEND_NUM_ARGS MP_ARRAY_SIZE(pyb_usb_vcp_send_args)
|
|
|
|
STATIC mp_obj_t pyb_usb_vcp_send(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
|
|
// parse args
|
|
mp_arg_val_t vals[PYB_USB_VCP_SEND_NUM_ARGS];
|
|
mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_USB_VCP_SEND_NUM_ARGS, pyb_usb_vcp_send_args, vals);
|
|
|
|
// get the buffer to send from
|
|
mp_buffer_info_t bufinfo;
|
|
uint8_t data[1];
|
|
pyb_buf_get_for_send(vals[0].u_obj, &bufinfo, data);
|
|
|
|
// send the data
|
|
int ret = USBD_CDC_Tx(bufinfo.buf, bufinfo.len, vals[1].u_int);
|
|
|
|
return mp_obj_new_int(ret);
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_send_obj, 1, pyb_usb_vcp_send);
|
|
|
|
/// \method recv(data, *, timeout=5000)
|
|
///
|
|
/// Receive data on the bus:
|
|
///
|
|
/// - `data` can be an integer, which is the number of bytes to receive,
|
|
/// or a mutable buffer, which will be filled with received bytes.
|
|
/// - `timeout` is the timeout in milliseconds to wait for the receive.
|
|
///
|
|
/// Return value: if `data` is an integer then a new buffer of the bytes received,
|
|
/// otherwise the number of bytes read into `data` is returned.
|
|
STATIC mp_obj_t pyb_usb_vcp_recv(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
|
|
// parse args
|
|
mp_arg_val_t vals[PYB_USB_VCP_SEND_NUM_ARGS];
|
|
mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_USB_VCP_SEND_NUM_ARGS, pyb_usb_vcp_send_args, vals);
|
|
|
|
// get the buffer to receive into
|
|
vstr_t vstr;
|
|
mp_obj_t o_ret = pyb_buf_get_for_recv(vals[0].u_obj, &vstr);
|
|
|
|
// receive the data
|
|
int ret = USBD_CDC_Rx((uint8_t*)vstr.buf, vstr.len, vals[1].u_int);
|
|
|
|
// return the received data
|
|
if (o_ret != MP_OBJ_NULL) {
|
|
return mp_obj_new_int(ret); // number of bytes read into given buffer
|
|
} else {
|
|
vstr.len = ret; // set actual number of bytes read
|
|
return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); // create a new buffer
|
|
}
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_recv_obj, 1, pyb_usb_vcp_recv);
|
|
|
|
mp_obj_t pyb_usb_vcp___exit__(mp_uint_t n_args, const mp_obj_t *args) {
|
|
return mp_const_none;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_usb_vcp___exit___obj, 4, 4, pyb_usb_vcp___exit__);
|
|
|
|
STATIC const mp_map_elem_t pyb_usb_vcp_locals_dict_table[] = {
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_setinterrupt), (mp_obj_t)&pyb_usb_vcp_setinterrupt_obj },
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_isconnected), (mp_obj_t)&pyb_usb_vcp_isconnected_obj },
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_any), (mp_obj_t)&pyb_usb_vcp_any_obj },
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_send), (mp_obj_t)&pyb_usb_vcp_send_obj },
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_recv), (mp_obj_t)&pyb_usb_vcp_recv_obj },
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)&mp_stream_read_obj },
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_readinto), (mp_obj_t)&mp_stream_readinto_obj },
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_readline), (mp_obj_t)&mp_stream_unbuffered_readline_obj},
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_readlines), (mp_obj_t)&mp_stream_unbuffered_readlines_obj},
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_write), (mp_obj_t)&mp_stream_write_obj },
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&mp_identity_obj },
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR___del__), (mp_obj_t)&mp_identity_obj },
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR___enter__), (mp_obj_t)&mp_identity_obj },
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR___exit__), (mp_obj_t)&pyb_usb_vcp___exit___obj },
|
|
};
|
|
|
|
STATIC MP_DEFINE_CONST_DICT(pyb_usb_vcp_locals_dict, pyb_usb_vcp_locals_dict_table);
|
|
|
|
STATIC mp_uint_t pyb_usb_vcp_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
|
|
int ret = USBD_CDC_Rx((byte*)buf, size, 0);
|
|
if (ret == 0) {
|
|
// return EAGAIN error to indicate non-blocking
|
|
*errcode = MP_EAGAIN;
|
|
return MP_STREAM_ERROR;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
STATIC mp_uint_t pyb_usb_vcp_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
|
|
int ret = USBD_CDC_Tx((const byte*)buf, size, 0);
|
|
if (ret == 0) {
|
|
// return EAGAIN error to indicate non-blocking
|
|
*errcode = MP_EAGAIN;
|
|
return MP_STREAM_ERROR;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
STATIC mp_uint_t pyb_usb_vcp_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
|
|
mp_uint_t ret;
|
|
if (request == MP_STREAM_POLL) {
|
|
mp_uint_t flags = arg;
|
|
ret = 0;
|
|
if ((flags & MP_STREAM_POLL_RD) && USBD_CDC_RxNum() > 0) {
|
|
ret |= MP_STREAM_POLL_RD;
|
|
}
|
|
if ((flags & MP_STREAM_POLL_WR) && USBD_CDC_TxHalfEmpty()) {
|
|
ret |= MP_STREAM_POLL_WR;
|
|
}
|
|
} else {
|
|
*errcode = MP_EINVAL;
|
|
ret = MP_STREAM_ERROR;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
STATIC const mp_stream_p_t pyb_usb_vcp_stream_p = {
|
|
.read = pyb_usb_vcp_read,
|
|
.write = pyb_usb_vcp_write,
|
|
.ioctl = pyb_usb_vcp_ioctl,
|
|
};
|
|
|
|
const mp_obj_type_t pyb_usb_vcp_type = {
|
|
{ &mp_type_type },
|
|
.name = MP_QSTR_USB_VCP,
|
|
.print = pyb_usb_vcp_print,
|
|
.make_new = pyb_usb_vcp_make_new,
|
|
.getiter = mp_identity,
|
|
.iternext = mp_stream_unbuffered_iter,
|
|
.protocol = &pyb_usb_vcp_stream_p,
|
|
.locals_dict = (mp_obj_t)&pyb_usb_vcp_locals_dict,
|
|
};
|
|
|
|
/******************************************************************************/
|
|
// Micro Python bindings for USB HID
|
|
|
|
typedef struct _pyb_usb_hid_obj_t {
|
|
mp_obj_base_t base;
|
|
} pyb_usb_hid_obj_t;
|
|
|
|
STATIC const pyb_usb_hid_obj_t pyb_usb_hid_obj = {{&pyb_usb_hid_type}};
|
|
|
|
STATIC mp_obj_t pyb_usb_hid_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
|
// check arguments
|
|
mp_arg_check_num(n_args, n_kw, 0, 0, false);
|
|
|
|
// TODO raise exception if USB is not configured for HID
|
|
|
|
// return the USB HID object
|
|
return (mp_obj_t)&pyb_usb_hid_obj;
|
|
}
|
|
|
|
/// \method recv(data, *, timeout=5000)
|
|
///
|
|
/// Receive data on the bus:
|
|
///
|
|
/// - `data` can be an integer, which is the number of bytes to receive,
|
|
/// or a mutable buffer, which will be filled with received bytes.
|
|
/// - `timeout` is the timeout in milliseconds to wait for the receive.
|
|
///
|
|
/// Return value: if `data` is an integer then a new buffer of the bytes received,
|
|
/// otherwise the number of bytes read into `data` is returned.
|
|
STATIC mp_obj_t pyb_usb_hid_recv(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
|
|
static const mp_arg_t allowed_args[] = {
|
|
{ MP_QSTR_data, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
|
|
{ MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 5000} },
|
|
};
|
|
|
|
// parse args
|
|
mp_arg_val_t vals[MP_ARRAY_SIZE(allowed_args)];
|
|
mp_arg_parse_all(n_args - 1, args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, vals);
|
|
|
|
// get the buffer to receive into
|
|
vstr_t vstr;
|
|
mp_obj_t o_ret = pyb_buf_get_for_recv(vals[0].u_obj, &vstr);
|
|
|
|
// receive the data
|
|
int ret = USBD_HID_Rx((uint8_t*)vstr.buf, vstr.len, vals[1].u_int);
|
|
|
|
// return the received data
|
|
if (o_ret != MP_OBJ_NULL) {
|
|
return mp_obj_new_int(ret); // number of bytes read into given buffer
|
|
} else {
|
|
vstr.len = ret; // set actual number of bytes read
|
|
return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); // create a new buffer
|
|
}
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_hid_recv_obj, 1, pyb_usb_hid_recv);
|
|
|
|
STATIC mp_obj_t pyb_usb_hid_send(mp_obj_t self_in, mp_obj_t report_in) {
|
|
#ifdef USE_DEVICE_MODE
|
|
mp_buffer_info_t bufinfo;
|
|
byte temp_buf[8];
|
|
// get the buffer to send from
|
|
// we accept either a byte array, or a tuple/list of integers
|
|
if (!mp_get_buffer(report_in, &bufinfo, MP_BUFFER_READ)) {
|
|
mp_obj_t *items;
|
|
mp_obj_get_array(report_in, &bufinfo.len, &items);
|
|
if (bufinfo.len > sizeof(temp_buf)) {
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "tuple/list too large for HID report; use bytearray instead"));
|
|
}
|
|
for (int i = 0; i < bufinfo.len; i++) {
|
|
temp_buf[i] = mp_obj_get_int(items[i]);
|
|
}
|
|
bufinfo.buf = temp_buf;
|
|
}
|
|
|
|
// send the data
|
|
USBD_HID_SendReport(&hUSBDDevice, bufinfo.buf, bufinfo.len);
|
|
#endif
|
|
|
|
return mp_const_none;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_usb_hid_send_obj, pyb_usb_hid_send);
|
|
|
|
// deprecated in favour of USB_HID.send
|
|
STATIC mp_obj_t pyb_hid_send_report(mp_obj_t arg) {
|
|
return pyb_usb_hid_send(MP_OBJ_NULL, arg);
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_1(pyb_hid_send_report_obj, pyb_hid_send_report);
|
|
|
|
STATIC const mp_map_elem_t pyb_usb_hid_locals_dict_table[] = {
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_send), (mp_obj_t)&pyb_usb_hid_send_obj },
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_recv), (mp_obj_t)&pyb_usb_hid_recv_obj },
|
|
};
|
|
|
|
STATIC MP_DEFINE_CONST_DICT(pyb_usb_hid_locals_dict, pyb_usb_hid_locals_dict_table);
|
|
|
|
STATIC mp_uint_t pyb_usb_hid_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
|
|
mp_uint_t ret;
|
|
if (request == MP_STREAM_POLL) {
|
|
mp_uint_t flags = arg;
|
|
ret = 0;
|
|
if ((flags & MP_STREAM_POLL_WR) && USBD_HID_CanSendReport(&hUSBDDevice)) {
|
|
ret |= MP_STREAM_POLL_WR;
|
|
}
|
|
} else {
|
|
*errcode = MP_EINVAL;
|
|
ret = MP_STREAM_ERROR;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
STATIC const mp_stream_p_t pyb_usb_hid_stream_p = {
|
|
.ioctl = pyb_usb_hid_ioctl,
|
|
};
|
|
|
|
const mp_obj_type_t pyb_usb_hid_type = {
|
|
{ &mp_type_type },
|
|
.name = MP_QSTR_USB_HID,
|
|
.make_new = pyb_usb_hid_make_new,
|
|
.protocol = &pyb_usb_hid_stream_p,
|
|
.locals_dict = (mp_obj_t)&pyb_usb_hid_locals_dict,
|
|
};
|
|
|
|
/******************************************************************************/
|
|
// code for experimental USB OTG support
|
|
|
|
#ifdef USE_HOST_MODE
|
|
|
|
#include "led.h"
|
|
#include "usbh_core.h"
|
|
#include "usbh_usr.h"
|
|
#include "usbh_hid_core.h"
|
|
#include "usbh_hid_keybd.h"
|
|
#include "usbh_hid_mouse.h"
|
|
|
|
__ALIGN_BEGIN USBH_HOST USB_Host __ALIGN_END ;
|
|
|
|
static int host_is_enabled = 0;
|
|
|
|
void pyb_usb_host_init(void) {
|
|
if (!host_is_enabled) {
|
|
// only init USBH once in the device's power-lifetime
|
|
/* Init Host Library */
|
|
USBH_Init(&USB_OTG_Core, USB_OTG_FS_CORE_ID, &USB_Host, &HID_cb, &USR_Callbacks);
|
|
}
|
|
host_is_enabled = 1;
|
|
}
|
|
|
|
void pyb_usb_host_process(void) {
|
|
USBH_Process(&USB_OTG_Core, &USB_Host);
|
|
}
|
|
|
|
uint8_t usb_keyboard_key = 0;
|
|
|
|
// TODO this is an ugly hack to get key presses
|
|
uint pyb_usb_host_get_keyboard(void) {
|
|
uint key = usb_keyboard_key;
|
|
usb_keyboard_key = 0;
|
|
return key;
|
|
}
|
|
|
|
void USR_MOUSE_Init(void) {
|
|
led_state(4, 1);
|
|
USB_OTG_BSP_mDelay(100);
|
|
led_state(4, 0);
|
|
}
|
|
|
|
void USR_MOUSE_ProcessData(HID_MOUSE_Data_TypeDef *data) {
|
|
led_state(4, 1);
|
|
USB_OTG_BSP_mDelay(50);
|
|
led_state(4, 0);
|
|
}
|
|
|
|
void USR_KEYBRD_Init(void) {
|
|
led_state(4, 1);
|
|
USB_OTG_BSP_mDelay(100);
|
|
led_state(4, 0);
|
|
}
|
|
|
|
void USR_KEYBRD_ProcessData(uint8_t pbuf) {
|
|
led_state(4, 1);
|
|
USB_OTG_BSP_mDelay(50);
|
|
led_state(4, 0);
|
|
usb_keyboard_key = pbuf;
|
|
}
|
|
|
|
#endif // USE_HOST_MODE
|