7b393bc406
Introduction of ports subdirectory where all ports are moved to The main change in this release is the introduction of a "ports/" subdirectory at the top-level of the repository, and all of the ports are moved here. In the process the "stmhal" port is renamed to "stm32" to better reflect the MCU that it targets. In addition, the STM32 CMSIS and HAL sources are moved to a new submodule called "stm32lib". The bytecode has changed in this release, compared to the previous release, and as a consequence the .mpy version number has increased to version 3. This means that scripts compiled with the previous mpy-cross must be recompiled to work with this new version. There have also been various enhancements and optimisations, such as: check for valid UTF-8 when creating str objects, support for reverse special binary operations like __radd__, full domain checking in the math module, support for floor-division and modulo in the viper emitter, and addition of stack overflow checking when executing a regex. The stm32 port sees improved support for F7 MCUs, addition of a new board B_L475E_IOT01A based on the STM32L475, and support for the Wiznet W5500 chipset along with improved socket behaviour. A detailed list of changes follows. py core: - objstr: startswith, endswith: check arg to be a string - nlrx86,x64: replace #define of defined() with portable macro usage - objtype: handle NotImplemented return from binary special methods - objtype: mp_obj_class_lookup: improve debug logging - map: remove unused new/free functions - make m_malloc_fail() have void return type, since it doesn't return - modstruct: in struct.pack, stop converting if there are no args left - modstruct: check and prevent buffer-read overflow in struct unpacking - modstruct: check and prevent buffer-write overflow in struct packing - nlrthumb: get working again on standard Thumb arch (ie not Thumb2) - objfloat: fix binary ops with incompatible objects - obj: fix comparison of float/complex NaN with itself - objtype: implement fallback for instance inplace special methods - objtuple: properly implement comparison with incompatible types - objstr: add check for valid UTF-8 when making a str from bytes - objlist: properly implement comparison with incompatible types - runtime0.h: move relational ops to the beginning of mp_binary_op_t - runtime0.h: move MP_BINARY_OP_DIVMOD to the end of mp_binary_op_t - objtype: make sure mp_binary_op_method_name has full size again - runtime0.h: put inplace arith ops in front of normal operations - builtinhelp: simplify code slightly by extracting object type - runtime: implement dispatch for "reverse op" special methods - nlrx86: fix building for Android/x86 - builtinhelp: change signature of help text var from pointer to array - runtime.h: change empty mp_warning macro so var-args are non empty - modbuiltins: implement abs() by dispatching to MP_UNARY_OP_ABS - {objfloat,objcomplex}: optimise MP_UNARY_OP_ABS by reusing variables - mpconfig.h: add note that using computed gotos in VM is not C99 - objstr: strip: don't strip "\0" by default - objexcept: prevent infinite recursion when allocating exceptions - stream: remove unnecessary checks for NULL return from vstr_add_len - vstr: raise a RuntimeError if fixed vstr buffer overflows - vm: use lowercase letter at start of exception message - persistentcode: define mp_raw_code_save_file() for any unix target - add config option to print warnings/errors to stderr - objfloat: support raising a negative number to a fractional power - objset: simplify set and frozenset by separating their locals dicts - objset: check that RHS of a binary op is a set/frozenset - objset: include the failed key in a KeyError raised from set.remove - objtype: change type of enum-to-qstr table to uint16_t to save space - objstr: make empty bytes object have a null-terminating byte - mpprint: only check for null string printing when NDEBUG not defined - objtype: clean up unary- and binary-op enum-to-qstr mapping tables - persistentcode: bump .mpy version number to version 3 - bc: update opcode_format_table to match the bytecode - modmath: add full checks for math domain errors - modmath: convert log2 macro into a function - formatfloat: don't print the negative sign of a NaN value - formatfloat: use standard isinf, isnan funcs instead of custom ones - modbuiltins: use existing utf8_get_char helper in builtin ord func - emitnative: implement floor-division and modulo for viper emitter - objtype: use CPython compatible method name for sizeof - objtype: fit qstrs for special methods in byte type - objtype: define all special methods if requested - objtype: introduce MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS extmod: - modubinascii: only include uzlib/tinf.h when it's really needed - modussl_mbedtls: allow to compile with MBEDTLS_DEBUG_C disabled - machine_pinbase: put PinBase singleton in ROM - re1.5: upgrade to v0.8.2, adds hook for stack overflow checking - modure: add stack overflow checking when executing a regex - uos_dupterm: update uos.dupterm() and helper funcs to have index - uos_dupterm: swallow any errors from dupterm closing the stream - vfs: replace VLA in proxy func with small, static sized array - modussl: add finaliser support for ussl objects - modussl_mbedtls: allow to compile with unix coverage build lib: - add new submodule, stm32lib containing STM32 CMSIS and HAL source - embed/abort_: use mp_raise_msg helper function - libm: fix tanhf so that it correctly handles +/- infinity args - libm: remove implementation of log2f, use MP_NEED_LOG2 instead - axtls: update, support for SSL_EAGAIN return code - berkeley-db-1.xx: update, allow to override MINCACHE, DEFPSIZE drivers: - memory/spiflash: change from hard-coded soft SPI to generic SPI - display/ssd1306.py: improve performance of graphics methods - nrf24l01: make nRF24L01 test script more portable - display/ssd1306: implement SSD1306_I2C poweron method - display/ssd1306: make poweron() work the same with SSD1306_SPI - wiznet5k: improve the performance of socket ops with threading - wiznet5k: get low-level W5500 driver working tools: - upip: upgrade to 1.2.2 - pyboard: use repr() when quoting data in error messages - pyboard: update docstring for additional device support tests: - object_new: better messages, check user __new__() method - class_new: add checks for __init__ being called and other improvements - class_new: add another testcase for __new__/__init__ interaction - class_inplace_op: test for inplace op fallback to normal one - run-bench-tests: update locations of executables, now in ports/ - class_reverse_op: test for reverse arith ops special methods - run-tests: skip class_inplace_op for minimal profile - run-tests: fix copy-paste mistake in var name - cpydiff: add cases for locals() discrepancies - extmod: add test for ure regexes leading to infinite recursion - extmod: add test for '-' in character class in regex - run-tests: close device under test using "finally" - net_inet: update tls test to work with CPython and incl new site unix port: - rename modsocket.c to modusocket.c - modusocket: remove #if MICROPY_SOCKET_EXTRA code blocks - enable MICROPY_PY_REVERSE_SPECIAL_METHODS stm32 port: - modmachine: make machine.bootloader() work when MPU is enabled - modmachine: improve support for sleep/deepsleep on F7 MCUs - compute PLL freq table during build instead of at run time - modmachine: for F7 MCU, save power by reducing internal volt reg - boards/pllvalues.py: make script work with both Python 2 and 3 - Makefile: use lib/stm32lib instead of local cmsis and hal files - remove cmsis and hal files, they are now a submodule - Makefile: automatically fetch stm32lib submodule if needed - update to new STM Cube HAL library - fix clock initialisation of L4 MCUs - rename stmhal port directory to stm32 - remove unused usbd_msc.c file - boards: change remaining stm32f4xx_hal_conf.h to unix line ending - boards: change linker scripts to use "K" instead of hex byte size - boards: fix I2C1 pin mapping on NUCLEO_F401RE/F411RE boards - i2c: when scanning for I2C devices only do 1 probe per address - modnwwiznet5k: release the GIL on blocking network operations - boards: add new board B_L475E_IOT01A based on STM32L475 - make-stmconst.py: make sure mpz const data lives in ROM - timer: make pyb.Timer() instances persistent - mpconfigport.h: add configuration for max periphs on L4 series - usbdev: make the USBD callback struct const so it can go in ROM - usbdev: change static function variable to non-static - usbdev: put all CDC state in a struct - usbdev: put all HID state in a struct - usbdev: simplify CDC tx/rx buffer passing - usbdev: simplify HID tx/rx buffer passing - usbdev/core: add state parameter to all callback functions - usbdev: put all state for the USB device driver in a struct - usbdev: simplify pointers to MSC state and block dev operations - usbdev: merge all global USB device state into a single struct - usbdev: make device descriptor callbacks take a state pointer - usbdev: move all the USB device descriptor state into its struct - timer: enable ARPE so that timer freq can be changed smoothly - modnwwiznet5k: get the IP address of an established socket - boards: fix typos in stm32f767_af.csv table - usbd_cdc_interface: don't reset CDC output buf on initialisation - modnwwiznet5k: implement WIZNET5K.isconnected() method - modusocket: make getaddrinfo() work when passed an IP address - modusocket: return OSError(-2) if getaddrinfo fails - mpconfigport.h: add MICROPY_THREAD_YIELD() macro - modnwwiznet5k: add support for W5500 Ethernet chip - modnwwiznet5k: increase SPI bus speed to 42MHz - modnwwiznet5k: implement stream ioctl for the Wiznet driver - mphalport: improve efficiency of mp_hal_stdout_tx_strn_cooked - make uos.dupterm() conform to specs by using extmod version cc3200 port: - enable micropython.kbd_intr() method - use standard implementation of keyboard interrupt esp8266 port: - rename axtls_helpers.c to posix_helpers.c - posix_helpers: set ENOMEM on memory alloc failure - set DEFPSIZE=1024, MINCACHE=3 for "btree" module - esp_mphal: send data in chunks to mp_uos_dupterm_tx_strn - modnetwork: add "bssid" keyword arg to WLAN.connect() method - modules/webrepl_setup: add info about allowed password length zephyr port: - Makefile: revamp "test" target after ports were moved to ports/ - use CONFIG_NET_APP_SETTINGS to setup initial network addresses - switch to interrupt-driven pull-style console pic16bit port: - add definition of SEEK_SET to unistd.h docs: - pyboard/tutorial: add "timeout=0" to UART in pass-through example - more xrefs to "MicroPython port" in glossary - library/network: fix ref to "socket" module (should be "usocket") - machine.Signal: improve style/grammar and add usage example - library: add description of "index" parameter to uos.dupterm() - library/micropython: fix typo in RST formatting - library/framebuf.rst: generalise constructor to all colour formats - btree: describe page caching policy of the underlying implementation - esp8266/tutorial: update neopixel with example of using 4 bbp - library/network: clarify usage of "bssid" arg in connect() method - pyboard/quickref: add info for Switch, RTC, CAN, Accel classes - pyboard/tutorial: update now that yellow LED also supports PWM - esp8266/quickref: add quickref info for RTC class - library: add missing cross-ref links for classes in pyb module - library/network: update docs to state that W5500 is supported - uselect: document one-shot polling mode - usocket: elaborate descriptions - usocket: document inet_ntop(), inet_pton() - library/network: add dhcp_hostname parameter - reference/isr_rules: minor typo correction - ussl: fix module name refs and use "MicroPython port" term - esp8266/general: add section on TLS limitations - usocket: document that settimeout() isn't supported by all ports - ure: add "|" (alternative) to the list of supported operators - reference/isr_rules.rst: add tutorial on use of micropython.schedule() travis: - use --upgrade when pip is installing cpp-coveralls - update build command now that stm32 Wiznet config has changed examples: - hwconfig_console: add .on()/.off() methods all: - convert mp_uint_t to mp_unary_op_t/mp_binary_op_t where appropriate - convert remaining "mp_uint_t n_args" to "size_t n_args" - make new ports/ sub-directory and move all ports there - update Makefiles and others to build with new ports/ dir layout - remove inclusion of internal py header files - use NULL instead of "" when calling mp_raise exception helpers README: - update "Dependencies" section - add explicit section on contributing - add gcc and arm-none-eabi-newlib to list of required components .gitattributes: - remove obsolete entries for stmhal/hal, stmhal/cmsis - add entries for files that will move to ports/ dir
353 lines
12 KiB
C
353 lines
12 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2016 Paul Sokolovsky
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
|
|
#include "py/runtime.h"
|
|
#include "py/stream.h"
|
|
#include "py/builtin.h"
|
|
#ifdef MICROPY_PY_WEBREPL_DELAY
|
|
#include "py/mphal.h"
|
|
#endif
|
|
#include "extmod/modwebsocket.h"
|
|
#include "genhdr/mpversion.h"
|
|
|
|
#ifdef MICROPY_PY_WEBREPL
|
|
|
|
#if 0 // print debugging info
|
|
#define DEBUG_printf DEBUG_printf
|
|
#else // don't print debugging info
|
|
#define DEBUG_printf(...) (void)0
|
|
#endif
|
|
|
|
struct webrepl_file {
|
|
char sig[2];
|
|
char type;
|
|
char flags;
|
|
uint64_t offset;
|
|
uint32_t size;
|
|
uint16_t fname_len;
|
|
char fname[64];
|
|
} __attribute__((packed));
|
|
|
|
enum { PUT_FILE = 1, GET_FILE, GET_VER };
|
|
enum { STATE_PASSWD, STATE_NORMAL };
|
|
|
|
typedef struct _mp_obj_webrepl_t {
|
|
mp_obj_base_t base;
|
|
mp_obj_t sock;
|
|
byte state;
|
|
byte hdr_to_recv;
|
|
uint32_t data_to_recv;
|
|
struct webrepl_file hdr;
|
|
mp_obj_t cur_file;
|
|
} mp_obj_webrepl_t;
|
|
|
|
// These get passed to functions which aren't force-l32, so can't be const
|
|
STATIC char passwd_prompt[] = "Password: ";
|
|
STATIC char connected_prompt[] = "\r\nWebREPL connected\r\n>>> ";
|
|
STATIC char denied_prompt[] = "\r\nAccess denied\r\n";
|
|
|
|
STATIC char webrepl_passwd[10];
|
|
|
|
STATIC void write_webrepl(mp_obj_t websock, const void *buf, size_t len) {
|
|
const mp_stream_p_t *sock_stream = mp_get_stream_raise(websock, MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL);
|
|
int err;
|
|
int old_opts = sock_stream->ioctl(websock, MP_STREAM_SET_DATA_OPTS, FRAME_BIN, &err);
|
|
sock_stream->write(websock, buf, len, &err);
|
|
sock_stream->ioctl(websock, MP_STREAM_SET_DATA_OPTS, old_opts, &err);
|
|
}
|
|
|
|
#define SSTR(s) s, sizeof(s) - 1
|
|
STATIC void write_webrepl_str(mp_obj_t websock, const char *str, int sz) {
|
|
int err;
|
|
const mp_stream_p_t *sock_stream = mp_get_stream_raise(websock, MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL);
|
|
sock_stream->write(websock, str, sz, &err);
|
|
}
|
|
|
|
STATIC void write_webrepl_resp(mp_obj_t websock, uint16_t code) {
|
|
char buf[4] = {'W', 'B', code & 0xff, code >> 8};
|
|
write_webrepl(websock, buf, sizeof(buf));
|
|
}
|
|
|
|
STATIC mp_obj_t webrepl_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
|
mp_arg_check_num(n_args, n_kw, 1, 2, false);
|
|
mp_get_stream_raise(args[0], MP_STREAM_OP_READ | MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL);
|
|
DEBUG_printf("sizeof(struct webrepl_file) = %lu\n", sizeof(struct webrepl_file));
|
|
mp_obj_webrepl_t *o = m_new_obj(mp_obj_webrepl_t);
|
|
o->base.type = type;
|
|
o->sock = args[0];
|
|
o->hdr_to_recv = sizeof(struct webrepl_file);
|
|
o->data_to_recv = 0;
|
|
o->state = STATE_PASSWD;
|
|
write_webrepl_str(args[0], SSTR(passwd_prompt));
|
|
return o;
|
|
}
|
|
|
|
STATIC int write_file_chunk(mp_obj_webrepl_t *self) {
|
|
const mp_stream_p_t *file_stream =
|
|
mp_get_stream_raise(self->cur_file, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL);
|
|
byte readbuf[2 + 256];
|
|
int err;
|
|
mp_uint_t out_sz = file_stream->read(self->cur_file, readbuf + 2, sizeof(readbuf) - 2, &err);
|
|
if (out_sz == MP_STREAM_ERROR) {
|
|
return out_sz;
|
|
}
|
|
readbuf[0] = out_sz;
|
|
readbuf[1] = out_sz >> 8;
|
|
DEBUG_printf("webrepl: Sending %d bytes of file\n", out_sz);
|
|
write_webrepl(self->sock, readbuf, 2 + out_sz);
|
|
return out_sz;
|
|
}
|
|
|
|
STATIC void handle_op(mp_obj_webrepl_t *self) {
|
|
|
|
// Handle operations not requiring opened file
|
|
|
|
switch (self->hdr.type) {
|
|
case GET_VER: {
|
|
static char ver[] = {MICROPY_VERSION_MAJOR, MICROPY_VERSION_MINOR, MICROPY_VERSION_MICRO};
|
|
write_webrepl(self->sock, ver, sizeof(ver));
|
|
self->hdr_to_recv = sizeof(struct webrepl_file);
|
|
return;
|
|
}
|
|
}
|
|
|
|
// Handle operations requiring opened file
|
|
|
|
mp_obj_t open_args[2] = {
|
|
mp_obj_new_str(self->hdr.fname, strlen(self->hdr.fname), false),
|
|
MP_OBJ_NEW_QSTR(MP_QSTR_rb)
|
|
};
|
|
|
|
if (self->hdr.type == PUT_FILE) {
|
|
open_args[1] = MP_OBJ_NEW_QSTR(MP_QSTR_wb);
|
|
}
|
|
|
|
self->cur_file = mp_builtin_open(2, open_args, (mp_map_t*)&mp_const_empty_map);
|
|
|
|
#if 0
|
|
struct mp_stream_seek_t seek = { .offset = self->hdr.offset, .whence = 0 };
|
|
int err;
|
|
mp_uint_t res = file_stream->ioctl(self->cur_file, MP_STREAM_SEEK, (uintptr_t)&seek, &err);
|
|
assert(res != MP_STREAM_ERROR);
|
|
#endif
|
|
|
|
write_webrepl_resp(self->sock, 0);
|
|
|
|
if (self->hdr.type == PUT_FILE) {
|
|
self->data_to_recv = self->hdr.size;
|
|
} else if (self->hdr.type == GET_FILE) {
|
|
self->data_to_recv = 1;
|
|
}
|
|
}
|
|
|
|
STATIC mp_uint_t _webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode);
|
|
|
|
STATIC mp_uint_t webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
|
|
mp_uint_t out_sz;
|
|
do {
|
|
out_sz = _webrepl_read(self_in, buf, size, errcode);
|
|
} while (out_sz == -2);
|
|
return out_sz;
|
|
}
|
|
|
|
STATIC mp_uint_t _webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
|
|
// We know that os.dupterm always calls with size = 1
|
|
assert(size == 1);
|
|
mp_obj_webrepl_t *self = self_in;
|
|
const mp_stream_p_t *sock_stream = mp_get_stream_raise(self->sock, MP_STREAM_OP_READ);
|
|
mp_uint_t out_sz = sock_stream->read(self->sock, buf, size, errcode);
|
|
//DEBUG_printf("webrepl: Read %d initial bytes from websocket\n", out_sz);
|
|
if (out_sz == 0 || out_sz == MP_STREAM_ERROR) {
|
|
return out_sz;
|
|
}
|
|
|
|
if (self->state == STATE_PASSWD) {
|
|
char c = *(char*)buf;
|
|
if (c == '\r' || c == '\n') {
|
|
self->hdr.fname[self->data_to_recv] = 0;
|
|
DEBUG_printf("webrepl: entered password: %s\n", self->hdr.fname);
|
|
|
|
if (strcmp(self->hdr.fname, webrepl_passwd) != 0) {
|
|
write_webrepl_str(self->sock, SSTR(denied_prompt));
|
|
return 0;
|
|
}
|
|
|
|
self->state = STATE_NORMAL;
|
|
self->data_to_recv = 0;
|
|
write_webrepl_str(self->sock, SSTR(connected_prompt));
|
|
} else if (self->data_to_recv < 10) {
|
|
self->hdr.fname[self->data_to_recv++] = c;
|
|
}
|
|
return -2;
|
|
}
|
|
|
|
// If last read data belonged to text record (== REPL)
|
|
int err;
|
|
if (sock_stream->ioctl(self->sock, MP_STREAM_GET_DATA_OPTS, 0, &err) == 1) {
|
|
return out_sz;
|
|
}
|
|
|
|
DEBUG_printf("webrepl: received bin data, hdr_to_recv: %d, data_to_recv=%d\n", self->hdr_to_recv, self->data_to_recv);
|
|
|
|
if (self->hdr_to_recv != 0) {
|
|
char *p = (char*)&self->hdr + sizeof(self->hdr) - self->hdr_to_recv;
|
|
*p++ = *(char*)buf;
|
|
if (--self->hdr_to_recv != 0) {
|
|
mp_uint_t hdr_sz = sock_stream->read(self->sock, p, self->hdr_to_recv, errcode);
|
|
if (hdr_sz == MP_STREAM_ERROR) {
|
|
return hdr_sz;
|
|
}
|
|
self->hdr_to_recv -= hdr_sz;
|
|
if (self->hdr_to_recv != 0) {
|
|
return -2;
|
|
}
|
|
}
|
|
|
|
DEBUG_printf("webrepl: op: %d, file: %s, chunk @%x, sz=%d\n", self->hdr.type, self->hdr.fname, (uint32_t)self->hdr.offset, self->hdr.size);
|
|
|
|
handle_op(self);
|
|
|
|
return -2;
|
|
}
|
|
|
|
if (self->data_to_recv != 0) {
|
|
static byte filebuf[512];
|
|
filebuf[0] = *(byte*)buf;
|
|
mp_uint_t buf_sz = 1;
|
|
if (--self->data_to_recv != 0) {
|
|
size_t to_read = MIN(sizeof(filebuf) - 1, self->data_to_recv);
|
|
mp_uint_t sz = sock_stream->read(self->sock, filebuf + 1, to_read, errcode);
|
|
if (sz == MP_STREAM_ERROR) {
|
|
return sz;
|
|
}
|
|
self->data_to_recv -= sz;
|
|
buf_sz += sz;
|
|
}
|
|
|
|
if (self->hdr.type == PUT_FILE) {
|
|
DEBUG_printf("webrepl: Writing %lu bytes to file\n", buf_sz);
|
|
int err;
|
|
mp_uint_t res = mp_stream_write_exactly(self->cur_file, filebuf, buf_sz, &err);
|
|
if (err != 0 || res != buf_sz) {
|
|
assert(0);
|
|
}
|
|
} else if (self->hdr.type == GET_FILE) {
|
|
assert(buf_sz == 1);
|
|
assert(self->data_to_recv == 0);
|
|
assert(filebuf[0] == 0);
|
|
mp_uint_t out_sz = write_file_chunk(self);
|
|
if (out_sz != 0) {
|
|
self->data_to_recv = 1;
|
|
}
|
|
}
|
|
|
|
if (self->data_to_recv == 0) {
|
|
mp_stream_close(self->cur_file);
|
|
self->hdr_to_recv = sizeof(struct webrepl_file);
|
|
DEBUG_printf("webrepl: Finished file operation %d\n", self->hdr.type);
|
|
write_webrepl_resp(self->sock, 0);
|
|
}
|
|
|
|
#ifdef MICROPY_PY_WEBREPL_DELAY
|
|
// Some platforms may have broken drivers and easily gets
|
|
// overloaded with modest traffic WebREPL file transfers
|
|
// generate. The basic workaround is a crude rate control
|
|
// done in such way.
|
|
mp_hal_delay_ms(MICROPY_PY_WEBREPL_DELAY);
|
|
#endif
|
|
}
|
|
|
|
return -2;
|
|
}
|
|
|
|
STATIC mp_uint_t webrepl_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
|
|
mp_obj_webrepl_t *self = self_in;
|
|
if (self->state == STATE_PASSWD) {
|
|
// Don't forward output until passwd is entered
|
|
return size;
|
|
}
|
|
const mp_stream_p_t *stream_p = mp_get_stream_raise(self->sock, MP_STREAM_OP_WRITE);
|
|
return stream_p->write(self->sock, buf, size, errcode);
|
|
}
|
|
|
|
STATIC mp_obj_t webrepl_close(mp_obj_t self_in) {
|
|
mp_obj_webrepl_t *self = MP_OBJ_TO_PTR(self_in);
|
|
// TODO: This is a place to do cleanup
|
|
return mp_stream_close(self->sock);
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(webrepl_close_obj, webrepl_close);
|
|
|
|
STATIC mp_obj_t webrepl_set_password(mp_obj_t passwd_in) {
|
|
size_t len;
|
|
const char *passwd = mp_obj_str_get_data(passwd_in, &len);
|
|
if (len > sizeof(webrepl_passwd) - 1) {
|
|
mp_raise_ValueError(NULL);
|
|
}
|
|
strcpy(webrepl_passwd, passwd);
|
|
return mp_const_none;
|
|
}
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_1(webrepl_set_password_obj, webrepl_set_password);
|
|
|
|
STATIC const mp_rom_map_elem_t webrepl_locals_dict_table[] = {
|
|
{ MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
|
|
{ MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&webrepl_close_obj) },
|
|
};
|
|
STATIC MP_DEFINE_CONST_DICT(webrepl_locals_dict, webrepl_locals_dict_table);
|
|
|
|
STATIC const mp_stream_p_t webrepl_stream_p = {
|
|
.read = webrepl_read,
|
|
.write = webrepl_write,
|
|
};
|
|
|
|
STATIC const mp_obj_type_t webrepl_type = {
|
|
{ &mp_type_type },
|
|
.name = MP_QSTR__webrepl,
|
|
.make_new = webrepl_make_new,
|
|
.protocol = &webrepl_stream_p,
|
|
.locals_dict = (mp_obj_dict_t*)&webrepl_locals_dict,
|
|
};
|
|
|
|
STATIC const mp_rom_map_elem_t webrepl_module_globals_table[] = {
|
|
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__webrepl) },
|
|
{ MP_ROM_QSTR(MP_QSTR__webrepl), MP_ROM_PTR(&webrepl_type) },
|
|
{ MP_ROM_QSTR(MP_QSTR_password), MP_ROM_PTR(&webrepl_set_password_obj) },
|
|
};
|
|
|
|
STATIC MP_DEFINE_CONST_DICT(webrepl_module_globals, webrepl_module_globals_table);
|
|
|
|
const mp_obj_module_t mp_module_webrepl = {
|
|
.base = { &mp_type_module },
|
|
.globals = (mp_obj_dict_t*)&webrepl_module_globals,
|
|
};
|
|
|
|
#endif // MICROPY_PY_WEBREPL
|