Merge branch 'master' into circuitpython-nickzoic-716-pulseio-esp8266

Author: nickzoic

.travis.yml

@@ -12,6 +12,7 @@ env:
   - TRAVIS_BOARD=feather_m0_rfm69
   - TRAVIS_BOARD=feather_m0_rfm9x
   - TRAVIS_BOARD=feather_m0_express
+  - TRAVIS_BOARD=feather_m0_express_crickit
   - TRAVIS_BOARD=feather_m4_express
   - TRAVIS_BOARD=itsybitsy_m0_express
   - TRAVIS_BOARD=itsybitsy_m4_express

README.rst

@@ -104,7 +104,7 @@ Differences from `MicroPython <https://github.com/micropython/micropython>`__
 CircuitPython:
 
 -  includes a ports for MicroChip SAMD21 (Commonly known as M0 in Adafruit
-   product names and SAMD51 (M4).
+   product names) and SAMD51 (M4).
 -  supports only SAMD21, SAMD51, and ESP8266 ports. An nRF port is under
    development.
 -  tracks MicroPython's releases (not master).

main.c

@@ -233,40 +233,7 @@ bool start_mp(safe_mode_t safe_mode) {
     }
 }
 
-int __attribute__((used)) main(void) {
-    // initialise the cpu and peripherals
-    safe_mode_t safe_mode = port_init();
-
-    rgb_led_status_init();
-
-    // Stack limit should be less than real stack size, so we have a chance
-    // to recover from limit hit.  (Limit is measured in bytes.)
-    mp_stack_ctrl_init();
-    mp_stack_set_limit((char*)&_estack - (char*)&_ebss - 1024);
-
-#if MICROPY_MAX_STACK_USAGE
-    // _ezero (same as _ebss) is an int, so start 4 bytes above it.
-    mp_stack_set_bottom(&_ezero + 1);
-    mp_stack_fill_with_sentinel();
-#endif
-
-    // Create a new filesystem only if we're not in a safe mode.
-    // A power brownout here could make it appear as if there's
-    // no SPI flash filesystem, and we might erase the existing one.
-    filesystem_init(safe_mode == NO_SAFE_MODE, false);
-
-    // Reset everything and prep MicroPython to run boot.py.
-    reset_port();
-    reset_board();
-    reset_mp();
-
-    // Turn on autoreload by default but before boot.py in case it wants to change it.
-    autoreload_enable();
-
-    // By default our internal flash is readonly to local python code and
-    // writable over USB. Set it here so that boot.py can change it.
-    filesystem_writable_by_python(false);
-
+void run_boot_py(safe_mode_t safe_mode) {
     // If not in safe mode, run boot before initing USB and capture output in a
     // file.
     if (filesystem_present() && safe_mode == NO_SAFE_MODE && MP_STATE_VM(vfs_mount_table) != NULL) {
@@ -338,6 +305,43 @@ int __attribute__((used)) main(void) {
         reset_port();
         reset_mp();
     }
+}
+
+int __attribute__((used)) main(void) {
+    // initialise the cpu and peripherals
+    safe_mode_t safe_mode = port_init();
+
+    rgb_led_status_init();
+
+    // Stack limit should be less than real stack size, so we have a chance
+    // to recover from limit hit.  (Limit is measured in bytes.)
+    mp_stack_set_top((char*)&_estack);
+    mp_stack_set_limit((char*)&_estack - (char*)&_ebss - 1024);
+
+#if MICROPY_MAX_STACK_USAGE
+    // _ezero (same as _ebss) is an int, so start 4 bytes above it.
+    mp_stack_set_bottom(&_ezero + 1);
+    mp_stack_fill_with_sentinel();
+#endif
+
+    // Create a new filesystem only if we're not in a safe mode.
+    // A power brownout here could make it appear as if there's
+    // no SPI flash filesystem, and we might erase the existing one.
+    filesystem_init(safe_mode == NO_SAFE_MODE, false);
+
+    // Reset everything and prep MicroPython to run boot.py.
+    reset_port();
+    reset_board();
+    reset_mp();
+
+    // Turn on autoreload by default but before boot.py in case it wants to change it.
+    autoreload_enable();
+
+    // By default our internal flash is readonly to local python code and
+    // writable over USB. Set it here so that boot.py can change it.
+    filesystem_writable_by_python(false);
+
+    run_boot_py(safe_mode);
 
     // Start serial and HID after giving boot.py a chance to tweak behavior.
     serial_init();

ports/atmel-samd/background.c

@@ -26,11 +26,19 @@
 #include "background.h"
 
 #include "audio_dma.h"
+#include "tick.h"
 #include "usb.h"
 #include "usb_mass_storage.h"
 
+volatile uint64_t last_finished_tick = 0;
+
 void run_background_tasks(void) {
     audio_dma_background();
     usb_msc_background();
     usb_cdc_background();
+    last_finished_tick = ticks_ms;
+}
+
+bool background_tasks_ok(void) {
+    return ticks_ms - last_finished_tick < 1000;
 }

ports/atmel-samd/background.h

@@ -27,6 +27,9 @@
 #ifndef MICROPY_INCLUDED_ATMEL_SAMD_BACKGROUND_H
 #define MICROPY_INCLUDED_ATMEL_SAMD_BACKGROUND_H
 
+#include <stdbool.h>
+
 void run_background_tasks(void);
+bool background_tasks_ok(void);
 
 #endif  // MICROPY_INCLUDED_ATMEL_SAMD_BACKGROUND_H

ports/atmel-samd/bindings/samd/Clock.c

@@ -47,15 +47,7 @@
 STATIC void samd_clock_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    mp_printf(print, "%q.%q.%s(", MP_QSTR_samd, MP_QSTR_clock, self->name);
-    if (clock_get_enabled(self->type, self->index)) {
-        mp_printf(print, "frequency=%u", clock_get_frequency(self->type, self->index));
-        uint32_t calibration = clock_get_calibration(self->type, self->index);
-        if (calibration) {
-            mp_printf(print, ", calibration=%u", calibration);
-        }
-    }
-    mp_printf(print, ")");
+    mp_printf(print, "%q.%q.%q", MP_QSTR_samd, MP_QSTR_clock, self->name);
 }
 
 //|     .. attribute:: enabled

ports/atmel-samd/bindings/samd/Clock.h

@@ -31,39 +31,39 @@
 
 typedef struct {
     mp_obj_base_t base;
-    const char *name;
+    qstr name;
     uint8_t type;
     uint8_t index;
 } samd_clock_obj_t;
 
 #define CLOCK(_name, _type, _index) \
 const samd_clock_obj_t clock_ ## _name = { \
     { &samd_clock_type }, \
-    .name = #_name, \
+    .name = MP_QSTR_ ## _name, \
     .type = _type, \
     .index = _index, \
 }
 
 #define CLOCK_SOURCE(_name) \
 const samd_clock_obj_t clock_ ## _name = { \
     { &samd_clock_type }, \
-    .name = #_name, \
+    .name = MP_QSTR_ ## _name, \
     .type = 0, \
     .index = GCLK_SOURCE_ ## _name, \
 }
 
 #define CLOCK_GCLK(_name) \
 const samd_clock_obj_t clock_ ## _name = { \
     { &samd_clock_type }, \
