merge from upstream

Author: dhalbert

.github/workflows/build.yml

@@ -22,7 +22,8 @@ jobs:
  python-version: 3.5
  - name: Install deps
  run: |
- sudo apt-get install -y gettext librsvg2-bin
+ sudo apt-get install -y eatmydata
+ sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
  pip install requests sh click setuptools cpp-coveralls Sphinx sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
  - name: Versions
  run: |
@@ -66,20 +67,71 @@ jobs:
  run: python3 -u ci_new_boards_check.py
  working-directory: tools
 
+ - name: Build mpy-cross.static-raspbian
+ run: make -C mpy-cross -j2 -f Makefile.static-raspbian
+ - uses: actions/upload-artifact@v1.0.0
+ with:
+ name: mpy-cross.static-raspbian
+ path: mpy-cross/mpy-cross.static-raspbian
+
+ - name: Build mpy-cross.static
+ run: make -C mpy-cross -j2 -f Makefile.static
+ - uses: actions/upload-artifact@v1.0.0
+ with:
+ name: mpy-cross.static-amd64-linux
+ path: mpy-cross/mpy-cross.static
+
+ - name: Build mpy-cross.static-mingw
+ run: make -C mpy-cross -j2 -f Makefile.static-mingw
+ - uses: actions/upload-artifact@v1.0.0
+ with:
+ name: mpy-cross.static-x64-windows
+ path: mpy-cross/mpy-cross.static.exe
+
+ mpy-cross-mac:
+ runs-on: macos-latest
+ steps:
+ - name: Dump GitHub context
+ env:
+ GITHUB_CONTEXT: ${{ toJson(github) }}
+ run: echo "$GITHUB_CONTEXT"
+ - name: Install deps
+ run: |
+ brew link --force gettext
+ - name: Versions
+ run: |
+ gcc --version
+ python3 --version
+ msgfmt --version
+ - uses: actions/checkout@v1
+ with:
+ submodules: true
+ - name: CircuitPython version
+ run: git describe --dirty --always --tags
+ - name: Build mpy-cross
+ run: make -C mpy-cross -j2
+ - uses: actions/upload-artifact@v1.0.0
+ with:
+ name: mpy-cross-macos-catalina
+ path: mpy-cross/mpy-cross
+
  build-arm:
  runs-on: ubuntu-16.04
  needs: test
  strategy:
  fail-fast: false
  matrix:
  board:
+ - "aramcon_badge_2019"
  - "arduino_mkr1300"
  - "arduino_mkrzero"
  - "arduino_nano_33_ble"
  - "arduino_zero"
  - "bast_pro_mini_m0"
  - "capablerobot_usbhub"
  - "catwan_usbstick"
+ - "circuitbrains_basic_m0"
+ - "circuitbrains_deluxe_m4"
  - "circuitplayground_bluefruit"
  - "circuitplayground_express"
  - "circuitplayground_express_crickit"
@@ -94,6 +146,9 @@ jobs:
  - "electronut_labs_blip"
  - "electronut_labs_papyr"
  - "escornabot_makech"
+ - "espruino_pico"
+ - "espruino_wifi"
+ - "feather_bluefruit_sense"
  - "feather_m0_adalogger"
  - "feather_m0_basic"
  - "feather_m0_express"
@@ -102,6 +157,7 @@ jobs:
  - "feather_m0_rfm9x"
  - "feather_m0_supersized"
  - "feather_m4_express"
+ - "feather_m7_1011"
  - "feather_mimxrt1011"
  - "feather_mimxrt1062"
  - "feather_nrf52840_express"
@@ -112,19 +168,25 @@ jobs:
  - "hallowing_m0_express"
  - "hallowing_m4_express"
  - "imxrt1010_evk"
+ - "imxrt1020_evk"
+ - "imxrt1060_evk"
  - "itsybitsy_m0_express"
  - "itsybitsy_m4_express"
  - "itsybitsy_nrf52840_express"
  - "kicksat-sprite"
  - "makerdiary_nrf52840_mdk"
  - "makerdiary_nrf52840_mdk_usb_dongle"
+ - "meowbit_v121"
  - "meowmeow"
  - "metro_m0_express"
  - "metro_m4_airlift_lite"
  - "metro_m4_express"
  - "metro_nrf52840_express"
  - "mini_sam_m4"
  - "monster_m4sk"
+ - "ndgarage_ndbit6"
+ - "ohs2020_badge"
+ - "openbook_m4"
  - "particle_argon"
  - "particle_boron"
  - "particle_xenon"
