diff options
| author | Dan Halbert <halbert@halwitz.org> | 2019-08-20 13:06:23 -0400 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2019-08-20 13:06:23 -0400 |
| commit | e00696de7ff5828c78decb115f7ff1e3837ff194 (patch) | |
| tree | 1846a0898b197d6118b358689ea5cc76d49dbccc /py | |
| parent | 58d29feab1095fbd33e6b068fed0d266427146b7 (diff) | |
| parent | 42143ca0568c69bec6c60da3ae9a1e8f3ca106ff (diff) | |
merge from upstream and make translate
Diffstat (limited to 'py')
| -rw-r--r-- | py/circuitpy_mpconfig.h | 3 | ||||
| -rw-r--r-- | py/circuitpy_mpconfig.mk | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 1dbca8c61..393b7600c 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -596,8 +596,8 @@ extern const struct _mp_obj_module_t ustack_module; WIZNET_MODULE \ PEW_MODULE \ PIXELBUF_MODULE \ - PULSEIO_MODULE \ PS2IO_MODULE \ + PULSEIO_MODULE \ RANDOM_MODULE \ RE_MODULE \ ROTARYIO_MODULE \ @@ -645,6 +645,7 @@ extern const struct _mp_obj_module_t ustack_module; NETWORK_ROOT_POINTERS \ void run_background_tasks(void); +#define RUN_BACKGROUND_TASKS (run_background_tasks()) // TODO: Used in wiznet5k driver, but may not be needed in the long run. #define MICROPY_THREAD_YIELD() diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 7469fbf3f..949cd1d18 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -74,6 +74,12 @@ CIRCUITPY_AUDIOIO = $(CIRCUITPY_FULL_BUILD) endif CFLAGS += -DCIRCUITPY_AUDIOIO=$(CIRCUITPY_AUDIOIO) +ifndef CIRCUITPY_AUDIOIO_COMPAT +CIRCUITPY_AUDIOIO_COMPAT = $(CIRCUITPY_AUDIOIO) +endif +CFLAGS += -DCIRCUITPY_AUDIOIO_COMPAT=$(CIRCUITPY_AUDIOIO_COMPAT) + + ifndef CIRCUITPY_AUDIOPWMIO CIRCUITPY_AUDIOPWMIO = 0 endif |