-    .name = #_name, \
+    .name = MP_QSTR_ ## _name, \
     .type = 1, \
     .index = _name ## _GCLK_ID, \
 }
 
 #define CLOCK_GCLK_(_name, _extra) \
 const samd_clock_obj_t clock_ ## _name ## _ ## _extra = { \
     { &samd_clock_type }, \
-    .name = #_name "_" #_extra, \
+    .name = MP_QSTR_ ## _name ## _ ## _extra, \
     .type = 1, \
     .index = _name ## _GCLK_ID_ ## _extra, \
 }

ports/atmel-samd/boards/arduino_zero/mpconfigboard.h

@@ -24,3 +24,7 @@
 
 #define DEFAULT_UART_BUS_RX (&pin_PA11)
 #define DEFAULT_UART_BUS_TX (&pin_PA10)
+
+// USB is always used internally so skip the pin objects for it.
+#define IGNORE_PIN_PA24     1
+#define IGNORE_PIN_PA25     1

ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h

@@ -68,3 +68,7 @@
 
 #define DEFAULT_UART_BUS_RX (&pin_PB09)
 #define DEFAULT_UART_BUS_TX (&pin_PB08)
+
+// USB is always used internally so skip the pin objects for it.
+#define IGNORE_PIN_PA24     1
+#define IGNORE_PIN_PA25     1

ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h

@@ -71,3 +71,7 @@
 
 #define DEFAULT_UART_BUS_RX (&pin_PB09)
 #define DEFAULT_UART_BUS_TX (&pin_PB08)
+
+// USB is always used internally so skip the pin objects for it.
+#define IGNORE_PIN_PA24     1
+#define IGNORE_PIN_PA25     1