@@ -137,13 +199,15 @@ jobs:
  - "pybadge"
  - "pybadge_airlift"
  - "pyboard_v11"
+ - "pycubed"
  - "pygamer"
  - "pygamer_advance"
  - "pyportal"
  - "pyportal_titano"
  - "pyruler"
  - "robohatmm1_m4"
  - "sam32"
+ - "seeeduino_xiao"
  - "serpente"
  - "shirtty"
  - "snekboard"
@@ -158,7 +222,9 @@ jobs:
  - "stm32f411ce_blackpill"
  - "stm32f411ve_discovery"
  - "stm32f412zg_discovery"
+ - "stm32f4_discovery"
  - "stringcar_m0_express"
+ - "teensy40"
  - "teknikio_bluebird"
  - "trellis_m4_express"
  - "trinket_m0"

.gitmodules

@@ -110,4 +110,7 @@
 url = https://github.com/adafruit/Adafruit_MP3
 [submodule "ports/mimxrt10xx/sdk"]
 path = ports/mimxrt10xx/sdk
-url = https://github.com/arturo182/MIMXRT10xx_SDK
+url = https://github.com/adafruit/MIMXRT10xx_SDK
+[submodule "frozen/Adafruit_CircuitPython_Register"]
+path = frozen/Adafruit_CircuitPython_Register
+url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git

Makefile

@@ -36,7 +36,7 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(BASEOPTS)
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS = $(BASEOPTS)
 
-TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/nrf py shared-bindings shared-module supervisor
+TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/mimxrt10xx ports/nrf ports/stm32f4 py shared-bindings shared-module supervisor
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext stubs
 

README.rst

@@ -94,13 +94,12 @@ Differences from `MicroPython <https://github.com/micropython/micropython>`__
 
 CircuitPython:
 
-- includes ports for MicroChip SAMD21 (Commonly known as M0 in Adafruit
- product names) and SAMD51 (M4).
-- supports only SAMD21, SAMD51, and nRF52840 ports.
-- tracks MicroPython's releases (not master).
-- floats (aka decimals) are enabled for all builds.
-- error messages are translated into 10+ languages.
-- does not support concurrency within Python (including interrupts and threading). Some concurrency
+- Supports native USB on all boards, allowing file editing without special tools.
+- Supports only SAMD21, SAMD51, nRF52840, CXD56, STM32F4 and i.MX RT ports.
+- Tracks MicroPython's releases (not master).
+- Floats (aka decimals) are enabled for all builds.
+- Error messages are translated into 10+ languages.
+- Does not support concurrency within Python (including interrupts and threading). Some concurrency
  is achieved with native modules for tasks that require it such as audio file playback.
 
 Behavior

conf.py

@@ -125,6 +125,7 @@
  "ports/cc3200",
  "ports/cc3200/FreeRTOS",
  "ports/cc3200/hal",
+ "ports/cxd56/mkspk",
  "ports/cxd56/spresense-exported-sdk",
  "ports/esp32",
  "ports/esp8266/boards",

docs/shared_bindings_matrix.py

@@ -185,7 +185,7 @@ def get_excluded_boards(base):
  board_is_excluded = True
 
  # check if module is specifically disabled for this board
- re_pattern = "CIRCUITPY_{}\s=\s(\w)".format(module.upper())
+ re_pattern = r"CIRCUITPY_{}\s=\s(\w)".format(module.upper())
  find_module = re.search(re_pattern, contents)
  if not find_module:
  if base[module]["default_value"].isdigit():
@@ -204,9 +204,7 @@ def get_excluded_boards(base):
  ]):
  check_dependent_modules[module] = base[module]["default_value"]
  else:
- if (find_module.group(1) == "0" and
- find_module.group(1) != base[module]["default_value"]):
- board_is_excluded = True
+ board_is_excluded = find_module.group(1) == "0"
 
  if board_is_excluded:
  if board_chip in base[module]["excluded"]:

extmod/modframebuf.c

@@ -28,6 +28,7 @@
 #include <string.h>
 
 #include "py/runtime.h"
+#include "py/objtype.h"
 #include "py/proto.h"
 
 #if MICROPY_PY_FRAMEBUF
@@ -304,17 +305,26 @@ STATIC mp_obj_t framebuf_make_new(const mp_obj_type_t *type, size_t n_args, cons
  return MP_OBJ_FROM_PTR(o);
 }
 
