6446010753
This adds support for CIRCUITPY_WIFI_SSID and CIRCUITPY_WIFI_PASSWORD in `/.env`. When both are defined, CircuitPython will attempt to connect to the network even when user code isn't running. If the user code attempts to a network with the same SSID, it will return immediately. Connecting to another SSID will disconnect from the auto-connected network. If the user code initiates the connection, then it will be shutdown after user code exits. (Should match <8 behavior.) This PR also reworks the default displayio terminal. It now supports a title bar TileGrid in addition to the (newly renamed) scroll area. The default title bar is the top row of the display and is positioned to the right of the Blinka logo when it is enabled. The scroll area is now below the Blinka logo. The Wi-Fi auto-connect code now uses the title bar to show its state including the IP address when connected. It does this through the "standard" OSC control sequence `ESC ] 0 ; <s> ESC \` where <s> is the title bar string. This is commonly supported by terminals so it should work over USB and UART as well. Related to #6174
148 lines
5.9 KiB
C
148 lines
5.9 KiB
C
/*
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "shared-bindings/terminalio/Terminal.h"
|
|
#include "shared-bindings/util.h"
|
|
|
|
#include "py/ioctl.h"
|
|
#include "py/objproperty.h"
|
|
#include "py/objstr.h"
|
|
#include "py/runtime.h"
|
|
#include "py/stream.h"
|
|
#include "shared-bindings/fontio/BuiltinFont.h"
|
|
#include "supervisor/shared/translate/translate.h"
|
|
|
|
//| class Terminal:
|
|
//| """Display a character stream with a TileGrid
|
|
//|
|
|
//| ASCII control:
|
|
//| * ``\\r`` - Move cursor to column 1
|
|
//| * ``\\n`` - Move cursor down a row
|
|
//| * ``\\b`` - Move cursor left one if possible
|
|
//|
|
|
//| OSC control sequences:
|
|
//| * ``ESC ] 0; <s> ESC \\`` - Set title bar to <s>
|
|
//| * ``ESC ] ####; <s> ESC \\`` - Ignored
|
|
//|
|
|
//| VT100 control sequences:
|
|
//| * ``ESC [ K`` - Clear the remainder of the line
|
|
//| * ``ESC [ #### D`` - Move the cursor to the left by ####
|
|
//| * ``ESC [ 2 J`` - Erase the entire display
|
|
//| * ``ESC [ nnnn ; mmmm H`` - Move the cursor to mmmm, nnnn.
|
|
//| """
|
|
//|
|
|
//| def __init__(self, scroll_area: displayio.TileGrid, font: fontio.BuiltinFont, *, title_bar: displayio.TileGrid = None) -> None:
|
|
//| """Terminal manages tile indices and cursor position based on VT100 commands. The font should be
|
|
//| a `fontio.BuiltinFont` and the TileGrid's bitmap should match the font's bitmap."""
|
|
//| ...
|
|
//|
|
|
|
|
STATIC mp_obj_t terminalio_terminal_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
|
|
enum { ARG_scroll_area, ARG_font, ARG_title_bar };
|
|
static const mp_arg_t allowed_args[] = {
|
|
{ MP_QSTR_scroll_area, MP_ARG_REQUIRED | MP_ARG_OBJ },
|
|
{ MP_QSTR_font, MP_ARG_REQUIRED | MP_ARG_OBJ },
|
|
{ MP_QSTR_title_bar, MP_ARG_KW_ONLY | MP_ARG_OBJ, { .u_obj = mp_const_none } },
|
|
};
|
|
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
|
|
mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
|
|
|
|
displayio_tilegrid_t *scroll_area = mp_arg_validate_type(args[ARG_scroll_area].u_obj, &displayio_tilegrid_type, MP_QSTR_scroll_area);
|
|
displayio_tilegrid_t *title_bar = NULL;
|
|
if (args[ARG_title_bar].u_obj != mp_const_none) {
|
|
title_bar = mp_arg_validate_type(args[ARG_title_bar].u_obj, &displayio_tilegrid_type, MP_QSTR_title_bar);
|
|
}
|
|
|
|
fontio_builtinfont_t *font = mp_arg_validate_type(args[ARG_font].u_obj, &fontio_builtinfont_type, MP_QSTR_font);
|
|
|
|
terminalio_terminal_obj_t *self = m_new_obj(terminalio_terminal_obj_t);
|
|
self->base.type = &terminalio_terminal_type;
|
|
|
|
common_hal_terminalio_terminal_construct(self, scroll_area, font, title_bar);
|
|
return MP_OBJ_FROM_PTR(self);
|
|
}
|
|
|
|
// These are standard stream methods. Code is in py/stream.c.
|
|
//
|
|
//| def write(self, buf: ReadableBuffer) -> Optional[int]:
|
|
//| """Write the buffer of bytes to the bus.
|
|
//|
|
|
//| :return: the number of bytes written
|
|
//| :rtype: int or None"""
|
|
//| ...
|
|
//|
|
|
STATIC mp_uint_t terminalio_terminal_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
|
|
terminalio_terminal_obj_t *self = MP_OBJ_TO_PTR(self_in);
|
|
const byte *buf = buf_in;
|
|
|
|
return common_hal_terminalio_terminal_write(self, buf, size, errcode);
|
|
}
|
|
|
|
STATIC mp_uint_t terminalio_terminal_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
|
|
terminalio_terminal_obj_t *self = MP_OBJ_TO_PTR(self_in);
|
|
mp_uint_t ret;
|
|
if (request == MP_IOCTL_POLL) {
|
|
mp_uint_t flags = arg;
|
|
ret = 0;
|
|
if ((flags & MP_IOCTL_POLL_WR) && common_hal_terminalio_terminal_ready_to_tx(self)) {
|
|
ret |= MP_IOCTL_POLL_WR;
|
|
}
|
|
} else {
|
|
*errcode = MP_EINVAL;
|
|
ret = MP_STREAM_ERROR;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
STATIC const mp_rom_map_elem_t terminalio_terminal_locals_dict_table[] = {
|
|
// Standard stream methods.
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
|
|
};
|
|
STATIC MP_DEFINE_CONST_DICT(terminalio_terminal_locals_dict, terminalio_terminal_locals_dict_table);
|
|
|
|
STATIC const mp_stream_p_t terminalio_terminal_stream_p = {
|
|
MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
|
|
.read = NULL,
|
|
.write = terminalio_terminal_write,
|
|
.ioctl = terminalio_terminal_ioctl,
|
|
.is_text = true,
|
|
};
|
|
|
|
const mp_obj_type_t terminalio_terminal_type = {
|
|
{ &mp_type_type },
|
|
.flags = MP_TYPE_FLAG_EXTENDED,
|
|
.name = MP_QSTR_Terminal,
|
|
.make_new = terminalio_terminal_make_new,
|
|
.locals_dict = (mp_obj_dict_t *)&terminalio_terminal_locals_dict,
|
|
MP_TYPE_EXTENDED_FIELDS(
|
|
.getiter = mp_identity_getiter,
|
|
.iternext = mp_stream_unbuffered_iter,
|
|
.protocol = &terminalio_terminal_stream_p,
|
|
),
|
|
};
|