2019-09-14 15:40:24 -04:00
|
|
|
/*
|
|
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
|
|
*
|
|
|
|
* The MIT License (MIT)
|
|
|
|
*
|
2021-05-19 19:22:07 -04:00
|
|
|
* Copyright (c) 2019-2021 Scott Shawcroft for Adafruit Industries
|
2019-09-14 15:40:24 -04:00
|
|
|
*
|
|
|
|
* 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 <string.h>
|
|
|
|
|
|
|
|
#include "extmod/vfs.h"
|
|
|
|
#include "extmod/vfs_fat.h"
|
Merge tag 'v1.17' into merge-1.17
F-strings, new machine.I2S class, ESP32-C3 support and LEGO_HUB_NO6 board
This release of MicroPython adds support for f-strings (PEP-498), with a
few limitations compared to normal Python. F-strings are essentially
syntactic sugar for "".format() and make formatting strings a lot more
convenient. Other improvements to the core runtime include pretty printing
OSError when it has two arguments (an errno code and a string), scheduling
of KeyboardInterrupt on the main thread, and support for a single argument
to the optimised form of StopIteration.
In the machine module a new I2S class has been added, with support for
esp32 and stm32 ports. This provides a consistent API for transmit and
receive of audio data in blocking, non-blocking and asyncio-based
operation. Also, the json module has support for the "separators" argument
in the dump and dumps functions, and framebuf now includes a way to blit
between frame buffers of different formats using a palette. A new,
portable machine.bitstream function is also added which can output a stream
of bits with configurable timing, and is used as the basis for driving
WS2812 LEDs in a common way across ports.
There has been some restructuring of the repository directory layout, with
all third-party code now in the lib/ directory. And a new top-level
directory shared/ has been added with first-party code that was previously
in lib/ moved there.
The docs have seen further improvement with enhancements and additions to
the rp2 parts, as well as a new quick reference for the zephyr port.
The terms master/slave have been replaced with controller/peripheral,
mainly relating to I2C and SPI usage. And u-module references have been
replaced with just the module name without the u-prefix to help clear up
the intended usage of modules in MicroPython.
For the esp8266 and esp32 ports, hidden networks are now included in WLAN
scan results. On the esp32 the RMT class is enhanced with idle_level and
write_pulses modes. There is initial support for ESP32-C3 chips with
GENERIC_C3 and GENERIC_C3_USB boards.
The javascript port has had its Makefile and garbage collector
implementation reworked so it compiles and runs with latest the Emscripten
using asyncify.
The mimxrt port sees the addition of hardware I2C and SPI support, as well
as some additional methods to the machine module. There is also support
for Hyperflash chips.
The nrf port now has full VFS storage support, enables source-line on
traceback, and has .mpy features consistent with other ports.
For the rp2 port there is now more configurability for boards, and more
boards added.
The stm32 port has a new LEGO_HUB_NO6 board definition with detailed
information how to get this LEGO Hub running stock MicroPython. There is
also now support to change the CPU frequency on STM32WB MCUs. And USBD_xxx
descriptor options have been renamed to MICROPY_HW_USB_xxx.
Thanks to everyone who contributed to this release: Amir Gonnen, Andrew
Scheller, Bryan Tong Minh, Chris Wilson, Damien George, Daniel Mizyrycki,
David Lechner, David P, Fernando, finefoot, Frank Pilhofer, Glenn Ruben
Bakke, iabdalkader, Jeff Epler, Jim Mussared, Jonathan Hogg, Josh Klar,
Josh Lloyd, Julia Hathaway, Krzysztof Adamski, Matúš Olekšák, Michael
Weiss, Michel Bouwmans, Mike Causer, Mike Teachman, Ned Konz, NitiKaur,
oclyke, Patrick Van Oosterwijck, Peter Hinch, Peter Züger, Philipp
Ebensberger, robert-hh, Roberto Colistete Jr, Sashkoiv, Seon Rozenblum,
Tobias Thyrrestrup, Tom McDermott, Will Sowerbutts, Yonatan Goldschmidt.
What follows is a detailed list of changes, generated from the git commit
history, and organised into sections.
Main components
===============
all:
- fix signed shifts and NULL access errors from -fsanitize=undefined
- update to point to files in new shared/ directory
py core:
- mpstate: make exceptions thread-local
- mpstate: schedule KeyboardInterrupt on main thread
- mperrno: add MP_ECANCELED error code
- makeqstrdefs.py: don't include .h files explicitly in preprocessing
- mark unused arguments from bytecode decoding macros
- objexcept: pretty print OSError also when it has 2 arguments
- makeversionhdr: add --tags arg to git describe
- vm: simplify handling of MP_OBJ_STOP_ITERATION in yield-from opcode
- objexcept: make mp_obj_exception_get_value support subclassed excs
- support single argument to optimised MP_OBJ_STOP_ITERATION
- introduce and use mp_raise_type_arg helper
- modsys: optimise sys.exit for code size by using exception helpers
- objexcept: make mp_obj_new_exception_arg1 inline
- obj: fix formatting of comment for mp_obj_is_integer
- emitnative: reuse need_reg_all func in need_stack_settled
- emitnative: ensure stack settling is safe mid-branch
- runtime: fix bool unary op for subclasses of native types
- builtinimport: fix condition for including do_execute_raw_code()
- mkrules: automatically build mpy-cross if it doesn't exist
- implement partial PEP-498 (f-string) support
- lexer: clear fstring_args vstr on lexer free
- mkrules.mk: do submodule sync in "make submodules"
extmod:
- btstack: add missing call to mp_bluetooth_hci_uart_deinit
- btstack: check that BLE is active before performing operations
- uasyncio: get addr and bind server socket before creating task
- axtls-include: add axtls_os_port.h to customise axTLS
- update for move of crypto-algorithms, re1.5, uzlib to lib
- moduselect: conditionally compile select()
- nimble: fix leak in l2cap_send if send-while-stalled
- btstack/btstack.mk: use -Wno-implicit-fallthrough, not =0
- utime: always invoke mp_hal_delay_ms when >= to 0ms
- modbluetooth: clamp MTU values to 32->UINT16_MAX
- nimble: allow modbluetooth binding to hook "sent HCI packet"
- nimble: add "memory stalling" mechanism for l2cap_send
- uasyncio: in open_connection use address info in socket creation
- modujson: add support for dump/dumps separators keyword-argument
- modlwip: fix close and clean up of UDP and raw sockets
- modbluetooth: add send_update arg to gatts_write
- add machine.bitstream
- modframebuf: enable blit between different formats via a palette
lib:
- tinyusb: update to version 0.10.1
- pico-sdk: update to version 1.2.0
- utils/stdout_helpers: make mp_hal_stdout_tx_strn_cooked efficient
- axtls: switch to repo at micropython/axtls
- axtls: update to latest axtls 2.1.5 wih additional commits
- re1.5: move re1.5 code from extmod to lib
- uzlib: move uzlib code from extmod to lib
- crypto-algorithms: move crypto-algorithms code from extmod to lib
- update README's based on contents of these dirs
drivers:
- neopixel: add common machine.bitstream-based neopixel module
- neopixel: optimize fill() for speed
- neopixel: reduce code size of driver
- cyw43: fix cyw43_deinit so it can be called many times in a row
- cyw43: make wifi join fail if interface is not active
mpy-cross:
- disable stack check when building with Emscripten
Support components
==================
docs:
- library: document new esp32.RMT features and fix wait_done
- library: warn that ustruct doesn't handle spaces in format strings
- esp8266/tutorial: change flash mode from dio to dout
- replace master/slave with controller/peripheral in I2C and SPI
- rp2: enhance quickref and change image to Pico pinout
- rp2: update general section to give a brief technical overview
- library/utime.rst: clarify behaviour and precision of sleep ms/us
- library/uasyncio.rst: document stream readexactly() method
- library/machine.I2S.rst: fix use of sd pin in examples
- zephyr: add quick reference for the Zephyr port
- library/zephyr: add libraries specific to the Zephyr port
- templates: add unix and zephyr quickref links to top-index
- rename ufoo.rst to foo.rst
- replace ufoo with foo in all docs
- library/index.rst: clarify module naming and purpose
- library/builtins.rst: add module title
- library/network.rst: simplify socket import
- add docs for machine.bitstream and neopixel module
- library: fix usage of :term: for frozen module reference
- esp8266: use monospace for software tools
- reference: mention that slicing a memoryview causes allocation
examples: no changes specific to this component/port
tests:
- extmod: make uasyncio_heaplock test more deterministic
- cpydiff/modules_struct_whitespace_in_format: run black
- extmod/ujson: add tests for dump/dumps separators argument
- run-multitests.py: add broadcast and wait facility
- multi_bluetooth/ble_subscribe.py: add test for subscription
- extmod/vfs_fat_finaliser.py: ensure alloc at never-used GC blocks
- basics: split f-string debug printing to separate file with .exp
- pybnative: make while.py test run on boards without pyb.delay
tools:
- autobuild: add scripts to build release firmware
- remove obsolete build-stm-latest.sh script
- ci.sh: run apt-get update in ci_powerpc_setup
- makemanifest.py: allow passing flags to mpy-tool.py
- autobuild: add mimxrt port to build scripts for nightly builds
- pyboard.py: add cmd-line option to make soft reset configurable
- mpremote: swap order of PID and VID in connect-list output
- ci.sh: build unix dev variant as part of macOS CI
- ci.sh: build GENERIC_C3 board as part of esp32 CI
- autobuild: use separate IDF version to build newer esp32 SoCs
- autobuild: add FeatherS2 and TinyS2 to esp32 auto builds
- mpremote: add seek whence for mounted files
- mpremote: raise OSError on unsupported RemoteFile.seek
- autobuild: add the MIMXRT1050_EVKB board to the daily builds
- ci.sh: add mpy-cross build to nrf port
- codeformat.py: include ports/nrf/modules/nrf in code formatting
- gen-cpydiff.py: don't rename foo to ufoo in diff output
- autobuild: add auto build for Silicognition wESP32
- mpremote: fix connect-list in case VID/PID are None
- mpremote: add "devs" shortcut for "connect list"
- mpremote: remove support for pyb.USB_VCP in/out specialisation
- autobuild: don't use "-B" for make, it's already a fresh build
- pyboard.py: move --no-exclusive/--soft-reset out of mutex group
- pyboard.py: make --no-follow use same variable as --follow
- pyboard.py: add --exclusive to match --no-exclusive
- pyboard.py: make --no-soft-reset consistent with other args
- uncrustify: force 1 newline at end of file
- mpremote: bump version to 0.0.6
CI:
- workflows: add workflow to build and test javascript port
- workflows: switch from Coveralls to Codecov
- workflows: switch from lcov to gcov
- workflows: add workflow to build and test unix dev variant
The ports
=========
all ports:
- use common mp_hal_stdout_tx_strn_cooked instead of custom one
- update for move of crypto-algorithms, uzlib to lib
- rename USBD_VID/PID config macros to MICROPY_HW_USB_VID/PID
bare-arm port: no changes specific to this component/port
cc3200 port: no changes specific to this component/port
esp8266 port:
- add __len__ to NeoPixel driver to support iterating
- Makefile: add more libm files to build
- include hidden networks in WLAN.scan results
- replace esp.neopixel with machine.bitstream
- remove dead code for end_ticks in machine_bitstream
esp32 port:
- boards/sdkconfig.base: disable MEMPROT_FEATURE to alloc from IRAM
- add __len__ to NeoPixel driver to support iterating
- main: allow MICROPY_DIR to be overridden
- esp32_rmt: fix RMT looping in newer IDF versions
- esp32_rmt: enhance RMT with idle_level and write_pulses modes
- add new machine.I2S class for I2S protocol support
- machine_spi: calculate actual attained baudrate
- machine_hw_spi: use a 2 item SPI queue for long transfers
- machine_dac: add MICROPY_PY_MACHINE_DAC option, enable by default
- machine_i2s: add MICROPY_PY_MACHINE_I2S option, enable by default
- fix use of mp_int_t, size_t and uintptr_t
- add initial support for ESP32C3 SoCs
- boards/GENERIC_C3: add generic C3-based board
- modmachine: release the GIL in machine.idle()
- mphalport: always yield at least once in delay_ms
- machine_uart: add flow kw-arg to enable hardware flow control
- boards: add Silicognition wESP32 board configuration
- mpconfigport.h: enable reverse and inplace special methods
- include hidden networks in WLAN.scan results
- makeimg.py: get bootloader and partition offset from sdkconfig
- enable MICROPY_PY_FSTRINGS by default
- machine_hw_spi: release GIL during transfers
- machine_pin: make check for non-output pins respect chip variant
- replace esp.neopixel with machine.bitstream
- remove dead code for end_ticks in machine_bitstream
- boards: add GENERIC_C3_USB board with USB serial/JTAG support
javascript port:
- rework Makefile and GC so it works with latest Emscripten
- Makefile: suppress compiler errors from array bounds
- Makefile: change variable to EXPORTED_RUNTIME_METHODS
mimxrt port:
- move calc_weekday helper function to timeutils
- machine_spi: add the SPI class to the machine module
- moduos: seed the PRNG on boot using the TRNG
- boards: set vfs partition start to 1 MBbyte
- main: skip running main.py if boot.py failed
- main: extend the information returned by help()
- mimxrt_flash: remove commented-out code
- modmachine: add a few minor methods to the machine module
- machine_led: use mp_raise_msg_varg helper
- machine_i2c: add hardware-based machine.I2C to machine module
- add support for Hyperflash chips
- boards: add support for the MIMXRT1050_EVKB board
- machine_pin: implement ioctl for Pin
minimal port:
- Makefile: add support for building with user C modules
nrf port:
- modules: replace master/slave with controller/peripheral in SPI
- boards/common.ld: calculate unused flash region
- modules/nrf: add new nrf module with flash block device
- drivers: add support for using flash block device with SoftDevice
- mpconfigport.h: expose nrf module when MICROPY_PY_NRF is set
- README: update README.md to reflect internal file systems
- mpconfigport.h: tune FAT FS configuration
- Makefile: add _fs_size linker script override from make
- modules/uos: allow a board to configure MICROPY_VFS_FAT/LFS1/LFS2
- mpconfigport.h: enable MICROPY_PY_IO_FILEIO when an FS is enabled
- qstrdefsport.h: add entries for in-built FS mount points
- main: add auto mount and auto format hook for internal flash FS
- boards: enable needed features for FAT/LFS1/LFS2
- facilitate use of freeze manifest
- boards: set FROZEN_MANIFEST blank when SD present on nrf51 targets
- modules/scripts: add file system formatting script
- Makefile: set default manifest file for all targets
- mphalport: add dummy function for mp_hal_time_ns()
- boards: enable MICROPY_VFS_LFS2 for all target boards
- modules/uos: add ilistdir to uos module
- modules/nrf: add function to enable/disable DCDC
- enable source line on tracebacks
- set .mpy features consistent with documentation and other ports
pic16bit port: no changes specific to this component/port
powerpc port: no changes specific to this component/port
qemu-arm port: no changes specific to this component/port
rp2 port:
- use 0=Monday datetime convention in RTC
- machine_rtc: in RTC.datetime, compute weekday automatically
- CMakeLists.txt: suppress compiler errors for pico-sdk and tinyusb
- tusb_config.h: set CFG_TUD_CDC_EP_BUFSIZE to 256
- machine_uart: add hardware flow control support
- machine_uart: allow overriding default machine UART pins
- machine_i2c: allow boards to configure I2C pins using new macros
- machine_spi: allow boards to configure SPI pins using new macros
- machine_uart: fix poll ioctl to also check hardware FIFO
- machine_uart: fix read when FIFO has chars but ringbuf doesn't
- tusb_port: allow boards to configure USB VID and PID
- boards/ADAFRUIT_FEATHER_RP2040: configure custom VID/PID
- boards/ADAFRUIT_FEATHER_RP2040: configure I2C/SPI default pins
- boards/SPARKFUN_PROMICRO: configure UART/I2C/SPI default pins
- boards/SPARKFUN_THINGPLUS: configure I2C/SPI default pins
- boards: add Adafruit ItsyBitsy RP2040
- boards: add Adafruit QT Py RP2040
- boards: add Pimoroni Pico LiPo 4MB
- boards: add Pimoroni Pico LiPo 16MB
- boards: add Pimoroni Tiny 2040
- CMakeLists.txt: allow a board's cmake to set the manifest path
- enable MICROPY_PY_FSTRINGS by default
- Makefile: add "submodules" target, to match other ports
- rp2_flash: disable IRQs while calling flash_erase/program
- CMakeLists.txt: add option to enable double tap reset to bootrom
- mpconfigport.h: allow boards to add root pointers
samd port:
- add support for building with user C modules
stm32 port:
- softtimer: add soft_timer_reinsert() helper function
- mpbthciport: change from systick to soft-timer for BT scheduling
- provide a custom BTstack runloop that integrates with soft timer
- usb: make irq's default trigger enable all events
- boardctrl: skip running main.py if boot.py had an error
- sdio: fix undefined reference to DMA stream on H7
- dma: add DMAMUX configuration for H7 to fix dma_nohal_init
- main: call mp_deinit() at end of main
- adc: allow using ADC12 and ADC3 for H7
- adc: define the ADC instance used for internal channels
- adc: simplify and generalise how pin_adcX table is defined
- add new machine.I2S class for I2S protocol support
- boards/NUCLEO_F446RE: fix I2C1 pin assignment to match datasheet
- replace master/slave with controller/peripheral in I2C and SPI
- systick: always POLL_HOOK when delaying for milliseconds
- sdram: make SDRAM test cache aware, and optional failure with msg
- boards/NUCLEO_F446RE: enable CAN bus support
- boards: add support for SparkFun STM32 MicroMod Processor board
- uart: fix LPUART1 baudrate set/get
- uart: support low baudrates on LPUART1
- boards/STM32F429DISC: set correct UART2 pins and add UART3/6
- boards/NUCLEO_F439ZI: add board definition for NUCLEO_F439ZI
- boards/LEGO_HUB_NO6: add board definition for LEGO_HUB_NO6
- Makefile: update to only pull in used Bluetooth library
- README.md: update supported MCUs, and submodule and mboot use
- usbd_desc: rename USBD_xxx descriptor opts to MICROPY_HW_USB_xxx
- usbd_cdc_interface: rename USBD_CDC_xx opts to MICROPY_HW_USB_xx
- powerctrl: support changing frequency on WB MCUs
- boards/NUCLEO_H743ZI2: add modified version of NUCLEO_H743ZI
- mbedtls: fix compile warning about uninitialized val
- enable MICROPY_PY_FSTRINGS by default
- add implementation of machine.bitstream
- Makefile: allow GIT_SUBMODULES and LIBS to be extended
- stm32_it: support TIM17 IRQs on WB MCUs
- disable computed goto on constrained boards
- storage: make extended-block-device more configurable
- boards/LEGO_HUB_NO6: change SPI flash storage to use hardware SPI
- boards/LEGO_HUB_NO6: skip first 1MiB of SPI flash for storage
- boards/LEGO_HUB_NO6: add make commands to backup/restore firmware
teensy port: no changes specific to this component/port
unix port:
- modffi: add option to lock GC in callback, and cfun access
- Makefile: add back LIB_SRC_C to list of object files
- variants: enable help and help("modules") on standard and dev
- Makefile: disable error compression on arm-linux-gnueabi-gcc
windows port:
- Makefile: add .exe extension to executables name
- appveyor: update to VS 2017 and use Python 3.8 for build/test
zephyr port:
- machine_spi: add support for hardware SPI
2021-10-14 15:38:41 -04:00
|
|
|
#include "shared/timeutils/timeutils.h"
|
2019-09-14 15:40:24 -04:00
|
|
|
|
|
|
|
#include "shared-bindings/_bleio/__init__.h"
|
|
|
|
#include "shared-bindings/_bleio/Adapter.h"
|
|
|
|
#include "shared-bindings/_bleio/Characteristic.h"
|
2021-05-19 19:22:07 -04:00
|
|
|
#include "shared-bindings/_bleio/PacketBuffer.h"
|
2019-09-14 15:40:24 -04:00
|
|
|
#include "shared-bindings/_bleio/Service.h"
|
|
|
|
#include "shared-bindings/_bleio/UUID.h"
|
2021-05-19 19:22:07 -04:00
|
|
|
#include "shared-module/storage/__init__.h"
|
|
|
|
|
|
|
|
#include "bluetooth/ble_drv.h"
|
2019-09-14 15:40:24 -04:00
|
|
|
|
|
|
|
#include "common-hal/_bleio/__init__.h"
|
|
|
|
|
2021-09-07 21:03:42 -04:00
|
|
|
#include "supervisor/fatfs_port.h"
|
2019-09-14 15:40:24 -04:00
|
|
|
#include "supervisor/shared/autoreload.h"
|
2021-06-25 17:58:32 -04:00
|
|
|
#include "supervisor/shared/bluetooth/file_transfer_protocol.h"
|
2021-05-19 19:22:07 -04:00
|
|
|
#include "supervisor/shared/tick.h"
|
|
|
|
#include "supervisor/usb.h"
|
2019-09-14 15:40:24 -04:00
|
|
|
|
|
|
|
#include "py/mpstate.h"
|
2021-08-23 21:08:30 -04:00
|
|
|
#include "py/stackctrl.h"
|
2019-09-14 15:40:24 -04:00
|
|
|
|
2021-06-25 17:58:32 -04:00
|
|
|
STATIC bleio_service_obj_t supervisor_ble_service;
|
|
|
|
STATIC bleio_uuid_obj_t supervisor_ble_service_uuid;
|
|
|
|
STATIC bleio_characteristic_obj_t supervisor_ble_version_characteristic;
|
|
|
|
STATIC bleio_uuid_obj_t supervisor_ble_version_uuid;
|
|
|
|
STATIC bleio_characteristic_obj_t supervisor_ble_transfer_characteristic;
|
|
|
|
STATIC bleio_uuid_obj_t supervisor_ble_transfer_uuid;
|
2021-05-19 19:22:07 -04:00
|
|
|
|
|
|
|
// This is the base UUID for the file transfer service.
|
|
|
|
const uint8_t file_transfer_base_uuid[16] = {0x72, 0x65, 0x66, 0x73, 0x6e, 0x61, 0x72, 0x54, 0x65, 0x6c, 0x69, 0x46, 0x00, 0x00, 0xaf, 0xad };
|
2021-06-25 17:58:32 -04:00
|
|
|
|
|
|
|
STATIC mp_obj_list_t characteristic_list;
|
|
|
|
STATIC mp_obj_t characteristic_list_items[2];
|
2021-05-19 19:22:07 -04:00
|
|
|
// 2 * 10 ringbuf packets, 512 for a disk sector and 12 for the file transfer write header.
|
|
|
|
#define PACKET_BUFFER_SIZE (2 * 10 + 512 + 12)
|
|
|
|
// uint32_t so its aligned
|
2021-06-25 17:58:32 -04:00
|
|
|
STATIC uint32_t _buffer[PACKET_BUFFER_SIZE / 4 + 1];
|
|
|
|
STATIC uint32_t _outgoing1[BLE_GATTS_VAR_ATTR_LEN_MAX / 4];
|
|
|
|
STATIC uint32_t _outgoing2[BLE_GATTS_VAR_ATTR_LEN_MAX / 4];
|
|
|
|
STATIC ble_drv_evt_handler_entry_t static_handler_entry;
|
|
|
|
STATIC bleio_packet_buffer_obj_t _transfer_packet_buffer;
|
2019-09-14 15:40:24 -04:00
|
|
|
|
2021-06-25 17:58:32 -04:00
|
|
|
void supervisor_start_bluetooth_file_transfer(void) {
|
2019-09-14 15:40:24 -04:00
|
|
|
supervisor_ble_service_uuid.base.type = &bleio_uuid_type;
|
2021-05-19 19:22:07 -04:00
|
|
|
common_hal_bleio_uuid_construct(&supervisor_ble_service_uuid, 0xfebb, NULL);
|
2019-09-14 15:40:24 -04:00
|
|
|
|
|
|
|
// We know we'll only be 1 characteristic so we can statically allocate it.
|
|
|
|
characteristic_list.base.type = &mp_type_list;
|
|
|
|
characteristic_list.alloc = sizeof(characteristic_list_items) / sizeof(characteristic_list_items[0]);
|
|
|
|
characteristic_list.len = 0;
|
|
|
|
characteristic_list.items = characteristic_list_items;
|
|
|
|
mp_seq_clear(characteristic_list.items, 0, characteristic_list.alloc, sizeof(*characteristic_list.items));
|
2019-11-22 19:33:48 -05:00
|
|
|
|
2019-10-22 20:24:04 -04:00
|
|
|
_common_hal_bleio_service_construct(&supervisor_ble_service, &supervisor_ble_service_uuid, false /* is secondary */, &characteristic_list);
|
2019-09-14 15:40:24 -04:00
|
|
|
|
2021-05-19 19:22:07 -04:00
|
|
|
// Version number
|
2019-09-14 15:40:24 -04:00
|
|
|
supervisor_ble_version_uuid.base.type = &bleio_uuid_type;
|
2021-05-19 19:22:07 -04:00
|
|
|
common_hal_bleio_uuid_construct(&supervisor_ble_version_uuid, 0x0100, file_transfer_base_uuid);
|
2019-09-14 15:40:24 -04:00
|
|
|
common_hal_bleio_characteristic_construct(&supervisor_ble_version_characteristic,
|
2021-03-15 09:57:36 -04:00
|
|
|
&supervisor_ble_service,
|
|
|
|
0, // handle (for remote only)
|
|
|
|
&supervisor_ble_version_uuid,
|
|
|
|
CHAR_PROP_READ,
|
|
|
|
SECURITY_MODE_OPEN,
|
|
|
|
SECURITY_MODE_NO_ACCESS,
|
|
|
|
4, // max length
|
|
|
|
true, // fixed length
|
2021-06-25 17:58:32 -04:00
|
|
|
NULL, // no initial value
|
|
|
|
NULL); // no description
|
2019-09-14 15:40:24 -04:00
|
|
|
|
2021-09-13 17:44:05 -04:00
|
|
|
uint32_t version = 4;
|
2019-09-14 15:40:24 -04:00
|
|
|
mp_buffer_info_t bufinfo;
|
|
|
|
bufinfo.buf = &version;
|
|
|
|
bufinfo.len = sizeof(version);
|
|
|
|
common_hal_bleio_characteristic_set_value(&supervisor_ble_version_characteristic, &bufinfo);
|
|
|
|
|
|
|
|
// Active filename.
|
2021-05-19 19:22:07 -04:00
|
|
|
supervisor_ble_transfer_uuid.base.type = &bleio_uuid_type;
|
|
|
|
common_hal_bleio_uuid_construct(&supervisor_ble_transfer_uuid, 0x0200, file_transfer_base_uuid);
|
|
|
|
common_hal_bleio_characteristic_construct(&supervisor_ble_transfer_characteristic,
|
2021-03-15 09:57:36 -04:00
|
|
|
&supervisor_ble_service,
|
|
|
|
0, // handle (for remote only)
|
2021-05-19 19:22:07 -04:00
|
|
|
&supervisor_ble_transfer_uuid,
|
|
|
|
CHAR_PROP_READ | CHAR_PROP_WRITE_NO_RESPONSE | CHAR_PROP_NOTIFY,
|
|
|
|
SECURITY_MODE_ENC_NO_MITM,
|
|
|
|
SECURITY_MODE_ENC_NO_MITM,
|
|
|
|
BLE_GATTS_VAR_ATTR_LEN_MAX, // max length
|
2021-03-15 09:57:36 -04:00
|
|
|
false, // fixed length
|
2021-06-25 17:58:32 -04:00
|
|
|
NULL, // no initial valuen
|
|
|
|
NULL);
|
2019-09-14 15:40:24 -04:00
|
|
|
|
2021-05-19 19:22:07 -04:00
|
|
|
_common_hal_bleio_packet_buffer_construct(
|
|
|
|
&_transfer_packet_buffer, &supervisor_ble_transfer_characteristic,
|
|
|
|
_buffer, PACKET_BUFFER_SIZE,
|
|
|
|
_outgoing1, _outgoing2, BLE_GATTS_VAR_ATTR_LEN_MAX,
|
|
|
|
&static_handler_entry);
|
|
|
|
}
|
2019-09-14 15:40:24 -04:00
|
|
|
|
2021-05-19 19:22:07 -04:00
|
|
|
#define COMMAND_SIZE 1024
|
|
|
|
|
|
|
|
#define ANY_COMMAND 0x00
|
|
|
|
#define THIS_COMMAND 0x01
|
|
|
|
|
2021-09-13 19:12:40 -04:00
|
|
|
// FATFS has a two second timestamp resolution but the BLE API allows for nanosecond resolution.
|
|
|
|
// This function truncates the time the time to a resolution storable by FATFS and fills in the
|
|
|
|
// FATFS encoded version into fattime.
|
2021-09-07 21:03:42 -04:00
|
|
|
uint64_t truncate_time(uint64_t input_time, DWORD *fattime) {
|
|
|
|
timeutils_struct_time_t tm;
|
|
|
|
uint64_t seconds_since_epoch = timeutils_seconds_since_epoch_from_nanoseconds_since_1970(input_time);
|
|
|
|
timeutils_seconds_since_epoch_to_struct_time(seconds_since_epoch, &tm);
|
|
|
|
uint64_t truncated_time = timeutils_nanoseconds_since_epoch_to_nanoseconds_since_1970((seconds_since_epoch / 2) * 2 * 1000000000);
|
|
|
|
|
|
|
|
*fattime = ((tm.tm_year - 1980) << 25) | (tm.tm_mon << 21) | (tm.tm_mday << 16) |
|
|
|
|
(tm.tm_hour << 11) | (tm.tm_min << 5) | (tm.tm_sec >> 1);
|
|
|
|
return truncated_time;
|
|
|
|
}
|
|
|
|
|
2021-05-19 19:22:07 -04:00
|
|
|
// Used by read and write.
|
2021-06-25 17:58:32 -04:00
|
|
|
STATIC FIL active_file;
|
|
|
|
STATIC uint8_t _process_read(const uint8_t *raw_buf, size_t command_len) {
|
2021-05-19 19:22:07 -04:00
|
|
|
struct read_command *command = (struct read_command *)raw_buf;
|
2021-09-07 21:03:42 -04:00
|
|
|
size_t header_size = sizeof(struct read_command);
|
|
|
|
size_t response_size = sizeof(struct read_data);
|
2021-05-19 19:22:07 -04:00
|
|
|
uint8_t data_buffer[response_size];
|
|
|
|
struct read_data response;
|
|
|
|
response.command = READ_DATA;
|
|
|
|
response.status = STATUS_OK;
|
|
|
|
if (command->path_length > (COMMAND_SIZE - response_size - 1)) { // -1 for the null we'll write
|
|
|
|
// TODO: throw away any more packets of path.
|
|
|
|
response.status = STATUS_ERROR;
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, response_size, NULL, 0);
|
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
|
|
|
// We need to receive another packet to have the full path.
|
|
|
|
if (command_len < header_size + command->path_length) {
|
|
|
|
return THIS_COMMAND;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *path = (char *)((uint8_t *)command) + header_size;
|
|
|
|
path[command->path_length] = '\0';
|
2019-09-14 15:40:24 -04:00
|
|
|
|
2021-05-19 19:22:07 -04:00
|
|
|
FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
|
|
|
|
FRESULT result = f_open(fs, &active_file, path, FA_READ);
|
|
|
|
if (result != FR_OK) {
|
|
|
|
response.status = STATUS_ERROR;
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, response_size, NULL, 0);
|
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
|
|
|
uint32_t total_length = f_size(&active_file);
|
|
|
|
// Write out the response header.
|
|
|
|
uint32_t offset = command->chunk_offset;
|
|
|
|
uint32_t chunk_size = command->chunk_size;
|
|
|
|
chunk_size = MIN(chunk_size, total_length - offset);
|
|
|
|
response.chunk_offset = offset;
|
|
|
|
response.total_length = total_length;
|
|
|
|
response.data_size = chunk_size;
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, response_size, NULL, 0);
|
|
|
|
f_lseek(&active_file, offset);
|
|
|
|
// Write out the chunk contents. We can do this in small pieces because PacketBuffer
|
|
|
|
// will assemble them into larger packets of its own.
|
|
|
|
size_t chunk_end = offset + chunk_size;
|
|
|
|
while (offset < chunk_end) {
|
|
|
|
size_t quantity_read;
|
|
|
|
size_t read_amount = MIN(response_size, chunk_end - offset);
|
|
|
|
f_read(&active_file, data_buffer, read_amount, &quantity_read);
|
|
|
|
offset += quantity_read;
|
|
|
|
// TODO: Do something if the read fails
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, data_buffer, quantity_read, NULL, 0);
|
|
|
|
}
|
|
|
|
if (offset >= total_length) {
|
|
|
|
f_close(&active_file);
|
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
|
|
|
return READ_PACING;
|
2019-09-14 15:40:24 -04:00
|
|
|
}
|
|
|
|
|
2021-09-07 21:03:42 -04:00
|
|
|
STATIC uint8_t _process_read_pacing(const uint8_t *raw_buf, size_t command_len) {
|
|
|
|
struct read_pacing *command = (struct read_pacing *)raw_buf;
|
|
|
|
struct read_data response;
|
|
|
|
response.command = READ_DATA;
|
|
|
|
response.status = STATUS_OK;
|
|
|
|
size_t response_size = sizeof(struct read_data);
|
|
|
|
|
2021-05-19 19:22:07 -04:00
|
|
|
uint32_t total_length = f_size(&active_file);
|
|
|
|
// Write out the response header.
|
2021-09-07 21:03:42 -04:00
|
|
|
uint32_t chunk_size = MIN(command->chunk_size, total_length - command->chunk_offset);
|
|
|
|
response.chunk_offset = command->chunk_offset;
|
|
|
|
response.total_length = total_length;
|
|
|
|
response.data_size = chunk_size;
|
2021-05-19 19:22:07 -04:00
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, response_size, NULL, 0);
|
2021-09-07 21:03:42 -04:00
|
|
|
f_lseek(&active_file, command->chunk_offset);
|
2021-05-19 19:22:07 -04:00
|
|
|
// Write out the chunk contents. We can do this in small pieces because PacketBuffer
|
|
|
|
// will assemble them into larger packets of its own.
|
|
|
|
size_t chunk_offset = 0;
|
2021-09-07 21:03:42 -04:00
|
|
|
uint8_t data[20];
|
2021-05-19 19:22:07 -04:00
|
|
|
while (chunk_offset < chunk_size) {
|
|
|
|
size_t quantity_read;
|
2021-09-07 21:03:42 -04:00
|
|
|
size_t read_size = MIN(chunk_size - chunk_offset, sizeof(data));
|
|
|
|
FRESULT result = f_read(&active_file, &data, read_size, &quantity_read);
|
2021-05-19 19:22:07 -04:00
|
|
|
if (quantity_read == 0 || result != FR_OK) {
|
|
|
|
// TODO: If we can't read everything, then the file must have been shortened. Maybe we
|
|
|
|
// should return 0s to pad it out.
|
|
|
|
break;
|
|
|
|
}
|
2021-09-07 21:03:42 -04:00
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&data, quantity_read, NULL, 0);
|
2021-05-19 19:22:07 -04:00
|
|
|
chunk_offset += quantity_read;
|
|
|
|
}
|
2021-09-07 21:03:42 -04:00
|
|
|
if ((chunk_offset + chunk_size) >= total_length) {
|
2021-05-19 19:22:07 -04:00
|
|
|
f_close(&active_file);
|
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
|
|
|
return READ_PACING;
|
|
|
|
}
|
2019-09-14 15:40:24 -04:00
|
|
|
|
2021-05-19 19:22:07 -04:00
|
|
|
// Used by write and write data to know when the write is complete.
|
2021-06-25 17:58:32 -04:00
|
|
|
STATIC size_t total_write_length;
|
2021-09-07 21:03:42 -04:00
|
|
|
STATIC uint64_t _truncated_time;
|
2021-06-25 17:58:32 -04:00
|
|
|
|
2021-09-13 19:12:40 -04:00
|
|
|
// Returns true if usb is active and replies with an error if so. If not, it grabs
|
|
|
|
// the USB mass storage lock and returns false. Make sure to release the lock with
|
|
|
|
// usb_msc_unlock() when the transaction is complete.
|
|
|
|
STATIC bool _usb_active(void *response, size_t response_size) {
|
|
|
|
// Check to see if USB has already been mounted. If not, then we "eject" from USB until we're done.
|
|
|
|
#if CIRCUITPY_USB && CIRCUITPY_USB_MSC
|
|
|
|
if (storage_usb_enabled() && !usb_msc_lock()) {
|
|
|
|
// Status is always the second byte of the response.
|
|
|
|
((uint8_t *)response)[1] = STATUS_ERROR_READONLY;
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)response, response_size, NULL, 0);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2021-06-25 17:58:32 -04:00
|
|
|
STATIC uint8_t _process_write(const uint8_t *raw_buf, size_t command_len) {
|
2021-05-19 19:22:07 -04:00
|
|
|
struct write_command *command = (struct write_command *)raw_buf;
|
2021-09-07 21:03:42 -04:00
|
|
|
size_t header_size = sizeof(struct write_command);
|
2021-05-19 19:22:07 -04:00
|
|
|
struct write_pacing response;
|
|
|
|
response.command = WRITE_PACING;
|
|
|
|
response.status = STATUS_OK;
|
|
|
|
if (command->path_length > (COMMAND_SIZE - header_size - 1)) { // -1 for the null we'll write
|
|
|
|
// TODO: throw away any more packets of path.
|
|
|
|
response.status = STATUS_ERROR;
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct write_pacing), NULL, 0);
|
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
|
|
|
// We need to receive another packet to have the full path.
|
|
|
|
if (command_len < header_size + command->path_length) {
|
|
|
|
return THIS_COMMAND;
|
|
|
|
}
|
|
|
|
total_write_length = command->total_length;
|
|
|
|
|
|
|
|
char *path = (char *)command->path;
|
|
|
|
path[command->path_length] = '\0';
|
2021-09-13 19:12:40 -04:00
|
|
|
if (_usb_active(&response, sizeof(struct write_pacing))) {
|
2021-05-19 19:22:07 -04:00
|
|
|
return ANY_COMMAND;
|
2019-09-14 15:40:24 -04:00
|
|
|
}
|
2021-05-19 19:22:07 -04:00
|
|
|
|
|
|
|
FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
|
2021-09-07 21:03:42 -04:00
|
|
|
DWORD fattime;
|
|
|
|
_truncated_time = truncate_time(command->modification_time, &fattime);
|
|
|
|
override_fattime(fattime);
|
2021-05-19 19:22:07 -04:00
|
|
|
FRESULT result = f_open(fs, &active_file, path, FA_WRITE | FA_OPEN_ALWAYS);
|
|
|
|
if (result != FR_OK) {
|
|
|
|
response.status = STATUS_ERROR;
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct write_pacing), NULL, 0);
|
|
|
|
#if CIRCUITPY_USB_MSC
|
|
|
|
usb_msc_unlock();
|
|
|
|
#endif
|
2021-09-07 21:03:42 -04:00
|
|
|
override_fattime(0);
|
2021-05-19 19:22:07 -04:00
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
|
|
|
// Write out the pacing response.
|
|
|
|
|
|
|
|
// Align the next chunk to a sector boundary.
|
|
|
|
uint32_t offset = command->offset;
|
|
|
|
size_t chunk_size = MIN(total_write_length - offset, 512 - (offset % 512));
|
2021-07-01 15:49:11 -04:00
|
|
|
// Special case when truncating the file. (Deleting stuff off the end.)
|
|
|
|
if (chunk_size == 0) {
|
|
|
|
f_lseek(&active_file, offset);
|
|
|
|
f_truncate(&active_file);
|
|
|
|
f_close(&active_file);
|
2021-09-07 21:03:42 -04:00
|
|
|
override_fattime(0);
|
2021-07-01 15:49:11 -04:00
|
|
|
#if CIRCUITPY_USB_MSC
|
|
|
|
usb_msc_unlock();
|
|
|
|
#endif
|
|
|
|
}
|
2021-05-19 19:22:07 -04:00
|
|
|
response.offset = offset;
|
|
|
|
response.free_space = chunk_size;
|
2021-09-07 21:03:42 -04:00
|
|
|
response.truncated_time = _truncated_time;
|
2021-05-19 19:22:07 -04:00
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct write_pacing), NULL, 0);
|
2021-07-01 15:49:11 -04:00
|
|
|
if (chunk_size == 0) {
|
|
|
|
// Don't reload until everything is written out of the packet buffer.
|
|
|
|
common_hal_bleio_packet_buffer_flush(&_transfer_packet_buffer);
|
|
|
|
// Trigger an autoreload
|
2021-08-23 21:08:30 -04:00
|
|
|
autoreload_start();
|
2021-07-01 15:49:11 -04:00
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
|
|
|
|
2021-05-19 19:22:07 -04:00
|
|
|
return WRITE_DATA;
|
2019-09-14 15:40:24 -04:00
|
|
|
}
|
|
|
|
|
2021-06-25 17:58:32 -04:00
|
|
|
STATIC uint8_t _process_write_data(const uint8_t *raw_buf, size_t command_len) {
|
2021-05-19 19:22:07 -04:00
|
|
|
struct write_data *command = (struct write_data *)raw_buf;
|
2021-09-07 21:03:42 -04:00
|
|
|
size_t header_size = sizeof(struct write_data);
|
2021-05-19 19:22:07 -04:00
|
|
|
struct write_pacing response;
|
|
|
|
response.command = WRITE_PACING;
|
|
|
|
response.status = STATUS_OK;
|
|
|
|
if (command->data_size > (COMMAND_SIZE - header_size - 1)) { // -1 for the null we'll write
|
|
|
|
// TODO: throw away any more packets of path.
|
|
|
|
response.status = STATUS_ERROR;
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct write_pacing), NULL, 0);
|
|
|
|
#if CIRCUITPY_USB_MSC
|
|
|
|
usb_msc_unlock();
|
|
|
|
#endif
|
2021-09-07 21:03:42 -04:00
|
|
|
override_fattime(0);
|
2021-05-19 19:22:07 -04:00
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
|
|
|
// We need to receive another packet to have the full path.
|
|
|
|
if (command_len < header_size + command->data_size) {
|
|
|
|
return THIS_COMMAND;
|
|
|
|
}
|
|
|
|
uint32_t offset = command->offset;
|
|
|
|
f_lseek(&active_file, offset);
|
|
|
|
UINT actual;
|
|
|
|
f_write(&active_file, command->data, command->data_size, &actual);
|
|
|
|
if (actual < command->data_size) { // -1 for the null we'll write
|
|
|
|
// TODO: throw away any more packets of path.
|
|
|
|
response.status = STATUS_ERROR;
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct write_pacing), NULL, 0);
|
|
|
|
#if CIRCUITPY_USB_MSC
|
|
|
|
usb_msc_unlock();
|
|
|
|
#endif
|
2021-09-07 21:03:42 -04:00
|
|
|
override_fattime(0);
|
2021-05-19 19:22:07 -04:00
|
|
|
return ANY_COMMAND;
|
2019-09-14 15:40:24 -04:00
|
|
|
}
|
2021-05-19 19:22:07 -04:00
|
|
|
offset += command->data_size;
|
|
|
|
// Align the next chunk to a sector boundary.
|
|
|
|
size_t chunk_size = MIN(total_write_length - offset, 512);
|
|
|
|
response.offset = offset;
|
|
|
|
response.free_space = chunk_size;
|
2021-09-07 21:03:42 -04:00
|
|
|
response.truncated_time = _truncated_time;
|
2021-05-19 19:22:07 -04:00
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct write_pacing), NULL, 0);
|
|
|
|
if (total_write_length == offset) {
|
|
|
|
f_truncate(&active_file);
|
|
|
|
f_close(&active_file);
|
2021-09-07 21:03:42 -04:00
|
|
|
override_fattime(0);
|
2021-05-19 19:22:07 -04:00
|
|
|
#if CIRCUITPY_USB_MSC
|
|
|
|
usb_msc_unlock();
|
|
|
|
#endif
|
|
|
|
// Don't reload until everything is written out of the packet buffer.
|
|
|
|
common_hal_bleio_packet_buffer_flush(&_transfer_packet_buffer);
|
|
|
|
// Trigger an autoreload
|
2021-08-23 21:08:30 -04:00
|
|
|
autoreload_start();
|
2021-05-19 19:22:07 -04:00
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
|
|
|
return WRITE_DATA;
|
|
|
|
}
|
2019-09-14 15:40:24 -04:00
|
|
|
|
2021-08-23 21:08:30 -04:00
|
|
|
STATIC FRESULT _delete_directory_contents(FATFS *fs, const TCHAR *path) {
|
|
|
|
FF_DIR dir;
|
|
|
|
FRESULT res = f_opendir(fs, &dir, path);
|
|
|
|
FILINFO file_info;
|
|
|
|
// Check the stack since we're putting paths on it.
|
|
|
|
if (mp_stack_usage() >= MP_STATE_THREAD(stack_limit)) {
|
|
|
|
return FR_INT_ERR;
|
|
|
|
}
|
|
|
|
while (res == FR_OK) {
|
|
|
|
res = f_readdir(&dir, &file_info);
|
|
|
|
if (res != FR_OK || file_info.fname[0] == '\0') {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
size_t pathlen = strlen(path);
|
|
|
|
size_t fnlen = strlen(file_info.fname);
|
|
|
|
TCHAR full_path[pathlen + 1 + fnlen];
|
|
|
|
memcpy(full_path, path, pathlen);
|
|
|
|
full_path[pathlen] = '/';
|
|
|
|
size_t full_pathlen = pathlen + 1 + fnlen;
|
|
|
|
memcpy(full_path + pathlen + 1, file_info.fname, fnlen);
|
|
|
|
full_path[full_pathlen] = '\0';
|
|
|
|
if ((file_info.fattrib & AM_DIR) != 0) {
|
|
|
|
res = _delete_directory_contents(fs, full_path);
|
|
|
|
}
|
|
|
|
if (res != FR_OK) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
res = f_unlink(fs, full_path);
|
|
|
|
}
|
|
|
|
f_closedir(&dir);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2021-06-25 17:58:32 -04:00
|
|
|
STATIC uint8_t _process_delete(const uint8_t *raw_buf, size_t command_len) {
|
2021-05-19 19:22:07 -04:00
|
|
|
const struct delete_command *command = (struct delete_command *)raw_buf;
|
2021-09-07 21:03:42 -04:00
|
|
|
size_t header_size = sizeof(struct delete_command);
|
2021-06-25 17:58:32 -04:00
|
|
|
struct delete_status response;
|
2021-05-19 19:22:07 -04:00
|
|
|
response.command = DELETE_STATUS;
|
|
|
|
response.status = STATUS_OK;
|
|
|
|
if (command->path_length > (COMMAND_SIZE - header_size - 1)) { // -1 for the null we'll write
|
|
|
|
// TODO: throw away any more packets of path.
|
|
|
|
response.status = STATUS_ERROR;
|
2021-06-25 17:58:32 -04:00
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct delete_status), NULL, 0);
|
2021-05-19 19:22:07 -04:00
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
2021-09-13 19:12:40 -04:00
|
|
|
if (_usb_active(&response, sizeof(struct delete_status))) {
|
2021-09-13 17:44:05 -04:00
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
2021-05-19 19:22:07 -04:00
|
|
|
// We need to receive another packet to have the full path.
|
|
|
|
if (command_len < header_size + command->path_length) {
|
|
|
|
return THIS_COMMAND;
|
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
|
2021-05-19 19:22:07 -04:00
|
|
|
char *path = (char *)((uint8_t *)command) + header_size;
|
|
|
|
path[command->path_length] = '\0';
|
2021-08-23 21:08:30 -04:00
|
|
|
FILINFO file;
|
2021-09-13 17:44:05 -04:00
|
|
|
FRESULT result = f_stat(fs, path, &file);
|
|
|
|
if (result == FR_OK) {
|
2021-08-23 21:08:30 -04:00
|
|
|
if ((file.fattrib & AM_DIR) != 0) {
|
|
|
|
result = _delete_directory_contents(fs, path);
|
|
|
|
}
|
|
|
|
if (result == FR_OK) {
|
|
|
|
result = f_unlink(fs, path);
|
|
|
|
}
|
|
|
|
}
|
2021-09-13 17:44:05 -04:00
|
|
|
#if CIRCUITPY_USB_MSC
|
|
|
|
usb_msc_unlock();
|
|
|
|
#endif
|
2021-05-19 19:22:07 -04:00
|
|
|
if (result != FR_OK) {
|
|
|
|
response.status = STATUS_ERROR;
|
|
|
|
}
|
2021-06-25 17:58:32 -04:00
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct delete_status), NULL, 0);
|
2021-09-13 17:44:05 -04:00
|
|
|
if (result == FR_OK) {
|
|
|
|
// Don't reload until everything is written out of the packet buffer.
|
|
|
|
common_hal_bleio_packet_buffer_flush(&_transfer_packet_buffer);
|
|
|
|
// Trigger an autoreload
|
|
|
|
autoreload_start();
|
|
|
|
}
|
2021-05-19 19:22:07 -04:00
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
2019-09-14 15:40:24 -04:00
|
|
|
|
2021-09-13 19:12:40 -04:00
|
|
|
// NULL-terminate the path and remove any trailing /. Older versions of the
|
|
|
|
// protocol require it but newer ones do not.
|
|
|
|
STATIC void _terminate_path(char *path, size_t path_length) {
|
|
|
|
// -1 because fatfs doesn't want a trailing /
|
|
|
|
if (path[path_length - 1] == '/') {
|
|
|
|
path[path_length - 1] = '\0';
|
|
|
|
} else {
|
|
|
|
path[path_length] = '\0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-25 17:58:32 -04:00
|
|
|
STATIC uint8_t _process_mkdir(const uint8_t *raw_buf, size_t command_len) {
|
2021-05-19 19:22:07 -04:00
|
|
|
const struct mkdir_command *command = (struct mkdir_command *)raw_buf;
|
2021-09-07 21:03:42 -04:00
|
|
|
size_t header_size = sizeof(struct mkdir_command);
|
2021-06-25 17:58:32 -04:00
|
|
|
struct mkdir_status response;
|
2021-05-19 19:22:07 -04:00
|
|
|
response.command = MKDIR_STATUS;
|
|
|
|
response.status = STATUS_OK;
|
|
|
|
if (command->path_length > (COMMAND_SIZE - header_size - 1)) { // -1 for the null we'll write
|
|
|
|
// TODO: throw away any more packets of path.
|
|
|
|
response.status = STATUS_ERROR;
|
2021-06-25 17:58:32 -04:00
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct mkdir_status), NULL, 0);
|
2021-05-19 19:22:07 -04:00
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
2021-09-13 19:12:40 -04:00
|
|
|
if (_usb_active(&response, sizeof(struct mkdir_status))) {
|
2021-09-13 17:44:05 -04:00
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
2021-05-19 19:22:07 -04:00
|
|
|
// We need to receive another packet to have the full path.
|
|
|
|
if (command_len < header_size + command->path_length) {
|
|
|
|
return THIS_COMMAND;
|
|
|
|
}
|
|
|
|
FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
|
2021-09-07 21:03:42 -04:00
|
|
|
char *path = (char *)command->path;
|
2021-09-13 19:12:40 -04:00
|
|
|
_terminate_path(path, command->path_length);
|
|
|
|
|
2021-09-07 21:03:42 -04:00
|
|
|
DWORD fattime;
|
|
|
|
response.truncated_time = truncate_time(command->modification_time, &fattime);
|
|
|
|
override_fattime(fattime);
|
2021-05-19 19:22:07 -04:00
|
|
|
FRESULT result = f_mkdir(fs, path);
|
2021-09-07 21:03:42 -04:00
|
|
|
override_fattime(0);
|
2021-09-13 17:44:05 -04:00
|
|
|
#if CIRCUITPY_USB_MSC
|
|
|
|
usb_msc_unlock();
|
|
|
|
#endif
|
2021-05-19 19:22:07 -04:00
|
|
|
if (result != FR_OK) {
|
|
|
|
response.status = STATUS_ERROR;
|
|
|
|
}
|
2021-06-25 17:58:32 -04:00
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct mkdir_status), NULL, 0);
|
2021-09-13 17:44:05 -04:00
|
|
|
if (result == FR_OK) {
|
|
|
|
// Don't reload until everything is written out of the packet buffer.
|
|
|
|
common_hal_bleio_packet_buffer_flush(&_transfer_packet_buffer);
|
|
|
|
// Trigger an autoreload
|
|
|
|
autoreload_start();
|
|
|
|
}
|
2021-05-19 19:22:07 -04:00
|
|
|
return ANY_COMMAND;
|
2019-09-14 15:40:24 -04:00
|
|
|
}
|
|
|
|
|
2021-10-28 13:57:16 -04:00
|
|
|
STATIC void send_listdir_entry_header(const struct listdir_entry *entry, mp_int_t max_packet_size) {
|
|
|
|
mp_int_t response_size = sizeof(struct listdir_entry);
|
|
|
|
if (max_packet_size >= response_size) {
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)entry, response_size, NULL, 0);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
// Split into 16 + 12 size packets to fit into 20 byte minimum packet size.
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)entry, 16, NULL, 0);
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, ((const uint8_t *)entry) + 16, response_size - 16, NULL, 0);
|
|
|
|
}
|
|
|
|
|
2021-06-25 17:58:32 -04:00
|
|
|
STATIC uint8_t _process_listdir(uint8_t *raw_buf, size_t command_len) {
|
2021-05-19 19:22:07 -04:00
|
|
|
const struct listdir_command *command = (struct listdir_command *)raw_buf;
|
|
|
|
struct listdir_entry *entry = (struct listdir_entry *)raw_buf;
|
2021-09-07 21:03:42 -04:00
|
|
|
size_t header_size = sizeof(struct listdir_command);
|
2021-10-28 13:57:16 -04:00
|
|
|
mp_int_t max_packet_size = common_hal_bleio_packet_buffer_get_outgoing_packet_length(&_transfer_packet_buffer);
|
|
|
|
if (max_packet_size < 0) {
|
|
|
|
// -1 means we're disconnected
|
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
2021-05-19 19:22:07 -04:00
|
|
|
// We reuse the command buffer so that we can produce long packets without
|
|
|
|
// making the stack large.
|
|
|
|
if (command->path_length > (COMMAND_SIZE - header_size - 1)) { // -1 for the null we'll write
|
|
|
|
// TODO: throw away any more packets of path.
|
|
|
|
entry->command = LISTDIR_ENTRY;
|
|
|
|
entry->status = STATUS_ERROR;
|
2021-10-28 13:57:16 -04:00
|
|
|
send_listdir_entry_header(entry, max_packet_size);
|
2021-05-19 19:22:07 -04:00
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
|
|
|
// We need to receive another packet to have the full path.
|
|
|
|
if (command_len < header_size + command->path_length) {
|
|
|
|
return THIS_COMMAND;
|
|
|
|
}
|
|
|
|
|
|
|
|
FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
|
2021-09-07 21:03:42 -04:00
|
|
|
char *path = (char *)&command->path;
|
2021-09-13 19:12:40 -04:00
|
|
|
_terminate_path(path, command->path_length);
|
2021-05-19 19:22:07 -04:00
|
|
|
// mp_printf(&mp_plat_print, "list %s\n", path);
|
|
|
|
FF_DIR dir;
|
|
|
|
FRESULT res = f_opendir(fs, &dir, path);
|
|
|
|
|
|
|
|
entry->command = LISTDIR_ENTRY;
|
|
|
|
entry->status = STATUS_OK;
|
|
|
|
entry->path_length = 0;
|
|
|
|
entry->entry_number = 0;
|
|
|
|
entry->entry_count = 0;
|
|
|
|
entry->flags = 0;
|
|
|
|
|
|
|
|
if (res != FR_OK) {
|
|
|
|
entry->status = STATUS_ERROR_NO_FILE;
|
2021-10-28 13:57:16 -04:00
|
|
|
send_listdir_entry_header(entry, max_packet_size);
|
2021-05-19 19:22:07 -04:00
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
|
|
|
FILINFO file_info;
|
|
|
|
res = f_readdir(&dir, &file_info);
|
|
|
|
char *fn = file_info.fname;
|
|
|
|
size_t total_entries = 0;
|
|
|
|
while (res == FR_OK && fn[0] != 0) {
|
|
|
|
res = f_readdir(&dir, &file_info);
|
|
|
|
total_entries += 1;
|
|
|
|
}
|
|
|
|
// Rewind the directory.
|
|
|
|
f_readdir(&dir, NULL);
|
|
|
|
entry->entry_count = total_entries;
|
|
|
|
for (size_t i = 0; i < total_entries; i++) {
|
|
|
|
res = f_readdir(&dir, &file_info);
|
|
|
|
entry->entry_number = i;
|
2021-09-07 21:03:42 -04:00
|
|
|
uint64_t truncated_time = timeutils_mktime(1980 + (file_info.fdate >> 9),
|
|
|
|
(file_info.fdate >> 5) & 0xf,
|
|
|
|
file_info.fdate & 0x1f,
|
|
|
|
file_info.ftime >> 11,
|
|
|
|
(file_info.ftime >> 5) & 0x1f,
|
|
|
|
(file_info.ftime & 0x1f) * 2) * 1000000000ULL;
|
|
|
|
entry->truncated_time = truncated_time;
|
2021-05-19 19:22:07 -04:00
|
|
|
if ((file_info.fattrib & AM_DIR) != 0) {
|
|
|
|
entry->flags = 1; // Directory
|
|
|
|
entry->file_size = 0;
|
|
|
|
} else {
|
|
|
|
entry->flags = 0;
|
|
|
|
entry->file_size = file_info.fsize;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t name_length = strlen(file_info.fname);
|
|
|
|
entry->path_length = name_length;
|
2021-10-28 13:57:16 -04:00
|
|
|
send_listdir_entry_header(entry, max_packet_size);
|
2021-05-19 19:22:07 -04:00
|
|
|
size_t fn_offset = 0;
|
|
|
|
while (fn_offset < name_length) {
|
|
|
|
size_t fn_size = MIN(name_length - fn_offset, 4);
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, ((uint8_t *)file_info.fname) + fn_offset, fn_size, NULL, 0);
|
|
|
|
fn_offset += fn_size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
f_closedir(&dir);
|
|
|
|
entry->path_length = 0;
|
|
|
|
entry->entry_number = entry->entry_count;
|
|
|
|
entry->flags = 0;
|
|
|
|
entry->file_size = 0;
|
2021-10-28 13:57:16 -04:00
|
|
|
send_listdir_entry_header(entry, max_packet_size);
|
2021-05-19 19:22:07 -04:00
|
|
|
return ANY_COMMAND;
|
2019-09-14 15:40:24 -04:00
|
|
|
}
|
|
|
|
|
2021-09-13 17:44:05 -04:00
|
|
|
STATIC uint8_t _process_move(const uint8_t *raw_buf, size_t command_len) {
|
|
|
|
const struct move_command *command = (struct move_command *)raw_buf;
|
|
|
|
size_t header_size = sizeof(struct move_command);
|
|
|
|
struct move_status response;
|
|
|
|
response.command = MOVE_STATUS;
|
|
|
|
response.status = STATUS_OK;
|
|
|
|
// +2 for null terminators.
|
|
|
|
uint32_t total_path_length = command->old_path_length + command->new_path_length + 1;
|
|
|
|
if (total_path_length > (COMMAND_SIZE - header_size - 1)) {
|
|
|
|
// TODO: throw away any more packets of path.
|
|
|
|
response.status = STATUS_ERROR;
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct move_status), NULL, 0);
|
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
2021-09-13 19:12:40 -04:00
|
|
|
if (_usb_active(&response, sizeof(struct move_status))) {
|
2021-09-13 17:44:05 -04:00
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
|
|
|
// We need to receive another packet to have the full path.
|
|
|
|
if (command_len < header_size + total_path_length) {
|
|
|
|
return THIS_COMMAND;
|
|
|
|
}
|
|
|
|
FATFS *fs = &((fs_user_mount_t *)MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
|
|
|
|
char *old_path = (char *)command->paths;
|
|
|
|
old_path[command->old_path_length] = '\0';
|
|
|
|
|
|
|
|
char *new_path = old_path + command->old_path_length + 1;
|
|
|
|
new_path[command->new_path_length] = '\0';
|
|
|
|
|
|
|
|
// mp_printf(&mp_plat_print, "move %s to %s\n", old_path, new_path);
|
|
|
|
|
|
|
|
FRESULT result = f_rename(fs, old_path, new_path);
|
|
|
|
#if CIRCUITPY_USB_MSC
|
|
|
|
usb_msc_unlock();
|
|
|
|
#endif
|
|
|
|
if (result != FR_OK) {
|
|
|
|
response.status = STATUS_ERROR;
|
|
|
|
}
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)&response, sizeof(struct move_status), NULL, 0);
|
|
|
|
if (result == FR_OK) {
|
|
|
|
// Don't reload until everything is written out of the packet buffer.
|
|
|
|
common_hal_bleio_packet_buffer_flush(&_transfer_packet_buffer);
|
|
|
|
// Trigger an autoreload
|
|
|
|
autoreload_start();
|
|
|
|
}
|
|
|
|
return ANY_COMMAND;
|
|
|
|
}
|
|
|
|
|
2021-05-19 19:22:07 -04:00
|
|
|
// Background state that must live across background calls. After the _process
|
|
|
|
// helpers to force them to not use them.
|
2021-06-25 17:58:32 -04:00
|
|
|
STATIC uint8_t current_command[COMMAND_SIZE] __attribute__ ((aligned(4)));
|
|
|
|
STATIC volatile size_t current_offset;
|
|
|
|
STATIC uint8_t next_command;
|
2021-07-01 15:49:11 -04:00
|
|
|
STATIC bool running = false;
|
2021-06-25 17:58:32 -04:00
|
|
|
void supervisor_bluetooth_file_transfer_background(void) {
|
2021-07-01 15:49:11 -04:00
|
|
|
if (running) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
running = true;
|
2021-05-19 19:22:07 -04:00
|
|
|
mp_int_t size = 1;
|
|
|
|
while (size > 0) {
|
|
|
|
size = common_hal_bleio_packet_buffer_readinto(&_transfer_packet_buffer, current_command + current_offset, COMMAND_SIZE - current_offset);
|
|
|
|
|
|
|
|
if (size == 0) {
|
|
|
|
break;
|
|
|
|
}
|
2021-08-23 21:08:30 -04:00
|
|
|
autoreload_suspend(AUTORELOAD_LOCK_BLE);
|
2021-05-19 19:22:07 -04:00
|
|
|
// TODO: If size < 0 return an error.
|
|
|
|
current_offset += size;
|
2021-07-08 22:11:05 -04:00
|
|
|
#if CIRCUITPY_VERBOSE_BLE
|
|
|
|
mp_printf(&mp_plat_print, "buffer[:%d]:", current_offset);
|
|
|
|
for (size_t i = 0; i < current_offset; i++) {
|
|
|
|
mp_printf(&mp_plat_print, " (%x %c)", current_command[i], current_command[i]);
|
|
|
|
}
|
|
|
|
mp_printf(&mp_plat_print, "\n");
|
|
|
|
#endif
|
2021-05-19 19:22:07 -04:00
|
|
|
uint8_t current_state = current_command[0];
|
|
|
|
// mp_printf(&mp_plat_print, "current command 0x%02x\n", current_state);
|
|
|
|
// Check for protocol error.
|
|
|
|
if (next_command != ANY_COMMAND && next_command != THIS_COMMAND && ((current_state & 0xf) != 0) && current_state != next_command) {
|
|
|
|
uint8_t response[2];
|
|
|
|
response[0] = next_command;
|
|
|
|
response[1] = STATUS_ERROR_PROTOCOL;
|
|
|
|
common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, response, 2, NULL, 0);
|
2021-08-23 21:08:30 -04:00
|
|
|
autoreload_resume(AUTORELOAD_LOCK_BLE);
|
2021-05-19 19:22:07 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
switch (current_state) {
|
|
|
|
case READ:
|
|
|
|
next_command = _process_read(current_command, current_offset);
|
|
|
|
break;
|
|
|
|
case READ_PACING:
|
|
|
|
next_command = _process_read_pacing(current_command, current_offset);
|
|
|
|
break;
|
|
|
|
case WRITE:
|
|
|
|
next_command = _process_write(current_command, current_offset);
|
|
|
|
break;
|
|
|
|
case WRITE_DATA:
|
|
|
|
next_command = _process_write_data(current_command, current_offset);
|
|
|
|
break;
|
|
|
|
case DELETE:
|
|
|
|
next_command = _process_delete(current_command, current_offset);
|
|
|
|
break;
|
|
|
|
case MKDIR:
|
|
|
|
next_command = _process_mkdir(current_command, current_offset);
|
|
|
|
break;
|
|
|
|
case LISTDIR:
|
|
|
|
next_command = _process_listdir(current_command, current_offset);
|
|
|
|
break;
|
2021-09-13 17:44:05 -04:00
|
|
|
case MOVE:
|
|
|
|
next_command = _process_move(current_command, current_offset);
|
|
|
|
break;
|
2021-05-19 19:22:07 -04:00
|
|
|
}
|
|
|
|
// Preserve the offset if we are waiting for more from this command.
|
|
|
|
if (next_command != THIS_COMMAND) {
|
|
|
|
current_offset = 0;
|
2019-09-14 15:40:24 -04:00
|
|
|
}
|
2021-08-23 21:08:30 -04:00
|
|
|
if (next_command == ANY_COMMAND) {
|
|
|
|
autoreload_resume(AUTORELOAD_LOCK_BLE);
|
|
|
|
}
|
2019-09-14 15:40:24 -04:00
|
|
|
}
|
2021-07-01 15:49:11 -04:00
|
|
|
running = false;
|
2019-09-14 15:40:24 -04:00
|
|
|
}
|
|
|
|
|
2021-06-25 17:58:32 -04:00
|
|
|
void supervisor_bluetooth_file_transfer_disconnected(void) {
|
|
|
|
next_command = ANY_COMMAND;
|
2021-07-01 15:49:11 -04:00
|
|
|
current_offset = 0;
|
2021-06-25 17:58:32 -04:00
|
|
|
f_close(&active_file);
|
2021-08-23 21:08:30 -04:00
|
|
|
autoreload_resume(AUTORELOAD_LOCK_BLE);
|
2021-06-25 17:58:32 -04:00
|
|
|
}
|