+STATIC const mp_obj_type_t mp_type_framebuf;
+
+// Helper to ensure we have the native super class instead of a subclass.
+static mp_obj_framebuf_t* native_framebuf(mp_obj_t framebuf_obj) {
+ mp_obj_t native_framebuf = mp_instance_cast_to_native_base(framebuf_obj, &mp_type_framebuf);
+ mp_obj_assert_native_inited(native_framebuf);
+ return MP_OBJ_TO_PTR(native_framebuf);
+}
+
 STATIC mp_int_t framebuf_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
  (void)flags;
- mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(self_in);
+ mp_obj_framebuf_t *self = native_framebuf(self_in);
  bufinfo->buf = self->buf;
  bufinfo->len = self->stride * self->height * (self->format == FRAMEBUF_RGB565 ? 2 : 1);
  bufinfo->typecode = 'B'; // view framebuf as bytes
  return 0;
 }
 
 STATIC mp_obj_t framebuf_fill(mp_obj_t self_in, mp_obj_t col_in) {
- mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(self_in);
+ mp_obj_framebuf_t *self = native_framebuf(self_in);
  mp_int_t col = mp_obj_get_int(col_in);
  formats[self->format].fill_rect(self, 0, 0, self->width, self->height, col);
  return mp_const_none;
@@ -324,7 +334,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(framebuf_fill_obj, framebuf_fill);
 STATIC mp_obj_t framebuf_fill_rect(size_t n_args, const mp_obj_t *args) {
  (void)n_args;
 
- mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
+ mp_obj_framebuf_t *self = native_framebuf(args[0]);
  mp_int_t x = mp_obj_get_int(args[1]);
  mp_int_t y = mp_obj_get_int(args[2]);
  mp_int_t width = mp_obj_get_int(args[3]);
@@ -338,7 +348,7 @@ STATIC mp_obj_t framebuf_fill_rect(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_fill_rect_obj, 6, 6, framebuf_fill_rect);
 
 STATIC mp_obj_t framebuf_pixel(size_t n_args, const mp_obj_t *args) {
- mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
+ mp_obj_framebuf_t *self = native_framebuf(args[0]);
  mp_int_t x = mp_obj_get_int(args[1]);
  mp_int_t y = mp_obj_get_int(args[2]);
  if (0 <= x && x < self->width && 0 <= y && y < self->height) {
@@ -357,7 +367,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_pixel_obj, 3, 4, framebuf_pi
 STATIC mp_obj_t framebuf_hline(size_t n_args, const mp_obj_t *args) {
  (void)n_args;
 
- mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
+ mp_obj_framebuf_t *self = native_framebuf(args[0]);
  mp_int_t x = mp_obj_get_int(args[1]);
  mp_int_t y = mp_obj_get_int(args[2]);
  mp_int_t w = mp_obj_get_int(args[3]);
@@ -372,7 +382,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_hline_obj, 5, 5, framebuf_hl
 STATIC mp_obj_t framebuf_vline(size_t n_args, const mp_obj_t *args) {
  (void)n_args;
 
- mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
+ mp_obj_framebuf_t *self = native_framebuf(args[0]);
  mp_int_t x = mp_obj_get_int(args[1]);
  mp_int_t y = mp_obj_get_int(args[2]);
  mp_int_t h = mp_obj_get_int(args[3]);
@@ -387,7 +397,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_vline_obj, 5, 5, framebuf_vl
 STATIC mp_obj_t framebuf_rect(size_t n_args, const mp_obj_t *args) {
  (void)n_args;
 
- mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
+ mp_obj_framebuf_t *self = native_framebuf(args[0]);
  mp_int_t x = mp_obj_get_int(args[1]);
  mp_int_t y = mp_obj_get_int(args[2]);
  mp_int_t w = mp_obj_get_int(args[3]);
@@ -406,7 +416,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_rect_obj, 6, 6, framebuf_rec
 STATIC mp_obj_t framebuf_line(size_t n_args, const mp_obj_t *args) {
  (void)n_args;
 
- mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
+ mp_obj_framebuf_t *self = native_framebuf(args[0]);
  mp_int_t x1 = mp_obj_get_int(args[1]);
  mp_int_t y1 = mp_obj_get_int(args[2]);
  mp_int_t x2 = mp_obj_get_int(args[3]);
@@ -470,8 +480,8 @@ STATIC mp_obj_t framebuf_line(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_line_obj, 6, 6, framebuf_line);
 
 STATIC mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args) {
- mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
- mp_obj_framebuf_t *source = MP_OBJ_TO_PTR(args[1]);
+ mp_obj_framebuf_t *self = native_framebuf(args[0]);
+ mp_obj_framebuf_t *source = native_framebuf(args[1]);
  mp_int_t x = mp_obj_get_int(args[2]);
  mp_int_t y = mp_obj_get_int(args[3]);
  mp_int_t key = -1;
@@ -513,7 +523,7 @@ STATIC mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_blit_obj, 4, 5, framebuf_blit);
 
 STATIC mp_obj_t framebuf_scroll(mp_obj_t self_in, mp_obj_t xstep_in, mp_obj_t ystep_in) {
- mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(self_in);
+ mp_obj_framebuf_t *self = native_framebuf(self_in);
  mp_int_t xstep = mp_obj_get_int(xstep_in);
  mp_int_t ystep = mp_obj_get_int(ystep_in);
  int sx, y, xend, yend, dx, dy;
@@ -546,7 +556,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(framebuf_scroll_obj, framebuf_scroll);
 
 STATIC mp_obj_t framebuf_text(size_t n_args, const mp_obj_t *args) {
  // extract arguments
- mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
+ mp_obj_framebuf_t *self = native_framebuf(args[0]);
  const char *str = mp_obj_str_get_str(args[1]);
  mp_int_t x0 = mp_obj_get_int(args[2]);
  mp_int_t y0 = mp_obj_get_int(args[3]);

extmod/vfs_fat.c

@@ -345,24 +345,31 @@ STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
  } else {
  mode |= MP_S_IFREG;
  }
- mp_uint_t seconds = timeutils_seconds_since_epoch(
- 1980 + ((fno.fdate >> 9) & 0x7f),
- (fno.fdate >> 5) & 0x0f,
- fno.fdate & 0x1f,
- (fno.ftime >> 11) & 0x1f,
- (fno.ftime >> 5) & 0x3f,
- 2 * (fno.ftime & 0x1f)
- );
+#if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_NONE
+ // On non-longint builds, the number of seconds since 1970 (epoch) is too
+ // large to fit in a smallint, so just return 31-DEC-1999 (0).
+ mp_obj_t seconds = MP_OBJ_NEW_SMALL_INT(946684800);
+#else
+ mp_obj_t seconds = mp_obj_new_int_from_uint(
+ timeutils_seconds_since_epoch(
+ 1980 + ((fno.fdate >> 9) & 0x7f),
+ (fno.fdate >> 5) & 0x0f,
+ fno.fdate & 0x1f,
+ (fno.ftime >> 11) & 0x1f,
+ (fno.ftime >> 5) & 0x3f,
+ 2 * (fno.ftime & 0x1f)
+ ));
+#endif
  t->items[0] = MP_OBJ_NEW_SMALL_INT(mode); // st_mode
  t->items[1] = MP_OBJ_NEW_SMALL_INT(0); // st_ino
  t->items[2] = MP_OBJ_NEW_SMALL_INT(0); // st_dev
  t->items[3] = MP_OBJ_NEW_SMALL_INT(0); // st_nlink
  t->items[4] = MP_OBJ_NEW_SMALL_INT(0); // st_uid
  t->items[5] = MP_OBJ_NEW_SMALL_INT(0); // st_gid
  t->items[6] = mp_obj_new_int_from_uint(fno.fsize); // st_size
- t->items[7] = mp_obj_new_int_from_uint(seconds); // st_atime
- t->items[8] = mp_obj_new_int_from_uint(seconds); // st_mtime
- t->items[9] = mp_obj_new_int_from_uint(seconds); // st_ctime
+ t->items[7] = seconds;  // st_atime
+ t->items[8] = seconds;  // st_mtime
+ t->items[9] = seconds;  // st_ctime
 
  return MP_OBJ_FROM_PTR(t);
 }

extmod/vfs_fat_file.c

@@ -28,6 +28,7 @@
 #if MICROPY_VFS && MICROPY_VFS_FAT
 
 #include <stdio.h>
+#include <string.h>
 
 #include "py/runtime.h"
 #include "py/stream.h"
@@ -199,7 +200,7 @@ STATIC mp_obj_t file_open(fs_user_mount_t *vfs, const mp_obj_type_t *type, mp_ar
  FRESULT res = f_open(&vfs->fatfs, &o->fp, fname, mode);
  if (res != FR_OK) {
  m_del_obj(pyb_file_obj_t, o);
- mp_raise_OSError(fresult_to_errno_table[res]);
+ mp_raise_OSError_errno_str(fresult_to_errno_table[res], args[0].u_obj);
  }
  // If we're reading, turn on fast seek.
  if (mode == FA_READ) {